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
New UI updates
Rich Turner1c9d80b2f395
diff --git a/ui/app/customerA/build.gradle b/ui/app/customerA/build.gradleindex d42b4b9b8..758501995 100644--- a/ui/app/customerA/build.gradle+++ b/ui/app/customerA/build.gradle@@ -10,12 +10,20 @@ task serveProduction(type: NpmTask) {}task build(type: NpmTask) {+ onlyIf {+ // Only execute if we're not building from a custom project+ return !isCustomProject()+ }dependsOn npmInstallargs = ['run-script', 'build']}task installDist(type: Copy) {- dependsOn build+ onlyIf {+ // Only execute if we're not building from a custom project+ return !isCustomProject()+ }+ //dependsOn buildfrom project.buildDirinto "${project(':deployment').projectDir}/manager/consoles/${projectDir.name}"}diff --git a/ui/app/customerA/package.json b/ui/app/customerA/package.jsonnew file mode 100644index 000000000..10223888d--- /dev/null+++ b/ui/app/customerA/package.json@@ -0,0 +1,32 @@+{+ "name": "@openremote/app-customerA",+ "version": "1.0.0",+ "description": "Built in demo console application",+ "private": true,+ "scripts": {+ "clean": "npx shx rm -rf dist",+ "build": "npx webpack",+ "test": "echo \"Error: no test specified\" && exit 1"+ },+ "author": "OpenRemote",+ "license": "AGPL-3.0-or-later",+ "dependencies": {+ "@openremote/core": "^1.0.0",+ "lit-html": "^0.12.0"+ },+ "devDependencies": {+ "@babel/core": "^7.1.2",+ "@babel/preset-env": "^7.1.0",+ "awesome-typescript-loader": "^5.2.1",+ "babel-loader": "^8.0.4",+ "copy-webpack-plugin": "^4.6.0",+ "file-loader": "^2.0.0",+ "html-webpack-plugin": "^3.2.0",+ "raw-loader": "^0.5.1",+ "shx": "^0.3.2",+ "typescript": "^3.1.6",+ "webpack": "^4.24.0",+ "webpack-cli": "^3.1.2",+ "webpack-dev-server": "^3.1.10"+ }+}diff --git a/ui/app/manager/index.html b/ui/app/manager/index.htmlnew file mode 100644index 000000000..55c07651c--- /dev/null+++ b/ui/app/manager/index.html@@ -0,0 +1,9 @@+<!doctype html>+<html>+<head>+ <title>Manager</title>+</head>+<body>+<h1>The OpenRemote manager application</h1>+</body>+</html>\ No newline at end of filediff --git a/ui/component/core/package.json b/ui/component/core/package.jsonindex 72c2706ed..f822d16c0 100644--- a/ui/component/core/package.json+++ b/ui/component/core/package.json@@ -7,7 +7,7 @@"scripts": {"clean": "npx shx rm -rf dist","build": "npx tsc",- "test": "npm run karma run"+ "test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote","license": "AGPL-3.0-or-later",diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradleindex fc7af0f8b..9020a0410 100644--- a/ui/component/rest/build.gradle+++ b/ui/component/rest/build.gradle@@ -6,7 +6,7 @@ buildscript {mavenCentral()jcenter()maven {- url "${resolveProject("").projectDir}/lib"+ url "${isCustomProject() ? project(":openremote").projectDir : rootProject.projectDir}/lib"}}dependencies {@@ -17,7 +17,7 @@ buildscript {repositories {maven {- url "${resolveProject("").projectDir}/lib"+ url "${isCustomProject() ? project(":openremote").projectDir : rootProject.projectDir}/lib"}}diff --git a/ui/component/rest/package.json b/ui/component/rest/package.jsonindex 936ddb594..32b9d8333 100644--- a/ui/component/rest/package.json+++ b/ui/component/rest/package.json@@ -7,7 +7,7 @@"scripts": {"clean": "npx shx rm -rf dist","build": "npx tsc",- "test": "npm run karma run"+ "test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote","license": "AGPL-3.0-or-later",diff --git a/ui/demo/demo-core/package.json b/ui/demo/demo-core/package.jsonindex e4d2af376..4860a4f4f 100644--- a/ui/demo/demo-core/package.json+++ b/ui/demo/demo-core/package.json@@ -6,7 +6,7 @@"scripts": {"clean": "npx shx rm -rf dist","build": "npx webpack",- "test": "npm run karma run"+ "test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote","license": "AGPL-3.0-or-later",diff --git a/ui/demo/demo-or-asset-tree/package.json b/ui/demo/demo-or-asset-tree/package.jsonindex 66023d847..e5fc9c84f 100644--- a/ui/demo/demo-or-asset-tree/package.json+++ b/ui/demo/demo-or-asset-tree/package.json@@ -5,7 +5,7 @@"scripts": {"clean": "npx shx rm -rf dist","build": "npx webpack",- "test": "npm run karma run"+ "test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote","license": "AGPL-3.0-or-later",diff --git a/ui/demo/demo-rest/package.json b/ui/demo/demo-rest/package.jsonindex 1d61dd035..977b4245f 100644--- a/ui/demo/demo-rest/package.json+++ b/ui/demo/demo-rest/package.json@@ -6,7 +6,7 @@"scripts": {"clean": "npx shx rm -rf dist","build": "npx webpack",- "test": "npm run karma run"+ "test": "echo \"Error: no test specified\" && exit 1"},"author": "OpenRemote","license": "AGPL-3.0-or-later",diff --git a/ui/package-lock.json b/ui/package-lock.jsonnew file mode 100644index 000000000..48e341a09--- /dev/null+++ b/ui/package-lock.json@@ -0,0 +1,3 @@+{+ "lockfileVersion": 1+}diff --git a/ui/package.json b/ui/package.jsonindex 8599a775a..f312b34d8 100644--- a/ui/package.json+++ b/ui/package.json@@ -1,4 +1,8 @@{"private": true,- "workspaces": ["app/*", "component/*", "demo/*"]-}\ No newline at end of file+ "workspaces": [+ "app/*",+ "component/*",+ "demo/*"+ ]+}