Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

decouple individual cards and create a new component

Vincenta8a84071d222
diff --git a/ui/app/main/package.json b/ui/app/main/package.json
index 3e707cfdf..d0e2f4041 100644
--- a/ui/app/main/package.json
+++ b/ui/app/main/package.json
@@ -16,6 +16,7 @@
},
"dependencies": {
"@openremote/core": "^1.1.0",
+ "@openremote/or-asset-detail": "^1.0.0",
"@openremote/or-asset-tree": "^1.1.0",
"@openremote/or-asset-viewer": "^1.1.0",
"@openremote/or-header": "^1.1.0",
diff --git a/ui/app/main/src/components/pages/page-insights.ts b/ui/app/main/src/components/pages/page-insights.ts
index 8268b21c0..b34f20fc4 100644
--- a/ui/app/main/src/components/pages/page-insights.ts
+++ b/ui/app/main/src/components/pages/page-insights.ts
@@ -5,6 +5,8 @@ import "@openremote/or-data-viewer";
import {DataViewerConfig} from "@openremote/or-data-viewer";
import {DefaultBoxShadow, DefaultColor1, DefaultColor2, DefaultColor3, DefaultColor5} from "@openremote/core";
+import "@openremote/or-asset-detail";
+
// language=CSS
const style = css`
@@ -75,32 +77,6 @@ const style = css`
grid-column-start: 1;
grid-column-end: -1;
}
-
- .panel {
- background-color: var(--internal-or-asset-viewer-panel-color);
- border: 1px solid #e5e5e5;
- border-radius: 5px;
- max-width: 100%;
- position: relative;
- }
-
- .panel-content-wrapper {
- padding: var(--internal-or-asset-viewer-panel-padding);
- }
-
- .panel-content {
- display: flex;
- flex-wrap: wrap;
- }
-
- .panel-title {
- text-transform: uppercase;
- font-weight: bolder;
- line-height: 1em;
- color: var(--internal-or-asset-viewer-title-text-color);
- margin-bottom: 25px;
- flex: 0 0 auto;
- }
`;
const viewerConfig: DataViewerConfig = {
@@ -134,49 +110,13 @@ class PageInsights extends connect(store)(LitElement) {
return html`
<div id="wrapper">
<div id="container">
- <div class="panel" id="attributeDetail-panel">
- <div class="panel-content-wrapper">
- <div class="panel-title">
- <or-translate value="attributeDetail"></or-translate>
- </div>
- <div class="panel-content">
- <p>hello</p>
- </div>
- </div>
- </div>
- <div class="panel" id="attributeDetail-panel">
- <div class="panel-content-wrapper">
- <div class="panel-title">
- <or-translate value="attributeDetail"></or-translate>
- </div>
- <div class="panel-content">
- <p>person</p>
- </div>
- </div>
- </div>
- <div class="panel" id="attributeDetail-panel">
- <div class="panel-content-wrapper">
- <div class="panel-title">
- <or-translate value="attributeDetail"></or-translate>
- </div>
- <div class="panel-content">
- <p>welcome</p>
- </div>
- </div>
- </div>
- <div class="panel" id="attributeDetail-panel">
- <div class="panel-content-wrapper">
- <div class="panel-title">
- <or-translate value="attributeDetail"></or-translate>
- </div>
- <div class="panel-content">
- <p>to this place</p>
- </div>
- </div>
- </div>
- <div class="row">
-<!-- <or-data-viewer .config="${viewerConfig}"></or-data-viewer>-->
- </div>
+ <or-asset-detail></or-asset-detail>
+ <or-asset-detail></or-asset-detail>
+ <or-asset-detail></or-asset-detail>
+ <or-asset-detail></or-asset-detail>
+ <!--<div class="row">-->
+ <!-- <or-data-viewer .config="${viewerConfig}"></or-data-viewer>-->
+ <!--</div>-->
</div>
</div>
`;
diff --git a/ui/app/main/tsconfig.json b/ui/app/main/tsconfig.json
index 7653431a9..d50f266b4 100644
--- a/ui/app/main/tsconfig.json
+++ b/ui/app/main/tsconfig.json
@@ -14,7 +14,8 @@
{ "path": "../../component/or-header" },
{ "path": "../../component/or-input" },
{ "path": "../../component/or-map" },
- { "path": "../../component/or-asset-tree" },
+ { "path": "../../component/or-asset-detail" },
+ { "path": "../../component/or-asset-tree" },
{ "path": "../../component/or-attribute-input" },
{ "path": "../../component/or-chart" },
{ "path": "../../component/or-asset-viewer" },
diff --git a/ui/component/or-asset-detail/.npmignore b/ui/component/or-asset-detail/.npmignore
new file mode 100644
index 000000000..17e64b1ad
--- /dev/null
+++ b/ui/component/or-asset-detail/.npmignore
@@ -0,0 +1,8 @@
+build/
+build.gradle
+test/
+src/
+webpack.config.js
+tsconfig.json
+dist/*.map
+.tsbuildinfo
\ No newline at end of file
diff --git a/ui/component/or-asset-detail/README.md b/ui/component/or-asset-detail/README.md
new file mode 100644
index 000000000..734b6ef4a
--- /dev/null
+++ b/ui/component/or-asset-detail/README.md
@@ -0,0 +1,31 @@
+# @openremote/or-asset-detail \<or-asset-detail\>
+[![NPM Version][npm-image]][npm-url]
+[![Linux Build][travis-image]][travis-url]
+[![Test Coverage][coveralls-image]][coveralls-url]
+
+Web Component for displaying an input control.
+
+## Install
+```bash
+npm i @openremote/or-input
+yarn add @openremote/or-input
+```
+
+## Usage
+For a full list of properties, methods and options refer to the TypeDoc generated [documentation]().
+
+
+## Supported Browsers
+The last 2 versions of all modern browsers are supported, including Chrome, Safari, Opera, Firefox, Edge. In addition,
+Internet Explorer 11 is also supported.
+
+
+## License
+[GNU AGPL](https://www.gnu.org/licenses/agpl-3.0.en.html)
+
+[npm-image]: https://img.shields.io/npm/v/live-xxx.svg
+[npm-url]: https://npmjs.org/package/@openremote/or-input
+[travis-image]: https://img.shields.io/travis/live-js/live-xxx/master.svg
+[travis-url]: https://travis-ci.org/live-js/live-xxx
+[coveralls-image]: https://img.shields.io/coveralls/live-js/live-xxx/master.svg
+[coveralls-url]: https://coveralls.io/r/live-js/live-xxx?branch=master
diff --git a/ui/component/or-asset-detail/build.gradle b/ui/component/or-asset-detail/build.gradle
new file mode 100644
index 000000000..98cdcb8e2
--- /dev/null
+++ b/ui/component/or-asset-detail/build.gradle
@@ -0,0 +1,15 @@
+buildDir = "dist"
+
+task clean() {
+ doLast {
+ delete "dist"
+ }
+}
+
+task prepareUi() {
+ dependsOn clean, npmPrepare
+}
+
+task publishUi() {
+ dependsOn clean, npmPublish
+}
\ No newline at end of file
diff --git a/ui/component/or-asset-detail/package.json b/ui/component/or-asset-detail/package.json
new file mode 100644
index 000000000..efef20798
--- /dev/null
+++ b/ui/component/or-asset-detail/package.json
@@ -0,0 +1,24 @@
+{
+ "name": "@openremote/or-asset-detail",
+ "version": "1.0.0",
+ "description": "OpenRemote asset detail",
+ "main": "dist/umd/index.bundle.js",
+ "module": "dist/index.js",
+ "types": "dist/index.d.ts",
+ "scripts": {
+ "build": "npx tsc -b",
+ "test": "echo \"No tests\" && exit 0",
+ "prepublishOnly": "npx tsc -b && npx webpack"
+ },
+ "author": "OpenRemote",
+ "license": "AGPL-3.0-or-later",
+ "dependencies": {
+ "lit-element": "^2.2.1"
+ },
+ "devDependencies": {
+ "tslint": ">=5.11.0",
+ "typescript": ">=3.4.5",
+ "webpack": "^4.41.2",
+ "webpack-cli": "^3.3.9"
+ }
+}
diff --git a/ui/component/or-asset-detail/src/index.ts b/ui/component/or-asset-detail/src/index.ts
new file mode 100644
index 000000000..4d86f07d7
--- /dev/null
+++ b/ui/component/or-asset-detail/src/index.ts
@@ -0,0 +1,68 @@
+import {css, customElement, html, LitElement, property, PropertyValues} from "lit-element";
+import {classMap} from "lit-html/directives/class-map";
+
+import i18next from "i18next";
+
+// language=CSS
+const style = css`
+
+ :host {
+ width: 100%
+ }
+
+ :host([hidden]) {
+ display: none;
+ }
+
+ .panel {
+ background-color: var(--internal-or-asset-viewer-panel-color);
+ border: 1px solid #e5e5e5;
+ border-radius: 5px;
+ max-width: 100%;
+ position: relative;
+ }
+
+ .panel-content-wrapper {
+ padding: var(--internal-or-asset-viewer-panel-padding);
+ }
+
+ .panel-content {
+ display: flex;
+ flex-wrap: wrap;
+ }
+
+ .panel-title {
+ text-transform: uppercase;
+ font-weight: bolder;
+ line-height: 1em;
+ color: var(--internal-or-asset-viewer-title-text-color);
+ margin-bottom: 25px;
+ flex: 0 0 auto;
+ }
+`;
+
+@customElement("or-asset-detail")
+export class OrAssetDetail extends LitElement {
+
+ static get styles() {
+ return [
+ style
+ ];
+ }
+
+ protected render() {
+ return html`
+ <div class="panel">
+ <div class="panel-content-wrapper">
+ <div class="panel-title">
+ <or-translate value="attributeDetail"></or-translate>
+ </div>
+ <div class="panel-content">
+ <p>person</p>
+ </div>
+ </div>
+ </div>
+ `;
+ }
+
+}
diff --git a/ui/component/or-asset-detail/tsconfig.json b/ui/component/or-asset-detail/tsconfig.json
new file mode 100644
index 000000000..2d31b45ae
--- /dev/null
+++ b/ui/component/or-asset-detail/tsconfig.json
@@ -0,0 +1,14 @@
+{
+ "extends": "../../tsconfig",
+ "compilerOptions": {
+ "outDir": "./dist",
+ "tsBuildInfoFile": "./dist/.tsbuildinfo",
+ "rootDir": "src"
+ },
+ "include": [
+ "./src"
+ ],
+ "references": [
+ { "path": "../core" }
+ ]
+}
\ No newline at end of file
diff --git a/ui/component/or-asset-detail/webpack.config.js b/ui/component/or-asset-detail/webpack.config.js
new file mode 100644
index 000000000..9fe13702d
--- /dev/null
+++ b/ui/component/or-asset-detail/webpack.config.js
@@ -0,0 +1,7 @@
+const util = require("../webpack.util");
+
+bundles = {
+ "index.bundle": undefined
+};
+
+module.exports = util.generateExports(__dirname);
\ No newline at end of file