100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Cleanup of UI build process
Rich Turner2ee709dc13df
diff --git a/ui/component/build.gradle b/ui/component/build.gradleindex 5430207ba..45fd005de 100644--- a/ui/component/build.gradle+++ b/ui/component/build.gradle@@ -3,8 +3,12 @@ task build() {dependsOn getTasksByName("build", true).findAll {def isComponentBuild = it.path.contains(":ui:component") && it.project != project- if (isComponentBuild && !it.path.contains(":ui:component:core") && !it.path.contains(":ui:component:model") && !it.path.contains(":ui:component:rest")) {- it.dependsOn resolveTask(":ui:component:core:build")+ if (isComponentBuild) {+ if (it.path.contains(":ui:component:core")) {+ it.project.getTasksByName("npmBuild", false)[0].dependsOn resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build")+ } else if (!it.path.contains(":ui:component:model") && !it.path.contains(":ui:component:rest")) {+ it.dependsOn resolveTask(":ui:component:core:build")+ }}return isComponentBuilddiff --git a/ui/component/core/build.gradle b/ui/component/core/build.gradleindex e3a537889..412a38854 100644--- a/ui/component/core/build.gradle+++ b/ui/component/core/build.gradle@@ -6,8 +6,6 @@ task clean() {}}-npmBuild.dependsOn resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build")-task build() {dependsOn npmBuild}diff --git a/ui/component/or-header/build.gradle b/ui/component/or-header/build.gradleindex 7540a6212..412a38854 100644--- a/ui/component/or-header/build.gradle+++ b/ui/component/or-header/build.gradle@@ -1,3 +1,5 @@+buildDir = "dist"+task clean() {doLast {delete "dist"@@ -10,4 +12,4 @@ task build() {task installDist() {dependsOn build-}+}\ No newline at end of filediff --git a/ui/component/or-input/build.gradle b/ui/component/or-input/build.gradleindex 489605e7b..412a38854 100644--- a/ui/component/or-input/build.gradle+++ b/ui/component/or-input/build.gradle@@ -1,3 +1,5 @@+buildDir = "dist"+task clean() {doLast {delete "dist"@@ -5,5 +7,9 @@ task clean() {}task build() {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+ dependsOn npmBuild}++task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/component/or-input/src/index.d.ts b/ui/component/or-input/src/index.d.tsdeleted file mode 100644index cb0ff5c3b..000000000--- a/ui/component/or-input/src/index.d.ts+++ /dev/null@@ -1 +0,0 @@-export {};diff --git a/ui/component/or-input/src/index.js b/ui/component/or-input/src/index.jsdeleted file mode 100644index b8e1625fb..000000000--- a/ui/component/or-input/src/index.js+++ /dev/null@@ -1,47 +0,0 @@-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;- return c > 3 && r && Object.defineProperty(target, key, r), r;-};-import { html, LitElement, property } from 'lit-element';-class OrRulesEditor extends LitElement {- constructor() {- super();- // default value in minutes- this.value = 0;- // default value in minutes- this.current = 0;- // maxRange in minutes- this.maxRange = 360;- // minRange in minutes- this.minRange = 0;- // Steps in minutes- this.step = 5;- }- render() {- return html `- <h1>hi</h1>- `;- }-}-__decorate([- property({ type: Function })-], OrRulesEditor.prototype, "onChange", void 0);-__decorate([- property({ type: Number })-], OrRulesEditor.prototype, "value", void 0);-__decorate([- property({ type: Number })-], OrRulesEditor.prototype, "current", void 0);-__decorate([- property({ type: Number })-], OrRulesEditor.prototype, "maxRange", void 0);-__decorate([- property({ type: Number })-], OrRulesEditor.prototype, "minRange", void 0);-__decorate([- property({ type: Number })-], OrRulesEditor.prototype, "step", void 0);-window.customElements.define('or-rules-editor', OrRulesEditor);-//# sourceMappingURL=index.js.map\ No newline at end of filediff --git a/ui/component/or-input/src/index.js.map b/ui/component/or-input/src/index.js.mapdeleted file mode 100644index a1ed8a1f4..000000000--- a/ui/component/or-input/src/index.js.map+++ /dev/null@@ -1 +0,0 @@-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AAIvD,MAAM,aAAc,SAAQ,UAAU;IAgClC;QACI,KAAK,EAAE,CAAC;QArBZ,2BAA2B;QAEnB,UAAK,GAAW,CAAC,CAAC;QAE1B,2BAA2B;QAEpB,YAAO,GAAW,CAAC,CAAC;QAE3B,sBAAsB;QAEd,aAAQ,GAAW,GAAG,CAAC;QAE/B,sBAAsB;QAEd,aAAQ,GAAW,CAAC,CAAC;QAE7B,mBAAmB;QAEX,SAAI,GAAW,CAAC,CAAC;IAIzB,CAAC;IAjCS,MAAM;QAEZ,OAAO,IAAI,CAAA;;SAEV,CAAC;IACN,CAAC;CA+BJ;AA3BG;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAC;+CACL;AAItB;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;4CACC;AAI1B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;8CACE;AAI3B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;+CACM;AAI/B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;+CACI;AAI7B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;2CACA;AAS7B,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC"}\ No newline at end of filediff --git a/ui/component/or-rules-editor/build.gradle b/ui/component/or-rules-editor/build.gradleindex 489605e7b..412a38854 100644--- a/ui/component/or-rules-editor/build.gradle+++ b/ui/component/or-rules-editor/build.gradle@@ -1,3 +1,5 @@+buildDir = "dist"+task clean() {doLast {delete "dist"@@ -5,5 +7,9 @@ task clean() {}task build() {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+ dependsOn npmBuild}++task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/component/or-select/build.gradle b/ui/component/or-select/build.gradleindex 489605e7b..412a38854 100644--- a/ui/component/or-select/build.gradle+++ b/ui/component/or-select/build.gradle@@ -1,3 +1,5 @@+buildDir = "dist"+task clean() {doLast {delete "dist"@@ -5,5 +7,9 @@ task clean() {}task build() {- dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+ dependsOn npmBuild}++task installDist() {+ dependsOn build+}\ No newline at end of filediff --git a/ui/component/or-select/src/index.d.ts b/ui/component/or-select/src/index.d.tsdeleted file mode 100644index cb0ff5c3b..000000000--- a/ui/component/or-select/src/index.d.ts+++ /dev/null@@ -1 +0,0 @@-export {};diff --git a/ui/component/or-select/src/index.js b/ui/component/or-select/src/index.jsdeleted file mode 100644index b8e1625fb..000000000--- a/ui/component/or-select/src/index.js+++ /dev/null@@ -1,47 +0,0 @@-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;- return c > 3 && r && Object.defineProperty(target, key, r), r;-};-import { html, LitElement, property } from 'lit-element';-class OrRulesEditor extends LitElement {- constructor() {- super();- // default value in minutes- this.value = 0;- // default value in minutes- this.current = 0;- // maxRange in minutes- this.maxRange = 360;- // minRange in minutes- this.minRange = 0;- // Steps in minutes- this.step = 5;- }- render() {- return html `- <h1>hi</h1>- `;- }-}-__decorate([- property({ type: Function })-], OrRulesEditor.prototype, "onChange", void 0);-__decorate([- property({ type: Number })-], OrRulesEditor.prototype, "value", void 0);-__decorate([- property({ type: Number })-], OrRulesEditor.prototype, "current", void 0);-__decorate([- property({ type: Number })-], OrRulesEditor.prototype, "maxRange", void 0);-__decorate([- property({ type: Number })-], OrRulesEditor.prototype, "minRange", void 0);-__decorate([- property({ type: Number })-], OrRulesEditor.prototype, "step", void 0);-window.customElements.define('or-rules-editor', OrRulesEditor);-//# sourceMappingURL=index.js.map\ No newline at end of filediff --git a/ui/component/or-select/src/index.js.map b/ui/component/or-select/src/index.js.mapdeleted file mode 100644index a1ed8a1f4..000000000--- a/ui/component/or-select/src/index.js.map+++ /dev/null@@ -1 +0,0 @@-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AAIvD,MAAM,aAAc,SAAQ,UAAU;IAgClC;QACI,KAAK,EAAE,CAAC;QArBZ,2BAA2B;QAEnB,UAAK,GAAW,CAAC,CAAC;QAE1B,2BAA2B;QAEpB,YAAO,GAAW,CAAC,CAAC;QAE3B,sBAAsB;QAEd,aAAQ,GAAW,GAAG,CAAC;QAE/B,sBAAsB;QAEd,aAAQ,GAAW,CAAC,CAAC;QAE7B,mBAAmB;QAEX,SAAI,GAAW,CAAC,CAAC;IAIzB,CAAC;IAjCS,MAAM;QAEZ,OAAO,IAAI,CAAA;;SAEV,CAAC;IACN,CAAC;CA+BJ;AA3BG;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAC;+CACL;AAItB;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;4CACC;AAI1B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;8CACE;AAI3B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;+CACM;AAI/B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;+CACI;AAI7B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;2CACA;AAS7B,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC"}\ No newline at end of filediff --git a/ui/component/or-smart-notify/build.gradle b/ui/component/or-smart-notify/build.gradleindex 18f1ce16e..412a38854 100644--- a/ui/component/or-smart-notify/build.gradle+++ b/ui/component/or-smart-notify/build.gradle@@ -1,3 +1,5 @@+buildDir = "dist"+task clean() {doLast {delete "dist"@@ -6,4 +8,8 @@ task clean() {task build() {dependsOn npmBuild+}++task installDist() {+ dependsOn build}\ No newline at end of filediff --git a/ui/component/or-smart-notify/src/index.d.ts b/ui/component/or-smart-notify/src/index.d.tsdeleted file mode 100644index cb0ff5c3b..000000000--- a/ui/component/or-smart-notify/src/index.d.ts+++ /dev/null@@ -1 +0,0 @@-export {};diff --git a/ui/component/or-smart-notify/src/index.js b/ui/component/or-smart-notify/src/index.jsdeleted file mode 100644index bb3bbafc7..000000000--- a/ui/component/or-smart-notify/src/index.js+++ /dev/null@@ -1,331 +0,0 @@-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;- return c > 3 && r && Object.defineProperty(target, key, r), r;-};-import { html, LitElement, property, customElement } from 'lit-element';-import moment from 'moment';-import { icon } from '@fortawesome/fontawesome-svg-core';-import { faClock } from '@fortawesome/free-regular-svg-icons';-import { faTimes } from '@fortawesome/free-solid-svg-icons';-import REST from "@openremote/rest";-let OrSmartNotify = class OrSmartNotify extends LitElement {- constructor() {- super();- // if smart notify popup is visible- this.isVisible = false;- // If smart notify is active- this.isActive = false;- // If smart notify is active- this.isDisabled = false;- // If smart notify is active- this.smartNotify = {};- // default function on smartyNotify- this.currentTime = '-';- const self = this;- this.currentTime = moment().format('HH:mm');- setInterval(function () {- self.currentTime = moment().format('HH:mm');- }, 500);- }- render() {- // language=HTML- return html `- <style>- #smartNotifyControlPanel {- position: fixed;- left: 20px;- bottom: 146px;- width: 315px;- z-index: 2;- background-color: #FFFFFF;-- -webkit-box-shadow: 1px 1px 2px 0px rgba(0,0,0,0.28);- -moz-box-shadow: 1px 1px 2px 0px rgba(0,0,0,0.28);- box-shadow: 1px 1px 2px 0px rgba(0,0,0,0.28);- }- .layout.horizontal {- display: -ms-flexbox;- display: -webkit-flex;- display: flex;-- -ms-flex-direction: row;- -webkit-flex-direction: row;- flex-direction: row;--- -ms-flex-align: center;- -webkit-align-items: center;- align-items: center;-- -ms-flex-pack: center;- -webkit-justify-content: center;- justify-content: center;- }-- .t-center {- text-align: center;- }-- .controller-timeline{- padding: 5px 20px;- height: 32px;- line-height: 32px;- border-bottom: solid 1px #dedede;- }-- .flex {- -ms-flex: 1 1 0.000000001px;- -webkit-flex: 1;- flex: 1;- -webkit-flex-basis: 0.000000001px;- flex-basis: 0.000000001px;- }-- .padding-2-5 {- padding: 2px 5px;- }- .padding-10 {- padding: 10px;- }- #smart-notify-toggle {- margin-top: 29px;- }-- .smart-notify-toggle-label {- color: #FFFFFF;- background-color: #00477c;- border-top-left-radius: 5px;- border-top-right-radius: 5px;- padding: 2px 8px;- font-size: 12px;- height: 19px;- }-- .smart-notify-toggle-icon {- background-color: #555753;- border-bottom-left-radius: 5px;- border-bottom-right-radius: 5px;- margin-top: 2px;- height: 48px;- }-- .smart-notify-toggle-icon[active] {- background-color: #00477c;- }-- icon {- height: 20px;- width: 20px;- }-- icon .svg-inline--fa {- height: 20px;- width: 20px;- }-- icon[large] {- height: 28px;- width: 28px;- }-- icon[large] .svg-inline--fa {- height: 28px;- width: 28px;- margin: 10px;- }-- icon[large] svg path {- fill: #FFFFFF;- color: #FFFFFF;- }-- /* The switch - the box around the slider */- .switch {- position: relative;- display: inline-block;- width: 36px;- height: 14px;- margin: 10px 0;- }-- /* Hide default HTML checkbox */- .switch input {- opacity: 0;- width: 0;- height: 0;- }-- /* The slider */- .slider {- position: absolute;- cursor: pointer;- top: 0;- left: 0;- right: 0;- bottom: 0;- background-color: #ccc;- -webkit-transition: .4s;- transition: .4s;- }-- .slider:before {- position: absolute;- content: "";- height: 20px;- width: 20px;- left: 0;- top: -3px;- background-color: white;- -webkit-transition: .4s;- transition: .4s;- box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.6);- }-- input:checked + .slider:before {- background-color: var(--app-primary-color);- }-- input:focus + .slider {- }-- input:checked + .slider:before {- -webkit-transform: translateX(20px);- -ms-transform: translateX(20px);- transform: translateX(20px);- }-- /* Rounded sliders */- .slider.round {- border-radius: 34px;- }-- .slider.round:before {- border-radius: 50%;- }- </style>-- ${this.isVisible ? html `- <div id="smartNotifyControlPanel">- <div class="layout horizontal controller-timeline t-center">- <icon>${icon(faClock).node.item(0)}</icon>- <div class="flex padding-2-5" style="font-weight: 600;">Smart Notify</div>-- <a style="height: 22px;" @click="${this.close}">- <icon>${icon(faTimes).node.item(0)}</icon>- </a>- </div>- <div class="layout horizontal">- <div style="background-color: var(--app-lightgrey-color, #dedede);" class="flex padding-10">Activeren</div>- <div class="flex t-center">- <label class="switch">- <input @change="${this.setSmartNotify}" ?disabled="${this.isDisabled}" ?checked="${this.isActive}" type="checkbox">- <span class="slider round"></span>- </label>- </div>- </div>- ${this.isActive ? html `- <div class="layout horizontal">- <div style="background-color: var(--app-lightgrey-color, #dedede);" class="flex padding-10">Starttijd</div>- <div class="flex t-center">${this.isActive ? moment(this.smartNotify.attributes.SMART_NOTIFY_ENABLED.valueTimestamp).format('HH:mm') : "-"}</div>- </div>- ` : ``}- </div>- ` : ``}- <div id="smart-notify-toggle" @click="${this.toggleVisibility}">- <div class="smart-notify-toggle-label">${this.currentTime}</div>- <div class="smart-notify-toggle-icon" ?active="${this.isActive}">- <icon large>${icon(faClock).node.item(0)}</icon>- </div>- </div>-- `;- }- getSmartNotify() {- const self = this;- return new Promise(function (resolve, reject) {- const smartNotifyQuery = {- name: { predicateType: "string", value: "SMART_NOTIFY_ASSET" },- select: { include: "ALL_EXCEPT_PATH" /* ALL_EXCEPT_PATH */ }- };- REST.api.AssetResource.queryAssets(smartNotifyQuery).then((response) => {- console.log("Setting Smart Notify");- if (response.data) {- self.smartNotify = response.data[0];- self.isActive = self.smartNotify.attributes.SMART_NOTIFY_ENABLED.value ? true : false;- self.onChange();- resolve(response);- }- }).catch((reason) => {- reject(Error("Error:" + reason));- console.log("Error:" + reason);- });- });- }- checkSmartNotifyMarkers() {- const self = this;- if (this.isActive && this.smartNotify.attributes.SMART_NOTIFY_RESULT.value.markers && this.smartNotify.attributes.SMART_NOTIFY_RESULT.value.markers.length > 0) {- }- else if (this.isActive && this.smartNotify.attributes.SMART_NOTIFY_RESULT.value.markers.length === 0) {- this.getSmartNotify().then(() => {- setTimeout(function () {- self.checkSmartNotifyMarkers();- }.bind(this), 3000);- });- }- }- setSmartNotify(e) {- const isChecked = e.target.checked;- if (isChecked == true) {- this.smartNotify.attributes.SMART_NOTIFY_ENABLED.value = moment();- this.smartNotify.attributes.SMART_NOTIFY_ENABLED.valueTimestamp = moment();- this.isActive = true;- }- else {- this.smartNotify.attributes.SMART_NOTIFY_ENABLED.value = null;- this.isActive = false;- }- REST.api.AssetResource.update(this.smartNotify.id, this.smartNotify).then((response) => {- console.log("Setting Smart Notify");- this.smartNotify.version = this.smartNotify.version + 1;- if (isChecked == true) {- this.checkSmartNotifyMarkers();- }- else {- // Clear the smartnotify markers and smart notify in frontend- this.smartNotify.attributes.SMART_NOTIFY_ENABLED.value = false;- this.smartNotify.attributes.SMART_NOTIFY_RESULT.value.markers = [];- this.onChange();- }- }).catch((reason) => console.log("Error:" + reason));- }- close() {- this.isVisible = false;- }- toggleVisibility() {- this.isVisible = !this.isVisible;- }-};-__decorate([- property({ type: Function })-], OrSmartNotify.prototype, "onChange", void 0);-__decorate([- property({ type: Boolean })-], OrSmartNotify.prototype, "isVisible", void 0);-__decorate([- property({ type: Boolean })-], OrSmartNotify.prototype, "isActive", void 0);-__decorate([- property({ type: Boolean })-], OrSmartNotify.prototype, "isDisabled", void 0);-__decorate([- property({ type: Object })-], OrSmartNotify.prototype, "smartNotify", void 0);-__decorate([- property({ type: String })-], OrSmartNotify.prototype, "currentTime", void 0);-OrSmartNotify = __decorate([- customElement('or-smart-notify')-], OrSmartNotify);-//# sourceMappingURL=index.js.map\ No newline at end of filediff --git a/ui/component/or-smart-notify/src/index.js.map b/ui/component/or-smart-notify/src/index.js.mapdeleted file mode 100644index 43f302eaa..000000000--- a/ui/component/or-smart-notify/src/index.js.map+++ /dev/null@@ -1 +0,0 @@-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}\ No newline at end of filediff --git a/ui/component/or-thermostat/build.gradle b/ui/component/or-thermostat/build.gradleindex 7540a6212..412a38854 100644--- a/ui/component/or-thermostat/build.gradle+++ b/ui/component/or-thermostat/build.gradle@@ -1,3 +1,5 @@+buildDir = "dist"+task clean() {doLast {delete "dist"@@ -10,4 +12,4 @@ task build() {task installDist() {dependsOn build-}+}\ No newline at end of filediff --git a/ui/component/or-timeline/build.gradle b/ui/component/or-timeline/build.gradleindex abc5ddcd1..412a38854 100644--- a/ui/component/or-timeline/build.gradle+++ b/ui/component/or-timeline/build.gradle@@ -1,3 +1,5 @@+buildDir = "dist"+task clean() {doLast {delete "dist"diff --git a/ui/component/or-timeline/src/index.d.ts b/ui/component/or-timeline/src/index.d.tsdeleted file mode 100644index cb0ff5c3b..000000000--- a/ui/component/or-timeline/src/index.d.ts+++ /dev/null@@ -1 +0,0 @@-export {};diff --git a/ui/component/or-timeline/src/index.js b/ui/component/or-timeline/src/index.jsdeleted file mode 100644index a5a02fa90..000000000--- a/ui/component/or-timeline/src/index.js+++ /dev/null@@ -1,255 +0,0 @@-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;- return c > 3 && r && Object.defineProperty(target, key, r), r;-};-import { html, LitElement, property } from 'lit-element';-import moment from 'moment';-class OrTimeline extends LitElement {- constructor() {- super();- // default value in minutes- this.value = 0;- // default value in minutes- this.current = 0;- // maxRange in minutes- this.maxRange = 360;- // minRange in minutes- this.minRange = 0;- // Steps in minutes- this.step = 5;- }- render() {- if (this.shadowRoot) {- const range = this.shadowRoot.getElementById('or-timeline-slider');- if (range) {- range.value = Math.round(this.current);- this.moveBubble(range);- }- }- return html `- <style>- :host {- position: relative;- }- .timeline-container {- display: block;- height: 52px;- background-color: var(--app-white, #FFFFFF);-- -webkit-box-shadow: 1px 1px 2px 0px rgba(0,0,0,0.28);- -moz-box-shadow: 1px 1px 2px 0px rgba(0,0,0,0.28);- box-shadow: 1px 1px 2px 0px rgba(0,0,0,0.28);-- padding-top: 20px;- }- .slidecontainer {- position: relative;- margin: -5px 50px 0 30px;- }-- /* The slider itself */- .slider {- box-sizing: border-box;- -webkit-appearance: none; /* Override default CSS styles */- appearance: none;- width: calc(100% + 20px);- margin-left: -10px;- height: 12px;- background: #bdbdbd; /* Grey background */- outline: none; /* Remove outline */- opacity: 1; /* Set transparency (for mouse-over effects on hover) */- -webkit-transition: .2s; /* 0.2 seconds transition on hover */- transition: opacity .2s;-- border-radius: 6px;- cursor: pointer;- }-- /* The slider handle (use -webkit- (Chrome, Opera, Safari, Edge) and -moz- (Firefox) to override default look) */- .slider::-webkit-slider-thumb {- -webkit-appearance: none;- appearance: none;- width: 18px;- height: 18px;- margin: 0;- border-radius: 50%;- cursor: pointer;- border: 0 !important;- background-color: var(--timeline-accent, blue); /* Green background */- }-- .slider::-ms-thumb,- .slider::-moz-range-thumb,- .slider::-webkit-slider-thumb {- width: 18px;- height: 18px;- margin: 0;- border-radius: 50%;- cursor: pointer;- border: 0 !important;- background-color: var(--timeline-accent, blue); /* Green background */- }-- #timelineHourMarkers {- position: relative;- display: -webkit-box;- display: -moz-box;- display: -ms-flexbox;- display: -webkit-flex;- display: flex;- -webkit-box-orient: horizontal;- -moz-box-orient: horizontal;- -webkit-box-direction: normal;- -moz-box-direction: normal;- -webkit-flex-direction: row;- -ms-flex-direction: row;- flex-direction: row;-- margin: 0 50px 0 30px;- }-- #timelineHourMarkers > .timelineHourMark{- display: flex;- flex: 1 100%;- flex-grow: 1;- flex-shrink: 1;- flex-basis: 100%;-- overflow: visible;- color: var(--timeline-grey, darkgrey);- border-left: 1px solid var(--timeline-grey, darkgrey);- font-size: 12px;- -webkit-user-select: none;- -moz-user-select: none;- -ms-user-select: none;- user-select: none;- padding-left: 4px;- padding-bottom: 4px;- }- #timelineHourMarkers .timelineHourMark:last-child {- position: absolute;- right: -25px;- }-- #range-value {- position: absolute;- background-color: var(--timeline-accent, blue);- height: 30px;- width: 60px;- margin-left: -30px;- text-align: center;- color: white;- display: inline-block;- left: 0;- font-size: 12px;- font-weight: bold;- line-height: 30px;- }-- .time-value-container {- width: calc(100% - 80px);- display: block;- position: relative;- height: 30px;- margin: 0 50px 0 30px;- }- </style>--- <div class="time-value-container">- <div id="range-value">${this.current === 0 ? 'LIVE' : moment().add(this.current, 'minutes').format('HH:mm')}</div>- </div>- <div class="timeline-container">- <div id="timelineHourMarkers" class="layout horizontal justified style-scope controller-timeline">- ${new Array((this.maxRange / 60) + 1).fill(0).map((_, idx) => {- return html `- ${idx === 0 ? html `- <div class="timelineHourMark style-scope controller-timeline">Nu</div>- ` : html `- <div class="timelineHourMark style-scope controller-timeline">+${idx}u</div>- `}- `;- })}- </div>-- <div class="slidecontainer">- <input id="or-timeline-slider" class="slider" type="range" @input="${this.moveBubble}" @change="${this.valueChange}" value="${this.current}" min="${this.minRange}" max="${this.maxRange}" step="${this.step}">- </div>- </div>-- `;- }- moveBubble(e = null, value = null) {- let el;- if (e) {- el = e.target;- }- else {- if (this.shadowRoot) {- el = this.shadowRoot.getElementById('or-timeline-slider');- }- }- if (el) {- if (value) {- this.current = parseInt(value);- }- else {- this.current = parseInt(el.value);- }- // Measure width of range input- const width = el.offsetWidth;- const v = this.current;- // Figure out placement percentage between left and right of input- const newPoint = v / this.maxRange;- // Janky value to get pointer to line up better- let offset = 30;- let newPlace;- // Prevent bubble from going beyond left or right (unsupported browsers)- if (newPoint < 0) {- newPlace = 0;- }- else if (newPoint > 1) {- newPlace = width - offset;- }- else {- newPlace = (width - offset) * newPoint;- if (newPlace < 0) {- newPlace = 0;- }- }- // Move bubble- if (this.shadowRoot) {- const range = this.shadowRoot.getElementById('range-value');- if (range) {- range.style.left = newPlace + "px";- }- }- }- }- valueChange(e) {- this.moveBubble(e);- this.onChange();- }-}-__decorate([- property({ type: Function })-], OrTimeline.prototype, "onChange", void 0);-__decorate([- property({ type: Number })-], OrTimeline.prototype, "value", void 0);-__decorate([- property({ type: Number })-], OrTimeline.prototype, "current", void 0);-__decorate([- property({ type: Number })-], OrTimeline.prototype, "maxRange", void 0);-__decorate([- property({ type: Number })-], OrTimeline.prototype, "minRange", void 0);-__decorate([- property({ type: Number })-], OrTimeline.prototype, "step", void 0);-window.customElements.define('or-timeline', OrTimeline);-//# sourceMappingURL=index.js.map\ No newline at end of filediff --git a/ui/component/or-timeline/src/index.js.map b/ui/component/or-timeline/src/index.js.mapdeleted file mode 100644index b4f15ddf5..000000000--- a/ui/component/or-timeline/src/index.js.map+++ /dev/null@@ -1 +0,0 @@-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}\ No newline at end of file