Merge branch 'develop' into Fix-/-#175-fix-select-in-create-activity-…

…component
ita-social-projects · Apr 22, 2021 · 2c087db · 2c087db
2 parents dd16dec + 452bdf5
commit 2c087db
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 21 deletions.
diff --git a/src/app/shell/provider/personal-cabinet/personal-cabinet.component.html b/src/app/shell/provider/personal-cabinet/personal-cabinet.component.html
@@ -1,12 +1,12 @@
-<div>
-  <div class="container">
-    <h1 class="title">КАБІНЕТ КОРИСТУВАЧА</h1>
-    <nav class="nav" mat-tab-nav-bar>
-      <a mat-tab-link [routerLinkActive]="['active']" [routerLink]="'./config'">ОСОБИСТА ІНФОРМАЦІЯ</a>
-      <a mat-tab-link [routerLinkActive]="['active']" [routerLink]="'./org-info'">ІНФОРМАЦІЯ ПРО ЗАКЛАД</a>
-      <a mat-tab-link [routerLinkActive]="['active']" [routerLink]="'./activities'">ГУРТКИ</a>
-      <a mat-tab-link [routerLinkActive]="['active']" [routerLink]="'./applications'">ЗАЯВКИ</a>
-    </nav>
-  </div>
+<div class="container">
+  <h1 class="title">КАБІНЕТ КОРИСТУВАЧА</h1>
+  <nav class="nav" mat-tab-nav-bar>
+    <a mat-tab-link [routerLinkActive]="['active']" [routerLink]="'./config'">ОСОБИСТА ІНФОРМАЦІЯ</a>
+    <a mat-tab-link [routerLinkActive]="['active']" [routerLink]="'./org-info'">ІНФОРМАЦІЯ ПРО ЗАКЛАД</a>
+    <a mat-tab-link [routerLinkActive]="['active']" [routerLink]="'./activities'">ГУРТКИ</a>
+    <a mat-tab-link [routerLinkActive]="['active']" [routerLink]="'./requests'">ЗАЯВКИ</a>
+    <a mat-tab-link [routerLinkActive]="['active']" [routerLink]="'./messages'">ПОВІДОМЛЕННЯ</a>
+  </nav>
   <router-outlet></router-outlet>
-</div>
+</div>
+
diff --git a/src/app/shell/provider/provider-routing.module.ts b/src/app/shell/provider/provider-routing.module.ts
@@ -1,12 +1,12 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { PersonalCabinetComponent } from './personal-cabinet/personal-cabinet.component';
-import { CreateActivityComponent } from './provider-activities/create-activity/create-activity.component';
+import {NgModule} from '@angular/core';
+import {Routes, RouterModule} from '@angular/router';
+import {PersonalCabinetComponent} from './personal-cabinet/personal-cabinet.component';
+import {CreateActivityComponent} from './provider-activities/create-activity/create-activity.component';
 
+import {ProviderConfigComponent} from './provider-config/provider-config.component';
+import {ProviderRequestsComponent} from './provider-requests/provider-requests.component';
 import { ProviderActivitiesComponent } from './provider-activities/provider-activities.component';
-import { ProviderConfigComponent } from './provider-config/provider-config.component';
 import { ProviderOrgInfoComponent } from './provider-org-info/provider-org-info.component';
-import { ProviderApplicationsComponent } from './provider-applications/provider-applications.component';
 
 const routes: Routes = [
   {
@@ -25,17 +25,48 @@ const routes: Routes = [
         component: ProviderActivitiesComponent,
       },
       {
-        path: 'applications',
-        component: ProviderApplicationsComponent,
+        path: 'requests',
+        component: ProviderRequestsComponent,
+      },
+      {
+        path: 'messages'
       },
 
     ]
   },
-  { path: 'create-activity/:id', component: CreateActivityComponent }
+  { path: 'create-activity/:id', component: CreateActivityComponent },
+  {
+    path: 'cabinet', component: PersonalCabinetComponent,
+    children: [
+      {
+        path: 'config',
+        component: ProviderConfigComponent,
+      },
+      {
+        path: 'org-info',
+        component: ProviderOrgInfoComponent,
+      },
+      {
+        path: 'activities',
+        component: ProviderActivitiesComponent,
+      },
+      {
+        path: 'requests',
+        component: ProviderRequestsComponent,
+      },
+      {
+        path: 'messages'
+      },
+
+    ]
+  },
+  {path: 'create-activity/:id', component: CreateActivityComponent}
 ];
 
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class ProviderRoutingModule { }
+export class ProviderRoutingModule {
+}
+