diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bc9275b2..c2ea6602 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,7 +1,6 @@ name: UFO CI env: - NODE_VERSION: 18 is-main-branch: ${{ github.ref == 'refs/heads/main' }} is-pull-request: ${{ github.event_name == 'pull_request' }} @@ -24,10 +23,10 @@ jobs: fetch-depth: 0 # Derive appropriate SHAs for base and head for `nx affected` commands - uses: nrwl/nx-set-shas@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: ${{ env.NODE_VERSION }} - cache: npm + node-version: 20 + cache: 'npm' # Aggressive NPM dependency caching # https://dev.to/drakulavich/aggressive-dependency-caching-in-github-actions-3c64 @@ -57,10 +56,10 @@ jobs: fetch-depth: 0 # Derive appropriate SHAs for base and head for `nx affected` commands - uses: nrwl/nx-set-shas@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: ${{ env.NODE_VERSION }} - cache: npm + node-version: 20 + cache: 'npm' - name: Cache NPM Dependencies uses: actions/cache@v3 @@ -86,10 +85,10 @@ jobs: fetch-depth: 0 # Derive appropriate SHAs for base and head for `nx affected` commands - uses: nrwl/nx-set-shas@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - cache: npm + cache: 'npm' - name: Cache NPM Dependencies uses: actions/cache@v3 @@ -115,10 +114,10 @@ jobs: fetch-depth: 0 # Derive appropriate SHAs for base and head for `nx affected` commands - uses: nrwl/nx-set-shas@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: ${{ env.NODE_VERSION }} - cache: npm + node-version: 20 + cache: 'npm' - name: Cache NPM Dependencies uses: actions/cache@v3 @@ -142,10 +141,10 @@ jobs: with: fetch-depth: 0 - uses: nrwl/nx-set-shas@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: ${{ env.NODE_VERSION }} - cache: npm + node-version: 20 + cache: 'npm' - name: Cache NPM Dependencies uses: actions/cache@v3 @@ -171,10 +170,10 @@ jobs: fetch-depth: 0 # Derive appropriate SHAs for base and head for `nx affected` commands - uses: nrwl/nx-set-shas@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: ${{ env.NODE_VERSION }} - cache: npm + node-version: 20 + cache: 'npm' - name: Cache NPM Dependencies uses: actions/cache@v3 @@ -211,10 +210,10 @@ jobs: with: fetch-depth: 0 - uses: nrwl/nx-set-shas@v3 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: - node-version: ${{ env.NODE_VERSION }} - cache: npm + node-version: 20 + cache: 'npm' - name: Cache NPM Dependencies uses: actions/cache@v3 diff --git a/apps/audit-manager/project.json b/apps/audit-manager/project.json index 15b30f16..16a69112 100644 --- a/apps/audit-manager/project.json +++ b/apps/audit-manager/project.json @@ -4,7 +4,7 @@ "projectType": "application", "prefix": "app", "sourceRoot": "apps/audit-manager/src", - "tags": [], + "tags": ["frontend"], "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", diff --git a/apps/audit-manager/src/app/app.routes.ts b/apps/audit-manager/src/app/app.routes.ts index 6033cb7c..b5e65751 100644 --- a/apps/audit-manager/src/app/app.routes.ts +++ b/apps/audit-manager/src/app/app.routes.ts @@ -1,6 +1,10 @@ import { Route } from '@angular/router'; -import { auditBuilderRoutes } from '@app-speed/feature/audit-builder'; export const appRoutes: Route[] = [ - ...auditBuilderRoutes + { + path: 'audit-builder', + loadComponent: () => import('@app-speed/feature/audit-builder').then(c => c.AuditBuilderContainer), + }, + { path: '', redirectTo: 'audit-builder', pathMatch: 'full' }, + { path: '**', redirectTo: 'audit-builder' }, ]; diff --git a/apps/audit-manager/src/assets/FO11185404045a6-01.eps b/apps/audit-manager/src/assets/FO11185404045a6-01.eps new file mode 100644 index 00000000..dfde57eb Binary files /dev/null and b/apps/audit-manager/src/assets/FO11185404045a6-01.eps differ diff --git a/apps/audit-manager/src/assets/FO11185404045a6-01.jpg b/apps/audit-manager/src/assets/FO11185404045a6-01.jpg new file mode 100644 index 00000000..72eb726a Binary files /dev/null and b/apps/audit-manager/src/assets/FO11185404045a6-01.jpg differ diff --git a/apps/audit-manager/src/assets/FO11185404045a6-01.png b/apps/audit-manager/src/assets/FO11185404045a6-01.png new file mode 100644 index 00000000..b69c9025 Binary files /dev/null and b/apps/audit-manager/src/assets/FO11185404045a6-01.png differ diff --git a/apps/audit-manager/src/assets/FO11185404045a6-01.svg b/apps/audit-manager/src/assets/FO11185404045a6-01.svg new file mode 100644 index 00000000..d449197c --- /dev/null +++ b/apps/audit-manager/src/assets/FO11185404045a6-01.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/audit-manager/src/assets/FO11185404045a6-02.eps b/apps/audit-manager/src/assets/FO11185404045a6-02.eps new file mode 100644 index 00000000..3fda6563 Binary files /dev/null and b/apps/audit-manager/src/assets/FO11185404045a6-02.eps differ diff --git a/apps/audit-manager/src/assets/FO11185404045a6-02.jpg b/apps/audit-manager/src/assets/FO11185404045a6-02.jpg new file mode 100644 index 00000000..5f280687 Binary files /dev/null and b/apps/audit-manager/src/assets/FO11185404045a6-02.jpg differ diff --git a/apps/audit-manager/src/assets/FO11185404045a6-02.png b/apps/audit-manager/src/assets/FO11185404045a6-02.png new file mode 100644 index 00000000..df7be91f Binary files /dev/null and b/apps/audit-manager/src/assets/FO11185404045a6-02.png differ diff --git a/apps/audit-manager/src/assets/FO11185404045a6-02.svg b/apps/audit-manager/src/assets/FO11185404045a6-02.svg new file mode 100644 index 00000000..f2ddec0b --- /dev/null +++ b/apps/audit-manager/src/assets/FO11185404045a6-02.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/audit-manager/src/assets/FO11185404045a6.pdf b/apps/audit-manager/src/assets/FO11185404045a6.pdf new file mode 100644 index 00000000..65b16798 Binary files /dev/null and b/apps/audit-manager/src/assets/FO11185404045a6.pdf differ diff --git a/apps/audit-manager/src/favicon.ico b/apps/audit-manager/src/favicon.ico index 317ebcb2..657a530a 100644 Binary files a/apps/audit-manager/src/favicon.ico and b/apps/audit-manager/src/favicon.ico differ diff --git a/libs/aws-deploy/package.json b/libs/aws-deploy/package.json index bc26f53d..6f581a83 100644 --- a/libs/aws-deploy/package.json +++ b/libs/aws-deploy/package.json @@ -2,7 +2,7 @@ "name": "@app-speed/aws-deploy", "version": "0.0.1", "dependencies": { - "@nx/devkit": "16.10.0" + "@nx/devkit": "18.0.4" }, "type": "commonjs", "main": "./src/index.js", diff --git a/libs/feature/audit-builder/src/index.ts b/libs/feature/audit-builder/src/index.ts index 93a83725..0ab16453 100644 --- a/libs/feature/audit-builder/src/index.ts +++ b/libs/feature/audit-builder/src/index.ts @@ -1 +1 @@ -export { auditBuilderRoutes } from './lib/audit-builder.routes'; +export {AuditBuilderContainer} from './lib/audit-builder/audit-builder.container'; diff --git a/libs/feature/audit-builder/src/lib/audit-builder.routes.ts b/libs/feature/audit-builder/src/lib/audit-builder.routes.ts deleted file mode 100644 index 4fc7b15e..00000000 --- a/libs/feature/audit-builder/src/lib/audit-builder.routes.ts +++ /dev/null @@ -1,9 +0,0 @@ -import {Route} from '@angular/router'; -import { AuditBuilderContainer } from './audit-builder/audit-builder.container'; - -export const auditBuilderRoutes: Route[] = [ - { - path: '', - component: AuditBuilderContainer, - } -]; diff --git a/libs/features/result-viewer/src/lib/result-viewer/results-viewer.example.json b/libs/features/result-viewer/src/lib/result-viewer/results-viewer.example.json index a14fdb77..9cdc89f6 100644 --- a/libs/features/result-viewer/src/lib/result-viewer/results-viewer.example.json +++ b/libs/features/result-viewer/src/lib/result-viewer/results-viewer.example.json @@ -1,4 +1,4 @@ { - "htmlReportUrl": "https://deepblue-userflow-records.s3.eu-central-1.amazonaws.com/push-based.io2022-09-23T14_26.uf.html" + "htmlReportUrl": "https://deepblue-userflow-records.s3.eu-central-1.amazonaws.com/push-based.io2022-09-23T14_26.uf.html", "traceReportUrl": "https://deepblue-userflow-records.s3.eu-central-1.amazonaws.com/push-based.io2022-09-23T14_26.uf.json" } diff --git a/libs/ui/src/patterns/audit-builder/audit-builder.component.ts b/libs/ui/src/patterns/audit-builder/audit-builder.component.ts index bcd94458..00a42028 100644 --- a/libs/ui/src/patterns/audit-builder/audit-builder.component.ts +++ b/libs/ui/src/patterns/audit-builder/audit-builder.component.ts @@ -89,5 +89,5 @@ export class AuditBuilderComponent extends RxEffects { return new FormGroup({ type: new FormControl(step.type, Validators.required) }) - }; + } }