isa44.74/organizee-front
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

truc

Browse source
This commit is contained in:
Blandine Bajard 2022-02-25 17:02:25 +01:00
commit 50fd7539ac
21 changed files with 188 additions and 77 deletions

3
src/app/app-routing.module.ts
View file

@ -13,13 +13,13 @@ import { PageForgotPasswordComponent } from './pages/page-forgot-password/page-f
import { PageMenuSemaineComponent } from './pages/page-menu-semaine/page-menu-semaine.component'; import { PageMenuSemaineComponent } from './pages/page-menu-semaine/page-menu-semaine.component';
import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component'; import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component';
import { PageNotFoundComponent } from './pages/page-not-found/page-not-found.component'; import { PageNotFoundComponent } from './pages/page-not-found/page-not-found.component';
import { PageHumeurComponent} from './pages/page-humeur/page-humeur.component';
import { PageRepertoireComponent } from './pages/page-repertoire/page-repertoire.component'; import { PageRepertoireComponent } from './pages/page-repertoire/page-repertoire.component';
import { PageResetPasswordComponent } from './pages/page-reset-password/page-reset-password.component'; import { PageResetPasswordComponent } from './pages/page-reset-password/page-reset-password.component';
import { PageSignupComponent } from './pages/page-signup/page-signup.component'; import { PageSignupComponent } from './pages/page-signup/page-signup.component';
import { PageToDoListComponent } from './pages/page-to-do-list/page-to-do-list.component'; import { PageToDoListComponent } from './pages/page-to-do-list/page-to-do-list.component';
import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component'; import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component';
import { PageUpdateMemberComponent } from './pages/page-update-member/page-update-member.component'; import { PageUpdateMemberComponent } from './pages/page-update-member/page-update-member.component';
import { PageSupportComponent } from './pages/page-support/page-support.component';
import { FooterComponent } from './components/footer/footer.component'; import { FooterComponent } from './components/footer/footer.component';
import { AuthGuard } from './auth.guard'; import { AuthGuard } from './auth.guard';
@ -38,6 +38,7 @@ const routes: Routes = [
{ path: 'repertoire', canActivate: [AuthGuard], component: PageRepertoireComponent }, { path: 'repertoire', canActivate: [AuthGuard], component: PageRepertoireComponent },
{ path: 'reinitialisation-password', component: PageResetPasswordComponent }, { path: 'reinitialisation-password', component: PageResetPasswordComponent },
{ path: 'creation-compte', component: PageSignupComponent }, { path: 'creation-compte', component: PageSignupComponent },
{ path: 'page-support', component: PageSupportComponent},
{ path: 'to-do-list', canActivate: [AuthGuard], component: PageToDoListComponent }, { path: 'to-do-list', canActivate: [AuthGuard], component: PageToDoListComponent },
{ path: 'modifier-membre', canActivate: [AuthGuard], component: PageUpdateMemberComponent }, { path: 'modifier-membre', canActivate: [AuthGuard], component: PageUpdateMemberComponent },
{ path: 'modifier-compte', canActivate: [AuthGuard], component: PageUpdateAccountComponent }, { path: 'modifier-compte', canActivate: [AuthGuard], component: PageUpdateAccountComponent },

4
src/app/app.module.ts
View file

@ -34,7 +34,6 @@ import { PageAjoutContactComponent } from './pages/page-ajout-contact/page-ajout
import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component'; import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component';
import { PageCreationTeamComponent } from './pages/page-creation-team/page-creation-team.component'; import { PageCreationTeamComponent } from './pages/page-creation-team/page-creation-team.component';
import { AutofocusFixModule } from 'ngx-autofocus-fix'; import { AutofocusFixModule } from 'ngx-autofocus-fix';
import { PageHumeurComponent } from './pages/page-humeur/page-humeur.component';
import { FooterComponent } from './components/footer/footer.component'; import { FooterComponent } from './components/footer/footer.component';
import { PageDeleteAccountComponent } from './pages/page-delete-account/page-delete-account.component'; import { PageDeleteAccountComponent } from './pages/page-delete-account/page-delete-account.component';
import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component'; import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component';
@ -66,11 +65,11 @@ registerLocaleData(localeFr)
SigninComponent, SigninComponent,
PageDashboardComponent, PageDashboardComponent,
MeteoComponent, MeteoComponent,
PageHumeurComponent,
CalendrierComponent, CalendrierComponent,
CardMemberComponent, CardMemberComponent,
ToDoListComponent, ToDoListComponent,
TacheComponent, TacheComponent,
CardMenuComponent, CardMenuComponent,
FicheContactComponent, FicheContactComponent,
PaginationComponent, PaginationComponent,
@ -78,7 +77,6 @@ registerLocaleData(localeFr)
PageAjoutContactComponent, PageAjoutContactComponent,
PageModifierContactComponent, PageModifierContactComponent,
PageCreationTeamComponent, PageCreationTeamComponent,
PageHumeurComponent,
FooterComponent, FooterComponent,
PageDeleteAccountComponent, PageDeleteAccountComponent,
PageUpdateAccountComponent, PageUpdateAccountComponent,

23
src/app/components/footer/footer.component.html
View file

@ -1,19 +1,12 @@
<body> <div class="footer text-center" >
<h3>Plan du site</h3>
<p>footer works!</p> <div class="liens">
<h2>PLAN DU SITE</h2> <a routerLink="../accueil" routerLinkActive="active-custom" class="nav-link">Page d'accueil</a>
<a routerLink="../tableau-de-bord" routerLinkActive="active-custom" class="nav-link">Tableau de bord</a>
<a routerLink="../accueil" routerLinkActive="active-custom" class="nav-link">Page d'accueil</a>
<a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">Ma Team</a> <a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">Ma Team</a>
<a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">Répertoire</a> <a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">Répertoire</a>
<a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">To-Do-List</a> <a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">To-Do-List</a>
<a routerLink="../agenda" routerLinkActive="active-custom" class="nav-link">Agenda</a>
<a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">Menus</a> <a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">Menus</a>
<a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">Ma Team</a> </div>
<a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">Répertoire</a> </div>
<a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">To-Do-List</a>
<a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">Menus</a>
</body>

13
src/app/components/footer/footer.component.scss
View file

@ -1,7 +1,10 @@
body { .liens {
background-color: pink; display: flex;
text-align: left; justify-content: center;
color : blue;
font-size: smaller;
} }
h2 {
color : blue .footer {
margin-top: 20px;
} }

22
src/app/components/humeur/humeur.component.html Normal file
View file

@ -0,0 +1,22 @@
<div>
<h2>Mon humeur :</h2>
<p><img src="{{monHumeurLien}}" alt="{{monHumeurTitle}}" *ngIf="monHumeurLien" ></p>
<p>Je modifie mon avatar :</p>
<div class="humeur" *ngFor="let humor of tabHumeur; let i=index">
<img src="{{humor.lien}}" alt="{{humor.title}}" (click)="onChoixHumeur(i)">
</div>
<div >
</div> </div>

9
src/app/pages/page-humeur/page-humeur.component.scss → src/app/components/humeur/humeur.component.scss
View file

@ -1,6 +1,3 @@
p>img { p>img {
width: 85px; width: 85px;
height: 85px; height: 85px;
@ -9,15 +6,13 @@ p>img {
img { img {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.humeur { .humeur {
display: inline; display: inline;
} }
body { div {
background-color: grey; background-color: #87AFC7;
text-align: center; text-align: center;
} }

12
src/app/pages/page-humeur/page-humeur.component.spec.ts → src/app/components/humeur/humeur.component.spec.ts
View file

@ -1,20 +1,20 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { PageHumeurComponent } from './page-humeur.component'; import { HumeurComponent } from './humeur.component';
describe('PageHumeurComponent', () => { describe('HumeurComponent', () => {
let component: PageHumeurComponent; let component: HumeurComponent;
let fixture: ComponentFixture<PageHumeurComponent>; let fixture: ComponentFixture<HumeurComponent>;
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
declarations: [ PageHumeurComponent ] declarations: [ HumeurComponent ]
}) })
.compileComponents(); .compileComponents();
}); });
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(PageHumeurComponent); fixture = TestBed.createComponent(HumeurComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });

19
src/app/pages/page-humeur/page-humeur.component.ts → src/app/components/humeur/humeur.component.ts
View file

@ -1,14 +1,14 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
@Component({ @Component({
selector: 'app-page-humeur', selector: 'app-humeur',
templateUrl: './page-humeur.component.html', templateUrl: './humeur.component.html',
styleUrls: ['./page-humeur.component.scss'] styleUrls: ['./humeur.component.scss']
}) })
export class HumeurComponent implements OnInit {
export class PageHumeurComponent implements OnInit {
monHumeurLien! : string[];
monHumeurLien! : string[];
monHumeurTitle! : string[] ; monHumeurTitle! : string[] ;
@ -17,7 +17,7 @@ export class PageHumeurComponent implements OnInit {
{ title : "Je pleure", lien : "assets/images/emoticon-pleurer.png"}, { title : "Je pleure", lien : "assets/images/emoticon-pleurer.png"},
{ title : "Je suis fatigué", lien : "assets/images/emoticon-fatigue.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 en colère", lien : "assets/images/emoticon-insulter.png"},
{ title : "Je suis malade", lien : "assets/images/emoticon-vomir.png"} ] { title : "Je suis en joie", lien : "assets/images/emoticon-feter.png"} ]
constructor() { } constructor() { }
@ -31,9 +31,6 @@ console.log("humeur titre est : ", this.monHumeurTitle);
console.log("humeur lien est : ", this.monHumeurLien); console.log("humeur lien est : ", this.monHumeurLien);
console.log("index humeur est : ", numero ); console.log("index humeur est : ", numero );
}
} }
}

11
src/app/pages/page-ajout-contact/page-ajout-contact.component.html
View file

@ -109,6 +109,7 @@
<label for="floatingInput">Adresse email</label> <label for="floatingInput">Adresse email</label>
</div> </div>
<<<<<<< HEAD
<div class="form-floating"> <div class="form-floating">
<input <input
type="date" type="date"
@ -132,6 +133,16 @@
/> />
<label for="floatingInputfirstName">Adresse</label> <label for="floatingInputfirstName">Adresse</label>
</div> </div>
=======
<div class="form-floating">
<input type="text"
class="form-control"
id="floatingInputTelephone"
placeholder=""
name="telephone"
formControlName="telephoneFc">
<label for="floatingInputfirstName">Téléphone</label>
>>>>>>> a04bef695410a222414a12ccffad18d2706be72b
<button <button
class="w-100 btn btn-lg btn-secondary" class="w-100 btn btn-lg btn-secondary"

4
src/app/pages/page-dashboard/page-dashboard.component.html
View file

@ -1,5 +1,7 @@
<app-header></app-header> <app-header></app-header>
<app-side-bar></app-side-bar> <app-side-bar></app-side-bar>
<app-humeur></app-humeur>
<app-deconnexion></app-deconnexion> <app-deconnexion></app-deconnexion>
<div class="container"> <div class="container">
@ -37,3 +39,5 @@
</div> </div>
</div> </div>
<app-footer></app-footer>

8
src/app/pages/page-dashboard/page-dashboard.component.ts
View file

@ -33,11 +33,5 @@ export class PageDashboardComponent implements OnInit {
}); });
} }
// récuperer l id du membre s=qui est connecté
//recuperer l id dans le token grace au user id du getCurrentMembreId
// placer ce userId dans la methode getMembreId a la place de l id
//********************************************************************
} }

22
src/app/pages/page-humeur/page-humeur.component.html
View file

@ -1,22 +0,0 @@
<body>
<h2>Mon humeur :</h2>
<p><img src="{{monHumeurLien}}" *ngIf="monHumeurLien" ></p>
<p>Je modifie mon avatar :</p>
<div class="humeur" *ngFor="let humor of tabHumeur; let i=index">
<img src="{{humor.lien}}" alt="{{humor.title}}" (click)="onChoixHumeur(i)">
</div>
<div >
</div> </body>

1
src/app/pages/page-not-found/page-not-found.component.spec.ts
View file

@ -23,3 +23,4 @@ describe('PageNotFoundComponent', () => {
expect(component).toBeTruthy(); expect(component).toBeTruthy();
}); });
}); });

31
src/app/pages/page-support/page-support.component.html Normal file
View file

@ -0,0 +1,31 @@
<!-- <div>
<app-header></app-header>
<app-side-bar></app-side-bar>
</div> -->
<div>
<h2>Demande support</h2>
<form action="/demande_support" method="post">
<label for="name">Nom :</label>
<div>
<input type="text" id="name" value="Votre nom" name="user_name">
</div>
<label for="mail">E-mail :</label>
<div>
<input type="email" id="mail" name="user_mail" value="Votre adresse mail">
</div>
<label for="msg">Message :</label>
<div>
<textarea id="msg" name="user_message">Formulez votre demande ici</textarea>
</div>
<div class="button">
<button class="btn btn-primary">Envoyez votre message</button>
<button type="button" class="btn btn-danger">Effacer</button>
</div>
</form>
</div>

39
src/app/pages/page-support/page-support.component.scss Normal file
View file

@ -0,0 +1,39 @@
form {
background-color: rgb(184, 202, 235);
width: 600px;
border: 3px solid blue;
margin: 0 auto;
border-radius: 1em;
padding:3em;
}
input, textarea {
width: 500px;
color :rgb(153, 171, 208)
}
button {
margin-left: .9em;
}
h2{
text-align: center;
color : blue;
}
label {
color : rgb(65, 47, 221);
text-align: left;
width: 90px;
}
textarea {
height: 8em;
color :rgb(153, 171, 208)
}
.button {
text-align: center;
}

25
src/app/pages/page-support/page-support.component.spec.ts Normal file
View file

@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { PageSupportComponent } from './page-support.component';
describe('PageSupportComponent', () => {
let component: PageSupportComponent;
let fixture: ComponentFixture<PageSupportComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ PageSupportComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(PageSupportComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

19
src/app/pages/page-support/page-support.component.ts Normal file
View file

@ -0,0 +1,19 @@
import { Component, OnInit } from '@angular/core';
//DRIVEN FORM
@Component({
selector: 'app-page-support',
templateUrl: './page-support.component.html',
styleUrls: ['./page-support.component.scss']
})
export class PageSupportComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

BIN
src/assets/images/emoticon-feter.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 75 KiB

BIN
src/assets/images/emoticon-heureux.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

(image error) Size: 443 KiB

After

(image error) Size: 123 KiB

BIN
src/assets/images/emoticon-heureux2.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 443 KiB

BIN
src/assets/images/emoticon-vomir.png
View file

Binary file not shown.
Side by side

Before

(image error) Size: 54 KiB