Changeset 81c2e6f for src/Clients

Timestamp:

10/21/21 21:53:08 (3 years ago)

Author:

Стојков Марко <mst@…>

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.

Message:

merged navbar into dev

Location:

src/Clients/Angular/finki-chattery

Files:

• .vscode/launch.json (added)
• angular.json (modified) (3 diffs)
• src/app/app.component.html (modified) (1 diff)
• src/app/app.module.ts (modified) (2 diffs)
• src/app/core/core.module.ts (modified) (3 diffs)
• src/app/core/services/redirect.service.ts (modified) (1 diff)
• src/app/core/services/services.ts (modified) (1 diff)
• src/app/core/state/category-state/category.actions.ts (modified) (2 diffs)
• src/app/shared-app/components/components.ts (modified) (2 diffs)
• src/app/shared-app/components/generic/header/header.component.html (added)
• src/app/shared-app/components/generic/header/header.component.scss (added)
• src/app/shared-app/components/generic/header/header.component.ts (added)

src/Clients/Angular/finki-chattery/angular.json

@@ -98 +98 @@
             "tsConfig": "tsconfig.spec.json",
             "karmaConfig": "karma.conf.js",
-            "assets": ["src/favicon.ico", "src/assets"],
-            "styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"],
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
+              "src/styles.scss"
+            ],
             "scripts": []
           }
@@ -106 +112 @@
           "builder": "@angular-devkit/build-angular:tslint",
           "options": {
-            "tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
-            "exclude": ["**/node_modules/**"]
+            "tsConfig": [
+              "tsconfig.app.json",
+              "tsconfig.spec.json",
+              "e2e/tsconfig.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
           }
         },
@@ -125 +137 @@
     }
   },
-  "defaultProject": "finki-chattery"
+  "defaultProject": "finki-chattery",
+  "cli": {
+    "analytics": false
+  }
 }

src/Clients/Angular/finki-chattery/src/app/app.component.html

@@ -1 +1 @@
 <main>
   <mat-progress-bar class="global-loader" [class.hidden]="!(loader.isLoading | async)" mode="indeterminate"></mat-progress-bar>
+  <app-header></app-header>
   <router-outlet></router-outlet>
 </main>

src/Clients/Angular/finki-chattery/src/app/app.module.ts

@@ -10 +10 @@
 import { CoreModule } from './core/core.module';
 import { translateConfiguration, TranslateFromJsonService } from './shared-app/services';
-import { SharedMaterialModule } from './shared-material/shared-material.module';
 
 @NgModule({
@@ -18 +17 @@
     AppRoutingModule,
     CoreModule,
-    SharedMaterialModule,
     BrowserAnimationsModule,
     ToastrModule.forRoot(),

src/Clients/Angular/finki-chattery/src/app/core/core.module.ts

@@ -11 +11 @@
 import { GUARDS } from './guards/guards';
 import { LoaderInterceptor } from './interceptors/loader.interceptor';
-import { SERVICES } from './services/services';
 import { reducers } from './state';
 import { TokenInterceptor } from './interceptors/token.interceptor';
@@ -21 +20 @@
   declarations: [COMPONENTS],
   providers: [
-    SERVICES,
     GUARDS,
     { provide: HTTP_INTERCEPTORS, useClass: LoaderInterceptor, multi: true },
@@ -39 +37 @@
     EffectsModule.forRoot([QuestionEffects, CategoriesEffects])
   ],
-  exports: [HttpClientModule, COMPONENTS]
+  exports: [HttpClientModule, SharedAppModule, COMPONENTS]
 })
 export class CoreModule {}

src/Clients/Angular/finki-chattery/src/app/core/services/redirect.service.ts

@@ -20 +20 @@
           switch (currentUser.userType) {
             case ApplicationUserType.Student:
+              this.router.navigateByUrl(`questioning/preview`);
               break;
             case ApplicationUserType.Teacher:

src/Clients/Angular/finki-chattery/src/app/core/services/services.ts

@@ -1 @@
-export const SERVICES: any[] = [];

src/Clients/Angular/finki-chattery/src/app/core/state/category-state/category.actions.ts

@@ -1 +1 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { Action } from '@ngrx/store';
+import { CategoryStateViewModel } from 'src/app/shared-app/models';
 import { CategoryStateResponse } from './category-state.models';
 
@@ -20 +21 @@
   readonly type = CategoryActionTypes.GetCategoriesStateSuccess;
 
-  constructor(public payload: CategoryStateResponse[]) {}
+  constructor(public payload: CategoryStateViewModel[]) {}
 }
 

src/Clients/Angular/finki-chattery/src/app/shared-app/components/components.ts

@@ -2 +2 @@
 import { FileUploadComponent } from './generic/file-upload/file-upload.component';
 import { FormErrorComponent } from './generic/form-error/form-error.component';
+import { HeaderComponent } from './generic/header/header.component';
 import { VoteComponent } from './generic/vote/vote.component';
 import { QuestionPreviewComponent } from './question/question-preview/question-preview.component';
@@ -12 +13 @@
   QuestionPreviewComponent,
   VoteComponent,
-  StudentCardComponent
+  StudentCardComponent,
+  HeaderComponent
 ];