change lib path refs components
This commit is contained in:
parent
54bf9d3fe2
commit
a88cfb8e3d
6 changed files with 34 additions and 21 deletions
1
.idea/vcs.xml
generated
1
.idea/vcs.xml
generated
|
@ -2,6 +2,5 @@
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="" vcs="Git" />
|
<mapping directory="" vcs="Git" />
|
||||||
<mapping directory="$PROJECT_DIR$/sae-airwatch" vcs="Git" />
|
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
|
@ -4,6 +4,7 @@ import {DsNavbar} from './ds-navbar';
|
||||||
import {CommonModule} from '@angular/common';
|
import {CommonModule} from '@angular/common';
|
||||||
import {Store, StoreModule} from '@ngrx/store';
|
import {Store, StoreModule} from '@ngrx/store';
|
||||||
import {reducers} from '../reducers';
|
import {reducers} from '../reducers';
|
||||||
|
import {ActivatedRoute, RouterModule} from '@angular/router';
|
||||||
|
|
||||||
const appReducer = reducers.app;
|
const appReducer = reducers.app;
|
||||||
|
|
||||||
|
@ -16,9 +17,20 @@ const meta: Meta<DsNavbar> = {
|
||||||
imports: [
|
imports: [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
StoreModule.forRoot({app: appReducer as any}),
|
StoreModule.forRoot({app: appReducer as any}),
|
||||||
|
RouterModule.forRoot([]),
|
||||||
],
|
],
|
||||||
providers: [
|
providers: [
|
||||||
Store
|
Store,
|
||||||
|
{
|
||||||
|
provide: ActivatedRoute,
|
||||||
|
useValue: {
|
||||||
|
snapshot: {
|
||||||
|
paramMap: {
|
||||||
|
get: () => null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
],
|
],
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
</h2>
|
</h2>
|
||||||
<!-- traduction de requête-->
|
<!-- traduction de requête-->
|
||||||
<div id="translation_request">
|
<div id="translation_request">
|
||||||
|
<sae-color-display></sae-color-display>
|
||||||
<div class="helper">
|
<div class="helper">
|
||||||
<span>
|
<span>
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
import { Component } from '@angular/core';
|
import {Component} from '@angular/core';
|
||||||
import {TopNavigation} from '../../shared/navigation/top-navigation/top-navigation';
|
import {TranslateTexts} from 'sae-lib/inbox/translate-texts/translate-texts';
|
||||||
import {TranslateTexts} from '../../../../../my-workspace/projects/sae-lib/translate-texts/translate-texts';
|
|
||||||
import {FiltersGroup} from '../../../../../my-workspace/projects/sae-lib/filters/filters-group/filters-group';
|
import {FiltersGroup} from '../../../../../my-workspace/projects/sae-lib/filters/filters-group/filters-group';
|
||||||
import {BottomNavigation} from '../../shared/navigation/bottom-navigation/bottom-navigation';
|
import {BottomNavigation} from '../../shared/navigation/bottom-navigation/bottom-navigation';
|
||||||
|
import {ColorDisplay} from 'sae-lib/colours/color-display/color-display';
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
|
@ -10,7 +10,8 @@ import {BottomNavigation} from '../../shared/navigation/bottom-navigation/bottom
|
||||||
imports: [
|
imports: [
|
||||||
TranslateTexts,
|
TranslateTexts,
|
||||||
FiltersGroup,
|
FiltersGroup,
|
||||||
BottomNavigation
|
BottomNavigation,
|
||||||
|
ColorDisplay
|
||||||
],
|
],
|
||||||
templateUrl: './main.html',
|
templateUrl: './main.html',
|
||||||
styleUrl: './main.scss'
|
styleUrl: './main.scss'
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
<div class="top-navigation">
|
<div class="top-navigation">
|
||||||
|
|
||||||
<nav class="navbar" role="navigation" aria-label="main navigation">
|
<nav aria-label="main navigation" class="navbar" role="navigation">
|
||||||
<div class="navbar-brand">
|
<div class="navbar-brand">
|
||||||
<a class="navbar-item" href="https://cipherbliss.com">
|
<a class="navbar-item" href="https://cipherbliss.com">
|
||||||
|
|
||||||
<img src="safran_logo.svg" alt="logo">
|
<img alt="logo" src="safran_logo.svg">
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false"
|
<a aria-expanded="false" aria-label="menu" class="navbar-burger" data-target="navbarBasicExample"
|
||||||
data-target="navbarBasicExample">
|
role="button">
|
||||||
<span aria-hidden="true"></span>
|
<span aria-hidden="true"></span>
|
||||||
<span aria-hidden="true"></span>
|
<span aria-hidden="true"></span>
|
||||||
<span aria-hidden="true"></span>
|
<span aria-hidden="true"></span>
|
||||||
|
@ -16,19 +16,19 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="navbarBasicExample" class="navbar-menu">
|
<div class="navbar-menu" id="navbarBasicExample">
|
||||||
|
|
||||||
<div class="navbar-start">
|
<div class="navbar-start">
|
||||||
<a class="navbar-item" routerLink="home" routerLinkActive="is-active">
|
<a class="navbar-item" routerLink="home" routerLinkActive="is-active">
|
||||||
<img src="csc_logo.svg" alt="logo">
|
<img alt="logo" src="csc_logo.svg">
|
||||||
CSC Solution Matcher
|
CSC Solution Matcher
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="navbar-end">
|
<div class="navbar-end">
|
||||||
|
|
||||||
<!-- <a class="navbar-item">-->
|
<!-- <a class="navbar-item">-->
|
||||||
<!-- Home-->
|
<!-- Home-->
|
||||||
<!-- </a>-->
|
<!-- </a>-->
|
||||||
<a class="navbar-item is-active">
|
<a class="navbar-item is-active">
|
||||||
<i class="ri-admin-line"></i>
|
<i class="ri-admin-line"></i>
|
||||||
Admin
|
Admin
|
||||||
|
@ -43,7 +43,7 @@
|
||||||
<!-- exit-->
|
<!-- exit-->
|
||||||
<i class="ri-door-line"></i>
|
<i class="ri-door-line"></i>
|
||||||
</a>
|
</a>
|
||||||
<a class="navbar-item">
|
<a class="navbar-item user-account-item">
|
||||||
<!-- user -->
|
<!-- user -->
|
||||||
<i class="ri-user-2-fill"></i>
|
<i class="ri-user-2-fill"></i>
|
||||||
borhène
|
borhène
|
||||||
|
@ -53,5 +53,5 @@
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<!-- <app-alert-box></app-alert-box>-->
|
<!-- <app-alert-box></app-alert-box>-->
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
@use '../../../../styles/variables-barrel' as variables;
|
@use '../../../../styles/variables-barrel' as variables;
|
||||||
.top-navigation{
|
|
||||||
|
.top-navigation {
|
||||||
background: variables.$bg-color-nav;
|
background: variables.$bg-color-nav;
|
||||||
color: white;
|
color: white;
|
||||||
.is-active{
|
|
||||||
color: #7FB8E7;
|
|
||||||
|
|
||||||
|
.is-active, .user-account-item {
|
||||||
|
color: #7FB8E7;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue