diff --git a/apps/projection/.eslintrc.json b/apps/angular/projection/.eslintrc.json similarity index 89% rename from apps/projection/.eslintrc.json rename to apps/angular/projection/.eslintrc.json index c1da729..d3cd799 100644 --- a/apps/projection/.eslintrc.json +++ b/apps/angular/projection/.eslintrc.json @@ -1,5 +1,5 @@ { - "extends": ["../../.eslintrc.json"], + "extends": ["../../../.eslintrc.json"], "ignorePatterns": ["!**/*"], "overrides": [ { diff --git a/apps/projection/README.md b/apps/angular/projection/README.md similarity index 67% rename from apps/projection/README.md rename to apps/angular/projection/README.md index c81227f..f1fe412 100644 --- a/apps/projection/README.md +++ b/apps/angular/projection/README.md @@ -5,9 +5,9 @@ ### Run Application ```bash -npx nx serve projection +npx nx serve angular-projection ``` ### Documentation and Instruction -Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/angular/1-projection/). +Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/angular/1-angular-projection/). diff --git a/apps/projection/jest.config.ts b/apps/angular/projection/jest.config.ts similarity index 80% rename from apps/projection/jest.config.ts rename to apps/angular/projection/jest.config.ts index ad50cd4..289a9b0 100644 --- a/apps/projection/jest.config.ts +++ b/apps/angular/projection/jest.config.ts @@ -1,10 +1,10 @@ /* eslint-disable */ export default { - displayName: 'projection', - preset: '../../jest.preset.js', + displayName: 'angular-projection', + preset: '../../../jest.preset.js', setupFilesAfterEnv: ['/src/test-setup.ts'], globals: {}, - coverageDirectory: '../../coverage/apps/projection', + coverageDirectory: '../../../coverage/apps/angular/projection', transform: { '^.+\\.(ts|mjs|js|html)$': [ 'jest-preset-angular', diff --git a/apps/projection/project.json b/apps/angular/projection/project.json similarity index 61% rename from apps/projection/project.json rename to apps/angular/projection/project.json index 646f8ab..f63bc97 100644 --- a/apps/projection/project.json +++ b/apps/angular/projection/project.json @@ -1,25 +1,25 @@ { - "name": "projection", - "$schema": "../../node_modules/nx/schemas/project-schema.json", + "name": "angular-projection", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", "projectType": "application", - "sourceRoot": "apps/projection/src", + "sourceRoot": "apps/angular/projection/src", "prefix": "app", "targets": { "build": { "executor": "@angular-devkit/build-angular:browser", "outputs": ["{options.outputPath}"], "options": { - "outputPath": "dist/apps/projection", - "index": "apps/projection/src/index.html", - "main": "apps/projection/src/main.ts", - "polyfills": "apps/projection/src/polyfills.ts", - "tsConfig": "apps/projection/tsconfig.app.json", + "outputPath": "dist/apps/angular/projection", + "index": "apps/angular/projection/src/index.html", + "main": "apps/angular/projection/src/main.ts", + "polyfills": "apps/angular/projection/src/polyfills.ts", + "tsConfig": "apps/angular/projection/tsconfig.app.json", "inlineStyleLanguage": "scss", "assets": [ - "apps/projection/src/favicon.ico", - "apps/projection/src/assets" + "apps/angular/projection/src/favicon.ico", + "apps/angular/projection/src/assets" ], - "styles": ["apps/projection/src/styles.scss"], + "styles": ["apps/angular/projection/src/styles.scss"], "scripts": [], "allowedCommonJsDependencies": ["seedrandom"] }, @@ -39,8 +39,8 @@ ], "fileReplacements": [ { - "replace": "apps/projection/src/environments/environment.ts", - "with": "apps/projection/src/environments/environment.prod.ts" + "replace": "apps/angular/projection/src/environments/environment.ts", + "with": "apps/angular/projection/src/environments/environment.prod.ts" } ], "outputHashing": "all" @@ -60,10 +60,10 @@ "executor": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { - "browserTarget": "projection:build:production" + "browserTarget": "angular-projection:build:production" }, "development": { - "browserTarget": "projection:build:development" + "browserTarget": "angular-projection:build:development" } }, "defaultConfiguration": "development" @@ -71,15 +71,15 @@ "extract-i18n": { "executor": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "projection:build" + "browserTarget": "angular-projection:build" } }, "lint": { "executor": "@nx/linter:eslint", "options": { "lintFilePatterns": [ - "apps/projection/**/*.ts", - "apps/projection/**/*.html" + "apps/angular/projection/**/*.ts", + "apps/angular/projection/**/*.html" ] } }, @@ -87,7 +87,7 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "apps/projection/jest.config.ts", + "jestConfig": "apps/angular/projection/jest.config.ts", "passWithNoTests": true } } diff --git a/apps/projection/src/app/app.component.ts b/apps/angular/projection/src/app/app.component.ts similarity index 100% rename from apps/projection/src/app/app.component.ts rename to apps/angular/projection/src/app/app.component.ts diff --git a/apps/projection/src/app/component/city-card/city-card.component.ts b/apps/angular/projection/src/app/component/city-card/city-card.component.ts similarity index 100% rename from apps/projection/src/app/component/city-card/city-card.component.ts rename to apps/angular/projection/src/app/component/city-card/city-card.component.ts diff --git a/apps/projection/src/app/component/student-card/student-card.component.ts b/apps/angular/projection/src/app/component/student-card/student-card.component.ts similarity index 95% rename from apps/projection/src/app/component/student-card/student-card.component.ts rename to apps/angular/projection/src/app/component/student-card/student-card.component.ts index 8a8c8ae..421630a 100644 --- a/apps/projection/src/app/component/student-card/student-card.component.ts +++ b/apps/angular/projection/src/app/component/student-card/student-card.component.ts @@ -10,8 +10,7 @@ import { CardComponent } from '../../ui/card/card.component'; template: ``, + customClass="bg-light-green">`, standalone: true, styles: [ ` diff --git a/apps/projection/src/app/component/teacher-card/teacher-card.component.ts b/apps/angular/projection/src/app/component/teacher-card/teacher-card.component.ts similarity index 95% rename from apps/projection/src/app/component/teacher-card/teacher-card.component.ts rename to apps/angular/projection/src/app/component/teacher-card/teacher-card.component.ts index 5f9b3da..006b8db 100644 --- a/apps/projection/src/app/component/teacher-card/teacher-card.component.ts +++ b/apps/angular/projection/src/app/component/teacher-card/teacher-card.component.ts @@ -10,8 +10,7 @@ import { CardComponent } from '../../ui/card/card.component'; template: ``, + customClass="bg-light-red">`, styles: [ ` ::ng-deep .bg-light-red { diff --git a/apps/projection/src/app/data-access/fake-http.service.ts b/apps/angular/projection/src/app/data-access/fake-http.service.ts similarity index 100% rename from apps/projection/src/app/data-access/fake-http.service.ts rename to apps/angular/projection/src/app/data-access/fake-http.service.ts diff --git a/apps/projection/src/app/data-access/student.store.ts b/apps/angular/projection/src/app/data-access/student.store.ts similarity index 100% rename from apps/projection/src/app/data-access/student.store.ts rename to apps/angular/projection/src/app/data-access/student.store.ts diff --git a/apps/projection/src/app/data-access/teacher.store.ts b/apps/angular/projection/src/app/data-access/teacher.store.ts similarity index 100% rename from apps/projection/src/app/data-access/teacher.store.ts rename to apps/angular/projection/src/app/data-access/teacher.store.ts diff --git a/apps/projection/src/app/model/card.model.ts b/apps/angular/projection/src/app/model/card.model.ts similarity index 100% rename from apps/projection/src/app/model/card.model.ts rename to apps/angular/projection/src/app/model/card.model.ts diff --git a/apps/projection/src/app/model/city.model.ts b/apps/angular/projection/src/app/model/city.model.ts similarity index 100% rename from apps/projection/src/app/model/city.model.ts rename to apps/angular/projection/src/app/model/city.model.ts diff --git a/apps/projection/src/app/model/student.model.ts b/apps/angular/projection/src/app/model/student.model.ts similarity index 100% rename from apps/projection/src/app/model/student.model.ts rename to apps/angular/projection/src/app/model/student.model.ts diff --git a/apps/projection/src/app/model/teacher.model.ts b/apps/angular/projection/src/app/model/teacher.model.ts similarity index 80% rename from apps/projection/src/app/model/teacher.model.ts rename to apps/angular/projection/src/app/model/teacher.model.ts index 6e7ce56..e904388 100644 --- a/apps/projection/src/app/model/teacher.model.ts +++ b/apps/angular/projection/src/app/model/teacher.model.ts @@ -5,7 +5,7 @@ export const subject = [ 'Maths', 'Sport', ] as const; -export type Subject = typeof subject[number]; +export type Subject = (typeof subject)[number]; export interface Teacher { id: number; diff --git a/apps/projection/src/app/ui/card/card.component.html b/apps/angular/projection/src/app/ui/card/card.component.html similarity index 66% rename from apps/projection/src/app/ui/card/card.component.html rename to apps/angular/projection/src/app/ui/card/card.component.html index fcd455a..81affa1 100644 --- a/apps/projection/src/app/ui/card/card.component.html +++ b/apps/angular/projection/src/app/ui/card/card.component.html @@ -1,29 +1,27 @@ -
+
+ width="200px" /> + width="200px" />
+ [type]="type">
diff --git a/apps/projection/src/app/ui/card/card.component.ts b/apps/angular/projection/src/app/ui/card/card.component.ts similarity index 100% rename from apps/projection/src/app/ui/card/card.component.ts rename to apps/angular/projection/src/app/ui/card/card.component.ts diff --git a/apps/projection/src/app/ui/list-item/list-item.component.ts b/apps/angular/projection/src/app/ui/list-item/list-item.component.ts similarity index 100% rename from apps/projection/src/app/ui/list-item/list-item.component.ts rename to apps/angular/projection/src/app/ui/list-item/list-item.component.ts diff --git a/apps/projection/src/assets/.gitkeep b/apps/angular/projection/src/assets/.gitkeep similarity index 100% rename from apps/projection/src/assets/.gitkeep rename to apps/angular/projection/src/assets/.gitkeep diff --git a/apps/projection/src/assets/img/student.webp b/apps/angular/projection/src/assets/img/student.webp similarity index 100% rename from apps/projection/src/assets/img/student.webp rename to apps/angular/projection/src/assets/img/student.webp diff --git a/apps/projection/src/assets/img/teacher.png b/apps/angular/projection/src/assets/img/teacher.png similarity index 100% rename from apps/projection/src/assets/img/teacher.png rename to apps/angular/projection/src/assets/img/teacher.png diff --git a/apps/projection/src/assets/svg/trash.svg b/apps/angular/projection/src/assets/svg/trash.svg similarity index 100% rename from apps/projection/src/assets/svg/trash.svg rename to apps/angular/projection/src/assets/svg/trash.svg diff --git a/apps/projection/src/environments/environment.prod.ts b/apps/angular/projection/src/environments/environment.prod.ts similarity index 100% rename from apps/projection/src/environments/environment.prod.ts rename to apps/angular/projection/src/environments/environment.prod.ts diff --git a/apps/projection/src/environments/environment.ts b/apps/angular/projection/src/environments/environment.ts similarity index 100% rename from apps/projection/src/environments/environment.ts rename to apps/angular/projection/src/environments/environment.ts diff --git a/apps/projection/src/favicon.ico b/apps/angular/projection/src/favicon.ico similarity index 100% rename from apps/projection/src/favicon.ico rename to apps/angular/projection/src/favicon.ico diff --git a/apps/projection/src/index.html b/apps/angular/projection/src/index.html similarity index 100% rename from apps/projection/src/index.html rename to apps/angular/projection/src/index.html diff --git a/apps/projection/src/main.ts b/apps/angular/projection/src/main.ts similarity index 100% rename from apps/projection/src/main.ts rename to apps/angular/projection/src/main.ts diff --git a/apps/projection/src/polyfills.ts b/apps/angular/projection/src/polyfills.ts similarity index 100% rename from apps/projection/src/polyfills.ts rename to apps/angular/projection/src/polyfills.ts diff --git a/apps/projection/src/styles.scss b/apps/angular/projection/src/styles.scss similarity index 64% rename from apps/projection/src/styles.scss rename to apps/angular/projection/src/styles.scss index bd6213e..b5c61c9 100644 --- a/apps/projection/src/styles.scss +++ b/apps/angular/projection/src/styles.scss @@ -1,3 +1,3 @@ @tailwind base; @tailwind components; -@tailwind utilities; \ No newline at end of file +@tailwind utilities; diff --git a/apps/projection/src/test-setup.ts b/apps/angular/projection/src/test-setup.ts similarity index 100% rename from apps/projection/src/test-setup.ts rename to apps/angular/projection/src/test-setup.ts diff --git a/apps/projection/tailwind.config.js b/apps/angular/projection/tailwind.config.js similarity index 100% rename from apps/projection/tailwind.config.js rename to apps/angular/projection/tailwind.config.js diff --git a/apps/projection/tsconfig.app.json b/apps/angular/projection/tsconfig.app.json similarity index 88% rename from apps/projection/tsconfig.app.json rename to apps/angular/projection/tsconfig.app.json index ed3ec6e..7a4dbc4 100644 --- a/apps/projection/tsconfig.app.json +++ b/apps/angular/projection/tsconfig.app.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../dist/out-tsc", + "outDir": "../../../dist/out-tsc", "types": [], "target": "ES2022", "useDefineForClassFields": false diff --git a/apps/projection/tsconfig.editor.json b/apps/angular/projection/tsconfig.editor.json similarity index 100% rename from apps/projection/tsconfig.editor.json rename to apps/angular/projection/tsconfig.editor.json diff --git a/apps/projection/tsconfig.json b/apps/angular/projection/tsconfig.json similarity index 93% rename from apps/projection/tsconfig.json rename to apps/angular/projection/tsconfig.json index c756d84..52eb4f7 100644 --- a/apps/projection/tsconfig.json +++ b/apps/angular/projection/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "files": [], "include": [], "references": [ diff --git a/apps/projection/tsconfig.spec.json b/apps/angular/projection/tsconfig.spec.json similarity index 85% rename from apps/projection/tsconfig.spec.json rename to apps/angular/projection/tsconfig.spec.json index c5db027..7aa46d8 100644 --- a/apps/projection/tsconfig.spec.json +++ b/apps/angular/projection/tsconfig.spec.json @@ -1,7 +1,7 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "outDir": "../../dist/out-tsc", + "outDir": "../../../dist/out-tsc", "module": "commonjs", "types": ["jest", "node"] }, diff --git a/nx.json b/nx.json index 11b273d..b21a8d6 100644 --- a/nx.json +++ b/nx.json @@ -82,5 +82,5 @@ "standalone": "true" } }, - "defaultProject": "projection" + "defaultProject": "angular-projection" }