From 2fd464d40bf4ab3c5b29d6c32b3e2f9ee551eb1f Mon Sep 17 00:00:00 2001 From: David Kossoglyad Date: Mon, 6 Mar 2023 12:10:01 +0200 Subject: [PATCH 1/7] feat(au1-app): add the router and home route --- packages/au1-app/src/app.html | 10 ++-------- packages/au1-app/src/app.ts | 16 ++++++++++++++++ packages/au1-app/src/routes/home/index.html | 12 ++++++++++++ packages/au1-app/src/routes/home/index.ts | 1 + 4 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 packages/au1-app/src/routes/home/index.html create mode 100644 packages/au1-app/src/routes/home/index.ts diff --git a/packages/au1-app/src/app.html b/packages/au1-app/src/app.html index e4729a3..d6988cf 100644 --- a/packages/au1-app/src/app.html +++ b/packages/au1-app/src/app.html @@ -49,16 +49,10 @@

${message}

-

Get Started

-

Quick start

- + - - - - - + diff --git a/packages/au1-app/src/app.ts b/packages/au1-app/src/app.ts index 87967d4..ddec091 100644 --- a/packages/au1-app/src/app.ts +++ b/packages/au1-app/src/app.ts @@ -1,3 +1,19 @@ +import { PLATFORM } from 'aurelia-framework'; +import {Router, RouterConfiguration} from 'aurelia-router'; + export class App { + + private router: Router; + public message: string; + + configureRouter(config: RouterConfiguration, router: Router){ + config.title = 'Contacts'; + config.map([ + { route: ['', 'home'], moduleId: PLATFORM.moduleName('routes/home/index'), name: 'home', nav: true, title: 'Home' }, + //{ route: '/contacts', moduleId: './contacts', name:'contacts', nav: true, title: 'Contacts' } + ]); + + this.router = router; + } } diff --git a/packages/au1-app/src/routes/home/index.html b/packages/au1-app/src/routes/home/index.html new file mode 100644 index 0000000..17a72c2 --- /dev/null +++ b/packages/au1-app/src/routes/home/index.html @@ -0,0 +1,12 @@ + diff --git a/packages/au1-app/src/routes/home/index.ts b/packages/au1-app/src/routes/home/index.ts new file mode 100644 index 0000000..2ea2175 --- /dev/null +++ b/packages/au1-app/src/routes/home/index.ts @@ -0,0 +1 @@ +export class Home {} From cee107072cbb049c13e5b995d884581a2a9c2361 Mon Sep 17 00:00:00 2001 From: David Kossoglyad Date: Mon, 6 Mar 2023 12:27:50 +0200 Subject: [PATCH 2/7] chore: add autolinks to workspace settings issue: #7 --- .vscode/settings.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 53e5656..8dad7b5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,5 +8,16 @@ ], "devskim.ignoreRulesList": [ "DS137138" + ], + "gitlens.autolinks": [ + + { + "prefix": "issue: #", + "url": "https://github.com/devops-example-org/frontend/issues/" + }, + { + "prefix": "pr: #", + "url": "https://github.com/devops-example-org/frontend/pull/" + } ] } \ No newline at end of file From d687f8be0ba6ef1b1107a68aeda1e7c5407157a8 Mon Sep 17 00:00:00 2001 From: David Kossoglyad Date: Mon, 6 Mar 2023 12:42:41 +0200 Subject: [PATCH 3/7] chore: fix branch name in workflow issue: #7 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fb807f..2b3f477 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,12 +8,12 @@ on: push: branches: - main - - dev + - develop - feature/* pull_request: branches: - main - - dev + - develop # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 886cd73f5dbf845479edb84f6e22b504f242cf1d Mon Sep 17 00:00:00 2001 From: David Kossoglyad Date: Mon, 6 Mar 2023 14:33:09 +0200 Subject: [PATCH 4/7] chore: try husky pre-commit with Cypress issue: #7 --- .gitignore | 3 ++- .husky/pre-commit | 2 +- .vscode/settings.json | 3 ++- packages/au1-app/playwright.config.ts | 4 ++-- turbo.json | 4 +++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 6fe96bc..9e0a324 100644 --- a/.gitignore +++ b/.gitignore @@ -120,4 +120,5 @@ dist .turbo .pnp.cjs -coverage-jest \ No newline at end of file +coverage-jest +**/*.mp4 diff --git a/.husky/pre-commit b/.husky/pre-commit index 0e2fbea..7253392 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -3,4 +3,4 @@ yarn run e2e -# yarn run cy +yarn run cy diff --git a/.vscode/settings.json b/.vscode/settings.json index 8dad7b5..2fbe163 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -19,5 +19,6 @@ "prefix": "pr: #", "url": "https://github.com/devops-example-org/frontend/pull/" } - ] + ], + "cmake.configureOnOpen": false } \ No newline at end of file diff --git a/packages/au1-app/playwright.config.ts b/packages/au1-app/playwright.config.ts index 405d013..ffcf68e 100644 --- a/packages/au1-app/playwright.config.ts +++ b/packages/au1-app/playwright.config.ts @@ -99,8 +99,8 @@ const config: PlaywrightTestConfig = { /* Run your local dev server before starting the tests */ webServer: { - command: 'npm start', - port: 8080, + command: 'webpack serve --port 8081', + port: 8081, }, }; diff --git a/turbo.json b/turbo.json index 80d7b15..c5b1faf 100644 --- a/turbo.json +++ b/turbo.json @@ -29,6 +29,8 @@ "inputs": ["src/**/*.{cjs,mjs,js,jsx,cts,mts,ts,tsx}", "test/**/*.{cjs,mjs,js,jsx,cts,mts,ts,tsx}", "package.json"], "dependsOn": ["^build"] }, - "start": {} + "start": {}, + "cy": {}, + "cy:dev": {} } } From 16a6223bb6b7bdce6cc6d617b9fd63567939d17c Mon Sep 17 00:00:00 2001 From: David Kossoglyad Date: Tue, 7 Mar 2023 01:35:49 +0200 Subject: [PATCH 5/7] style(fast-components): clean code --- packages/fast-components/src/app.ts | 2 +- packages/fast-components/src/my-tabs.ts | 2 +- packages/fast-components/src/name-tag.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/fast-components/src/app.ts b/packages/fast-components/src/app.ts index 95836de..b80d995 100644 --- a/packages/fast-components/src/app.ts +++ b/packages/fast-components/src/app.ts @@ -9,7 +9,7 @@ const template = html` template }) export class App extends FASTElement { - @observable contents: Array = [ + @observable contents: Array = [ 'unicorn', 'fuck!', 'Me' ]; diff --git a/packages/fast-components/src/my-tabs.ts b/packages/fast-components/src/my-tabs.ts index ca3e433..7d6123a 100644 --- a/packages/fast-components/src/my-tabs.ts +++ b/packages/fast-components/src/my-tabs.ts @@ -6,6 +6,6 @@ import { template } from "./my-tabs.template"; template }) export class MyTabs extends FASTElement { - @observable items: Array = []; + @observable items: Array = []; } \ No newline at end of file diff --git a/packages/fast-components/src/name-tag.ts b/packages/fast-components/src/name-tag.ts index 4a6d850..86cbeed 100644 --- a/packages/fast-components/src/name-tag.ts +++ b/packages/fast-components/src/name-tag.ts @@ -6,8 +6,8 @@ import { template } from './name-tag.template'; template }) export class NameTag extends FASTElement { - @attr greeting: string = 'Hello'; - @attr name: string = ''; + @attr greeting = 'Hello'; + @attr name = ''; // optional method greetingChanged() { From 769837cd2b0f9ba506189aa89cd32ba6570e1e5d Mon Sep 17 00:00:00 2001 From: David Kossoglyad Date: Wed, 8 Mar 2023 17:35:32 +0200 Subject: [PATCH 6/7] feat(au1-app): add the nav menu closes #7 --- packages/au1-app/index.ejs | 2 - packages/au1-app/package.json | 14 +- packages/au1-app/src/app.html | 38 +- packages/au1-app/src/app.scss | 51 + packages/au1-app/src/app.ts | 2 +- .../src/resources/fabric.components.css | 5806 +++++++++++++++++ .../src/routes/app-module-one/index.html | 101 + .../src/routes/app-module-one/index.ts | 1 + 8 files changed, 5974 insertions(+), 41 deletions(-) create mode 100644 packages/au1-app/src/app.scss create mode 100644 packages/au1-app/src/resources/fabric.components.css create mode 100644 packages/au1-app/src/routes/app-module-one/index.html create mode 100644 packages/au1-app/src/routes/app-module-one/index.ts diff --git a/packages/au1-app/index.ejs b/packages/au1-app/index.ejs index 9df296d..0f72389 100644 --- a/packages/au1-app/index.ejs +++ b/packages/au1-app/index.ejs @@ -6,8 +6,6 @@ - - diff --git a/packages/au1-app/package.json b/packages/au1-app/package.json index e2cb1e6..71638c6 100644 --- a/packages/au1-app/package.json +++ b/packages/au1-app/package.json @@ -8,12 +8,12 @@ }, "license": "MIT", "devDependencies": { - "@playwright/test": "^1.31.1", + "@playwright/test": "^1.31.2", "@types/jest": "^29.4.0", - "@types/node": "^18.14.1", + "@types/node": "^18.14.6", "@types/webpack": "^5.28.0", - "@typescript-eslint/eslint-plugin": "^5.53.0", - "@typescript-eslint/parser": "^5.53.0", + "@typescript-eslint/eslint-plugin": "^5.54.1", + "@typescript-eslint/parser": "^5.54.1", "app-settings-loader": "^2.0.8", "aurelia-cli": "^3.0.1", "aurelia-loader-nodejs": "^1.1.0", @@ -26,14 +26,14 @@ "css-loader": "^6.7.3", "cssnano": "^5.1.15", "duplicate-package-checker-webpack-plugin": "^3.0.0", - "eslint": "^8.34.0", + "eslint": "^8.35.0", "expose-loader": "^4.0.0", "gulp": "^4.0.2", "gulp-eslint": "^6.0.0", "html-loader": "^4.2.0", "html-webpack-plugin": "^5.5.0", - "jest": "^29.4.3", - "jest-cli": "^29.4.3", + "jest": "^29.5.0", + "jest-cli": "^29.5.0", "jest-transform-stub": "^2.0.0", "json-loader": "^0.5.7", "mini-css-extract-plugin": "^2.7.2", diff --git a/packages/au1-app/src/app.html b/packages/au1-app/src/app.html index d6988cf..e01dee8 100644 --- a/packages/au1-app/src/app.html +++ b/packages/au1-app/src/app.html @@ -1,6 +1,8 @@