diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 5475c14..77933ae 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -18,6 +18,7 @@ import { PageResetPasswordComponent } from './pages/page-reset-password/page-res import { PageSignupComponent } from './pages/page-signup/page-signup.component'; import { PageToDoListComponent } from './pages/page-to-do-list/page-to-do-list.component'; import { PageUpdateMemberComponent } from './pages/page-update-member/page-update-member.component'; +import { FooterComponent } from './components/footer/footer.component'; const routes: Routes = [ { path: '', redirectTo: 'accueil', pathMatch: 'full' }, @@ -38,6 +39,7 @@ const routes: Routes = [ { path: 'ajouter-contact', component: PageAjoutContactComponent }, { path: 'creation-team', component: PageCreationTeamComponent }, { path: 'humeur', component: PageHumeurComponent }, + { path: 'footer', component: FooterComponent}, { path: '**', component: PageNotFoundComponent }, ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 036d24f..42495ae 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -37,6 +37,7 @@ import { PageModifierContactComponent } from './pages/page-modifier-contact/page import { PageCreationTeamComponent } from './pages/page-creation-team/page-creation-team.component'; import { AutofocusFixModule } from 'ngx-autofocus-fix'; import { PageHumeurComponent } from './pages/page-humeur/page-humeur.component'; +import { FooterComponent } from './components/footer/footer.component'; @@ -75,6 +76,7 @@ import { PageHumeurComponent } from './pages/page-humeur/page-humeur.component'; PageModifierContactComponent, PageCreationTeamComponent, PageHumeurComponent, + FooterComponent, ], imports: [ BrowserModule, diff --git a/src/app/components/footer/footer.component.html b/src/app/components/footer/footer.component.html new file mode 100644 index 0000000..58bdfe9 --- /dev/null +++ b/src/app/components/footer/footer.component.html @@ -0,0 +1,19 @@ + + +

footer works!

+

PLAN DU SITE

+ + + +Page d'accueil +Ma Team +Répertoire +To-Do-List +Menus +Ma Team +Répertoire +To-Do-List +Menus + + + \ No newline at end of file diff --git a/src/app/components/footer/footer.component.scss b/src/app/components/footer/footer.component.scss new file mode 100644 index 0000000..ab74bd8 --- /dev/null +++ b/src/app/components/footer/footer.component.scss @@ -0,0 +1,7 @@ +body { + background-color: pink; + text-align: left; +} +h2 { + color : blue +} \ No newline at end of file diff --git a/src/app/components/footer/footer.component.spec.ts b/src/app/components/footer/footer.component.spec.ts new file mode 100644 index 0000000..a3c4af9 --- /dev/null +++ b/src/app/components/footer/footer.component.spec.ts @@ -0,0 +1,25 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { FooterComponent } from './footer.component'; + +describe('FooterComponent', () => { + let component: FooterComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ FooterComponent ] + }) + .compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(FooterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/footer/footer.component.ts b/src/app/components/footer/footer.component.ts new file mode 100644 index 0000000..c7a7ec5 --- /dev/null +++ b/src/app/components/footer/footer.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-footer', + templateUrl: './footer.component.html', + styleUrls: ['./footer.component.scss'] +}) +export class FooterComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/components/side-bar/side-bar.component.html b/src/app/components/side-bar/side-bar.component.html index 2d7f65e..56d5cb0 100644 --- a/src/app/components/side-bar/side-bar.component.html +++ b/src/app/components/side-bar/side-bar.component.html @@ -5,7 +5,7 @@ Répertoire To-Do-List Menus - Agenda + diff --git a/src/app/pages/page-humeur/page-humeur.component.html b/src/app/pages/page-humeur/page-humeur.component.html index eab3fdc..53f7bdd 100644 --- a/src/app/pages/page-humeur/page-humeur.component.html +++ b/src/app/pages/page-humeur/page-humeur.component.html @@ -1,25 +1,22 @@ -

page-humeur works!

- + + + +

Mon humeur :

-****************************************** - -choix de mon humeur - - - - -

Je choisis mon humeur :

-
- {{i}} - {{humor.title}}{{humor.title}} +

+ +

Je modifie mon avatar :

+ + +
+ {{humor.title}}
+
-
\ No newline at end of file +
\ No newline at end of file diff --git a/src/app/pages/page-humeur/page-humeur.component.scss b/src/app/pages/page-humeur/page-humeur.component.scss index e38057c..b5161d8 100644 --- a/src/app/pages/page-humeur/page-humeur.component.scss +++ b/src/app/pages/page-humeur/page-humeur.component.scss @@ -1,12 +1,23 @@ + +p>img { + width: 250px; + height: 70px; +} + img { width: 50px; height: 50px; + + } -p>img { - width: 70px; - height: 70px; +.humeur { +display: inline; +} +body { + background-color: grey; +text-align: center; } \ No newline at end of file diff --git a/src/app/pages/page-humeur/page-humeur.component.ts b/src/app/pages/page-humeur/page-humeur.component.ts index 586eb8a..7ca9b3d 100644 --- a/src/app/pages/page-humeur/page-humeur.component.ts +++ b/src/app/pages/page-humeur/page-humeur.component.ts @@ -15,6 +15,7 @@ export class PageHumeurComponent implements OnInit { tabHumeur= [ { title : "Je vais bien", lien : "assets/images/emoticon-heureux.png"}, { title : "Je pleure", lien : "assets/images/emoticon-pleurer.png"}, + { title : "Je suis fatigué", lien : "assets/images/emoticon-fatigue.png"}, { title : "Je suis en colère", lien : "assets/images/emoticon-insulter.png"}, { title : "Je suis malade", lien : "assets/images/emoticon-vomir.png"} ] diff --git a/src/assets/images/emoticon-fatigue.png b/src/assets/images/emoticon-fatigue.png new file mode 100644 index 0000000..c43712c Binary files /dev/null and b/src/assets/images/emoticon-fatigue.png differ diff --git a/src/assets/images/emoticon-heureux.png b/src/assets/images/emoticon-heureux.png index c7a9c9c..8aab547 100644 Binary files a/src/assets/images/emoticon-heureux.png and b/src/assets/images/emoticon-heureux.png differ