Ignore:
Timestamp:
10/27/21 19:40:58 (3 years ago)
Author:
Стојков Марко <mst@…>
Branches:
dev
Children:
d2b1fa6
Parents:
81e1ed6 (diff), 7899209 (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 dev

Location:
src/Clients/Angular/finki-chattery/src/app/modules/questioning
Files:
16 added
3 edited

Legend:

Unmodified
Added
Removed

  • src/Clients/Angular/finki-chattery/src/app/modules/questioning/components/questioning-components.ts

    r81e1ed6 r79ae621  
     1import { QuestionPreviewGeneralComponent } from './question-preview-general/question-preview-general.component';
     2import { QuestioningGeneralComponent } from './questioning-general/questioning-general.component';
     3import { QuestionsPreviewGeneralComponent } from './questions-preview-general/questions-preview-general.component';
     4import { QuestionsSearchComponent } from './questions-search/questions-search.component';
    15import { AskQuestionComponent } from './ask-question/ask-question.component';
    26
    3 export const QUESTIONING_COMPONENTS: any[] = [AskQuestionComponent];
     7export const QUESTIONING_COMPONENTS: any[] = [
     8  QuestionPreviewGeneralComponent,
     9  QuestionsPreviewGeneralComponent,
     10  QuestioningGeneralComponent,
     11  QuestionsSearchComponent,
     12  AskQuestionComponent
     13];

  • src/Clients/Angular/finki-chattery/src/app/modules/questioning/questioning.module.ts

    r81e1ed6 r79ae621  
    11import { NgModule } from '@angular/core';
    22
     3import { QuestioningRoutingModule } from './questioning.routes';
    34import { QUESTIONING_COMPONENTS } from './components/questioning-components';
    45import { SharedAppModule } from 'src/app/shared-app/shared-app.module';
    5 import { QuestioningRoutingModule } from './questioning.routes';
    6 
    76@NgModule({
    87  declarations: [QUESTIONING_COMPONENTS],

  • src/Clients/Angular/finki-chattery/src/app/modules/questioning/questioning.routes.ts

    r81e1ed6 r79ae621  
    11import { NgModule } from '@angular/core';
    22import { Routes, RouterModule } from '@angular/router';
     3import { QuestionPreviewGeneralComponent } from './components/question-preview-general/question-preview-general.component';
     4import { QuestioningGeneralComponent } from './components/questioning-general/questioning-general.component';
     5import { QuestionsPreviewGeneralComponent } from './components/questions-preview-general/questions-preview-general.component';
     6import { QuestionsSearchComponent } from './components/questions-search/questions-search.component';
    37import { AuthorizedStudentGuard } from 'src/app/core/guards/authorized-student.guard';
    48import { AskQuestionComponent } from './components/ask-question/ask-question.component';
    … …  
    610const routes: Routes = [
    711  {
    8     path: 'ask',
    9     component: AskQuestionComponent,
    10     canActivate: [AuthorizedStudentGuard]
     12    component: QuestioningGeneralComponent,
     13    path: '',
     14    children: [
     15      {
     16        path: 'preview',
     17        pathMatch: 'full',
     18        component: QuestionsPreviewGeneralComponent
     19      },
     20      {
     21        path: 'search',
     22        pathMatch: 'full',
     23        component: QuestionsSearchComponent
     24      },
     25      {
     26        path: 'ask',
     27        pathMatch: 'full',
     28        component: AskQuestionComponent,
     29        canActivate: [AuthorizedStudentGuard]
     30      }
     31      {
     32        path: ':questionUid',
     33        component: QuestionPreviewGeneralComponent
     34      }
     35    ]
    1136  }
    1237];
Note: See TracChangeset for help on using the changeset viewer.