diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index d515f62..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
-
\ No newline at end of file
diff --git a/old-sae-airwatch/src/app/ds-navbar/ds-navbar.stories.ts b/old-sae-airwatch/src/app/ds-navbar/ds-navbar.stories.ts
index d485cbc..4a816d3 100644
--- a/old-sae-airwatch/src/app/ds-navbar/ds-navbar.stories.ts
+++ b/old-sae-airwatch/src/app/ds-navbar/ds-navbar.stories.ts
@@ -4,6 +4,7 @@ import {DsNavbar} from './ds-navbar';
import {CommonModule} from '@angular/common';
import {Store, StoreModule} from '@ngrx/store';
import {reducers} from '../reducers';
+import {ActivatedRoute, RouterModule} from '@angular/router';
const appReducer = reducers.app;
@@ -16,9 +17,20 @@ const meta: Meta = {
imports: [
CommonModule,
StoreModule.forRoot({app: appReducer as any}),
+ RouterModule.forRoot([]),
],
providers: [
- Store
+ Store,
+ {
+ provide: ActivatedRoute,
+ useValue: {
+ snapshot: {
+ paramMap: {
+ get: () => null
+ }
+ }
+ }
+ }
]
})
],
diff --git a/sae-csc/src/app/pages/main/main.html b/sae-csc/src/app/pages/main/main.html
index f906640..82d371a 100644
--- a/sae-csc/src/app/pages/main/main.html
+++ b/sae-csc/src/app/pages/main/main.html
@@ -11,7 +11,7 @@
-
+
diff --git a/sae-csc/src/app/pages/main/main.ts b/sae-csc/src/app/pages/main/main.ts
index f44385e..5a7dcf6 100644
--- a/sae-csc/src/app/pages/main/main.ts
+++ b/sae-csc/src/app/pages/main/main.ts
@@ -1,8 +1,8 @@
-import { Component } from '@angular/core';
-import {TopNavigation} from '../../shared/navigation/top-navigation/top-navigation';
-import {TranslateTexts} from '../../../../../my-workspace/projects/sae-lib/translate-texts/translate-texts';
+import {Component} from '@angular/core';
+import {TranslateTexts} from 'sae-lib/inbox/translate-texts/translate-texts';
import {FiltersGroup} from '../../../../../my-workspace/projects/sae-lib/filters/filters-group/filters-group';
import {BottomNavigation} from '../../shared/navigation/bottom-navigation/bottom-navigation';
+import {ColorDisplay} from 'sae-lib/colours/color-display/color-display';
@Component({
@@ -10,7 +10,8 @@ import {BottomNavigation} from '../../shared/navigation/bottom-navigation/bottom
imports: [
TranslateTexts,
FiltersGroup,
- BottomNavigation
+ BottomNavigation,
+ ColorDisplay
],
templateUrl: './main.html',
styleUrl: './main.scss'
diff --git a/sae-csc/src/app/shared/navigation/top-navigation/top-navigation.html b/sae-csc/src/app/shared/navigation/top-navigation/top-navigation.html
index 162ccb2..6ed8a87 100644
--- a/sae-csc/src/app/shared/navigation/top-navigation/top-navigation.html
+++ b/sae-csc/src/app/shared/navigation/top-navigation/top-navigation.html
@@ -1,14 +1,14 @@