Changes in / [7899209:79ae621]

Location:

src/Clients/Angular/finki-chattery

Files:

• package-lock.json (modified) (1 diff)
• package.json (modified) (1 diff)
• src/app/app.component.ts (modified) (2 diffs)
• src/app/core/guards/authorized-student.guard.ts (added)
• src/app/modules/group-management/group-management.module.ts (added)
• src/app/modules/profile-management/profile-management.module.ts (added)
• src/app/modules/questioning/components/ask-question/ask-question.component.html (added)
• src/app/modules/questioning/components/ask-question/ask-question.component.scss (added)
• 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/models/questioning-request.models.ts (added)
• src/app/modules/questioning/questioning.routes.ts (modified) (2 diffs)
• src/app/modules/questioning/services/questioning-api.service.ts (added)
• src/app/shared-app/models/categories.models.ts (added)
• src/app/shared-app/models/index.ts (modified) (1 diff)
• src/app/shared-app/shared-app.module.ts (modified) (3 diffs)

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.component.ts

@@ -1 +1 @@
 import { Component, OnInit } from '@angular/core';
-import { LoaderService } from './core/services';
+import { LoaderService, RedirectService } from './core/services';
 
 @Component({
@@ -8 +8 @@
 })
 export class AppComponent implements OnInit {
-  constructor(public loader: LoaderService) {}
+  constructor(public loader: LoaderService, private redirect: RedirectService) {}
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+    this.redirect.redirectLoggedInUser();
+  }
 }

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/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/models/index.ts

@@ -4 +4 @@
 export * from './category-state-view-models.models';
 export * from './question-state-enums.models';
+export * from './categories.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
   ]
 })