Skip to content

armgit / core

Public Imported from GitHub
0

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

deployment cleanup

Rich Turner075379008a91
diff --git a/.gitignore b/.gitignore
index febd4bb17..41f893bd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ manager/.factorypath
deployment/proxy/
deployment/postgresql/
deployment/manager/openremote.log*
+deployment/manager/app/
diff --git a/client/build.gradle b/client/build.gradle
index 1f58a00ca..71392761a 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -159,19 +159,26 @@ task gwtSuperDev(dependsOn: classes, type: JavaExec) {
installDist {
dependsOn resolveTask(":client:src:main:webapp:installDist")
+
+ into "${project(':deployment').projectDir}/manager/app/manager"
+}
+
+clean {
+ doLast {
+ delete "${project(':deployment').projectDir}/manager/app/manager"
+ }
}
distributions {
main {
contents {
from("src/main/webapp") {
- into "webapp"
- exclude "gwt", "build.gradle", "package.json"
+ exclude "gwt", "build.gradle", "package.json", "yarn.lock"
}
/* You can comment out this block to skip GWT compilation for fast testing the build
*/
from(compileGwt.outputs) {
- into "webapp/gwt"
+ into "gwt"
exclude "WEB-INF"
}
}
diff --git a/deployment/build.gradle b/deployment/build.gradle
new file mode 100644
index 000000000..d6ffb8153
--- /dev/null
+++ b/deployment/build.gradle
@@ -0,0 +1,6 @@
+apply plugin: 'idea'
+idea {
+ module {
+ excludeDirs += file("manager/app")
+ }
+}
\ No newline at end of file
diff --git a/deployment/manager/app/customerA/build.gradle b/deployment/manager/app/customerA/build.gradle
deleted file mode 100644
index c8911bb8c..000000000
--- a/deployment/manager/app/customerA/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-task installDist {
- dependsOn yarnInstall
-}
\ No newline at end of file
diff --git a/deployment/manager/app/customerA/index.html b/deployment/manager/app/customerA/index.html
deleted file mode 100644
index 8adb2e53d..000000000
--- a/deployment/manager/app/customerA/index.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!doctype html>
-<html>
-<head>
- <title>OpenRemote SmartHome Example</title>
-
- <!-- Some sensible meta tags -->
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0,maximum-scale=1, user-scalable=no">
- <meta name="apple-mobile-web-app-capable" content="yes">
- <meta name="mobile-web-app-capable" content="yes">
-
- <!-- The language of the SmartHome app -->
- <meta name="or-language" content="en">
-
- <!-- ############## Required: Load WebComponents polyfill and components ############### -->
- <script src="/static/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
-
- <!-- Load the SmartHome app -->
- <link rel="import" href="/console/customerA/smart-home/smart-home-app.html">
-
- <style type="text/css">
- /* Recommended: Avoid flickering during loading/styling by hiding children of or-app */
- or-app > * {
- visibility: hidden;
- }
-
- /* Styles for the SmartHome app */
- html, body {
- margin: 0;
- min-height: 100vh;
- overflow: hidden;
- }
-
- body {
- background: var(--theme-mediumgrey);
- font-family: 'Open Sans', 'Roboto', Helvetica, Arial, Lucida, sans-serif;
- }
- </style>
-
-</head>
-
-<body>
-
-<or-app login tenant-realm="customerA" console-auto-enable="true">
-
- <smart-home-app>
- <!-- You can override the logo
- <img slot="logo" height="20" src="mylogo.png"/>
- -->
- </smart-home-app>
-
-</or-app>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/deployment/manager/app/customerA/package.json b/deployment/manager/app/customerA/package.json
deleted file mode 100644
index 0f00daa89..000000000
--- a/deployment/manager/app/customerA/package.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "name": "smarthome-example",
- "version": "3.0.0",
- "homepage": "http://openremote.com/",
- "authors": [
- "OpenRemote Inc. <[email protected]>"
- ],
- "description": "OpenRemote SmartHome Example App",
- "main": "index.html",
- "license": "APGLv3",
- "ignore": [
- "**/.*",
- "test",
- "tests"
- ],
- "dependencies": {
- }
-}
\ No newline at end of file
diff --git a/deployment/manager/app/master/examples.html b/deployment/manager/app/master/examples.html
deleted file mode 100644
index 26bf121f7..000000000
--- a/deployment/manager/app/master/examples.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!doctype html>
-<html>
-<head>
- <title>OpenRemote Console Application</title>
-
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-
- <!-- ############## Required: Load WebComponents polyfill and components ############### -->
- <script src="/static/node_modules/@webcomponentsjs/webcomponents-lite.js"></script>
-
- <link rel="import" href="/static/src/or-app/or-app.html">
- <link rel="import" href="/static/src/or-asset-list/or-asset-list.html">
- <link rel="import" href="/static/src/or-checkbox/or-checkbox.html">
- <!-- Optional: You can import other OpenRemote modules here -->
-
- <!-- Optional: Load more application resources after authentication -->
- <script>
- window.addEventListener("AppReady", function (e) {
- console.log("Loading console app resources...");
- let app = e.detail.app;
-
- // Load resources in parallel
- Promise.all([
- /*
- app.load.css("/console/master/something.css"),
- app.load.js("/console/master/something.js"),
- */
- ]).then(() => {
- /*
- // Load resources sequentially
- app.load.js("/resource1")
- .then(() => {
- return app.load.js("/some/resource")
- })
- .catch(e => {
- app.set("error", e);
- });
- */
- }).catch(e => {
- app.set("error", e);
- });
-
- })
- </script>
-
- <style type="text/css">
- /* Recommended: Avoid flickering during loading/styling by hiding children of or-app */
- or-app > * {
- visibility: hidden;
- }
-
- /* Optional: Create some styles only for your app */
- html, body {
- margin: 0;
- min-height: 100vh;
- overflow: hidden;
- }
-
- .myAppHeadline {
- display: block;
- text-decoration: none;
- padding: 1em;
- font-size: x-large;
- background: var(--theme-lightgreen);
- color: var(--theme-black);
- }
- </style>
-
-</head>
-
-<body>
-
-<!-- ############## Required: One <or-app> should wrap your frontend, you can enforce login/authentication ############## -->
-<or-app login tenant-realm="master">
-
- <!-- With or-Viewport you get OpenRemote default fonts -->
- <div class="flex layout vertical or-Viewport">
-
- <!-- You can use your own styles or the OpenRemote styles and theme -->
- <a href="#" class="myAppHeadline">
- OpenRemote Console App Examples
- </a>
-
- <!-- This is a container element that has some padding and visual separation from other containers -->
- <div class="or-MainContent">
- <p>
- View the source in your web browser and follow the examples on this page to write your own OpenRemote
- application, it's easy with <a href="https://www.webcomponents.org/">Web Components</a>.
- </p>
- </div>
-
- <!-- Switch to horizontal layout but flex vertical first and take as much vertical space as needed -->
- <div class="flex layout horizontal">
-
- <!-- Flex and take as much horizontal space as possible -->
- <div class="flex layout vertical">
-
- <!-- Execute an asset query and show a nice scrollable list -->
- <or-asset-list class="myAssetList flex or-MainContent or-FormList"
- select-include="ALL_EXCEPT_PATH_AND_ATTRIBUTES">
-
- <!-- Render each asset with a template -->
- <template>
- <div class="or-FormListItem layout horizontal center justified">
- <div>Asset Name: {{asset.name}}</div>
- <div>Parent: {{asset.parentName}}</div>
- <div>Created On: {{asset.createdOn}}</div>
- </div>
- </template>
-
- </or-asset-list>
-
- <!-- Execute an asset query and show a nice scrollable list -->
- <or-asset-list class="myAssetList flex or-MainContent or-FormList"
- select-include="ALL_EXCEPT_PATH_AND_ATTRIBUTES"
- asset-type="urn:openremote:asset:building">
-
- <!-- Render each asset with a template -->
- <template>
- <div class="or-FormListItem layout horizontal center justified">
- <div>Asset Name: {{asset.name}}</div>
- <div>Parent: {{asset.parentName}}</div>
- <div>Created On: {{asset.createdOn}}</div>
- </div>
- </template>
-
- </or-asset-list>
-
- </div>
-
- <!-- Flex and take as much horizontal space as possible, show scrollbars if content doesn't fit. -->
- <div class="flex or-MainContent scroll">
-
- <!-- TODO Work on this -->
- <h3 style="color: var(--theme-red);">Note: This is under development and incomplete!</h3>
-
- <!-- Execute AssetQuery and subscribe for attribute changes -->
- <or-asset type="room" id="blabla">
-
- <!-- Bind asset attributes to elements -->
- <p>
- Temperature of the room is: <span data-attribute="currentTemp"></span>
- </p>
-
- <form>
- Set desired temperature:
- <input data-attribute="setTemp" data-validate>
- <submit data-asset-action></submit>
- <!-- Defaults to 'update' as this is what restricted users can do -->
- </form>
-
- <!-- Show hide elements based on boolean asset attribute -->
- <p data-visible="humidityBool">
- Humidity too high!
- </p>
- <p data-attached="co2Bool">
- Too much CO2!
- </p>
- </or-asset>
- </div>
-
- </div>
-
- <!-- Use OpenRemote UI classes for pretty widgets -->
- <div class="or-MainContent">
- <div class="layout vertical">
-
- <div class="layout horizontal center justified" style="margin: 1em;">
-
- <button class="or-PushButton"
- onclick="openremote.INSTANCE.toasts.showToast(
- new openremote.toast.Toast(
- openremote.toast.Toast.Type.SUCCESS,
- 'Welcome ' + openremote.INSTANCE.user + ', on ' + openremote.INSTANCE.tenantRealm + '. It is ' + new Date() + '.',
- 3000
- ))">
- <span class="or-Icon fa fa-eye"></span>
- <span class="html-face">Show toast</span>
- </button>
-
- <button class="or-FormButtonPrimary or-PushButton"
- onclick="document.querySelectorAll('.myAssetList').forEach((assetList) => {assetList.executeQuery()})">
- <span class="or-Icon fa fa-refresh"></span>
- <span class="html-face">Refresh asset list</span>
- </button>
-
- <button class="or-FormButtonDanger or-PushButton"
- onclick="document.querySelector('or-app').logout()">
- <span class="or-Icon fa fa-sign-out"></span>
- <span class="html-face">Logout</span>
- </button>
-
- <div>
- <or-checkbox ></or-checkbox>
- </div>
-
- <div>
- <or-checkbox checked></or-checkbox>
- </div>
-
- <div class="or-Select">
- <select title="Some single-select options">
- <option value="foo">Option Foo</option>
- <option value="bar">Option Bar</option>
- <option value="Baz">Option Baz</option>
- </select>
- </div>
-
- <input class="or-Input or-InputTime"
- title="Some time input"
- type="time"
- step="60"
- required
- value="14:23"/>
-
- <input class="or-Input or-InputDate"
- title="Some date input"
- type="date"
- value="2018-11-06"/>
-
- </div>
-
- </div>
- </div>
-
- </div>
-
-</or-app>
-
-</body>
-</html>
diff --git a/manager/Dockerfile b/manager/Dockerfile
index 3e933b321..5ececb494 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -60,8 +60,7 @@ RUN /var/lib/dpkg/info/ca-certificates-java.postinst configure
ENV JAVA_OPTS -Xmx1g
-ENV MANAGER_DOCROOT webapp
-ENV CONSOLES_DOCROOT /deployment/consoles
+ENV APP_DOCROOT /deployment/app
ENV UI_DOCROOT /deployment/ui
ENV LOGGING_CONFIG_FILE /deployment/logging.properties
ENV MAP_TILES_PATH /deployment/map/mapdata.mbtiles
@@ -77,6 +76,5 @@ ADD deployment /deployment
RUN mkdir -p /deployment/extensions
ADD lib /opt/app/lib
-ADD client /opt/app
ENTRYPOINT java $JAVA_OPTS -cp /opt/app/lib/*:/deployment/extensions/* org.openremote.manager.Main
diff --git a/manager/build.gradle b/manager/build.gradle
index 2c66316dc..2d71a1bf5 100644
--- a/manager/build.gradle
+++ b/manager/build.gradle
@@ -35,13 +35,10 @@ distributions {
from(project.projectDir) {
include("*Dockerfile")
}
- from(resolveTask(":client:installDist")) {
- into "client"
- }
// Populate the /deployment directory in the Manager image
- from(resolveProject(":deployment:manager").projectDir) {
+ from("${resolveProject(":deployment").projectDir}/manager") {
into "deployment"
- exclude "**/build.gradle", "**/bower.json", "**/openremote.log*"
+ exclude "**/build.gradle", "**/package.json", "**/openremote.log*", "**/yarn.lock"
}
}
}
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index 1b90258b8..3b2325ff1 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -543,13 +543,13 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
componentRepresentation.getName()).get(0);
response = syncUsers(clientRequestInfo, componentRepresentation.getId(), realm, "triggerFullSync");
- if (!response.getStatusInfo().equals(Response.Status.OK)) {
- throw new WebApplicationException(
- Response.status(response.getStatus())
- .entity(response.getEntity())
- .build()
- );
- }
+// if (!response.getStatusInfo().equals(Response.Status.OK)) {
+// throw new WebApplicationException(
+// Response.status(response.getStatus())
+// .entity(response.getEntity())
+// .build()
+// );
+// }
}
}
diff --git a/profile/deploy.yml b/profile/deploy.yml
index 641a01543..9f0a5d657 100644
--- a/profile/deploy.yml
+++ b/profile/deploy.yml
@@ -168,9 +168,8 @@ services:
# NOTIFICATION_FIREBASE_API_KEY = '...'
# FIREBASE_CONFIG_FILE = '/deployment/fcm.json'
- # Custom location of the static console applications, each subdirectory must
- # have the name of a realm to which the console app belongs.
- # CONSOLES_DOCROOT: '/deployment/consoles'
+ # Custom location of the static applications.
+ # APP_DOCROOT: '/deployment/app'
# Disable HTTP redirects when a console application requests libraries which
# are delivered and used on the platform. This is necessary if your console application
@@ -219,10 +218,6 @@ services:
# processing push notifications) and will therefore fail silently until the user logs in again.
# IDENTITY_SESSION_OFFLINE_TIMEOUT_MINUTES: 20160
- # Location of the static manager (UI and API) resources, you don't need to override this
- # unless you want to deploy a modified version of the Manager UI and JavaScript components.
- # MANAGER_DOCROOT: 'client/src/main/webapp'
-
# Configure the default max age for data points stored in the database (individual attributes can use a custom
# value by using the DATA_POINTS_MAX_AGE_DAYS AssetMeta item).
# DATA_POINTS_MAX_AGE_DAYS = 30
diff --git a/ui/app/customerA-new/build.gradle b/ui/app/customerA-new/build.gradle
new file mode 100644
index 000000000..5c00acaa9
--- /dev/null
+++ b/ui/app/customerA-new/build.gradle
@@ -0,0 +1,15 @@
+task build {
+ dependsOn npmBuild
+}
+
+task installDist(type: Copy) {
+ dependsOn build
+ from project.buildDir
+ into "${project(':deployment').projectDir}/manager/app/${projectDir.name}"
+}
+
+task clean() {
+ doLast {
+ delete "${project(':deployment').projectDir}/manager/app/${projectDir.name}"
+ }
+}
\ No newline at end of file
diff --git a/deployment/manager/app/master/index.html b/ui/app/customerA-new/index.html
similarity index 77%
rename from deployment/manager/app/master/index.html
rename to ui/app/customerA-new/index.html
index 0c6f8596d..9fffdefc9 100644
--- a/deployment/manager/app/master/index.html
+++ b/ui/app/customerA-new/index.html
@@ -1,7 +1,7 @@
<!doctype html>
<html>
<head>
- <title>OpenRemote Console Application</title>
+ <title>Customer A</title>
</head>
<body>
<h1>The OpenRemote console application of the <code>master</code> tenant</h1>
@@ -14,8 +14,5 @@
<p>
You can duplicate the <code>master</code> directory to create new console applications for other tenants/realms.
</p>
-<p>
- For more documentation, see <a href="examples.html">examples.html</a>.
-</p>
</body>
</html>
\ No newline at end of file
diff --git a/ui/app/customerA-new/package.json b/ui/app/customerA-new/package.json
new file mode 100644
index 000000000..e47b54b3e
--- /dev/null
+++ b/ui/app/customerA-new/package.json
@@ -0,0 +1,30 @@
+{
+ "name": "@openremote/app-customerA",
+ "version": "1.0.0",
+ "description": "Built in demo console application",
+ "private": true,
+ "scripts": {
+ "build": "echo \"No build\" && exit 0",
+ "test": "echo \"No tests\" && exit 0"
+ },
+ "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",
+ "typescript": "^3.1.6",
+ "webpack": "^4.24.0",
+ "webpack-cli": "^3.1.2",
+ "webpack-dev-server": "^3.1.10"
+ }
+}
diff --git a/deployment/manager/app/customerA/.bowerrc b/ui/app/customerA/.bowerrc
similarity index 100%
rename from deployment/manager/app/customerA/.bowerrc
rename to ui/app/customerA/.bowerrc
diff --git a/ui/app/customerA/build.gradle b/ui/app/customerA/build.gradle
index 5c00acaa9..c8911bb8c 100644
--- a/ui/app/customerA/build.gradle
+++ b/ui/app/customerA/build.gradle
@@ -1,15 +1,3 @@
-task build {
- dependsOn npmBuild
-}
-
-task installDist(type: Copy) {
- dependsOn build
- from project.buildDir
- into "${project(':deployment').projectDir}/manager/app/${projectDir.name}"
-}
-
-task clean() {
- doLast {
- delete "${project(':deployment').projectDir}/manager/app/${projectDir.name}"
- }
+task installDist {
+ dependsOn yarnInstall
}
\ No newline at end of file
diff --git a/ui/app/customerA/index.html b/ui/app/customerA/index.html
index 9fffdefc9..8adb2e53d 100644
--- a/ui/app/customerA/index.html
+++ b/ui/app/customerA/index.html
@@ -1,18 +1,55 @@
<!doctype html>
<html>
<head>
- <title>Customer A</title>
+ <title>OpenRemote SmartHome Example</title>
+
+ <!-- Some sensible meta tags -->
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0,maximum-scale=1, user-scalable=no">
+ <meta name="apple-mobile-web-app-capable" content="yes">
+ <meta name="mobile-web-app-capable" content="yes">
+
+ <!-- The language of the SmartHome app -->
+ <meta name="or-language" content="en">
+
+ <!-- ############## Required: Load WebComponents polyfill and components ############### -->
+ <script src="/static/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
+
+ <!-- Load the SmartHome app -->
+ <link rel="import" href="/console/customerA/smart-home/smart-home-app.html">
+
+ <style type="text/css">
+ /* Recommended: Avoid flickering during loading/styling by hiding children of or-app */
+ or-app > * {
+ visibility: hidden;
+ }
+
+ /* Styles for the SmartHome app */
+ html, body {
+ margin: 0;
+ min-height: 100vh;
+ overflow: hidden;
+ }
+
+ body {
+ background: var(--theme-mediumgrey);
+ font-family: 'Open Sans', 'Roboto', Helvetica, Arial, Lucida, sans-serif;
+ }
+ </style>
+
</head>
+
<body>
-<h1>The OpenRemote console application of the <code>master</code> tenant</h1>
-<p>
- This is a placeholder. Put your frontend application here, it will be loaded by the OpenRemote console.
-</p>
-<p>
- On your OpenRemote installation, edit the HTML content in <code>deployment/manager/consoles/master/</code>.
-</p>
-<p>
- You can duplicate the <code>master</code> directory to create new console applications for other tenants/realms.
-</p>
+
+<or-app login tenant-realm="customerA" console-auto-enable="true">
+
+ <smart-home-app>
+ <!-- You can override the logo
+ <img slot="logo" height="20" src="mylogo.png"/>
+ -->
+ </smart-home-app>
+
+</or-app>
+
</body>
</html>
\ No newline at end of file
diff --git a/ui/app/customerA/package.json b/ui/app/customerA/package.json
index e47b54b3e..98e291a67 100644
--- a/ui/app/customerA/package.json
+++ b/ui/app/customerA/package.json
@@ -1,30 +1,16 @@
{
- "name": "@openremote/app-customerA",
- "version": "1.0.0",
- "description": "Built in demo console application",
- "private": true,
- "scripts": {
- "build": "echo \"No build\" && exit 0",
- "test": "echo \"No tests\" && exit 0"
- },
+ "name": "smarthome-example",
+ "version": "3.0.0",
+ "homepage": "http://openremote.com/",
+ "description": "OpenRemote SmartHome Example App",
+ "main": "index.html",
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
+ "ignore": [
+ "**/.*",
+ "test",
+ "tests"
+ ],
"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",
- "typescript": "^3.1.6",
- "webpack": "^4.24.0",
- "webpack-cli": "^3.1.2",
- "webpack-dev-server": "^3.1.10"
}
-}
+}
\ No newline at end of file
diff --git a/deployment/manager/app/customerA/smart-home/img/co2.png b/ui/app/customerA/smart-home/img/co2.png
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/img/co2.png
rename to ui/app/customerA/smart-home/img/co2.png
diff --git a/deployment/manager/app/customerA/smart-home/img/eye.png b/ui/app/customerA/smart-home/img/eye.png
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/img/eye.png
rename to ui/app/customerA/smart-home/img/eye.png
diff --git a/deployment/manager/app/customerA/smart-home/img/eye_large.png b/ui/app/customerA/smart-home/img/eye_large.png
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/img/eye_large.png
rename to ui/app/customerA/smart-home/img/eye_large.png
diff --git a/deployment/manager/app/customerA/smart-home/img/eye_large_active.png b/ui/app/customerA/smart-home/img/eye_large_active.png
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/img/eye_large_active.png
rename to ui/app/customerA/smart-home/img/eye_large_active.png
diff --git a/deployment/manager/app/customerA/smart-home/img/home_large_energy.png b/ui/app/customerA/smart-home/img/home_large_energy.png
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/img/home_large_energy.png
rename to ui/app/customerA/smart-home/img/home_large_energy.png
diff --git a/deployment/manager/app/customerA/smart-home/img/home_on.png b/ui/app/customerA/smart-home/img/home_on.png
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/img/home_on.png
rename to ui/app/customerA/smart-home/img/home_on.png
diff --git a/deployment/manager/app/customerA/smart-home/img/humidity.png b/ui/app/customerA/smart-home/img/humidity.png
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/img/humidity.png
rename to ui/app/customerA/smart-home/img/humidity.png
diff --git a/deployment/manager/app/customerA/smart-home/img/star.png b/ui/app/customerA/smart-home/img/star.png
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/img/star.png
rename to ui/app/customerA/smart-home/img/star.png
diff --git a/deployment/manager/app/customerA/smart-home/img/temperature.png b/ui/app/customerA/smart-home/img/temperature.png
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/img/temperature.png
rename to ui/app/customerA/smart-home/img/temperature.png
diff --git a/deployment/manager/app/customerA/smart-home/img/ventilation.png b/ui/app/customerA/smart-home/img/ventilation.png
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/img/ventilation.png
rename to ui/app/customerA/smart-home/img/ventilation.png
diff --git a/deployment/manager/app/customerA/smart-home/locales.json b/ui/app/customerA/smart-home/locales.json
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/locales.json
rename to ui/app/customerA/smart-home/locales.json
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-app.html b/ui/app/customerA/smart-home/smart-home-app.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-app.html
rename to ui/app/customerA/smart-home/smart-home-app.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-body.html b/ui/app/customerA/smart-home/smart-home-body.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-body.html
rename to ui/app/customerA/smart-home/smart-home-body.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-climate.html b/ui/app/customerA/smart-home/smart-home-climate.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-climate.html
rename to ui/app/customerA/smart-home/smart-home-climate.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-component.html b/ui/app/customerA/smart-home/smart-home-component.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-component.html
rename to ui/app/customerA/smart-home/smart-home-component.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-energy.html b/ui/app/customerA/smart-home/smart-home-energy.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-energy.html
rename to ui/app/customerA/smart-home/smart-home-energy.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-header.html b/ui/app/customerA/smart-home/smart-home-header.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-header.html
rename to ui/app/customerA/smart-home/smart-home-header.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-scenes.html b/ui/app/customerA/smart-home/smart-home-scenes.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-scenes.html
rename to ui/app/customerA/smart-home/smart-home-scenes.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-section.html b/ui/app/customerA/smart-home/smart-home-section.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-section.html
rename to ui/app/customerA/smart-home/smart-home-section.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-security.html b/ui/app/customerA/smart-home/smart-home-security.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-security.html
rename to ui/app/customerA/smart-home/smart-home-security.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-settings.html b/ui/app/customerA/smart-home/smart-home-settings.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-settings.html
rename to ui/app/customerA/smart-home/smart-home-settings.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-smart.html b/ui/app/customerA/smart-home/smart-home-smart.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-smart.html
rename to ui/app/customerA/smart-home/smart-home-smart.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-style.html b/ui/app/customerA/smart-home/smart-home-style.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-style.html
rename to ui/app/customerA/smart-home/smart-home-style.html
diff --git a/deployment/manager/app/customerA/smart-home/smart-home-temperature-select.html b/ui/app/customerA/smart-home/smart-home-temperature-select.html
similarity index 100%
rename from deployment/manager/app/customerA/smart-home/smart-home-temperature-select.html
rename to ui/app/customerA/smart-home/smart-home-temperature-select.html
diff --git a/ui/app/customerA/yarn.lock b/ui/app/customerA/yarn.lock
new file mode 100644
index 000000000..fb57ccd13
--- /dev/null
+++ b/ui/app/customerA/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+