Removed some routes and renamed others

This commit is contained in:
Erik Tiekstra
2021-09-03 12:01:29 +02:00
parent 5ed4b79d9c
commit 1fef2fe173
5 changed files with 22 additions and 17 deletions

View File

@@ -23,8 +23,8 @@ const routes: Routes = [
canActivate: [AuthGuard],
},
{
path: 'avrop',
data: { title: 'Avrop' },
path: 'nya-deltagare',
data: { title: 'Nya deltagare' },
loadChildren: () => import('./pages/avrop/avrop.module').then(m => m.AvropModule),
canActivate: [AuthGuard],
},

View File

@@ -6,21 +6,21 @@
</digi-typography>
<div class="start__wrapper">
<div class="start__notifications">
<digi-info-card af-heading="Notiser" af-heading-level="h1" af-type="info" af-link-text="Deltagare">
<digi-info-card af-heading="Nya deltagare" af-heading-level="h2" af-type="info">
<p>
Det har kommit in nya avrop med deltagare, länken nedan tar dig till fliken Nya deltagare. Du finner den
också i vänster menyn på sidan
</p>
<digi-ng-link-internal afText="Deltagare" afRoute="/deltagare"></digi-ng-link-internal>
<digi-ng-link-internal afText="Till nya deltagare" afRoute="/nya-deltagare"></digi-ng-link-internal>
</digi-info-card>
</div>
<div class="start__alerts">
<digi-notification-alert af-variation="info" af-heading="Viktig information" af-heading-level="h3">
<digi-notification-alert af-variation="info" af-heading="Viktig information" af-heading-level="h2">
<p>Large alert! Check the knobs section and play around!</p>
</digi-notification-alert>
<digi-notification-alert af-variation="success" af-heading="Allt gick bra" af-heading-level="h3">
<digi-notification-alert af-variation="success" af-heading="Allt gick bra" af-heading-level="h2">
<p>Dina skickade tilldelningar har nått fram till handledare som godkänt och arbetat vidare med deltagarna</p>
</digi-notification-alert>
</div>

View File

@@ -12,21 +12,15 @@
</a>
</li>
<li class="sidebar__item">
<a [routerLink]="['/avrop']" [routerLinkActive]="['sidebar__link--active']" class="sidebar__link">
<a [routerLink]="['/nya-deltagare']" [routerLinkActive]="['sidebar__link--active']" class="sidebar__link">
<msfa-icon class="sidebar__icon" [icon]="iconType.CLIPBOARD" size="xl"></msfa-icon>
Avrop
Nya deltagare
</a>
</li>
<li class="sidebar__item">
<a [routerLink]="['/deltagare']" [routerLinkActive]="['sidebar__link--active']" class="sidebar__link">
<msfa-icon class="sidebar__icon" [icon]="iconType.SOK_KANDIDAT" size="xl"></msfa-icon>
Mina deltagare
</a>
</li>
<li class="sidebar__item">
<a [routerLink]="['/planera-aktiviteter']" [routerLinkActive]="['sidebar__link--active']" class="sidebar__link">
<msfa-icon class="sidebar__icon" [icon]="iconType.USERS" size="xxl"></msfa-icon>
Planera aktiviteter
Deltagarlista
</a>
</li>

View File

@@ -1,8 +1,9 @@
export const NAVIGATION = {
administration: 'Administration',
personal: 'Hantera personal',
'redigera-konto': 'Redigera personal',
deltagare: 'Deltagare',
avrop: 'Avrop',
'nya-deltagare': 'Nya deltagare',
'planera-aktiviteter': 'Planera aktiviteter',
'mitt-konto': 'Mitt konto',
'bjuda-in': 'Bjuda in personal',

View File

@@ -15,9 +15,15 @@ export function mapPathsToBreadcrumbs(
if (isEmployeeCardRoute(paths)) {
breadcrumbs[breadcrumbs.length - 1].text = 'Personal information';
} else if (isEmployeeEditRoute(paths)) {
breadcrumbs[breadcrumbs.length - 2] = {
text: 'Hantera personal',
routerLink: '/administration/personal',
};
breadcrumbs[breadcrumbs.length - 1].text = 'Redigera konto';
} else if (isParticipantCardRoute(paths)) {
breadcrumbs[breadcrumbs.length - 1].text = 'Deltagarinformation';
}
}
return breadcrumbs;
}
@@ -25,6 +31,10 @@ function isEmployeeCardRoute(paths: string[]): boolean {
return paths.length === 3 && paths[1] === 'personal';
}
function isEmployeeEditRoute(paths: string[]): boolean {
return paths.length === 3 && paths[1] === 'redigera-konto';
}
function isParticipantCardRoute(paths: string[]): boolean {
return paths.length === 2 && paths[0] === 'deltagare';
}