Ignore:
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:
4 added
8 edited

Legend:

Unmodified
Added
Removed
  • src/Clients/Angular/finki-chattery/angular.json

    r45cf412 r81c2e6f  
    9898            "tsConfig": "tsconfig.spec.json",
    9999            "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            ],
    102108            "scripts": []
    103109          }
     
    106112          "builder": "@angular-devkit/build-angular:tslint",
    107113          "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            ]
    110122          }
    111123        },
     
    125137    }
    126138  },
    127   "defaultProject": "finki-chattery"
     139  "defaultProject": "finki-chattery",
     140  "cli": {
     141    "analytics": false
     142  }
    128143}
  • src/Clients/Angular/finki-chattery/src/app/app.component.html

    r45cf412 r81c2e6f  
    11<main>
    22  <mat-progress-bar class="global-loader" [class.hidden]="!(loader.isLoading | async)" mode="indeterminate"></mat-progress-bar>
     3  <app-header></app-header>
    34  <router-outlet></router-outlet>
    45</main>
  • src/Clients/Angular/finki-chattery/src/app/app.module.ts

    r45cf412 r81c2e6f  
    1010import { CoreModule } from './core/core.module';
    1111import { translateConfiguration, TranslateFromJsonService } from './shared-app/services';
    12 import { SharedMaterialModule } from './shared-material/shared-material.module';
    1312
    1413@NgModule({
     
    1817    AppRoutingModule,
    1918    CoreModule,
    20     SharedMaterialModule,
    2119    BrowserAnimationsModule,
    2220    ToastrModule.forRoot(),
  • src/Clients/Angular/finki-chattery/src/app/core/core.module.ts

    r45cf412 r81c2e6f  
    1111import { GUARDS } from './guards/guards';
    1212import { LoaderInterceptor } from './interceptors/loader.interceptor';
    13 import { SERVICES } from './services/services';
    1413import { reducers } from './state';
    1514import { TokenInterceptor } from './interceptors/token.interceptor';
     
    2120  declarations: [COMPONENTS],
    2221  providers: [
    23     SERVICES,
    2422    GUARDS,
    2523    { provide: HTTP_INTERCEPTORS, useClass: LoaderInterceptor, multi: true },
     
    3937    EffectsModule.forRoot([QuestionEffects, CategoriesEffects])
    4038  ],
    41   exports: [HttpClientModule, COMPONENTS]
     39  exports: [HttpClientModule, SharedAppModule, COMPONENTS]
    4240})
    4341export class CoreModule {}
  • src/Clients/Angular/finki-chattery/src/app/core/services/redirect.service.ts

    r45cf412 r81c2e6f  
    2020          switch (currentUser.userType) {
    2121            case ApplicationUserType.Student:
     22              this.router.navigateByUrl(`questioning/preview`);
    2223              break;
    2324            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  
    11import { HttpErrorResponse } from '@angular/common/http';
    22import { Action } from '@ngrx/store';
     3import { CategoryStateViewModel } from 'src/app/shared-app/models';
    34import { CategoryStateResponse } from './category-state.models';
    45
     
    2021  readonly type = CategoryActionTypes.GetCategoriesStateSuccess;
    2122
    22   constructor(public payload: CategoryStateResponse[]) {}
     23  constructor(public payload: CategoryStateViewModel[]) {}
    2324}
    2425
  • src/Clients/Angular/finki-chattery/src/app/shared-app/components/components.ts

    r45cf412 r81c2e6f  
    22import { FileUploadComponent } from './generic/file-upload/file-upload.component';
    33import { FormErrorComponent } from './generic/form-error/form-error.component';
     4import { HeaderComponent } from './generic/header/header.component';
    45import { VoteComponent } from './generic/vote/vote.component';
    56import { QuestionPreviewComponent } from './question/question-preview/question-preview.component';
     
    1213  QuestionPreviewComponent,
    1314  VoteComponent,
    14   StudentCardComponent
     15  StudentCardComponent,
     16  HeaderComponent
    1517];
Note: See TracChangeset for help on using the changeset viewer.