commit modif

db_users_projects_companies.json

@@ -9,56 +9,14 @@
     {
       "id": 4,
       "companyName": "Company-4",
-      "companyType": "PROSPECT",
-      "creationDate": "05 18 2022"
-    },
-    {
-      "id": 3,
-      "companyName": "Company-3",
       "companyType": "CLIENT",
       "creationDate": "05 18 2022"
     },
     {
-      "id": 5,
-      "companyName": "Company-1",
-      "companyType": "CLIENT",
-      "creationDate": "06 09 2022"
-    },
-    {
-      "id": 6,
-      "companyName": "Company-2",
-      "companyType": "CLIENT",
-      "creationDate": "06 09 2022"
-    },
-    {
-      "id": 7,
-      "companyName": "Company-5",
-      "companyType": "CLIENT",
-      "creationDate": "06 09 2022"
-    },
-    {
       "id": 8,
       "companyName": "company-6",
       "companyType": "PROSPECT",
       "creationDate": "06 09 2022"
-    },
-    {
-      "id": 9,
-      "companyName": "Company-7",
-      "companyType": "PROSPECT",
-      "creationDate": "06 09 2022"
-    },
-    {
-      "id": 10,
-      "companyName": "Company-8",
-      "companyType": "CLIENT",
-      "creationDate": "06 09 2022"
-    },
-    {
-      "id": 11,
-      "companyName": "Company-9",
-      "companyType": "PROSPECT",
-      "creationDate": "06 09 2022"
     }
   ],
   "users": [
@@ -119,48 +77,6 @@
       "id": 6
     },
     {
-      "address": {
-        "numRue": 44,
-        "nomRue": "Rue Notre Dame des Victoires",
-        "bp": 75002,
-        "ville": "Paris",
-        "pays": "France"
-      },
-      "creationDate": "05 15 2022",
-      "firstname": "Marion",
-      "lastname": "Jaillot",
-      "email": "marion.jaillot@natan.fr",
-      "id": 9
-    },
-    {
-      "address": {
-        "numRue": 44,
-        "nomRue": "Rue Notre Dame des Victoires",
-        "bp": 75002,
-        "ville": "Paris",
-        "pays": "France"
-      },
-      "creationDate": "05 15 2022",
-      "firstname": "avraham",
-      "lastname": "Benassaya",
-      "email": "avraham.benassaya@natan.fr",
-      "id": 10
-    },
-    {
-      "id": 11,
-      "firstname": "Charles",
-      "lastname": "Benassaya",
-      "email": "charles.benassaya@natan.fr",
-      "address": {
-        "numRue": 44,
-        "nomRue": "Rue Notre Dame des Victoires",
-        "bp": 75002,
-        "ville": "Paris",
-        "pays": "France"
-      },
-      "creationDate": "05 15 2022"
-    },
-    {
       "id": 12,
       "firstname": "Placide",
       "lastname": "Nduwayo",
@@ -189,20 +105,6 @@
       "creationDate": "05 15 2022"
     },
     {
-      "id": 15,
-      "firstname": "Rayene",
-      "lastname": "Bessrour",
-      "email": "rayene.bessrour@natan.fr",
-      "address": {
-        "numRue": 44,
-        "nomRue": "Rue Notre Dame des Victoires",
-        "bp": 75004,
-        "ville": "Paris",
-        "pays": "France"
-      },
-      "creationDate": "05 15 2022"
-    },
-    {
       "id": 19,
       "firstname": "Syrine",
       "lastname": "Ait Haddadene",
@@ -267,7 +169,7 @@
       "projectName": "Project-test",
       "priority": 1,
       "creationDate": "06 08 2022",
-      "companyId": 11,
+      "companyId": 8,
       "description": "project for test adding ",
       "userId": 12,
       "state": "IN PROGRESS"
@@ -279,7 +181,7 @@
       "creationDate": "06 09 2022",
       "companyId": 8,
       "description": "Project description here",
-      "userId": 3,
+      "userId": 4,
       "state": "IN PROGRESS"
     }
   ]

src/app/app.module.ts

@@ -1,6 +1,6 @@
 import { CompanyCreateEffects } from './ngrx/companies/effects.company.create';
 import { CompanyUpdateDeleteEffects } from './ngrx/companies/effects.company.update.delete';
-import { CompanyGetSearchEffects } from './ngrx/companies/effects.company.get';
+import { CompanyGetEffects } from './ngrx/companies/effects.company.get';
 import { BaseNavMenuComponent } from './pages/base-nav-menu/base-nav-menu.component';
 import { FormsModule } from '@angular/forms';
 import { AccueilModule } from './pages/accueil/accueil.module';
@@ -18,21 +18,19 @@ import { LayoutModule } from '@angular/cdk/layout';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatButtonModule } from '@angular/material/button';
 import { MatSidenavModule } from '@angular/material/sidenav';
-import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatMenuModule } from '@angular/material/menu';
 import { EffectsModule } from '@ngrx/effects';
 import { StoreModule } from '@ngrx/store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { UserCreateEffects } from './ngrx/users/effects.user.create';
-import { UserGetSearchEffects } from './ngrx/users/effects.user.get';
-import { UserUpdateEffects } from './ngrx/users/effects.user.update.delete';
+import { UserGetEffects } from './ngrx/users/effects.user.get';
+import { UserUpdateDeleteEffects } from './ngrx/users/effects.user.update.delete';
 import { userReducer } from './ngrx/users/users.reducer';
 import { projectReducer } from './ngrx/projects/projects.reducer';
 import { ProjectUpdateEffects } from './ngrx/projects/effects.project.update.delete';
 import { ProjectCreateEffects } from './ngrx/projects/effects.project.create';
 import { ProjectGetEffects } from './ngrx/projects/effects.project.get';
-import { DatePipe } from '@angular/common';
 import { companyReducer } from './ngrx/companies/companies.reducer';
 
 @NgModule({
@@ -51,7 +49,6 @@ import { companyReducer } from './ngrx/companies/companies.reducer';
     MatToolbarModule,
     MatButtonModule,
     MatSidenavModule,
-    MatIconModule,
     MatListModule,
     MatMenuModule,
     StoreModule.forRoot({
@@ -61,12 +58,12 @@ import { companyReducer } from './ngrx/companies/companies.reducer';
     }),
     EffectsModule.forRoot([
       UserCreateEffects,
-      UserGetSearchEffects,
-      UserUpdateEffects,
+      UserGetEffects,
+      UserUpdateDeleteEffects,
       ProjectCreateEffects,
       ProjectGetEffects,
       ProjectUpdateEffects,
-      CompanyGetSearchEffects,
+      CompanyGetEffects,
       CompanyUpdateDeleteEffects,
       CompanyCreateEffects
     ]),

src/app/ngrx/companies/companies.actions.ts

@@ -3,22 +3,6 @@ import { Action } from '@ngrx/store';
 import { Company } from 'src/app/shared/models/company/company.model';
 /** all actions related to company */
 
-//get all companies
-export class GetAllCompaniesAction implements Action {
-  type: CompanyActionTypes = CompanyActionTypes.GET_ALL_COMPANIES;
-  constructor(public payload: any) {}
-}
-
-export class GetAllCompaniesActionSuccess implements Action {
-  type: CompanyActionTypes = CompanyActionTypes.GET_ALL_COMPANIES_SUCCESS;
-  constructor(public payload: Company[]) {}
-}
-
-export class GetAllCompaniesActionError implements Action {
-  type: CompanyActionTypes = CompanyActionTypes.GET_ALL_COMPANIES_ERROR;
-  constructor(public payload: string) {}
-}
-
 //create form to create company
 export class CreateCompanyFormAddAction implements Action {
   type: CompanyActionTypes = CompanyActionTypes.CREATE_COMPANY_FORM_ADD;
@@ -52,6 +36,22 @@ export class SaveCompanyFormDataAddActionError implements Action {
   constructor(public payload: string) {}
 }
 
+//get all companies
+export class GetAllCompaniesAction implements Action {
+  type: CompanyActionTypes = CompanyActionTypes.GET_ALL_COMPANIES;
+  constructor(public payload: any) {}
+}
+
+export class GetAllCompaniesActionSuccess implements Action {
+  type: CompanyActionTypes = CompanyActionTypes.GET_ALL_COMPANIES_SUCCESS;
+  constructor(public payload: Company[]) {}
+}
+
+export class GetAllCompaniesActionError implements Action {
+  type: CompanyActionTypes = CompanyActionTypes.GET_ALL_COMPANIES_ERROR;
+  constructor(public payload: string) {}
+}
+
 //create form to update company
 export class CreateFormToUpdateCompanyAction implements Action {
   type: CompanyActionTypes = CompanyActionTypes.CREATE_COMPANY_FORM_UPDATE;
@@ -120,17 +120,16 @@ export class GetCompany_S_ProjectsError implements Action {
   constructor(public payload: string) {}
 }
 
-
 export type CompanyActionUnion =
-  | GetAllCompaniesAction
-  | GetAllCompaniesActionSuccess
-  | GetAllCompaniesActionError
   | CreateCompanyFormAddAction
   | CreateCompanyFormAddActionSuccess
   | CreateCompanyFormAddActionError
   | SaveCompanyFormDataAddAction
   | SaveCompanyFormDataAddActionSuccess
   | SaveCompanyFormDataAddActionError
+  | GetAllCompaniesAction
+  | GetAllCompaniesActionSuccess
+  | GetAllCompaniesActionError
   | CreateFormToUpdateCompanyAction
   | CreateFormToUpdateCompanyActionSuccess
   | CreateFormToUpdateCompanyActionError

src/app/ngrx/companies/companies.reducer.ts

@@ -19,6 +19,51 @@ export function companyReducer(state: CompanyState = companyInitialState, action
 ) : CompanyState {
 
   switch (action.type) {
+
+    //create form to add company
+    case CompanyActionTypes.CREATE_COMPANY_FORM_ADD:
+      return{
+        ...state,
+        msgState: MsgState.FORM_LOADING,
+      };
+
+    case CompanyActionTypes.CREATE_COMPANY_FORM_ADD_SUCCESS:
+      return{
+        ...state,
+        msgState: MsgState.FORM_LOADED
+      };
+    case CompanyActionTypes.CREATE_COMPANY_FORM_ADD_ERROR:
+      return{
+        ...state,
+        msgState: MsgState.ERR,
+        serverMsgError: (<CompanyActionUnion> action).payload
+      };
+
+    // save company with form data
+    case CompanyActionTypes.SAVE_COMPANY_FORM_DATA_ADD:
+      return{
+        ...state,
+        msgState: MsgState.ADD
+      };
+
+    case CompanyActionTypes.SAVE_COMPANY_FORM_DATA_ADD_SUCCESS:
+      let createdCompany: Company = (<CompanyActionUnion> action).payload;
+      let companiesListCopy3 : Company[] = [...state.companiesList];
+      companiesListCopy3.push(createdCompany);
+
+      return{
+        ...state,
+        msgState: MsgState.ADDED,
+        companiesList: companiesListCopy3
+      };
+
+    case CompanyActionTypes.SAVE_COMPANY_FORM_DATA_ADD_ERROR:
+      return{
+        ...state,
+        msgState: MsgState.ERR,
+        serverMsgError: (<CompanyActionUnion> action).payload
+      };
+
     // get all companies
     case CompanyActionTypes.GET_ALL_COMPANIES:
       return {
@@ -134,50 +179,6 @@ export function companyReducer(state: CompanyState = companyInitialState, action
           serverMsgError: (<CompanyActionUnion> action).payload
         };
 
-      //create form to add company
-      case CompanyActionTypes.CREATE_COMPANY_FORM_ADD:
-        return{
-          ...state,
-          msgState: MsgState.FORM_LOADING,
-        };
-
-      case CompanyActionTypes.CREATE_COMPANY_FORM_ADD_SUCCESS:
-        return{
-          ...state,
-          msgState: MsgState.FORM_LOADED
-        };
-      case CompanyActionTypes.CREATE_COMPANY_FORM_ADD_ERROR:
-        return{
-          ...state,
-          msgState: MsgState.ERR,
-          serverMsgError: (<CompanyActionUnion> action).payload
-        };
-
-      // save company with form data
-      case CompanyActionTypes.SAVE_COMPANY_FORM_DATA_ADD:
-        return{
-          ...state,
-          msgState: MsgState.ADD
-        };
-
-      case CompanyActionTypes.SAVE_COMPANY_FORM_DATA_ADD_SUCCESS:
-        let createdCompany: Company = (<CompanyActionUnion> action).payload;
-        let companiesListCopy3 : Company[] = [...state.companiesList];
-        companiesListCopy3.push(createdCompany);
-
-        return{
-          ...state,
-          msgState: MsgState.ADDED,
-          companiesList: companiesListCopy3
-        };
-
-      case CompanyActionTypes.SAVE_COMPANY_FORM_DATA_ADD_ERROR:
-        return{
-          ...state,
-          msgState: MsgState.ERR,
-          serverMsgError: (<CompanyActionUnion> action).payload
-        };
-
     default:
       return { ...state };
   }

src/app/ngrx/companies/company.action.types.ts

@@ -1,4 +1,17 @@
 export enum CompanyActionTypes {
+
+  /** List of all action types for managing companies */
+
+   //create a company form to add a project
+   CREATE_COMPANY_FORM_ADD = '[Company] CREATE COMPANY FORM ADD',
+   CREATE_COMPANY_FORM_ADD_SUCCESS = '[Company] CREATE COMPANY FORM ADD SUCCESS',
+   CREATE_COMPANY_FORM_ADD_ERROR = '[Company] CREATE COMPANY FORM ADD ERROR',
+
+   //save a company form data
+   SAVE_COMPANY_FORM_DATA_ADD = '[Company] SAVE COMPANY FORM DATA ADD',
+   SAVE_COMPANY_FORM_DATA_ADD_SUCCESS = '[Company] SAVE COMPANY FORM DATA ADD SUCCESS',
+   SAVE_COMPANY_FORM_DATA_ADD_ERROR = '[Company] SAVE COMPANY FORM DATA ADD ERROR',
+
   //get all companies action
   GET_ALL_COMPANIES = '[Company] GET ALL COMPANIES',
   GET_ALL_COMPANIES_SUCCESS = '[Company] GET ALL COMPANIES SUCCESS',
@@ -22,15 +35,5 @@ export enum CompanyActionTypes {
   // Get company's pprjects
   GET_COMPANY_S_PROJECTS = 'GET COMPANY\'S PROJECT',
   GET_COMPANY_S_PROJECTS_SUCCESS = 'GET COMPANY\'S PROJECT SUCCESS',
-  GET_COMPANY_S_PROJECTS_ERROR = 'GET COMPANY\'S PROJECT ERROR',
-
-  //create a company form to add a project
-  CREATE_COMPANY_FORM_ADD = '[Company] CREATE COMPANY FORM ADD',
-  CREATE_COMPANY_FORM_ADD_SUCCESS = '[Company] CREATE COMPANY FORM ADD SUCCESS',
-  CREATE_COMPANY_FORM_ADD_ERROR = '[Company] CREATE COMPANY FORM ADD ERROR',
-
-  //save a company form data
-  SAVE_COMPANY_FORM_DATA_ADD = '[Company] SAVE COMPANY FORM DATA ADD',
-  SAVE_COMPANY_FORM_DATA_ADD_SUCCESS = '[Company] SAVE COMPANY FORM DATA ADD SUCCESS',
-  SAVE_COMPANY_FORM_DATA_ADD_ERROR = '[Company] SAVE COMPANY FORM DATA ADD ERROR'
+  GET_COMPANY_S_PROJECTS_ERROR = 'GET COMPANY\'S PROJECT ERROR'
 }

src/app/ngrx/companies/effects.company.create.ts

@@ -1,6 +1,11 @@
 import { Company } from 'src/app/shared/models/company/company.model';
 import { CompanyActionTypes } from './company.action.types';
-import { CompanyActionUnion, CreateCompanyFormAddActionSuccess, SaveCompanyFormDataAddActionSuccess, SaveCompanyFormDataAddActionError } from './companies.actions';
+import {
+  CompanyActionUnion,
+  CreateCompanyFormAddActionSuccess,
+  SaveCompanyFormDataAddActionSuccess,
+  SaveCompanyFormDataAddActionError,
+} from './companies.actions';
 import { map, Observable, mergeMap, catchError, of } from 'rxjs';
 import { CompaniesServices } from './../../shared/services/companies.service';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
@@ -15,25 +20,31 @@ export class CompanyCreateEffects {
 
   // create company form to add company
   createFormToAddCompanyEffect: Observable<CompanyActionUnion> = createEffect(
-    () => this.companyActions.pipe(
+    () =>
+      this.companyActions.pipe(
         ofType(CompanyActionTypes.CREATE_COMPANY_FORM_ADD),
-        map((action: CompanyActionUnion) =>{
-          return new CreateCompanyFormAddActionSuccess()
+        map(() => {
+          return new CreateCompanyFormAddActionSuccess();
         })
       )
   );
 
   // save company form data
-  saveCompanyFormDataAddEffect : Observable<CompanyActionUnion> = createEffect(
-    () => this.companyActions.pipe(
-      ofType(CompanyActionTypes.SAVE_COMPANY_FORM_DATA_ADD),
-      mergeMap( (action : CompanyActionUnion)  =>{
-        return this.companiesService.createCompany(action.payload).pipe(
-          map ( (company: Company) => new SaveCompanyFormDataAddActionSuccess(company)),
-          catchError( err => of(new SaveCompanyFormDataAddActionError( err.message)))
-        )
-      })
-    )
+  saveCompanyFormDataAddEffect: Observable<CompanyActionUnion> = createEffect(
+    () =>
+      this.companyActions.pipe(
+        ofType(CompanyActionTypes.SAVE_COMPANY_FORM_DATA_ADD),
+        mergeMap((action: CompanyActionUnion) => {
+          return this.companiesService.createCompany(action.payload).pipe(
+            map(
+              (company: Company) =>
+                new SaveCompanyFormDataAddActionSuccess(company)
+            ),
+            catchError((err) =>
+              of(new SaveCompanyFormDataAddActionError(err.message))
+            )
+          );
+        })
+      )
   );
-
 }

src/app/ngrx/companies/effects.company.get.ts

@@ -13,7 +13,7 @@ import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { Company } from 'src/app/shared/models/company/company.model';
 
 @Injectable()
-export class CompanyGetSearchEffects {
+export class CompanyGetEffects {
   constructor(
     private companyActions: Actions,
     private companiesService: CompaniesServices

src/app/ngrx/companies/effects.company.update.delete.ts

@@ -1,5 +1,13 @@
 import { CompanyActionTypes } from './company.action.types';
-import { CompanyActionUnion, CreateFormToUpdateCompanyActionSuccess, CreateFormToUpdateCompanyActionError, UpdateCompanyWithFormDataActionSuccess, UpdateCompanyWithFormDataActionError, DeleteCompanyAction, DeleteCompanyActionSuccess, DeleteCompanyActionError } from './companies.actions';
+import {
+  CompanyActionUnion,
+  CreateFormToUpdateCompanyActionSuccess,
+  CreateFormToUpdateCompanyActionError,
+  UpdateCompanyWithFormDataActionSuccess,
+  UpdateCompanyWithFormDataActionError,
+  DeleteCompanyActionSuccess,
+  DeleteCompanyActionError,
+} from './companies.actions';
 import { Observable, mergeMap, map, catchError, of } from 'rxjs';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { CompaniesServices } from './../../shared/services/companies.service';
@@ -14,41 +22,53 @@ export class CompanyUpdateDeleteEffects {
   ) {}
 
   //create form to update company effect
-  createFormToUpdateCompanyEffect : Observable<CompanyActionUnion> = createEffect(
-    () => this.companyActions.pipe(
-      ofType(CompanyActionTypes.CREATE_COMPANY_FORM_UPDATE),
-      mergeMap((action: CompanyActionUnion) =>{
-        return this.companiesService.getCompanyById(action.payload.id).pipe(
-          map( (company: Company) => new CreateFormToUpdateCompanyActionSuccess(company)),
-          catchError(err => of(new CreateFormToUpdateCompanyActionError(err.message)))
-        )
-      })
-    )
-  );
+  createFormToUpdateCompanyEffect: Observable<CompanyActionUnion> =
+    createEffect(() =>
+      this.companyActions.pipe(
+        ofType(CompanyActionTypes.CREATE_COMPANY_FORM_UPDATE),
+        mergeMap((action: CompanyActionUnion) => {
+          return this.companiesService.getCompanyById(action.payload.id).pipe(
+            map(
+              (company: Company) =>
+                new CreateFormToUpdateCompanyActionSuccess(company)
+            ),
+            catchError((err) =>
+              of(new CreateFormToUpdateCompanyActionError(err.message))
+            )
+          );
+        })
+      )
+    );
 
   //update company with form data
 
-  updateCompanyWithFormDataEffect : Observable<CompanyActionUnion> = createEffect(
-    () => this.companyActions.pipe(
-      ofType(CompanyActionTypes.UPDATE_COMPANY_WITH_FORM_DATA),
-      mergeMap((action: CompanyActionUnion)=>{
-        return this.companiesService.updateCompany(action.payload).pipe(
-          map((company: Company) => new UpdateCompanyWithFormDataActionSuccess(company)),
-          catchError(err=> of(new UpdateCompanyWithFormDataActionError(err.message)))
-        )
-      })
-    )
-  );
+  updateCompanyWithFormDataEffect: Observable<CompanyActionUnion> =
+    createEffect(() =>
+      this.companyActions.pipe(
+        ofType(CompanyActionTypes.UPDATE_COMPANY_WITH_FORM_DATA),
+        mergeMap((action: CompanyActionUnion) => {
+          return this.companiesService.updateCompany(action.payload).pipe(
+            map(
+              (company: Company) =>
+                new UpdateCompanyWithFormDataActionSuccess(company)
+            ),
+            catchError((err) =>
+              of(new UpdateCompanyWithFormDataActionError(err.message))
+            )
+          );
+        })
+      )
+    );
 
   // delete a company
-  deleteCompany: Observable<CompanyActionUnion> = createEffect(
-    () => this.companyActions.pipe(
+  deleteCompany: Observable<CompanyActionUnion> = createEffect(() =>
+    this.companyActions.pipe(
       ofType(CompanyActionTypes.DELETE_COMPANY),
-      mergeMap((action: CompanyActionUnion)=>{
+      mergeMap((action: CompanyActionUnion) => {
         return this.companiesService.deleteCompany(action.payload.id).pipe(
-          map(()=>new DeleteCompanyActionSuccess(action.payload)),
-          catchError(err=> of(new DeleteCompanyActionError(err.message)))
-        )
+          map(() => new DeleteCompanyActionSuccess(action.payload)),
+          catchError((err) => of(new DeleteCompanyActionError(err.message)))
+        );
       })
     )
   );

src/app/ngrx/projects/effects.project.create.ts

@@ -1,5 +1,10 @@
 import { ProjectActionTypes } from './project.action.types';
-import { ProjectActionUnion, CreateProjectFormAddAction, SaveProjectFormDataActionSuccess, SaveProjectFormDataActionError, CreateProjectFormAddActionSuccess } from './projects.actions';
+import {
+  ProjectActionUnion,
+  SaveProjectFormDataActionSuccess,
+  SaveProjectFormDataActionError,
+  CreateProjectFormAddActionSuccess,
+} from './projects.actions';
 import { map, Observable, mergeMap, catchError, of } from 'rxjs';
 import { ProjectsServices } from './../../shared/services/projects.service';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
@@ -8,33 +13,36 @@ import { Project } from 'src/app/shared/models/project/project.model';
 
 @Injectable()
 export class ProjectCreateEffects {
-
   constructor(
     private projectActions: Actions,
     private projectsService: ProjectsServices
   ) {}
 
   //create project form effect
-  createAddProjectFormEffect:Observable<ProjectActionUnion> = createEffect(
-    ()=> this.projectActions.pipe(
-      ofType((ProjectActionTypes.CREATE_PROJECT_FORM_ADD)),
-      map( (projectAction: ProjectActionUnion)=>{
-        return new CreateProjectFormAddActionSuccess(projectAction.payload);
-      })
-    )
+  createAddProjectFormEffect: Observable<ProjectActionUnion> = createEffect(
+    () =>
+      this.projectActions.pipe(
+        ofType(ProjectActionTypes.CREATE_PROJECT_FORM_ADD),
+        map((projectAction: ProjectActionUnion) => {
+          return new CreateProjectFormAddActionSuccess(projectAction.payload);
+        })
+      )
   );
 
   //save project form data effect
-  saveProjectFormDataEffect : Observable<ProjectActionUnion> = createEffect(
-    ()=> this.projectActions.pipe(
+  saveProjectFormDataEffect: Observable<ProjectActionUnion> = createEffect(() =>
+    this.projectActions.pipe(
       ofType(ProjectActionTypes.SAVE_PROJECT_FORM_DATA),
-      mergeMap( (action: ProjectActionUnion) =>{
+      mergeMap((action: ProjectActionUnion) => {
         return this.projectsService.createProject(action.payload).pipe(
-          map((project: Project)=> new SaveProjectFormDataActionSuccess(project)),
-          catchError(err=>of(new SaveProjectFormDataActionError(err.message)))
-        )
+          map(
+            (project: Project) => new SaveProjectFormDataActionSuccess(project)
+          ),
+          catchError((err) =>
+            of(new SaveProjectFormDataActionError(err.message))
+          )
+        );
       })
     )
   );
-
 }

src/app/ngrx/projects/effects.project.get.ts

@@ -1,6 +1,14 @@
 import { Project } from './../../shared/models/project/project.model';
 import { ProjectActionTypes } from './project.action.types';
-import { ProjectActionUnion, GetAllProjectsActionSuccess, GetAllProjectsActionError, GetProjectWithUserAssociatedActionSuccess, GetProjectWithUserAssociatedActionError, GetProjectWithCompanyAssociatedActionSuccess, GetProjectWithCompanyAssociatedActionError } from './projects.actions';
+import {
+  ProjectActionUnion,
+  GetAllProjectsActionSuccess,
+  GetAllProjectsActionError,
+  GetProjectWithUserAssociatedActionSuccess,
+  GetProjectWithUserAssociatedActionError,
+  GetProjectWithCompanyAssociatedActionSuccess,
+  GetProjectWithCompanyAssociatedActionError,
+} from './projects.actions';
 import { Observable, mergeMap, map, catchError, of } from 'rxjs';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { ProjectsServices } from './../../shared/services/projects.service';
@@ -14,13 +22,15 @@ export class ProjectGetEffects {
   ) {}
 
   //get all projects
-  getAllProjectsEffect: Observable<ProjectActionUnion> = createEffect(
-    () => this.projectActions.pipe(
+  getAllProjectsEffect: Observable<ProjectActionUnion> = createEffect(() =>
+    this.projectActions.pipe(
       ofType(ProjectActionTypes.GET_ALL_PROJECTS),
-      mergeMap((action: ProjectActionUnion)=>{
+      mergeMap((action: ProjectActionUnion) => {
         return this.projectsService.getAllProjects().pipe(
-          map( (projects: Project[] )=> new GetAllProjectsActionSuccess(projects)),
-          catchError( err => of(new GetAllProjectsActionError(err.message)))
+          map(
+            (projects: Project[]) => new GetAllProjectsActionSuccess(projects)
+          ),
+          catchError((err) => of(new GetAllProjectsActionError(err.message)))
         );
       })
     )
@@ -28,27 +38,39 @@ export class ProjectGetEffects {
 
   //get project with user associated
   getProjectWithUserAssociated: Observable<ProjectActionUnion> = createEffect(
-    () => this.projectActions.pipe(
-      ofType(ProjectActionTypes.GET_PROJECT_WITH_USER_ASSOCIATED),
-      mergeMap( (action: ProjectActionUnion)=>{
-        return this.projectsService.getProjectWithUserAsociated().pipe(
-          map((listAny:any)=> new GetProjectWithUserAssociatedActionSuccess(listAny)),
-          catchError(err => of(new GetProjectWithUserAssociatedActionError(err.message)))
-        )
-      })
-    )
+    () =>
+      this.projectActions.pipe(
+        ofType(ProjectActionTypes.GET_PROJECT_WITH_USER_ASSOCIATED),
+        mergeMap((action: ProjectActionUnion) => {
+          return this.projectsService.getProjectWithUserAsociated().pipe(
+            map(
+              (listAny: any) =>
+                new GetProjectWithUserAssociatedActionSuccess(listAny)
+            ),
+            catchError((err) =>
+              of(new GetProjectWithUserAssociatedActionError(err.message))
+            )
+          );
+        })
+      )
   );
 
   //get project with company associated
-  getProjectWithCompanyAssociated: Observable<ProjectActionUnion> = createEffect(
-    () => this.projectActions.pipe(
-      ofType(ProjectActionTypes.GET_PROJECT_WITH_COMPANY_ASSOCIATED),
-      mergeMap( (action: ProjectActionUnion)=>{
-        return this.projectsService.getProjectWithCompanyAssociated().pipe(
-          map((listAny:any)=> new GetProjectWithCompanyAssociatedActionSuccess(listAny)),
-          catchError(err => of(new GetProjectWithCompanyAssociatedActionError(err.message)))
-        )
-      })
-    )
-  );
+  getProjectWithCompanyAssociated: Observable<ProjectActionUnion> =
+    createEffect(() =>
+      this.projectActions.pipe(
+        ofType(ProjectActionTypes.GET_PROJECT_WITH_COMPANY_ASSOCIATED),
+        mergeMap((action: ProjectActionUnion) => {
+          return this.projectsService.getProjectWithCompanyAssociated().pipe(
+            map(
+              (listAny: any) =>
+                new GetProjectWithCompanyAssociatedActionSuccess(listAny)
+            ),
+            catchError((err) =>
+              of(new GetProjectWithCompanyAssociatedActionError(err.message))
+            )
+          );
+        })
+      )
+    );
 }

src/app/ngrx/projects/effects.project.update.delete.ts

@@ -7,7 +7,6 @@ import {
   UpdateProjectWithFormDataActionSuccess,
   UpdateProjectWithFormDataActionError,
   DeleteProjectActionSuccess,
-  DeleteProjectActionError,
 } from './projects.actions';
 import { Observable, mergeMap, map, catchError, of } from 'rxjs';
 import { Actions, createEffect, ofType } from '@ngrx/effects';

src/app/ngrx/projects/project.action.types.ts

@@ -1,12 +1,7 @@
-/** Project actions types */
+/** All project action types */
 
 export enum ProjectActionTypes{
 
-  //get all project action
-  GET_ALL_PROJECTS = '[Project] GET ALL PROJECTS',
-  GET_ALL_PROJECTS_SUCCESS = '[Project] GET ALL PROJECTS SUCCESS',
-  GET_ALL_PROJECTS_ERROR = '[Project] GET ALL PROJECTS ERROR',
-
   //create project form to add a project
   CREATE_PROJECT_FORM_ADD = '[Project] CREATE PROJECT FORM ADD',
   CREATE_PROJECT_FORM_ADD_SUCCESS = '[Project] CREATE PROJECT FORM ADD SUCCESS',
@@ -17,6 +12,11 @@ export enum ProjectActionTypes{
   SAVE_PROJECT_FORM_DATA_SUCCESS ='[Project] SAVE PROJECT FORM DATA SUCCESS',
   SAVE_PROJECT_FORM_DATA_ERROR ='[Project] SAVE PROJECT FORM DATA ERROR',
 
+  //get all project action
+  GET_ALL_PROJECTS = '[Project] GET ALL PROJECTS',
+  GET_ALL_PROJECTS_SUCCESS = '[Project] GET ALL PROJECTS SUCCESS',
+  GET_ALL_PROJECTS_ERROR = '[Project] GET ALL PROJECTS ERROR',
+
   // create form to update project
   CREATE_PROJECT_FORM_UPDATE = '[Project] CREATE PROJECT FORM UPDATE',
   CREATE_PROJECT_FORM_UPDATE_SUCCESS = '[Project] CREATE PROJECT FORM UPDATE SUCCESS',

src/app/ngrx/projects/projects.actions.ts

@@ -2,139 +2,148 @@ import { Project } from './../../shared/models/project/project.model';
 import { ProjectActionTypes } from './project.action.types';
 import { Action } from '@ngrx/store';
 
-/** create actions related to projects */
-
-//create get all project action
-export class GetAllProjectsAction implements Action {
-  type: ProjectActionTypes = ProjectActionTypes.GET_ALL_PROJECTS;
-  constructor(public payload: any) {}
-}
-
-export class GetAllProjectsActionSuccess implements Action {
-  type: ProjectActionTypes = ProjectActionTypes.GET_ALL_PROJECTS_SUCCESS;
-  constructor(public payload: Project[]) {}
-}
-
-export class GetAllProjectsActionError implements Action {
-  type: ProjectActionTypes = ProjectActionTypes.GET_ALL_PROJECTS_ERROR;
-  constructor(public payload: string) {}
-}
+/** create all actions for managing  projects */
 
 //create project form to add a project
-
-export class CreateProjectFormAddAction implements Action{
+export class CreateProjectFormAddAction implements Action {
   type: ProjectActionTypes = ProjectActionTypes.CREATE_PROJECT_FORM_ADD;
-  constructor (public payload: any){}
+  constructor(public payload: any) {}
 }
 
-export class CreateProjectFormAddActionSuccess implements Action{
+export class CreateProjectFormAddActionSuccess implements Action {
   type: ProjectActionTypes = ProjectActionTypes.CREATE_PROJECT_FORM_ADD_SUCCESS;
-  constructor (public payload: any){}
+  constructor(public payload: any) {}
 }
 
-export class CreateProjectFormAddActionError implements Action{
+export class CreateProjectFormAddActionError implements Action {
   type: ProjectActionTypes = ProjectActionTypes.CREATE_PROJECT_FORM_ADD_ERROR;
-  constructor (public payload: string){}
+  constructor(public payload: string) {}
 }
 
 //save project form data
-export class SaveProjectFormDataAction implements Action{
+export class SaveProjectFormDataAction implements Action {
   type: ProjectActionTypes = ProjectActionTypes.SAVE_PROJECT_FORM_DATA;
-  constructor (public payload: Project){}
+  constructor(public payload: Project) {}
 }
-//save project form data
-export class SaveProjectFormDataActionSuccess implements Action{
+
+export class SaveProjectFormDataActionSuccess implements Action {
   type: ProjectActionTypes = ProjectActionTypes.SAVE_PROJECT_FORM_DATA_SUCCESS;
-  constructor (public payload: Project){}
+  constructor(public payload: Project) {}
 }
-//save project form data
-export class SaveProjectFormDataActionError implements Action{
+
+export class SaveProjectFormDataActionError implements Action {
   type: ProjectActionTypes = ProjectActionTypes.SAVE_PROJECT_FORM_DATA_ERROR;
-  constructor (public payload: string){}
+  constructor(public payload: string) {}
+}
+
+// get all projects action
+export class GetAllProjectsAction implements Action {
+  type: ProjectActionTypes = ProjectActionTypes.GET_ALL_PROJECTS;
+  constructor(public payload: any) {}
+}
+
+export class GetAllProjectsActionSuccess implements Action {
+  type: ProjectActionTypes = ProjectActionTypes.GET_ALL_PROJECTS_SUCCESS;
+  constructor(public payload: Project[]) {}
+}
+
+export class GetAllProjectsActionError implements Action {
+  type: ProjectActionTypes = ProjectActionTypes.GET_ALL_PROJECTS_ERROR;
+  constructor(public payload: string) {}
 }
 
 //create form for project update
-export class CreateProjectFormUpdateAction implements Action{
+export class CreateProjectFormUpdateAction implements Action {
   type: ProjectActionTypes = ProjectActionTypes.CREATE_PROJECT_FORM_UPDATE;
-  constructor(public payload: Project){}
+  constructor(public payload: Project) {}
 }
 
-export class CreateProjectFormUpdateActionSuccess implements Action{
-  type: ProjectActionTypes = ProjectActionTypes.CREATE_PROJECT_FORM_UPDATE_SUCCESS;
-  constructor(public payload: Project){}
+export class CreateProjectFormUpdateActionSuccess implements Action {
+  type: ProjectActionTypes =
+    ProjectActionTypes.CREATE_PROJECT_FORM_UPDATE_SUCCESS;
+  constructor(public payload: Project) {}
 }
 
-export class CreateProjectFormUpdateActionError implements Action{
-  type: ProjectActionTypes = ProjectActionTypes.CREATE_PROJECT_FORM_UPDATE_ERROR;
-  constructor(public payload: string){}
+export class CreateProjectFormUpdateActionError implements Action {
+  type: ProjectActionTypes =
+    ProjectActionTypes.CREATE_PROJECT_FORM_UPDATE_ERROR;
+  constructor(public payload: string) {}
 }
 
 // update project with form data
-export class UpdateProjectWithFormDataAction implements Action{
+export class UpdateProjectWithFormDataAction implements Action {
   type: ProjectActionTypes = ProjectActionTypes.UPDATE_PROJECT_WITH_FORM_DATA;
-  constructor (public payload: Project){}
+  constructor(public payload: Project) {}
 }
-export class UpdateProjectWithFormDataActionSuccess implements Action{
-  type: ProjectActionTypes = ProjectActionTypes.UPDATE_PROJECT_WITH_FORM_DATA_SUCCESS;
-  constructor (public payload: Project){}
+export class UpdateProjectWithFormDataActionSuccess implements Action {
+  type: ProjectActionTypes =
+    ProjectActionTypes.UPDATE_PROJECT_WITH_FORM_DATA_SUCCESS;
+  constructor(public payload: Project) {}
 }
-export class UpdateProjectWithFormDataActionError implements Action{
-  type: ProjectActionTypes = ProjectActionTypes.UPDATE_PROJECT_WITH_FORM_DATA_ERROR;
-  constructor (public payload: string){}
+export class UpdateProjectWithFormDataActionError implements Action {
+  type: ProjectActionTypes =
+    ProjectActionTypes.UPDATE_PROJECT_WITH_FORM_DATA_ERROR;
+  constructor(public payload: string) {}
 }
 
 // delete a project
-export class DeleteProjectAction implements Action{
+export class DeleteProjectAction implements Action {
   type: ProjectActionTypes = ProjectActionTypes.DELETE_PROJECT;
-  constructor(public payload: Project){}
+  constructor(public payload: Project) {}
 }
-export class DeleteProjectActionSuccess implements Action{
+export class DeleteProjectActionSuccess implements Action {
   type: ProjectActionTypes = ProjectActionTypes.DELETE_PROJECT_SUCCESS;
-  constructor(public payload: Project){}
+  constructor(public payload: Project) {}
 }
-export class DeleteProjectActionError implements Action{
+export class DeleteProjectActionError implements Action {
   type: ProjectActionTypes = ProjectActionTypes.DELETE_PROJECT_ERROR;
-  constructor(public payload: string){}
+  constructor(public payload: string) {}
 }
 
 // get project with user associated
-export class GetProjectWithUserAssociatedAction implements Action{
-  type: ProjectActionTypes = ProjectActionTypes.GET_PROJECT_WITH_USER_ASSOCIATED;
-  constructor(public payload: any){}
+export class GetProjectWithUserAssociatedAction implements Action {
+  type: ProjectActionTypes =
+    ProjectActionTypes.GET_PROJECT_WITH_USER_ASSOCIATED;
+  constructor(public payload: any) {}
 }
-export class GetProjectWithUserAssociatedActionSuccess implements Action{
-  type: ProjectActionTypes = ProjectActionTypes.GET_PROJECT_WITH_USER_ASSOCIATED_SUCCESS;
-  constructor(public payload: any){}
+export class GetProjectWithUserAssociatedActionSuccess implements Action {
+  type: ProjectActionTypes =
+    ProjectActionTypes.GET_PROJECT_WITH_USER_ASSOCIATED_SUCCESS;
+  constructor(public payload: any) {}
 }
-export class GetProjectWithUserAssociatedActionError implements Action{
-  type: ProjectActionTypes = ProjectActionTypes.GET_PROJECT_WITH_USER_ASSOCIATED_ERROR;
-  constructor(public payload: string){}
+export class GetProjectWithUserAssociatedActionError implements Action {
+  type: ProjectActionTypes =
+    ProjectActionTypes.GET_PROJECT_WITH_USER_ASSOCIATED_ERROR;
+  constructor(public payload: string) {}
 }
 
 // get project with company associated
-export class GetProjectWithCompanyAssociatedAction implements Action{
-  type: ProjectActionTypes = ProjectActionTypes.GET_PROJECT_WITH_COMPANY_ASSOCIATED;
-  constructor(public payload: any){}
+export class GetProjectWithCompanyAssociatedAction implements Action {
+  type: ProjectActionTypes =
+    ProjectActionTypes.GET_PROJECT_WITH_COMPANY_ASSOCIATED;
+  constructor(public payload: any) {}
 }
-export class GetProjectWithCompanyAssociatedActionSuccess implements Action{
-  type: ProjectActionTypes = ProjectActionTypes.GET_PROJECT_WITH_COMPANY_ASSOCIATED_SUCCESS;
-  constructor(public payload: any){}
+export class GetProjectWithCompanyAssociatedActionSuccess implements Action {
+  type: ProjectActionTypes =
+    ProjectActionTypes.GET_PROJECT_WITH_COMPANY_ASSOCIATED_SUCCESS;
+  constructor(public payload: any) {}
 }
-export class GetProjectWithCompanyAssociatedActionError implements Action{
-  type: ProjectActionTypes = ProjectActionTypes.GET_PROJECT_WITH_COMPANY_ASSOCIATED_ERROR;
-  constructor(public payload: string){}
+export class GetProjectWithCompanyAssociatedActionError implements Action {
+  type: ProjectActionTypes =
+    ProjectActionTypes.GET_PROJECT_WITH_COMPANY_ASSOCIATED_ERROR;
+  constructor(public payload: string) {}
 }
 
 export type ProjectActionUnion =
-  | GetAllProjectsAction
-  | GetAllProjectsActionSuccess
-  | GetAllProjectsActionError
   | CreateProjectFormAddAction
   | CreateProjectFormAddActionSuccess
   | CreateProjectFormAddActionError
   | SaveProjectFormDataAction
   | SaveProjectFormDataActionSuccess
   | SaveProjectFormDataActionError
+  | GetAllProjectsAction
+  | GetAllProjectsActionSuccess
+  | GetAllProjectsActionError
   | CreateProjectFormUpdateAction
   | CreateProjectFormUpdateActionSuccess
   | CreateProjectFormUpdateActionError

src/app/ngrx/projects/projects.reducer.ts

@@ -5,7 +5,8 @@ import { ProjectState } from './project.state';
 import { ProjectActionTypes } from './project.action.types';
 import { Project } from 'src/app/shared/models/project/project.model';
 
-/** a reducer need first initial state and action to perform */
+/** a reducer is used to perform actions from component.
+ a reducer needs first initial state and action to perform */
 
 const projectInitState: ProjectState = {
   currentProject: null,
@@ -20,29 +21,8 @@ export function projectReducer(
 ): ProjectState {
 
   switch (action.type) {
-    // get all projects action reducer
-    case ProjectActionTypes.GET_ALL_PROJECTS:
-      return {
-        ...state,
-        msgState: MsgState.LOADING,
-      };
-
-    case ProjectActionTypes.GET_ALL_PROJECTS_SUCCESS:
-      return {
-        ...state,
-        msgState: MsgState.LOADED,
-        projectsList: (<ProjectActionUnion>action).payload,
-      };
-
-    case ProjectActionTypes.GET_ALL_PROJECTS_ERROR:
-      return {
-        ...state,
-        msgState: MsgState.ERR,
-        serverErrorMsg: (<ProjectActionUnion>action).payload,
-      };
 
     // create project form to add action reducer
-
     case ProjectActionTypes.CREATE_PROJECT_FORM_ADD:
       return {
         ...state,
@@ -81,6 +61,27 @@ export function projectReducer(
         projectsList: projectsListCopy1,
       };
 
+    // get all projects action reducer
+    case ProjectActionTypes.GET_ALL_PROJECTS:
+      return {
+        ...state,
+        msgState: MsgState.LOADING,
+      };
+
+    case ProjectActionTypes.GET_ALL_PROJECTS_SUCCESS:
+      return {
+        ...state,
+        msgState: MsgState.LOADED,
+        projectsList: (<ProjectActionUnion>action).payload,
+      };
+
+    case ProjectActionTypes.GET_ALL_PROJECTS_ERROR:
+      return {
+        ...state,
+        msgState: MsgState.ERR,
+        serverErrorMsg: (<ProjectActionUnion>action).payload,
+      };
+
     // create form to update project
     case ProjectActionTypes.CREATE_PROJECT_FORM_UPDATE:
       return {

src/app/ngrx/users/effects.user.get.ts

@@ -14,7 +14,7 @@ import { User } from 'src/app/shared/models/user/user.model';
 import { UserActionTypes } from './user.action.types';
 
 @Injectable()
-export class UserGetSearchEffects {
+export class UserGetEffects {
   constructor(
     private userActions: Actions,
     private usersService: UsersServices,

src/app/ngrx/users/effects.user.update.delete.ts

@@ -13,11 +13,10 @@ import { Injectable } from '@angular/core';
 import { Actions, createEffect, ofType } from '@ngrx/effects';
 import { User } from 'src/app/shared/models/user/user.model';
 import { UserActionTypes } from './user.action.types';
-import { Router } from '@angular/router';
 
 @Injectable()
 
-export class UserUpdateEffects {
+export class UserUpdateDeleteEffects {
   constructor(
     private usersService: UsersServices,
     private effectActions: Actions

src/app/ngrx/users/user.action.types.ts

@@ -1,13 +1,8 @@
-/**type of actions*/
+/**all action types for user management*/
 
 export enum UserActionTypes {
 
-  // action: get all users
-  GET_ALL_USERS = '[User] GET ALL USERS',
-  GET_ALL_USERS_SUCCESS = '[User] GET-ALL USERS SUCCESS',
-  GET_ALL_USERS_ERROR = '[User] GET ALL USERS ERROR',
-
-  // action of button: create a user form
+  // user form to a user
   CREATE_FORM_ADD_USER = '[User] USER FORM ADD',
   CREATE_FORM_ADD_USER_SUCCESS = '[User] USER FORM ADD SUCCESS',
   CREATE_FORM_ADD_USER_ERROR = '[User] USER FORM ADD ERROR',
@@ -17,7 +12,13 @@ export enum UserActionTypes {
   SAVE_USERFORM_ADD_SUCCESS = '[User] SAVE USER SUCCESS',
   SAVE_USERFORM_ADD_ERROR = '[User] SAVE USER ERROR',
 
-  // action: create form to edit a user
+  // get all users
+  GET_ALL_USERS = '[User] GET ALL USERS',
+  GET_ALL_USERS_SUCCESS = '[User] GET-ALL USERS SUCCESS',
+  GET_ALL_USERS_ERROR = '[User] GET ALL USERS ERROR',
+
+
+  // create form to edit a user
   CREATE_FORM_USER_EDIT = '[User] USER FORM EDIT',
   CREATE_FORM_USER_EDIT_SUCCESS = '[User] USER FORM EDIT SUCCESS',
   CREATE_FORM_USER_EDIT_ERROR = '[User] USER FORM EDIT ERROR',
@@ -28,17 +29,17 @@ export enum UserActionTypes {
   UPDATE_USER_FORM_ERROR = '[User] USER FORM UPDATE ERROR',
 
 
-  // action: delete a user
+  // delete a user
   DELETE_A_USER = '[User] DELETE A USER',
   DELETE_A_USER_SUCCESS = '[User] DELETE A USER SUCCESS',
   DELETE_A_USER_ERROR = '[User] DELETE A USER ERROR',
 
-  //action : load user's projects
+  // load user's projects
 
   GET_USER_S_PROJECTS = 'GET USER\'S PROJECTS',
   GET_USER_S_PROJECTS_SUCCESS = 'GET USER\'S PROJECTS SUCCESS',
   GET_USER_S_PROJECTS_ERROR = 'GET USER\'S PROJECTS ERROR',
 
-  //action:navigate to another component
+  // navigate to another component
   NAVIGATE_TO_USER_S_PROJECTS_COMPONENT_SUCCESS = 'NAVIGATE TO USER\'S PROJECTS COMPONENT SUCCESS'
 }

src/app/ngrx/users/users.actions.ts

@@ -2,29 +2,9 @@ import { Action } from '@ngrx/store';
 import { User } from 'src/app/shared/models/user/user.model';
 import { UserActionTypes } from './user.action.types';
 
-
 /**create actions related to a user*/
 
-//get all users actions
-
-export class GetAllUsersAction implements Action {
-  type: UserActionTypes = UserActionTypes.GET_ALL_USERS;
-
-  constructor(public payload: any) {}
-}
-
-export class GetAllUsersActionSuccess implements Action {
-  type: UserActionTypes = UserActionTypes.GET_ALL_USERS_SUCCESS;
-  constructor(public payload: User[]) {}
-}
-
-export class GetAllUsersActionError implements Action {
-  type: UserActionTypes = UserActionTypes.GET_ALL_USERS_ERROR;
-  constructor(public payload: string) {}
-}
-
 // Actios of creating a user form to add user
-
 export class CreateFormUserAddAction implements Action {
   type: UserActionTypes = UserActionTypes.CREATE_FORM_ADD_USER;
   constructor(public payload: any) {}
@@ -41,23 +21,40 @@ export class CreateFormUserAddActionError implements Action {
 }
 
 //actions of saving a user form data
-export class SaveUserFormAddAction implements Action{
+export class SaveUserFormAddAction implements Action {
   type: UserActionTypes = UserActionTypes.SAVE_USERFORM_ADD;
-  constructor(public payload: User){}
+  constructor(public payload: User) {}
 }
 
-export class SaveUserFormAddActionSuccess implements Action{
+export class SaveUserFormAddActionSuccess implements Action {
   type: UserActionTypes = UserActionTypes.SAVE_USERFORM_ADD_SUCCESS;
-  constructor(public payload: User){}
+  constructor(public payload: User) {}
 }
 
-export class SaveUserFormAddActionError implements Action{
+export class SaveUserFormAddActionError implements Action {
   type: UserActionTypes = UserActionTypes.SAVE_USERFORM_ADD_ERROR;
-  constructor(public payload: string){}
+  constructor(public payload: string) {}
 }
 
-// Actions of creating a user form to edit user
+//get all users actions
+export class GetAllUsersAction implements Action {
+  type: UserActionTypes = UserActionTypes.GET_ALL_USERS;
+
+  constructor(public payload: any) {}
+}
+
+export class GetAllUsersActionSuccess implements Action {
+  type: UserActionTypes = UserActionTypes.GET_ALL_USERS_SUCCESS;
+  constructor(public payload: User[]) {}
+}
 
+export class GetAllUsersActionError implements Action {
+  type: UserActionTypes = UserActionTypes.GET_ALL_USERS_ERROR;
+  constructor(public payload: string) {}
+}
+
+
+// Actions of creating a user form to edit user
 export class CreareFormUserEditAction implements Action {
   type: UserActionTypes = UserActionTypes.CREATE_FORM_USER_EDIT;
 
@@ -76,20 +73,19 @@ export class CreareFormUserEditActionActionError implements Action {
 
 // action of updating user from user data form
 
-export class UpdateUserFormAction implements Action{
+export class UpdateUserFormAction implements Action {
   type: UserActionTypes = UserActionTypes.UPDATE_USER_FORM;
-  constructor(public payload: User){}
+  constructor(public payload: User) {}
 }
 
-export class UpdateUserFormActionSuccess implements Action{
+export class UpdateUserFormActionSuccess implements Action {
   type: UserActionTypes = UserActionTypes.UPDATE_USER_FORM_SUCCESS;
-  constructor(public payload: User){}
+  constructor(public payload: User) {}
 }
 
-export class UpdateUserFormActionError implements Action{
-
+export class UpdateUserFormActionError implements Action {
   type: UserActionTypes = UserActionTypes.UPDATE_USER_FORM_ERROR;
-  constructor(public payload: string){}
+  constructor(public payload: string) {}
 }
 
 // Actions of deleting a user
@@ -110,37 +106,38 @@ export class DeleteUserActionError implements Action {
 }
 
 //Action of loading user's projects
-export class GetUser_S_Projects implements Action{
+export class GetUser_S_Projects implements Action {
   type: UserActionTypes = UserActionTypes.GET_USER_S_PROJECTS;
-  constructor(public payload: any){}
+  constructor(public payload: any) {}
 }
 
-export class GetUser_S_ProjectsSuccess implements Action{
+export class GetUser_S_ProjectsSuccess implements Action {
   type: UserActionTypes = UserActionTypes.GET_USER_S_PROJECTS_SUCCESS;
-  constructor(public payload: any){}
+  constructor(public payload: any) {}
 }
 
-export class GetUser_S_ProjectsError implements Action{
+export class GetUser_S_ProjectsError implements Action {
   type: UserActionTypes = UserActionTypes.GET_USER_S_PROJECTS_ERROR;
-  constructor(public payload: string){}
+  constructor(public payload: string) {}
 }
 
 //action of navigating to another component
-export class NavigateActionSuccess implements Action{
-  type: UserActionTypes = UserActionTypes.NAVIGATE_TO_USER_S_PROJECTS_COMPONENT_SUCCESS
-  constructor(public payload: any){}
+export class NavigateActionSuccess implements Action {
+  type: UserActionTypes =
+    UserActionTypes.NAVIGATE_TO_USER_S_PROJECTS_COMPONENT_SUCCESS;
+  constructor(public payload: any) {}
 }
 
 export type UserActionUnion =
-  | GetAllUsersAction
-  | GetAllUsersActionSuccess
-  | GetAllUsersActionError
   | CreateFormUserAddAction
   | CreateFormUserAddActionSuccess
   | CreateFormUserAddActionError
   | SaveUserFormAddAction
   | SaveUserFormAddActionSuccess
   | SaveUserFormAddActionError
+  | GetAllUsersAction
+  | GetAllUsersActionSuccess
+  | GetAllUsersActionError
   | CreareFormUserEditAction
   | CreareFormUserEditActionSuccess
   | CreareFormUserEditActionActionError

src/app/ngrx/users/users.reducer.ts

@@ -21,26 +21,7 @@ export function userReducer(
   action: Action
 ): UserState {
 
-
   switch (action.type) {
-    // get all users actions
-    case UserActionTypes.GET_ALL_USERS:
-      return { ...state, msgState: MsgState.LOADING };
-
-    case UserActionTypes.GET_ALL_USERS_SUCCESS:
-      return {
-        ...state,
-        msgState: MsgState.LOADED,
-        usersList: (<UserActionUnion>action).payload,
-      };
-
-    case UserActionTypes.GET_ALL_USERS_ERROR:
-      return {
-        ...state,
-        msgState: MsgState.ERR,
-        serverMsgError: (<UserActionUnion>action).payload
-      };
-
 
     // create a user form action to add a suer
     case UserActionTypes.CREATE_FORM_ADD_USER:
@@ -87,6 +68,24 @@ export function userReducer(
         serverMsgError: (<UserActionUnion>action).payload
       };
 
+    // get all users actions
+    case UserActionTypes.GET_ALL_USERS:
+      return { ...state, msgState: MsgState.LOADING };
+
+    case UserActionTypes.GET_ALL_USERS_SUCCESS:
+      return {
+        ...state,
+        msgState: MsgState.LOADED,
+        usersList: (<UserActionUnion>action).payload,
+      };
+
+    case UserActionTypes.GET_ALL_USERS_ERROR:
+      return {
+        ...state,
+        msgState: MsgState.ERR,
+        serverMsgError: (<UserActionUnion>action).payload
+      };
+
     // create a edit user form actions
     case UserActionTypes.CREATE_FORM_USER_EDIT:
       return {

src/app/pages/accueil/accueil/accueil.component.html

@@ -4,9 +4,10 @@
 
     <div>
       <div class="card-body">
-        <h4 class="card-title">Welcome to Natan</h4>
+        <h4 class="card-title p-2">Welcome to Natan</h4>
         <p class="card-text p-2">NATAN est palindrome</p>
-        <p class="card-text">Ce qui fait de NATAN le meilleur</p>
+        <p class="card-text p-2">Ce qui fait de NATAN le meilleur</p>
+        <p class="card-text">For all collaborators, NATAN wishes you the best</p>
       </div>
     </div>
 

src/app/pages/base-nav-menu/base-nav-menu.component.html

@@ -17,14 +17,6 @@
 
   <mat-sidenav-content>
     <mat-toolbar>
-      <button
-      type="button"
-      aria-label="Toggle sidenav"
-      mat-icon-button
-      (click)="drawer.toggle()"
-      *ngIf="isHandset$ | async">
-      <mat-icon aria-label="Side nav toggle icon">menu</mat-icon>
-    </button>
       <span>Users, Projects and Companies Management</span>
     </mat-toolbar>
     <!-- Add Content Here -->

src/app/pages/base-nav-menu/base-nav-menu.component.ts

@@ -20,17 +20,5 @@ export class BaseNavMenuComponent {
       shareReplay()
     );
 
-  constructor(
-    private breakpointObserver: BreakpointObserver,
-    private router: Router,
-    private store: Store<{ userReducerKey: UserState }>,
-  ) {}
-
-  onUserCreate(): void {
-    this.router.navigateByUrl('/user-create');
-  }
-
-  onUsersGetAll(){
-    this.store.dispatch(new GetAllUsersAction({}));
-  }
+  constructor(private breakpointObserver: BreakpointObserver) {}
 }

src/app/pages/companies-manager/companies-management/company-nav-bar/company-nav-bar.component.ts

@@ -1,7 +1,7 @@
 import { Router } from '@angular/router';
 import { GetAllCompaniesAction } from './../../../../ngrx/companies/companies.actions';
 import { CompanyState } from './../../../../ngrx/companies/company.state';
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { Store } from '@ngrx/store';
 
 @Component({

src/app/pages/companies-manager/companies-management/company-s-projects/company-s-projects.component.ts

@@ -1,4 +1,4 @@
-import { Observable } from 'rxjs';
+import { map, Observable } from 'rxjs';
 import { MsgState } from './../../../../ngrx/msg.state';
 import { GetCompany_S_Projects } from './../../../../ngrx/companies/companies.actions';
 import { CompanyState } from './../../../../ngrx/companies/company.state';
@@ -21,7 +21,9 @@ export class CompanySProjectsComponent implements OnInit {
   ngOnInit(): void {
 
     this.store.dispatch(new GetCompany_S_Projects({}));
-    this.companyState$ = this.store.select('companyReducerKey');
+    this.companyState$ = this.store.pipe(
+      map( state => state.companyReducerKey)
+    )
   }
 
 }

src/app/pages/projects-manager/projects-management/project-with-company-associated/project-with-company-associated.component.ts

@@ -19,7 +19,6 @@ export class ProjectWithCompanyAssociatedComponent implements OnInit {
 
   ngOnInit(): void {
 
-
     this.store.dispatch(new GetProjectWithCompanyAssociatedAction({}));
     this.projectState$= this.store.select('projectReducerKey');
   }

src/app/pages/projects-manager/projects-management/project-with-user-associated/project-with-user-associated-list/project-with-user-associated-list.component.ts

@@ -1,16 +1,11 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
 
 @Component({
   selector: 'app-project-with-user-associated-list',
   templateUrl: './project-with-user-associated-list.component.html',
   styleUrls: ['./project-with-user-associated-list.component.css']
 })
-export class ProjectWithUserAssociatedListComponent implements OnInit {
+export class ProjectWithUserAssociatedListComponent {
 
-  constructor() { }
   @Input() inputProjectsListWithUserAssociated!: any;
-
-  ngOnInit(): void {
-  }
-
 }

src/app/pages/users-manager/users-management/user-create/user-create.component.ts

@@ -1,5 +1,4 @@
 import { Router } from '@angular/router';
-import { GetAllUsersAction } from 'src/app/ngrx/users/users.actions';
 import { DatePipe } from '@angular/common';
 import { UsersServices } from '../../../../shared/services/users.service';
 import { User } from '../../../../shared/models/user/user.model';

src/app/pages/users-manager/users-management/user-s-projects/user-s-projects.component.ts

@@ -1,6 +1,6 @@
 import { MsgState } from './../../../../ngrx/msg.state';
 import { Observable } from 'rxjs';
-import { GetUser_S_Projects, UserActionUnion } from './../../../../ngrx/users/users.actions';
+import { GetUser_S_Projects } from './../../../../ngrx/users/users.actions';
 import { UserState } from './../../../../ngrx/users/user.state';
 import { Component, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';

src/app/pages/users-manager/users-management/users-management.component.ts

@@ -24,8 +24,7 @@ export class UsersManagementComponent implements OnInit {
   constructor(private store: Store<{ userReducerKey: UserState }>) {}
 
   ngOnInit(): void {
-   // this.userState$ = this.store.select('userReducerKey');
-    //or
+
     this.userState$ = this.store.pipe(
       map( (userState) => userState.userReducerKey),
     )

src/app/shared/models/company/company.model.ts

@@ -1,5 +1,6 @@
 import { DatePipe } from '@angular/common';
 import { CompanyType } from './company.type';
+
 export class Company{
   id!: number;
   companyName!: string;

src/app/shared/services/projects.service.ts

@@ -1,6 +1,6 @@
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { Injectable, OnInit } from '@angular/core';
-import { catchError, Observable, retry, throwError } from 'rxjs';
+import { catchError, Observable, throwError } from 'rxjs';
 import { environment } from 'src/environments/environment';
 import { Project } from '../models/project/project.model';