Skip to content
Snippets Groups Projects
Commit 729bb3c2 authored by FORESTIER Fabien's avatar FORESTIER Fabien
Browse files

Edit routing, add static Pages, remode data param in root and pass slug as...

Edit routing, add static Pages, remode data param in root and pass slug as input for wordpress-page component
parent c5ec60ea
Branches
No related tags found
No related merge requests found
Showing
with 215 additions and 8 deletions
<div class="container footer no-margins-container"> <div class="container footer no-margins-container">
<div class="row justify-content-center align-items-center"> <div class="row justify-content-center align-items-center">
<div class="col-auto"> <div class="col-auto">
<a routerLink="/" i18n="@@footer.accessibility">Accessibility</a> <a routerLink="/accessibilite" i18n="@@footer.accessibility">Accessibility</a>
<a class="left-border" routerLink="/" i18n="@@footer.sitemap">Site Map</a> <a class="left-border" routerLink="/plan-du-site" i18n="@@footer.sitemap">Site Map</a>
<a class="left-border" routerLink="/" i18n="@@footer.notices">Legal Notices</a> <a class="left-border" routerLink="/mentions-legales" i18n="@@footer.notices">Legal Notices</a>
<a class="left-border" routerLink="/" i18n="@@footer.contactus">Contact Us</a> <a class="left-border" routerLink="/" i18n="@@footer.contactus">Contact Us</a>
</div> </div>
</div> </div>
......
<div class="container no-margins-container"> <div class="container no-margins-container">
<div class="row justify-content-between header-logo"> <div class="row justify-content-between header-logo">
<div class="col-auto"> <div class="col-auto">
<a routerLink="/research"> <a routerLink="/recherche">
<img class="logo-smart-data-grand-lyon" src="./assets/img/logo-smart-data-grand-lyon.png"> <img class="logo-smart-data-grand-lyon" src="./assets/img/logo-smart-data-grand-lyon.png">
</a> </a>
</div> </div>
...@@ -11,9 +11,15 @@ ...@@ -11,9 +11,15 @@
</div> </div>
<div class="row justify-content-between header-navbar"> <div class="row justify-content-between header-navbar">
<div class="col-auto"> <div class="col-auto">
<a routerLink="/research" routerLinkActive="active-link" i18n="@@header.home"> <a class="header-links" routerLink="/accueil" routerLinkActive="active-link" i18n="@@header.home">
Home Home
</a> </a>
<a class="header-links" routerLink="/recherche" routerLinkActive="active-link" i18n="@@header.data">
Data
</a>
<a class="header-links" routerLink="/demarche" routerLinkActive="active-link" i18n="@@header.approach">
Approach
</a>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<img class="flag-logo" src="./assets/img/uk-flag.png" title="English" i18n-title="@@header.logoEnglish" (click)="changeLanguage('en')"> <img class="flag-logo" src="./assets/img/uk-flag.png" title="English" i18n-title="@@header.logoEnglish" (click)="changeLanguage('en')">
......
...@@ -15,4 +15,12 @@ ...@@ -15,4 +15,12 @@
.flag-logo { .flag-logo {
width: 20px; width: 20px;
cursor: pointer; cursor: pointer;
}
.header-links {
margin-right: 10px;
}
.header-links:last-of-type {
margin-right: 0px;
} }
\ No newline at end of file
...@@ -2,12 +2,33 @@ import { NgModule } from '@angular/core'; ...@@ -2,12 +2,33 @@ import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { MainComponent } from './components/main/main.component'; import { MainComponent } from './components/main/main.component';
import { MetadataListComponent } from '../geosource/components/metadata-list/metadata-list.component'; import { MetadataListComponent } from '../geosource/components/metadata-list/metadata-list.component';
import { AccessibilityComponent, SiteMapComponent, LegalMentionsComponent, HomeComponent, ApproachComponent } from '../editorialisation/components';
const routes: Routes = [ const routes: Routes = [
{ {
path: '', path: '',
redirectTo: 'research', redirectTo: 'accueil',
pathMatch: 'full' pathMatch: 'full'
},
{
path: 'accueil',
component: HomeComponent
},
{
path: 'demarche',
component: ApproachComponent,
},
{
path: 'accessibilite',
component: AccessibilityComponent,
},
{
path: 'plan-du-site',
component: SiteMapComponent,
},
{
path: 'mentions-legales',
component: LegalMentionsComponent,
} }
]; ];
......
<app-wordpress-page [slug]="slug"></app-wordpress-page>
\ No newline at end of file
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { AccessibilityComponent } from './accessibility.component';
describe('AccessibilityComponent', () => {
let component: AccessibilityComponent;
let fixture: ComponentFixture<AccessibilityComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ AccessibilityComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(AccessibilityComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
import { environment } from '../../../../environments/environment';
@Component({
selector: 'app-accessibility',
templateUrl: './accessibility.component.html',
styleUrls: ['./accessibility.component.scss']
})
export class AccessibilityComponent implements OnInit {
slug: string;
constructor() {
this.slug = environment.wordpressStaticPages.accessibility;
}
ngOnInit() {
}
}
<app-wordpress-page [slug]="slug"></app-wordpress-page>
\ No newline at end of file
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ApproachComponent } from './approach.component';
describe('ApproachComponent', () => {
let component: ApproachComponent;
let fixture: ComponentFixture<ApproachComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ApproachComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ApproachComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
import { environment } from '../../../../environments/environment';
@Component({
selector: 'app-approach',
templateUrl: './approach.component.html',
styleUrls: ['./approach.component.scss']
})
export class ApproachComponent implements OnInit {
slug: string;
constructor() {
this.slug = environment.wordpressStaticPages.approach;
}
ngOnInit() {
}
}
<div class="container">
<h1>Home page</h1>
</div>
\ No newline at end of file
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { HomeComponent } from './home.component';
describe('HomeComponent', () => {
let component: HomeComponent;
let fixture: ComponentFixture<HomeComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ HomeComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(HomeComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
styleUrls: ['./home.component.scss']
})
export class HomeComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
import { WordpressPageComponent } from './wordpress-page/wordpress-page.component'; import { WordpressPageComponent } from './wordpress-page/wordpress-page.component';
import { HomeComponent } from './home/home.component';
import { LegalMentionsComponent } from './legal-mentions/legal-mentions.component';
import { AccessibilityComponent } from './accessibility/accessibility.component';
import { SiteMapComponent } from './site-map/site-map.component';
import { ApproachComponent } from './approach/approach.component';
export * from './wordpress-page/wordpress-page.component'; export * from './wordpress-page/wordpress-page.component';
export * from './home/home.component';
export * from './accessibility/accessibility.component';
export * from './site-map/site-map.component';
export * from './approach/approach.component';
export * from './legal-mentions/legal-mentions.component';
export const EditorialisationComponents = [ export const EditorialisationComponents = [
WordpressPageComponent, WordpressPageComponent,
HomeComponent,
LegalMentionsComponent,
AccessibilityComponent,
SiteMapComponent,
ApproachComponent
]; ];
<app-wordpress-page [slug]="slug"></app-wordpress-page>
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { LegalMentionsComponent } from './legal-mentions.component';
describe('LegalMentionsComponent', () => {
let component: LegalMentionsComponent;
let fixture: ComponentFixture<LegalMentionsComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ LegalMentionsComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(LegalMentionsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment