Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…Frontend into develop
  • Loading branch information
NabokinA committed Apr 22, 2021
2 parents 75486c0 + 417b30f commit 452bdf5
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 23 deletions.
4 changes: 2 additions & 2 deletions src/app/shared/models/workshop.model.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Address } from "./address.model";
import { Teacher } from "./teacher.model";
import { Address } from './address.model';
import { Teacher } from './teacher.model';

export class Workshop {
id: number;
Expand Down
Original file line number Diff line number Diff line change
@@ -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>

51 changes: 41 additions & 10 deletions src/app/shell/provider/provider-routing.module.ts
Original file line number Diff line number Diff line change
@@ -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 = [
{
Expand All @@ -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 {
}

0 comments on commit 452bdf5

Please sign in to comment.