Changeset 6b0fbbe for src/Clients

Timestamp:

10/27/21 21:48:47 (3 years ago)

Author:

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

Branches:

dev

Children:

2025810, 59d860c

Parents:

7899209 (diff), c152da1 (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 feature/ask-question-frontend into dev

Location:

src/Clients/Angular/finki-chattery

Files:

• package-lock.json (modified) (1 diff)
• package.json (modified) (1 diff)
• src/app/app-routing.module.ts (modified) (1 diff)
• src/app/core/core.module.ts (modified) (2 diffs)
• src/app/core/guards/authorized-student.guard.ts (added)
• src/app/core/guards/guards.ts (deleted)
• src/app/core/services/auth.service.ts (modified) (4 diffs)
• src/app/modules/questioning/components/ask-question/ask-question.component.html (added)
• src/app/modules/questioning/components/ask-question/ask-question.component.scss (moved) (moved from src/Clients/Angular/finki-chattery/src/app/core/guards/index.ts )
• src/app/modules/questioning/components/ask-question/ask-question.component.spec.ts (added)
• src/app/modules/questioning/components/ask-question/ask-question.component.ts (added)
• src/app/modules/questioning/components/questioning-components.ts (modified) (2 diffs)
• src/app/modules/questioning/components/questioning-general/questioning-general.component.ts (modified) (2 diffs)
• src/app/modules/questioning/components/questions-preview-general/questions-preview-general.component.ts (modified) (1 diff)
• src/app/modules/questioning/questioning.routes.ts (modified) (2 diffs)
• src/app/modules/questioning/services/questioning-api.service.ts (added)
• src/app/shared-app/components/components.ts (modified) (2 diffs)
• src/app/shared-app/components/generic/header/header.component.html (modified) (1 diff)
• src/app/shared-app/components/generic/header/header.component.ts (modified) (3 diffs)
• src/app/shared-app/components/question/ask-question-shared/ask-question-shared.component.html (added)
• src/app/shared-app/components/question/ask-question-shared/ask-question-shared.component.scss (added)
• src/app/shared-app/components/question/ask-question-shared/ask-question-shared.component.spec.ts (added)
• src/app/shared-app/components/question/ask-question-shared/ask-question-shared.component.ts (added)
• src/app/shared-app/components/question/question-preview/question-preview.component.html (modified) (2 diffs)
• src/app/shared-app/models/index.ts (modified) (1 diff)
• src/app/shared-app/models/questioning-request.models.ts (added)
• src/app/shared-app/shared-app.module.ts (modified) (3 diffs)
• src/assets/translations/en.json (modified) (1 diff)

src/Clients/Angular/finki-chattery/package-lock.json

@@ -1746 +1746 @@
       }
     },
+    "@tinymce/tinymce-angular": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@tinymce/tinymce-angular/-/tinymce-angular-4.0.0.tgz",
+      "integrity": "sha512-CmsKournkWWK5O7d8qgZQPvRC76z36GjeD3ZAHZEY/kUXKWAIXfbrHxxgQq9m7+wlfZq9QNgRx5ufN9y9N46DQ==",
+      "requires": {
+        "tslib": "^1.10.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+        }
+      }
+    },
     "@types/glob": {
       "version": "7.1.3",

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

@@ -29 +29 @@
     "@ngrx/store-devtools": "^11.0.1",
     "@ngx-translate/core": "^13.0.0",
+    "@tinymce/tinymce-angular": "^4.0.0",
     "moment": "^2.29.1",
     "ng2-file-upload": "^1.4.0",

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

@@ -6 +6 @@
 const routes: Routes = [
   {
+    path: 'questioning',
+    canActivate: [AuthorizedGuard],
+    loadChildren: () => import('./modules/questioning/questioning.module').then((x) => x.QuestioningModule)
+  },
+  {
     path: 'auth-callback',
+    pathMatch: 'full',
     component: AuthCallbackComponent
   },
   {
-    path: 'questioning',
-    canActivate: [AuthorizedGuard],
-    loadChildren: () => import('./modules/questioning/questioning.module').then((x) => x.QuestioningModule)
+    path: '',
+    pathMatch: 'full',
+    redirectTo: 'questioning/preview'
   },
   {

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

@@ -9 +9 @@
 import { SharedMaterialModule } from '../shared-material/shared-material.module';
 import { COMPONENTS } from './components/components';
-import { GUARDS } from './guards/guards';
 import { LoaderInterceptor } from './interceptors/loader.interceptor';
 import { reducers } from './state';
@@ -20 +19 @@
   declarations: [COMPONENTS],
   providers: [
-    GUARDS,
     { provide: HTTP_INTERCEPTORS, useClass: LoaderInterceptor, multi: true },
     { provide: HTTP_INTERCEPTORS, useClass: TokenInterceptor, multi: true }

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

@@ -1 +1 @@
 import { Injectable } from '@angular/core';
-import { User, UserManager } from 'oidc-client';
+import { User, UserManager, WebStorageStateStore } from 'oidc-client';
 import { Observable, of } from 'rxjs';
 
 import { environment } from '@env/environment';
-import { ApplicationUser, SelfUserResponse } from 'src/app/shared-app/models';
+import { ApplicationUser, ApplicationUserType, SelfUserResponse } from 'src/app/shared-app/models';
 import { BaseApiService } from 'src/app/shared-app/services/base-api.service';
 
@@ -17 +17 @@
     response_type: 'id_token token',
     scope: 'openid app.api.finki-chattery profile',
-    post_logout_redirect_uri: window.location.origin
+    post_logout_redirect_uri: window.location.origin,
+    filterProtocolClaims: true,
+    loadUserInfo: true,
+    userStore: new WebStorageStateStore({ store: window.localStorage })
   });
 
@@ -23 +26 @@
   public oidcUser: User | null = null;
 
-  constructor(private baseApi: BaseApiService) {}
+  constructor(private baseApi: BaseApiService) {
+    this.userManager.getUser().then((user) => {
+      this.oidcUser = user;
+      this.user = new ApplicationUser(
+        user?.profile.id,
+        user?.profile.userType,
+        user?.profile.emailAddress,
+        user?.profile.username,
+        user?.profile.isVerified
+      );
+    });
+  }
 
   public login(): void {
@@ -38 +52 @@
     }
     return false;
+  }
+
+  public isStudent(): boolean {
+    return this.user?.userType === ApplicationUserType.Student;
   }
 

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

@@ -3 +3 @@
 import { QuestionsPreviewGeneralComponent } from './questions-preview-general/questions-preview-general.component';
 import { QuestionsSearchComponent } from './questions-search/questions-search.component';
+import { AskQuestionComponent } from './ask-question/ask-question.component';
 
 export const QUESTIONING_COMPONENTS: any[] = [
@@ -8 +9 @@
   QuestionsPreviewGeneralComponent,
   QuestioningGeneralComponent,
-  QuestionsSearchComponent
+  QuestionsSearchComponent,
+  AskQuestionComponent
 ];

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

@@ -1 +1 @@
 import { Component, OnInit } from '@angular/core';
+import { CategoryFacadeService } from 'src/app/core/state/category-facade.service';
 
 @Component({
@@ -7 +8 @@
 })
 export class QuestioningGeneralComponent implements OnInit {
-  constructor() {}
+  constructor(private categoriesFacade: CategoryFacadeService) {}
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+    this.categoriesFacade.fetchCategories();
+  }
 }

src/Clients/Angular/finki-chattery/src/app/modules/questioning/components/questions-preview-general/questions-preview-general.component.ts

@@ -17 +17 @@
   questionsSortByForm = new FormControl(PreviewQuestionsOrderEnum.Latest);
 
-  constructor(private categoriesFacade: CategoryFacadeService, private questionFacade: QuestionFacadeService, private router: Router) {}
+  constructor(private questionFacade: QuestionFacadeService, private router: Router) {}
 
   ngOnInit(): void {
-    this.categoriesFacade.fetchCategories();
     this.questionFacade.fetchPreviewQuestions(PreviewQuestionsOrderEnum.Latest);
     this.questionsSortByForm.valueChanges.subscribe((value: PreviewQuestionsOrderEnum) => {

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

@@ -5 +5 @@
 import { QuestionsPreviewGeneralComponent } from './components/questions-preview-general/questions-preview-general.component';
 import { QuestionsSearchComponent } from './components/questions-search/questions-search.component';
+import { AuthorizedStudentGuard } from 'src/app/core/guards/authorized-student.guard';
+import { AskQuestionComponent } from './components/ask-question/ask-question.component';
 
 const routes: Routes = [
@@ -22 +24 @@
       },
       {
+        path: 'ask',
+        pathMatch: 'full',
+        component: AskQuestionComponent,
+        canActivate: [AuthorizedStudentGuard]
+      },
+      {
         path: ':questionUid',
         component: QuestionPreviewGeneralComponent

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

@@ -4 +4 @@
 import { HeaderComponent } from './generic/header/header.component';
 import { VoteComponent } from './generic/vote/vote.component';
+import { AskQuestionSharedComponent } from './question/ask-question-shared/ask-question-shared.component';
 import { PreviewQuestionDisplayComponent } from './question/preview-question-display/preview-question-display.component';
 import { QuestionPreviewComponent } from './question/question-preview/question-preview.component';
@@ -18 +19 @@
   HeaderComponent,
   SearchQuestionComponent,
-  PreviewQuestionDisplayComponent
+  PreviewQuestionDisplayComponent,
+  AskQuestionSharedComponent
 ];

src/Clients/Angular/finki-chattery/src/app/shared-app/components/generic/header/header.component.html

@@ -2 +2 @@
   <span>FinkiChattery</span>
   <span class="right"></span>
-  <app-button *ngIf="auth.isLoggedIn()" (action)="logout()" [buttonType]="ButtonType.CallToAction">Logout</app-button>
+  <app-button class="margin-y-xs" *ngIf="auth.isStudent()" (action)="askQuestion()" [buttonType]="ButtonType.CallToAction">{{
+    'header-ask-question' | translate
+  }}</app-button>
+  <app-button class="margin-y-xs" *ngIf="auth.isLoggedIn()" (action)="logout()" [buttonType]="ButtonType.Basic">{{
+    'header-logout' | translate
+  }}</app-button>
 </mat-toolbar>

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

@@ -1 +1 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 import { AuthService } from 'src/app/core/services';
 import { ButtonType } from '../button/button.models';
@@ -11 +12 @@
   ButtonType = ButtonType;
 
-  constructor(public auth: AuthService) {}
+  constructor(public auth: AuthService, private router: Router) {}
 
   ngOnInit(): void {}
@@ -18 +19 @@
     this.auth.logout();
   }
+
+  askQuestion(): void {
+    this.router.navigateByUrl('questioning/ask');
+  }
 }

src/Clients/Angular/finki-chattery/src/app/shared-app/components/question/question-preview/question-preview.component.html

@@ -20 +20 @@
       </mat-chip-list>
 
-      <div class="margin-top-lg" [innerHTML]="question.text"></div>
+      <editor
+        class="margin-x-sm"
+        [init]="{
+          apiKey: 'fx28x0d64jeufa35u7mcd80fgveayg5c4ap9gnr6posehzny',
+          menubar: false,
+          plugins: ['autoresize'],
+          toolbar: ''
+        }"
+        [disabled]="true"
+        [initialValue]="question.text"
+      ></editor>
       <div class="align-right">
         <app-student-card
@@ -48 +58 @@
           <app-vote [voteCount]="answer.upvotesCount" [correct]="answer.correctAnswer" fxFlex="6%"></app-vote>
           <div fxFlex="92%">
-            <div [innerHTML]="answer.text"></div>
+            <editor
+              class="margin-x-sm"
+              [init]="{
+                apiKey: 'fx28x0d64jeufa35u7mcd80fgveayg5c4ap9gnr6posehzny',
+                menubar: false,
+                plugins: ['autoresize'],
+                toolbar: ''
+              }"
+              [disabled]="true"
+              [initialValue]="answer.text"
+            ></editor>
             <div class="align-right">
               <app-student-card

src/Clients/Angular/finki-chattery/src/app/shared-app/models/index.ts

@@ -4 +4 @@
 export * from './category-state-view-models.models';
 export * from './question-state-enums.models';
+export * from './questioning-request.models';

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

@@ -7 +7 @@
 import { NgxMaterialTimepickerModule } from 'ngx-material-timepicker';
 import { FileUploadModule } from 'ng2-file-upload';
+import { EditorModule } from '@tinymce/tinymce-angular';
 
 import { COMPONENTS } from './components/components';
@@ -25 +26 @@
     FlexLayoutModule,
     FileUploadModule,
-    NgxMaterialTimepickerModule
+    NgxMaterialTimepickerModule,
+    EditorModule
   ],
   exports: [
@@ -38 +40 @@
     DIRECTIVES,
     PIPES,
-    SharedMaterialModule
+    SharedMaterialModule,
+    EditorModule
   ]
 })

src/Clients/Angular/finki-chattery/src/assets/translations/en.json

@@ -44 +44 @@
   "questions-preview-question-answers": "Answers",
   "questions-preview-question-views": "Views",
-  "questions-search-title": "Search results for: {{searchQuery}}"
+  "questions-search-title": "Search results for: {{searchQuery}}",
+  "ask-question-question-title": "Question title",
+  "ask-question-categories": "Add categories to question",
+  "ask-question-ask-button": "Ask question",
+  "header-logout": "Logout",
+  "header-ask-question": "Ask question"
 }