Changeset 68a1d2f for src


Ignore:
Timestamp:
10/21/21 21:45:51 (3 years ago)
Author:
Стојков Марко <mst@…>
Branches:
dev
Children:
2b66157
Parents:
eb21f00
Message:

Changed header component

Location:
src
Files:
3 added
3 deleted
8 edited

Legend:

Unmodified
Added
Removed

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

    reb21f00 r68a1d2f  
    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

    reb21f00 r68a1d2f  
    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

    reb21f00 r68a1d2f  
    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

    reb21f00 r68a1d2f  
    2020          switch (currentUser.userType) {
    2121            case ApplicationUserType.Student:
     22              this.router.navigateByUrl(`questioning/preview`);
     23
    2224              break;
    2325            case ApplicationUserType.Teacher:

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

    reb21f00 r68a1d2f  
    1 export const SERVICES: any[] = [];

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

    reb21f00 r68a1d2f  
    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

    reb21f00 r68a1d2f  
    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];

  • src/FinkiChattery/FinkiChattery.Identity/Properties/launchSettings.json

    reb21f00 r68a1d2f  
    1010  "profiles": {
    1111    "FinkiChattery.Identity": {
    12       "commandName": "Project",
    13       "launchBrowser": true,
    14       "applicationUrl": "https://localhost:44301",
     12      "commandName": "IISExpress",
    1513      "environmentVariables": {
    1614        "ASPNETCORE_ENVIRONMENT": "Development"
    17       }
     15      },
     16      "applicationUrl": "https://localhost:44301"
    1817    },
    1918    "SelfHost": {
Note: See TracChangeset for help on using the changeset viewer.