Changeset 81c2e6f for src/Clients/Angular
- Timestamp:
- 10/21/21 21:53:08 (3 years ago)
- Branches:
- dev
- Children:
- 70e04f1, 8b6791f
- Parents:
- 45cf412 (diff), 2b66157 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Location:
- src/Clients/Angular/finki-chattery
- Files:
-
- 4 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Clients/Angular/finki-chattery/angular.json
r45cf412 r81c2e6f 98 98 "tsConfig": "tsconfig.spec.json", 99 99 "karmaConfig": "karma.conf.js", 100 "assets": ["src/favicon.ico", "src/assets"], 101 "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"], 100 "assets": [ 101 "src/favicon.ico", 102 "src/assets" 103 ], 104 "styles": [ 105 "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", 106 "src/styles.scss" 107 ], 102 108 "scripts": [] 103 109 } … … 106 112 "builder": "@angular-devkit/build-angular:tslint", 107 113 "options": { 108 "tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"], 109 "exclude": ["**/node_modules/**"] 114 "tsConfig": [ 115 "tsconfig.app.json", 116 "tsconfig.spec.json", 117 "e2e/tsconfig.json" 118 ], 119 "exclude": [ 120 "**/node_modules/**" 121 ] 110 122 } 111 123 }, … … 125 137 } 126 138 }, 127 "defaultProject": "finki-chattery" 139 "defaultProject": "finki-chattery", 140 "cli": { 141 "analytics": false 142 } 128 143 } -
src/Clients/Angular/finki-chattery/src/app/app.component.html
r45cf412 r81c2e6f 1 1 <main> 2 2 <mat-progress-bar class="global-loader" [class.hidden]="!(loader.isLoading | async)" mode="indeterminate"></mat-progress-bar> 3 <app-header></app-header> 3 4 <router-outlet></router-outlet> 4 5 </main> -
src/Clients/Angular/finki-chattery/src/app/app.module.ts
r45cf412 r81c2e6f 10 10 import { CoreModule } from './core/core.module'; 11 11 import { translateConfiguration, TranslateFromJsonService } from './shared-app/services'; 12 import { SharedMaterialModule } from './shared-material/shared-material.module';13 12 14 13 @NgModule({ … … 18 17 AppRoutingModule, 19 18 CoreModule, 20 SharedMaterialModule,21 19 BrowserAnimationsModule, 22 20 ToastrModule.forRoot(), -
src/Clients/Angular/finki-chattery/src/app/core/core.module.ts
r45cf412 r81c2e6f 11 11 import { GUARDS } from './guards/guards'; 12 12 import { LoaderInterceptor } from './interceptors/loader.interceptor'; 13 import { SERVICES } from './services/services';14 13 import { reducers } from './state'; 15 14 import { TokenInterceptor } from './interceptors/token.interceptor'; … … 21 20 declarations: [COMPONENTS], 22 21 providers: [ 23 SERVICES,24 22 GUARDS, 25 23 { provide: HTTP_INTERCEPTORS, useClass: LoaderInterceptor, multi: true }, … … 39 37 EffectsModule.forRoot([QuestionEffects, CategoriesEffects]) 40 38 ], 41 exports: [HttpClientModule, COMPONENTS]39 exports: [HttpClientModule, SharedAppModule, COMPONENTS] 42 40 }) 43 41 export class CoreModule {} -
src/Clients/Angular/finki-chattery/src/app/core/services/redirect.service.ts
r45cf412 r81c2e6f 20 20 switch (currentUser.userType) { 21 21 case ApplicationUserType.Student: 22 this.router.navigateByUrl(`questioning/preview`); 22 23 break; 23 24 case ApplicationUserType.Teacher: -
src/Clients/Angular/finki-chattery/src/app/core/services/services.ts
r45cf412 r81c2e6f 1 export const SERVICES: any[] = []; -
src/Clients/Angular/finki-chattery/src/app/core/state/category-state/category.actions.ts
r45cf412 r81c2e6f 1 1 import { HttpErrorResponse } from '@angular/common/http'; 2 2 import { Action } from '@ngrx/store'; 3 import { CategoryStateViewModel } from 'src/app/shared-app/models'; 3 4 import { CategoryStateResponse } from './category-state.models'; 4 5 … … 20 21 readonly type = CategoryActionTypes.GetCategoriesStateSuccess; 21 22 22 constructor(public payload: CategoryState Response[]) {}23 constructor(public payload: CategoryStateViewModel[]) {} 23 24 } 24 25 -
src/Clients/Angular/finki-chattery/src/app/shared-app/components/components.ts
r45cf412 r81c2e6f 2 2 import { FileUploadComponent } from './generic/file-upload/file-upload.component'; 3 3 import { FormErrorComponent } from './generic/form-error/form-error.component'; 4 import { HeaderComponent } from './generic/header/header.component'; 4 5 import { VoteComponent } from './generic/vote/vote.component'; 5 6 import { QuestionPreviewComponent } from './question/question-preview/question-preview.component'; … … 12 13 QuestionPreviewComponent, 13 14 VoteComponent, 14 StudentCardComponent 15 StudentCardComponent, 16 HeaderComponent 15 17 ];
Note:
See TracChangeset
for help on using the changeset viewer.