diff --git a/apps/rxjs-race-condition/cypress/support/component-index.html b/apps/rxjs-race-condition/cypress/support/component-index.html deleted file mode 100644 index 543c1c1..0000000 --- a/apps/rxjs-race-condition/cypress/support/component-index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - rxjs-race-condition Components App - - - -
- - diff --git a/apps/rxjs-race-condition/.eslintrc.json b/apps/rxjs/race-condition/.eslintrc.json similarity index 94% rename from apps/rxjs-race-condition/.eslintrc.json rename to apps/rxjs/race-condition/.eslintrc.json index b428c22..bf8df14 100644 --- a/apps/rxjs-race-condition/.eslintrc.json +++ b/apps/rxjs/race-condition/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["../../.eslintrc.json"], + "extends": ["../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "overrides": [ { diff --git a/apps/rxjs-race-condition/README.md b/apps/rxjs/race-condition/README.md similarity index 100% rename from apps/rxjs-race-condition/README.md rename to apps/rxjs/race-condition/README.md diff --git a/apps/rxjs-race-condition/cypress.config.ts b/apps/rxjs/race-condition/cypress.config.ts similarity index 100% rename from apps/rxjs-race-condition/cypress.config.ts rename to apps/rxjs/race-condition/cypress.config.ts diff --git a/apps/rxjs-race-condition/cypress/fixtures/example.json b/apps/rxjs/race-condition/cypress/fixtures/example.json similarity index 100% rename from apps/rxjs-race-condition/cypress/fixtures/example.json rename to apps/rxjs/race-condition/cypress/fixtures/example.json diff --git a/apps/rxjs-race-condition/cypress/support/commands.ts b/apps/rxjs/race-condition/cypress/support/commands.ts similarity index 100% rename from apps/rxjs-race-condition/cypress/support/commands.ts rename to apps/rxjs/race-condition/cypress/support/commands.ts diff --git a/apps/rxjs/race-condition/cypress/support/component-index.html b/apps/rxjs/race-condition/cypress/support/component-index.html new file mode 100644 index 0000000..5ce08c7 --- /dev/null +++ b/apps/rxjs/race-condition/cypress/support/component-index.html @@ -0,0 +1,12 @@ + + + + + + + rxjs-race-condition Components App + + +
+ + diff --git a/apps/rxjs-race-condition/cypress/support/component.ts b/apps/rxjs/race-condition/cypress/support/component.ts similarity index 100% rename from apps/rxjs-race-condition/cypress/support/component.ts rename to apps/rxjs/race-condition/cypress/support/component.ts diff --git a/apps/rxjs-race-condition/cypress/tsconfig.json b/apps/rxjs/race-condition/cypress/tsconfig.json similarity index 100% rename from apps/rxjs-race-condition/cypress/tsconfig.json rename to apps/rxjs/race-condition/cypress/tsconfig.json diff --git a/apps/rxjs-race-condition/jest.config.ts b/apps/rxjs/race-condition/jest.config.ts similarity index 85% rename from apps/rxjs-race-condition/jest.config.ts rename to apps/rxjs/race-condition/jest.config.ts index 48bb089..2e2e892 100644 --- a/apps/rxjs-race-condition/jest.config.ts +++ b/apps/rxjs/race-condition/jest.config.ts @@ -1,10 +1,10 @@ /* eslint-disable */ export default { displayName: 'rxjs-race-condition', - preset: '../../jest.preset.js', + preset: '../../../jest.preset.js', setupFilesAfterEnv: ['/src/test-setup.ts'], globals: {}, - coverageDirectory: '../../coverage/apps/rxjs-race-condition', + coverageDirectory: '../../../coverage/apps/rxjs/race-condition', transform: { '^.+\\.(ts|mjs|js|html)$': [ 'jest-preset-angular', diff --git a/apps/rxjs-race-condition/project.json b/apps/rxjs/race-condition/project.json similarity index 74% rename from apps/rxjs-race-condition/project.json rename to apps/rxjs/race-condition/project.json index 533eb83..d1c94d9 100644 --- a/apps/rxjs-race-condition/project.json +++ b/apps/rxjs/race-condition/project.json @@ -1,25 +1,25 @@ { "name": "rxjs-race-condition", - "$schema": "../../node_modules/nx/schemas/project-schema.json", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", "projectType": "application", - "sourceRoot": "apps/rxjs-race-condition/src", + "sourceRoot": "apps/rxjs/race-condition/src", "prefix": "app", "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", "outputs": ["{options.outputPath}"], "options": { - "outputPath": "dist/apps/rxjs-race-condition", - "index": "apps/rxjs-race-condition/src/index.html", - "main": "apps/rxjs-race-condition/src/main.ts", + "outputPath": "dist/apps/rxjs/race-condition", + "index": "apps/rxjs/race-condition/src/index.html", + "main": "apps/rxjs/race-condition/src/main.ts", "polyfills": ["zone.js"], - "tsConfig": "apps/rxjs-race-condition/tsconfig.app.json", + "tsConfig": "apps/rxjs/race-condition/tsconfig.app.json", "inlineStyleLanguage": "scss", "assets": [ - "apps/rxjs-race-condition/src/favicon.ico", - "apps/rxjs-race-condition/src/assets" + "apps/rxjs/race-condition/src/favicon.ico", + "apps/rxjs/race-condition/src/assets" ], - "styles": ["apps/rxjs-race-condition/src/styles.scss"], + "styles": ["apps/rxjs/race-condition/src/styles.scss"], "scripts": [] }, "configurations": { @@ -72,8 +72,8 @@ "outputs": ["{options.outputFile}"], "options": { "lintFilePatterns": [ - "apps/rxjs-race-condition/**/*.ts", - "apps/rxjs-race-condition/**/*.html" + "apps/rxjs/race-condition/**/*.ts", + "apps/rxjs/race-condition/**/*.html" ] } }, @@ -81,14 +81,14 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "apps/rxjs-race-condition/jest.config.ts", + "jestConfig": "apps/rxjs/race-condition/jest.config.ts", "passWithNoTests": true } }, "component-test": { "executor": "@nx/cypress:cypress", "options": { - "cypressConfig": "apps/rxjs-race-condition/cypress.config.ts", + "cypressConfig": "apps/rxjs/race-condition/cypress.config.ts", "testingType": "component", "skipServe": true, "devServerTarget": "rxjs-race-condition:build" diff --git a/apps/rxjs-race-condition/src/app/app.component.cy.ts b/apps/rxjs/race-condition/src/app/app.component.cy.ts similarity index 100% rename from apps/rxjs-race-condition/src/app/app.component.cy.ts rename to apps/rxjs/race-condition/src/app/app.component.cy.ts diff --git a/apps/rxjs-race-condition/src/app/app.component.ts b/apps/rxjs/race-condition/src/app/app.component.ts similarity index 100% rename from apps/rxjs-race-condition/src/app/app.component.ts rename to apps/rxjs/race-condition/src/app/app.component.ts diff --git a/apps/rxjs-race-condition/src/app/app.config.ts b/apps/rxjs/race-condition/src/app/app.config.ts similarity index 100% rename from apps/rxjs-race-condition/src/app/app.config.ts rename to apps/rxjs/race-condition/src/app/app.config.ts diff --git a/apps/rxjs-race-condition/src/app/topic-dialog.component.ts b/apps/rxjs/race-condition/src/app/topic-dialog.component.ts similarity index 100% rename from apps/rxjs-race-condition/src/app/topic-dialog.component.ts rename to apps/rxjs/race-condition/src/app/topic-dialog.component.ts diff --git a/apps/rxjs-race-condition/src/app/topic.service.ts b/apps/rxjs/race-condition/src/app/topic.service.ts similarity index 100% rename from apps/rxjs-race-condition/src/app/topic.service.ts rename to apps/rxjs/race-condition/src/app/topic.service.ts diff --git a/apps/rxjs-race-condition/src/assets/.gitkeep b/apps/rxjs/race-condition/src/assets/.gitkeep similarity index 100% rename from apps/rxjs-race-condition/src/assets/.gitkeep rename to apps/rxjs/race-condition/src/assets/.gitkeep diff --git a/apps/rxjs-race-condition/src/favicon.ico b/apps/rxjs/race-condition/src/favicon.ico similarity index 100% rename from apps/rxjs-race-condition/src/favicon.ico rename to apps/rxjs/race-condition/src/favicon.ico diff --git a/apps/rxjs-race-condition/src/index.html b/apps/rxjs/race-condition/src/index.html similarity index 100% rename from apps/rxjs-race-condition/src/index.html rename to apps/rxjs/race-condition/src/index.html diff --git a/apps/rxjs-race-condition/src/main.ts b/apps/rxjs/race-condition/src/main.ts similarity index 100% rename from apps/rxjs-race-condition/src/main.ts rename to apps/rxjs/race-condition/src/main.ts diff --git a/apps/rxjs-race-condition/src/styles.scss b/apps/rxjs/race-condition/src/styles.scss similarity index 58% rename from apps/rxjs-race-condition/src/styles.scss rename to apps/rxjs/race-condition/src/styles.scss index 3d9b6c4..5f2e97e 100644 --- a/apps/rxjs-race-condition/src/styles.scss +++ b/apps/rxjs/race-condition/src/styles.scss @@ -9,12 +9,16 @@ $theme-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400); $theme-warn: mat.define-palette(mat.$red-palette); -$theme: mat.define-light-theme((color: (primary: $theme-primary, - accent: $theme-accent, - warn: $theme-warn, - ), - typography: mat.define-typography-config(), - )); +$theme: mat.define-light-theme( + ( + color: ( + primary: $theme-primary, + accent: $theme-accent, + warn: $theme-warn, + ), + typography: mat.define-typography-config(), + ) +); @include mat.dialog-theme($theme); -@include mat.button-theme($theme); \ No newline at end of file +@include mat.button-theme($theme); diff --git a/apps/rxjs-race-condition/src/test-setup.ts b/apps/rxjs/race-condition/src/test-setup.ts similarity index 100% rename from apps/rxjs-race-condition/src/test-setup.ts rename to apps/rxjs/race-condition/src/test-setup.ts diff --git a/apps/rxjs-race-condition/tsconfig.app.json b/apps/rxjs/race-condition/tsconfig.app.json similarity index 89% rename from apps/rxjs-race-condition/tsconfig.app.json rename to apps/rxjs/race-condition/tsconfig.app.json index e46d4fc..01a02ed 100644 --- a/apps/rxjs-race-condition/tsconfig.app.json +++ b/apps/rxjs/race-condition/tsconfig.app.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../dist/out-tsc", + "outDir": "../../../dist/out-tsc", "types": [] }, "files": ["src/main.ts"], diff --git a/apps/rxjs-race-condition/tsconfig.editor.json b/apps/rxjs/race-condition/tsconfig.editor.json similarity index 100% rename from apps/rxjs-race-condition/tsconfig.editor.json rename to apps/rxjs/race-condition/tsconfig.editor.json diff --git a/apps/rxjs-race-condition/tsconfig.json b/apps/rxjs/race-condition/tsconfig.json similarity index 94% rename from apps/rxjs-race-condition/tsconfig.json rename to apps/rxjs/race-condition/tsconfig.json index 28546c4..3879b94 100644 --- a/apps/rxjs-race-condition/tsconfig.json +++ b/apps/rxjs/race-condition/tsconfig.json @@ -25,7 +25,7 @@ "path": "./cypress/tsconfig.json" } ], - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "angularCompilerOptions": { "enableI18nLegacyMessageIdFormat": false, "strictInjectionParameters": true, diff --git a/apps/rxjs-race-condition/tsconfig.spec.json b/apps/rxjs/race-condition/tsconfig.spec.json similarity index 87% rename from apps/rxjs-race-condition/tsconfig.spec.json rename to apps/rxjs/race-condition/tsconfig.spec.json index f6a7d97..ca14cc6 100644 --- a/apps/rxjs-race-condition/tsconfig.spec.json +++ b/apps/rxjs/race-condition/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../dist/out-tsc", + "outDir": "../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] },