From 6d142a75e5d68a16d49bf5621383e59c2fba0d28 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Wed, 29 Jul 2020 17:06:47 -0400 Subject: [PATCH 1/5] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Remove=20connect-cl?= =?UTF-8?q?ient=20commands=20from=20lint=20and=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Connect-client isn't ready to be released. Hence, removing it's build tasks for monorepo build tasks to save build time. --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e455ef34b..c21329537 100644 --- a/package.json +++ b/package.json @@ -16,15 +16,16 @@ ] }, "scripts": { + "build": "yarn build:ui:core", "build:ui:core": "cd ui/core && yarn build", "build:ui:connect-client": "cd ui/connect-client && yarn build", - "lint": "yarn lint:addons:api && yarn lint:addons:auth && yarn lint:addons:rose && yarn lint:ui:core && yarn lint:ui:connect-client", + "lint": "yarn lint:addons:api && yarn lint:addons:auth && yarn lint:addons:rose && yarn lint:ui:core", "lint:addons:api": "echo \"\n\nlint: addons/api\n\" && cd addons/api && yarn lint", "lint:addons:auth": "echo \"\n\nlint: addons/auth\n\" && cd addons/auth && yarn lint", "lint:addons:rose": "echo \"\n\nlint: addons/rose\n\" && cd addons/rose && yarn lint", "lint:ui:core": "echo \"\n\nlint: ui/core\n\" && cd ui/core && yarn lint", "lint:ui:connect-client": "echo \"\n\nlint: ui/connect-client\n\" && cd ui/connect-client && yarn lint", - "test": "yarn test:addons:api && yarn test:addons:auth && yarn test:addons:rose && yarn test:ui:core && yarn test:ui:connect-client", + "test": "yarn test:addons:api && yarn test:addons:auth && yarn test:addons:rose && yarn test:ui:core", "test:addons:api": "echo \"\n\ntest: addons/api\n\" && cd addons/api && yarn test", "test:addons:auth": "echo \"\n\ntest: addons/auth\n\" && cd addons/auth && yarn test", "test:addons:rose": "echo \"\n\ntest: addons/rose\n\" && cd addons/rose && yarn test", From e37d97a8749b614d6e1c5f58dc6405b182c07af6 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Wed, 29 Jul 2020 17:07:28 -0400 Subject: [PATCH 2/5] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20monorepo?= =?UTF-8?q?=20readme=20to=20reflect=20'main'=20git=20branch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index abc20fb67..701c24d56 100644 --- a/README.md +++ b/README.md @@ -54,23 +54,28 @@ You will need the following things properly installed on your computer. List of available project commands. `yarn run ` -| Command | Description | -|---------------------|--------------------------------------------------------------------------------------------------------------------| -| commit | Replaces `git commit`, ensures checks pass before commit is allowed and normalizes commit messages across authors. | -| compliance:licenses | Checks that all dependencies have OSS-compatible licenses. | -| doc:toc | Automatically generates a table of contents for the README file. | +| Command | Description | +|---------------------|---| +| build | Builds Core UI. | +| test | Runs tests in CI mode. | +| commit | Replaces `git commit`, ensures compliance, audit, lint, and test checks pass before commit is allowed and normalizes commit messages across authors. | +| lint | Runs ember-template-lint on all of the hbs, js, and sass files. | +| compliance:audit | Checks for issues using `yarn audit` with moderate and above criticality.| +| compliance:licenses | Checks that all dependencies have OSS-compatible licenses. | +| doc:toc | Automatically generates a table of contents for the README file. | ## Contributing ### Branching We follow [A Successful Git Branching Model][nvie-git], otherwise known as -Gitflow. Branches `master` and `develop` are sacred mainlines into which we do +Gitflow. Branches `main` and `develop` are sacred mainlines into which we do not commit directly. Instead, these branches have special meaning defining what code may be found within. The `develop` branch contains code _for the next -release_. Code in `master` is _released, tagged, and ready for +release_. Code in `main` is _released, tagged, and ready for production deployment_. +To start contributing: 1. Start a new **topic branch** off `develop`. 2. Commit work. 3. When work is complete, create a PR from the topic branch into `develop`. @@ -80,20 +85,20 @@ production deployment_. 5. A core team member may merge the PR into `develop`. At this point, the code is unreleased but considered "releasable". 6. **Releasing**: when it's time to release, create a PR from `develop` into - `master` (we skip Gitflow's `release` branch). This is tantamount to + `main` (we skip Gitflow's `release` branch). This is tantamount to requesting a new release (version) of the product. Ensure the body of the PR includes well-documented changes slated for release. 7. Code review and automated checks occur. -8. A core team member may merge the PR into `master` to initiate a release. -9. Tag the merge commit in `master` with version number of the release and cut +8. A core team member may merge the PR into `main` to initiate a release. +9. Tag the merge commit in `main` with version number of the release and cut a release in GitHub. While Gitflow may seem heavy, most of its process can be automated. Gitflow is similar to its lighter-weight sibling [GitHub Flow][github-flow]. In essence, -Gitflow differs only by adding an second mainline branch (`master`) that is +Gitflow differs only by adding an second mainline branch (`main`) that is designated as _always containing production code_. Another happy characteristic of Gitflow is that it's easy to track the project's release history, since -_every commit to `master` is a release by definition_. The well-defined nature +_every commit to `main` is a release by definition_. The well-defined nature of releases assists in cross-team collaboration, ensuring everyone has confidence about the state of the project. @@ -113,15 +118,14 @@ To quickly produce a production build of Core UI, run from this folder: ```bash yarn install -yarn build:ui:core +yarn build ``` Assets are saved to `ui/core/dist/`. #### Building with a Container -Optionally, you may build the UI within a container. Execute the -following command: +Optionally, you may build the UI within a container. Execute the following command: ```bash docker-compose -f docker-compose-embedding.yml run build From 3b346263d2a7864f251481713e9c0139d4aae055 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 30 Jul 2020 11:23:39 -0400 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20Update=20connect?= =?UTF-8?q?-client=20name=20to=20desktop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/{connect-client => desktop}/.editorconfig | 0 ui/{connect-client => desktop}/.ember-cli | 0 ui/{connect-client => desktop}/.eslintignore | 0 ui/{connect-client => desktop}/.eslintrc.js | 0 ui/{connect-client => desktop}/.prettierrc | 0 ui/{connect-client => desktop}/.sasslintrc | 0 ui/{connect-client => desktop}/.template-lintrc.js | 0 ui/{connect-client => desktop}/.travis.yml | 0 ui/{connect-client => desktop}/.watchmanconfig | 0 ui/{connect-client => desktop}/README.md | 0 ui/{connect-client => desktop}/app/app.js | 0 ui/{connect-client => desktop}/app/components/.gitkeep | 0 ui/{connect-client => desktop}/app/controllers/.gitkeep | 0 ui/{connect-client => desktop}/app/helpers/.gitkeep | 0 ui/{connect-client => desktop}/app/index.html | 0 ui/{connect-client => desktop}/app/models/.gitkeep | 0 ui/{connect-client => desktop}/app/router.js | 0 ui/{connect-client => desktop}/app/routes/.gitkeep | 0 ui/{connect-client => desktop}/app/styles/app.scss | 0 ui/{connect-client => desktop}/app/templates/application.hbs | 0 ui/{connect-client => desktop}/config/environment.js | 0 ui/{connect-client => desktop}/config/optional-features.json | 0 ui/{connect-client => desktop}/config/targets.js | 0 ui/{connect-client => desktop}/electron-app/.gitignore | 0 ui/{connect-client => desktop}/electron-app/package.json | 0 .../electron-app/src/handle-file-urls.js | 0 ui/{connect-client => desktop}/electron-app/src/index.js | 0 ui/{connect-client => desktop}/electron-app/tests/index.js | 0 ui/{connect-client => desktop}/electron-app/yarn.lock | 0 ui/{connect-client => desktop}/ember-cli-build.js | 0 ui/{connect-client => desktop}/mirage/config.js | 0 ui/{connect-client => desktop}/package.json | 0 ui/{connect-client => desktop}/public/robots.txt | 0 ui/{connect-client => desktop}/testem-electron.js | 0 ui/{connect-client => desktop}/testem.js | 0 ui/{connect-client => desktop}/tests/helpers/.gitkeep | 0 ui/{connect-client => desktop}/tests/index.html | 0 ui/{connect-client => desktop}/tests/integration/.gitkeep | 0 ui/{connect-client => desktop}/tests/test-helper.js | 0 ui/{connect-client => desktop}/tests/unit/.gitkeep | 0 ui/{connect-client => desktop}/vendor/.gitkeep | 0 41 files changed, 0 insertions(+), 0 deletions(-) rename ui/{connect-client => desktop}/.editorconfig (100%) rename ui/{connect-client => desktop}/.ember-cli (100%) rename ui/{connect-client => desktop}/.eslintignore (100%) rename ui/{connect-client => desktop}/.eslintrc.js (100%) rename ui/{connect-client => desktop}/.prettierrc (100%) rename ui/{connect-client => desktop}/.sasslintrc (100%) rename ui/{connect-client => desktop}/.template-lintrc.js (100%) rename ui/{connect-client => desktop}/.travis.yml (100%) rename ui/{connect-client => desktop}/.watchmanconfig (100%) rename ui/{connect-client => desktop}/README.md (100%) rename ui/{connect-client => desktop}/app/app.js (100%) rename ui/{connect-client => desktop}/app/components/.gitkeep (100%) rename ui/{connect-client => desktop}/app/controllers/.gitkeep (100%) rename ui/{connect-client => desktop}/app/helpers/.gitkeep (100%) rename ui/{connect-client => desktop}/app/index.html (100%) rename ui/{connect-client => desktop}/app/models/.gitkeep (100%) rename ui/{connect-client => desktop}/app/router.js (100%) rename ui/{connect-client => desktop}/app/routes/.gitkeep (100%) rename ui/{connect-client => desktop}/app/styles/app.scss (100%) rename ui/{connect-client => desktop}/app/templates/application.hbs (100%) rename ui/{connect-client => desktop}/config/environment.js (100%) rename ui/{connect-client => desktop}/config/optional-features.json (100%) rename ui/{connect-client => desktop}/config/targets.js (100%) rename ui/{connect-client => desktop}/electron-app/.gitignore (100%) rename ui/{connect-client => desktop}/electron-app/package.json (100%) rename ui/{connect-client => desktop}/electron-app/src/handle-file-urls.js (100%) rename ui/{connect-client => desktop}/electron-app/src/index.js (100%) rename ui/{connect-client => desktop}/electron-app/tests/index.js (100%) rename ui/{connect-client => desktop}/electron-app/yarn.lock (100%) rename ui/{connect-client => desktop}/ember-cli-build.js (100%) rename ui/{connect-client => desktop}/mirage/config.js (100%) rename ui/{connect-client => desktop}/package.json (100%) rename ui/{connect-client => desktop}/public/robots.txt (100%) rename ui/{connect-client => desktop}/testem-electron.js (100%) rename ui/{connect-client => desktop}/testem.js (100%) rename ui/{connect-client => desktop}/tests/helpers/.gitkeep (100%) rename ui/{connect-client => desktop}/tests/index.html (100%) rename ui/{connect-client => desktop}/tests/integration/.gitkeep (100%) rename ui/{connect-client => desktop}/tests/test-helper.js (100%) rename ui/{connect-client => desktop}/tests/unit/.gitkeep (100%) rename ui/{connect-client => desktop}/vendor/.gitkeep (100%) diff --git a/ui/connect-client/.editorconfig b/ui/desktop/.editorconfig similarity index 100% rename from ui/connect-client/.editorconfig rename to ui/desktop/.editorconfig diff --git a/ui/connect-client/.ember-cli b/ui/desktop/.ember-cli similarity index 100% rename from ui/connect-client/.ember-cli rename to ui/desktop/.ember-cli diff --git a/ui/connect-client/.eslintignore b/ui/desktop/.eslintignore similarity index 100% rename from ui/connect-client/.eslintignore rename to ui/desktop/.eslintignore diff --git a/ui/connect-client/.eslintrc.js b/ui/desktop/.eslintrc.js similarity index 100% rename from ui/connect-client/.eslintrc.js rename to ui/desktop/.eslintrc.js diff --git a/ui/connect-client/.prettierrc b/ui/desktop/.prettierrc similarity index 100% rename from ui/connect-client/.prettierrc rename to ui/desktop/.prettierrc diff --git a/ui/connect-client/.sasslintrc b/ui/desktop/.sasslintrc similarity index 100% rename from ui/connect-client/.sasslintrc rename to ui/desktop/.sasslintrc diff --git a/ui/connect-client/.template-lintrc.js b/ui/desktop/.template-lintrc.js similarity index 100% rename from ui/connect-client/.template-lintrc.js rename to ui/desktop/.template-lintrc.js diff --git a/ui/connect-client/.travis.yml b/ui/desktop/.travis.yml similarity index 100% rename from ui/connect-client/.travis.yml rename to ui/desktop/.travis.yml diff --git a/ui/connect-client/.watchmanconfig b/ui/desktop/.watchmanconfig similarity index 100% rename from ui/connect-client/.watchmanconfig rename to ui/desktop/.watchmanconfig diff --git a/ui/connect-client/README.md b/ui/desktop/README.md similarity index 100% rename from ui/connect-client/README.md rename to ui/desktop/README.md diff --git a/ui/connect-client/app/app.js b/ui/desktop/app/app.js similarity index 100% rename from ui/connect-client/app/app.js rename to ui/desktop/app/app.js diff --git a/ui/connect-client/app/components/.gitkeep b/ui/desktop/app/components/.gitkeep similarity index 100% rename from ui/connect-client/app/components/.gitkeep rename to ui/desktop/app/components/.gitkeep diff --git a/ui/connect-client/app/controllers/.gitkeep b/ui/desktop/app/controllers/.gitkeep similarity index 100% rename from ui/connect-client/app/controllers/.gitkeep rename to ui/desktop/app/controllers/.gitkeep diff --git a/ui/connect-client/app/helpers/.gitkeep b/ui/desktop/app/helpers/.gitkeep similarity index 100% rename from ui/connect-client/app/helpers/.gitkeep rename to ui/desktop/app/helpers/.gitkeep diff --git a/ui/connect-client/app/index.html b/ui/desktop/app/index.html similarity index 100% rename from ui/connect-client/app/index.html rename to ui/desktop/app/index.html diff --git a/ui/connect-client/app/models/.gitkeep b/ui/desktop/app/models/.gitkeep similarity index 100% rename from ui/connect-client/app/models/.gitkeep rename to ui/desktop/app/models/.gitkeep diff --git a/ui/connect-client/app/router.js b/ui/desktop/app/router.js similarity index 100% rename from ui/connect-client/app/router.js rename to ui/desktop/app/router.js diff --git a/ui/connect-client/app/routes/.gitkeep b/ui/desktop/app/routes/.gitkeep similarity index 100% rename from ui/connect-client/app/routes/.gitkeep rename to ui/desktop/app/routes/.gitkeep diff --git a/ui/connect-client/app/styles/app.scss b/ui/desktop/app/styles/app.scss similarity index 100% rename from ui/connect-client/app/styles/app.scss rename to ui/desktop/app/styles/app.scss diff --git a/ui/connect-client/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs similarity index 100% rename from ui/connect-client/app/templates/application.hbs rename to ui/desktop/app/templates/application.hbs diff --git a/ui/connect-client/config/environment.js b/ui/desktop/config/environment.js similarity index 100% rename from ui/connect-client/config/environment.js rename to ui/desktop/config/environment.js diff --git a/ui/connect-client/config/optional-features.json b/ui/desktop/config/optional-features.json similarity index 100% rename from ui/connect-client/config/optional-features.json rename to ui/desktop/config/optional-features.json diff --git a/ui/connect-client/config/targets.js b/ui/desktop/config/targets.js similarity index 100% rename from ui/connect-client/config/targets.js rename to ui/desktop/config/targets.js diff --git a/ui/connect-client/electron-app/.gitignore b/ui/desktop/electron-app/.gitignore similarity index 100% rename from ui/connect-client/electron-app/.gitignore rename to ui/desktop/electron-app/.gitignore diff --git a/ui/connect-client/electron-app/package.json b/ui/desktop/electron-app/package.json similarity index 100% rename from ui/connect-client/electron-app/package.json rename to ui/desktop/electron-app/package.json diff --git a/ui/connect-client/electron-app/src/handle-file-urls.js b/ui/desktop/electron-app/src/handle-file-urls.js similarity index 100% rename from ui/connect-client/electron-app/src/handle-file-urls.js rename to ui/desktop/electron-app/src/handle-file-urls.js diff --git a/ui/connect-client/electron-app/src/index.js b/ui/desktop/electron-app/src/index.js similarity index 100% rename from ui/connect-client/electron-app/src/index.js rename to ui/desktop/electron-app/src/index.js diff --git a/ui/connect-client/electron-app/tests/index.js b/ui/desktop/electron-app/tests/index.js similarity index 100% rename from ui/connect-client/electron-app/tests/index.js rename to ui/desktop/electron-app/tests/index.js diff --git a/ui/connect-client/electron-app/yarn.lock b/ui/desktop/electron-app/yarn.lock similarity index 100% rename from ui/connect-client/electron-app/yarn.lock rename to ui/desktop/electron-app/yarn.lock diff --git a/ui/connect-client/ember-cli-build.js b/ui/desktop/ember-cli-build.js similarity index 100% rename from ui/connect-client/ember-cli-build.js rename to ui/desktop/ember-cli-build.js diff --git a/ui/connect-client/mirage/config.js b/ui/desktop/mirage/config.js similarity index 100% rename from ui/connect-client/mirage/config.js rename to ui/desktop/mirage/config.js diff --git a/ui/connect-client/package.json b/ui/desktop/package.json similarity index 100% rename from ui/connect-client/package.json rename to ui/desktop/package.json diff --git a/ui/connect-client/public/robots.txt b/ui/desktop/public/robots.txt similarity index 100% rename from ui/connect-client/public/robots.txt rename to ui/desktop/public/robots.txt diff --git a/ui/connect-client/testem-electron.js b/ui/desktop/testem-electron.js similarity index 100% rename from ui/connect-client/testem-electron.js rename to ui/desktop/testem-electron.js diff --git a/ui/connect-client/testem.js b/ui/desktop/testem.js similarity index 100% rename from ui/connect-client/testem.js rename to ui/desktop/testem.js diff --git a/ui/connect-client/tests/helpers/.gitkeep b/ui/desktop/tests/helpers/.gitkeep similarity index 100% rename from ui/connect-client/tests/helpers/.gitkeep rename to ui/desktop/tests/helpers/.gitkeep diff --git a/ui/connect-client/tests/index.html b/ui/desktop/tests/index.html similarity index 100% rename from ui/connect-client/tests/index.html rename to ui/desktop/tests/index.html diff --git a/ui/connect-client/tests/integration/.gitkeep b/ui/desktop/tests/integration/.gitkeep similarity index 100% rename from ui/connect-client/tests/integration/.gitkeep rename to ui/desktop/tests/integration/.gitkeep diff --git a/ui/connect-client/tests/test-helper.js b/ui/desktop/tests/test-helper.js similarity index 100% rename from ui/connect-client/tests/test-helper.js rename to ui/desktop/tests/test-helper.js diff --git a/ui/connect-client/tests/unit/.gitkeep b/ui/desktop/tests/unit/.gitkeep similarity index 100% rename from ui/connect-client/tests/unit/.gitkeep rename to ui/desktop/tests/unit/.gitkeep diff --git a/ui/connect-client/vendor/.gitkeep b/ui/desktop/vendor/.gitkeep similarity index 100% rename from ui/connect-client/vendor/.gitkeep rename to ui/desktop/vendor/.gitkeep From 28acb93a33859a97257f92ad0b3a44f64450f421 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Thu, 30 Jul 2020 11:26:48 -0400 Subject: [PATCH 4/5] =?UTF-8?q?chore:=20=F0=9F=A4=96=20Update=20connect-cl?= =?UTF-8?q?ient=20package=20name=20&=20tasks=20to=20desktop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 6 +++--- ui/desktop/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index c21329537..10cc97eaa 100644 --- a/package.json +++ b/package.json @@ -18,19 +18,19 @@ "scripts": { "build": "yarn build:ui:core", "build:ui:core": "cd ui/core && yarn build", - "build:ui:connect-client": "cd ui/connect-client && yarn build", + "build:ui:desktop": "cd ui/desktop && yarn build", "lint": "yarn lint:addons:api && yarn lint:addons:auth && yarn lint:addons:rose && yarn lint:ui:core", "lint:addons:api": "echo \"\n\nlint: addons/api\n\" && cd addons/api && yarn lint", "lint:addons:auth": "echo \"\n\nlint: addons/auth\n\" && cd addons/auth && yarn lint", "lint:addons:rose": "echo \"\n\nlint: addons/rose\n\" && cd addons/rose && yarn lint", "lint:ui:core": "echo \"\n\nlint: ui/core\n\" && cd ui/core && yarn lint", - "lint:ui:connect-client": "echo \"\n\nlint: ui/connect-client\n\" && cd ui/connect-client && yarn lint", + "lint:ui:desktop": "echo \"\n\nlint: ui/desktop\n\" && cd ui/desktop && yarn lint", "test": "yarn test:addons:api && yarn test:addons:auth && yarn test:addons:rose && yarn test:ui:core", "test:addons:api": "echo \"\n\ntest: addons/api\n\" && cd addons/api && yarn test", "test:addons:auth": "echo \"\n\ntest: addons/auth\n\" && cd addons/auth && yarn test", "test:addons:rose": "echo \"\n\ntest: addons/rose\n\" && cd addons/rose && yarn test", "test:ui:core": "echo \"\n\ntest: ui/core\n\" && cd ui/core && yarn test", - "test:ui:connect-client": "echo \"\n\ntest: ui/connect-client\n\" && cd ui/connect-client && yarn test", + "test:ui:desktop": "echo \"\n\ntest: ui/desktop\n\" && cd ui/desktop && yarn test", "compliance:audit": "bash ./scripts/yarn-audit.sh", "precommit": "yarn compliance:licenses && yarn compliance:audit && yarn lint && yarn test", "commit": "git-cz", diff --git a/ui/desktop/package.json b/ui/desktop/package.json index 0aa87f3e3..45ea68987 100644 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -1,5 +1,5 @@ { - "name": "connect-client", + "name": "desktop", "version": "0.0.0", "description": "Client UI for Project Watchtower.", "license": "MPL-2.0", From e9225c56451352b9656e26f7f0658a670321c90c Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 30 Jul 2020 12:17:29 -0400 Subject: [PATCH 5/5] chore: fix references to client-connect that prevented tests from passing --- ui/desktop/app/index.html | 4 ++-- ui/desktop/config/environment.js | 2 +- ui/desktop/electron-app/package.json | 4 ++-- ui/desktop/tests/index.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/desktop/app/index.html b/ui/desktop/app/index.html index 836b9e453..9190b6dfe 100644 --- a/ui/desktop/app/index.html +++ b/ui/desktop/app/index.html @@ -10,7 +10,7 @@ {{content-for "head"}} - + {{content-for "head-footer"}} @@ -18,7 +18,7 @@ {{content-for "body"}} - + {{content-for "body-footer"}} diff --git a/ui/desktop/config/environment.js b/ui/desktop/config/environment.js index 6cbe437d5..82fba2044 100644 --- a/ui/desktop/config/environment.js +++ b/ui/desktop/config/environment.js @@ -5,7 +5,7 @@ const API_HOST = process.env.API_HOST || ''; module.exports = function (environment) { let ENV = { - modulePrefix: 'connect-client', + modulePrefix: 'desktop', environment, rootURL: process.env.EMBER_CLI_ELECTRON ? '' : '/', locationType: process.env.EMBER_CLI_ELECTRON ? 'hash' : 'auto', diff --git a/ui/desktop/electron-app/package.json b/ui/desktop/electron-app/package.json index 3d7f241f9..47c42aea1 100644 --- a/ui/desktop/electron-app/package.json +++ b/ui/desktop/electron-app/package.json @@ -1,6 +1,6 @@ { - "name": "connect-client", - "productName": "connect-client", + "name": "desktop", + "productName": "desktop", "version": "0.0.0", "private": true, "description": "Electron UI for client for Project Watchtower.", diff --git a/ui/desktop/tests/index.html b/ui/desktop/tests/index.html index 4bdd48cd0..f4228fb29 100644 --- a/ui/desktop/tests/index.html +++ b/ui/desktop/tests/index.html @@ -11,7 +11,7 @@ {{content-for "test-head"}} - + {{content-for "head-footer"}} @@ -24,7 +24,7 @@ - + {{content-for "body-footer"}}