diff --git a/.github/labeler.yml b/.github/labeler.yml index 063cf9b27..dc2128305 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -14,7 +14,7 @@ ui: - ui/**/* admin: - - ui/core/**/* + - ui/admin/**/* desktop: - ui/desktop/**/* diff --git a/README.md b/README.md index cd0c38650..590b6f2db 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ subproject, e.g. running or testing. - [Contributing](#contributing) - [Branching](#branching) - [Building ToC](#building-toc) - - [Building Core UI for Production](#building-core-ui-for-production) + - [Building Admin UI for Production](#building-admin-ui-for-production) - [Building with a Container](#building-with-a-container) - [Committing](#committing) - [License Checking](#license-checking) @@ -57,7 +57,7 @@ List of available project commands. `yarn run ` | Command | Description | |---------------------|---| -| build | Builds Core UI. | +| build | Builds Admin 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. | @@ -77,20 +77,20 @@ To autogenerate a ToC (table of contents) for this README, run `yarn doc:toc`. Please update the ToC whenever editing the structure of README. -### Building Core UI for Production +### Building Admin UI for Production -See ui/core/README.md Building for Production for more information on how to -build the Core UI. Be sure to set build-related environment variables as -necessary for your target environment, as described in the Core UI readme. +See ui/admin/README.md Building for Production for more information on how to +build the Admin UI. Be sure to set build-related environment variables as +necessary for your target environment, as described in the Admin UI readme. -To quickly produce a production build of Core UI, run from this folder: +To quickly produce a production build of Admin UI, run from this folder: ```bash yarn install yarn build ``` -Assets are saved to `ui/core/dist/`. +Assets are saved to `ui/admin/dist/`. #### Building with a Container @@ -100,7 +100,7 @@ Optionally, you may build the UI within a container. Execute the following comm docker-compose -f docker-compose-embedding.yml run build ``` -Assets are saved to `ui/core/dist/`. +Assets are saved to `ui/admin/dist/`. ### Committing diff --git a/docker-compose-embedding.yml b/docker-compose-embedding.yml index 278634b15..cfa19d38b 100644 --- a/docker-compose-embedding.yml +++ b/docker-compose-embedding.yml @@ -13,17 +13,17 @@ services: - 'icu_addons_api_node_modules:/src/addons/api/node_modules' - 'icu_addons_auth_node_modules:/src/addons/auth/node_modules' - 'icu_addons_rose_node_modules:/src/addons/rose/node_modules' - - 'icu_ui_core_node_modules:/src/ui/core/node_modules' + - 'icu_ui_admin_node_modules:/src/ui/admin/node_modules' working_dir: /src build: <<: *node entrypoint: bash - command: '-c "yarn install && yarn build:ui:core && chmod -R 777 ."' + command: '-c "yarn install && yarn build:ui:admin && chmod -R 777 ."' volumes: icu_node_modules: icu_addons_api_node_modules: icu_addons_auth_node_modules: icu_addons_rose_node_modules: - icu_ui_core_node_modules: + icu_ui_admin_node_modules: diff --git a/package.json b/package.json index a2778a5e0..571c7f40e 100644 --- a/package.json +++ b/package.json @@ -16,25 +16,25 @@ ] }, "scripts": { - "build": "yarn build:ui:core", - "build:ui:core": "cd ui/core && yarn build", + "build": "yarn build:ui:admin", + "build:ui:admin": "cd ui/admin && yarn build", "build:ui:desktop": "cd ui/desktop && yarn build", "lint": "npm-run-all lint:*", "lint:addons-api": "cd addons/api && yarn lint", "lint:addons-auth": "cd addons/auth && yarn lint", "lint:addons-rose": "cd addons/rose && yarn lint", - "lint:ui-core": "cd ui/core && yarn lint", + "lint:ui-admin": "cd ui/admin && yarn lint", "lint:ui-desktop": "cd ui/desktop && yarn lint", "test": "npm-run-all test:*", "test:addons-api": "cd addons/api && yarn test", "test:addons-auth": "cd addons/auth && yarn test", "test:addons-rose": "cd addons/rose && yarn test", - "test:ui-core": "cd ui/core && yarn test", + "test:ui-admin": "cd ui/admin && yarn test", "test:ui-desktop": "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", - "compliance:licenses": "license-checker --onlyAllow 'Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'boundary-ui;core@0.0.0;desktop@0.0.0;base64-js@0.0.2'", + "compliance:licenses": "license-checker --onlyAllow 'Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;Public Domain;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'boundary-ui;admin@0.0.0;desktop@0.0.0;base64-js@0.0.2'", "doc:toc": "doctoc README.md" }, "devDependencies": { diff --git a/ui/admin/README.md b/ui/admin/README.md index 92ab6cc1f..67697ab52 100644 --- a/ui/admin/README.md +++ b/ui/admin/README.md @@ -1,6 +1,6 @@ -# Core UI +# Admin UI -The core UI for Boundary. +The admin UI for Boundary. diff --git a/ui/admin/app/app.js b/ui/admin/app/app.js index cb4588790..7378c958e 100644 --- a/ui/admin/app/app.js +++ b/ui/admin/app/app.js @@ -1,7 +1,7 @@ import Application from '@ember/application'; import Resolver from 'ember-resolver'; import loadInitializers from 'ember-load-initializers'; -import config from 'core/config/environment'; +import config from 'admin/config/environment'; export default class App extends Application { modulePrefix = config.modulePrefix; diff --git a/ui/admin/app/index.html b/ui/admin/app/index.html index 248478b1f..a56a21e63 100644 --- a/ui/admin/app/index.html +++ b/ui/admin/app/index.html @@ -3,14 +3,14 @@ - Core + Admin {{content-for "head"}} - + @@ -20,7 +20,7 @@ {{content-for "body"}} - + {{content-for "body-footer"}} diff --git a/ui/admin/app/router.js b/ui/admin/app/router.js index 8b018594c..ddfe7f488 100644 --- a/ui/admin/app/router.js +++ b/ui/admin/app/router.js @@ -1,5 +1,5 @@ import EmberRouter from '@ember/routing/router'; -import config from 'core/config/environment'; +import config from 'admin/config/environment'; export default class Router extends EmberRouter { location = config.locationType; diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js index a114cc329..1c832b45b 100644 --- a/ui/admin/config/environment.js +++ b/ui/admin/config/environment.js @@ -5,7 +5,7 @@ const API_HOST = process.env.API_HOST || ''; module.exports = function (environment) { let ENV = { - modulePrefix: 'core', + modulePrefix: 'admin', environment, rootURL: '/', locationType: 'auto', diff --git a/ui/admin/package.json b/ui/admin/package.json index f1732ffd8..d82e617d8 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -1,8 +1,8 @@ { - "name": "core", + "name": "admin", "version": "0.0.0", "private": true, - "description": "Core UI for Boundary.", + "description": "Admin UI for Boundary.", "license": "MPL-2.0", "author": "HashiCorp", "directories": { diff --git a/ui/admin/tests/index.html b/ui/admin/tests/index.html index a6a72cc95..97040205c 100644 --- a/ui/admin/tests/index.html +++ b/ui/admin/tests/index.html @@ -3,7 +3,7 @@ - Core Tests + Admin Tests @@ -11,7 +11,7 @@ {{content-for "test-head"}} - + {{content-for "head-footer"}} @@ -24,7 +24,7 @@ - + {{content-for "body-footer"}} diff --git a/ui/admin/tests/test-helper.js b/ui/admin/tests/test-helper.js index 709fedf2e..bc88900fc 100644 --- a/ui/admin/tests/test-helper.js +++ b/ui/admin/tests/test-helper.js @@ -1,5 +1,5 @@ -import Application from 'core/app'; -import config from 'core/config/environment'; +import Application from '../app'; +import config from '../config/environment'; import { setApplication } from '@ember/test-helpers'; //import { start } from 'ember-qunit'; import start from 'ember-exam/test-support/start'; diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss index 6b60d508c..cff8d538d 100644 --- a/ui/desktop/app/styles/app.scss +++ b/ui/desktop/app/styles/app.scss @@ -135,6 +135,7 @@ 0% { background-position: -100% 0; } + 100% { background-position: -200% 0; } @@ -162,6 +163,7 @@ 0% { background-color: var(--action-subtler-1); } + 100% { background-color: transparent; }