Changeset 45cf412 for src/Clients

Timestamp:

10/21/21 19:52:33 (3 years ago)

Author:

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

Branches:

dev

Children:

1e33fad, 81c2e6f, dd731cd

Parents:

3b395c5 (diff), 31c006c (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 add categoreis to ngrx state into dev

Location:

src/Clients/Angular/finki-chattery/src

Files:

• app/app-routing.module.ts (modified) (1 diff)
• app/app.component.ts (modified) (1 diff)
• app/core/core.module.ts (modified) (2 diffs)
• app/core/state/category-facade.service.ts (added)
• app/core/state/category-state/category-state.models.ts (added)
• app/core/state/category-state/category.actions.ts (added)
• app/core/state/category-state/category.effects.ts (added)
• app/core/state/category-state/category.mapper.ts (added)
• app/core/state/category-state/category.reducers.ts (added)
• app/core/state/category-state/category.selectors.ts (added)
• app/core/state/category-state/category.state.ts (added)
• app/core/state/index.ts (modified) (1 diff)
• app/modules/questioning/components/questioning-components.ts (modified) (1 diff)
• app/modules/questioning/components/questions-preview-general/questions-preview-general.component.html (added)
• app/modules/questioning/components/questions-preview-general/questions-preview-general.component.scss (added)
• app/modules/questioning/components/questions-preview-general/questions-preview-general.component.spec.ts (added)
• app/modules/questioning/components/questions-preview-general/questions-preview-general.component.ts (added)
• app/modules/questioning/questioning.module.ts (modified) (1 diff)
• app/modules/questioning/questioning.routes.ts (modified) (1 diff)
• app/shared-app/models/category-state-view-models.models.ts (added)
• app/shared-app/models/index.ts (modified) (1 diff)
• assets/translations/en.json (modified) (1 diff)

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

@@ -11 +11 @@
   {
     path: '**',
-    redirectTo: 'public/home'
+    redirectTo: 'questioning/preview'
   }
 ];

src/Clients/Angular/finki-chattery/src/app/app.component.ts

@@ -1 +1 @@
 import { Component, OnInit } from '@angular/core';
-import { AuthService, LoaderService, RedirectService } from './core/services';
+import { LoaderService, RedirectService } from './core/services';
 
 @Component({

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

@@ -16 +16 @@
 import { EffectsModule } from '@ngrx/effects';
 import { QuestionEffects } from './state/question-state/question.effects';
+import { CategoriesEffects } from './state/category-state/category.effects';
 
 @NgModule({
@@ -36 +37 @@
       logOnly: !environment.production
     }),
-    EffectsModule.forRoot([QuestionEffects])
+    EffectsModule.forRoot([QuestionEffects, CategoriesEffects])
   ],
   exports: [HttpClientModule, COMPONENTS]

src/Clients/Angular/finki-chattery/src/app/core/state/index.ts

@@ -2 +2 @@
 import { QuestionState } from './question-state/question.state';
 import { reducer as questionReducer } from './question-state/question.reducers';
+import { CategoryState } from './category-state/category.state';
+import { reducer as categoryReducer } from './category-state/category.reducers';
 
 export interface State {
   question: QuestionState;
+  category: CategoryState;
 }
 
 export const reducers: ActionReducerMap<State, any> = {
-  question: questionReducer
+  question: questionReducer,
+  category: categoryReducer
 };

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

@@ -1 +1 @@
 import { QuestionPreviewGeneralComponent } from './question-preview-general/question-preview-general.component';
+import { QuestionsPreviewGeneralComponent } from './questions-preview-general/questions-preview-general.component';
 
-export const QUESTIONING_COMPONENTS: any[] = [QuestionPreviewGeneralComponent];
+export const QUESTIONING_COMPONENTS: any[] = [QuestionPreviewGeneralComponent, QuestionsPreviewGeneralComponent];

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

@@ -4 +4 @@
 import { QUESTIONING_COMPONENTS } from './components/questioning-components';
 import { SharedAppModule } from 'src/app/shared-app/shared-app.module';
-
 @NgModule({
   declarations: [QUESTIONING_COMPONENTS],

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

@@ -2 +2 @@
 import { Routes, RouterModule } from '@angular/router';
 import { QuestionPreviewGeneralComponent } from './components/question-preview-general/question-preview-general.component';
+import { QuestionsPreviewGeneralComponent } from './components/questions-preview-general/questions-preview-general.component';
 
 const routes: Routes = [
+  {
+    path: 'preview',
+    pathMatch: 'full',
+    component: QuestionsPreviewGeneralComponent
+  },
   {
     path: ':questionUid',

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

@@ -2 +2 @@
 export * from './user.models';
 export * from './question-state-view-models.models';
+export * from './category-state-view-models.models';

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

@@ -24 +24 @@
   "vote-correct-answer": "This has been accepted as the correct answer by the owner of the question",
   "answer-sort-oldest": "Oldest",
-  "answer-sort-votes": "Votes"
+  "answer-sort-votes": "Votes",
+  "internet-techologies": "Internet technologies",
+  "software-engineering": "Software engineering",
+  "visual-programming": "Visual programming",
+  "operating-systems": "Operating systems"
 }