diff --git a/src/app/app.module.ts b/src/app/app.module.ts index eff3679..26c2d2f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { NgModule, LOCALE_ID } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; @@ -39,6 +39,9 @@ import { FooterComponent } from './components/footer/footer.component'; import { PageDeleteAccountComponent } from './pages/page-delete-account/page-delete-account.component'; import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component'; import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular"; +import { registerLocaleData } from '@angular/common'; +import localeFr from '@angular/common/locales/fr'; +registerLocaleData(localeFr) @NgModule({ declarations: [ @@ -77,6 +80,7 @@ import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular"; FooterComponent, PageDeleteAccountComponent, PageUpdateAccountComponent, + ], imports: [ BrowserModule, @@ -85,9 +89,10 @@ import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular"; HttpClientModule, FormsModule, AutofocusFixModule.forRoot(), - DayPilotModule + DayPilotModule, ], providers: [ +{provide: LOCALE_ID, useValue: "fr-FR" } ], bootstrap: [AppComponent], diff --git a/src/app/components/card-menu/card-menu.component.html b/src/app/components/card-menu/card-menu.component.html index 44b472f..306f3aa 100644 --- a/src/app/components/card-menu/card-menu.component.html +++ b/src/app/components/card-menu/card-menu.component.html @@ -1,71 +1,3 @@ -
-
-

{{ menu.dateMenu | date: "EEEE, d":"fr" }}

-

{{ menu.repas }}

-

{{ menu.libelle }}

- - -
- - -
-
-
-
- -
- - - -
-
-
-
-
- -
- - - - -
-
@@ -81,28 +13,30 @@
-
+ +
@@ -119,6 +53,83 @@
- + +
+
+
+
+

{{ menu.dateMenu | date: "EEEE":"fr" }}

+
+

Midi

+

{{ menu.repasMidi }}

+
+
+

Soir

+

{{ menu.repasSoir }}

+
+ +
+ + +
+
+ +
+
+ + + +
+
+ +
+
+ +
+ + + +
+
+
+
diff --git a/src/app/components/card-menu/card-menu.component.scss b/src/app/components/card-menu/card-menu.component.scss index 26b0670..75a65c9 100644 --- a/src/app/components/card-menu/card-menu.component.scss +++ b/src/app/components/card-menu/card-menu.component.scss @@ -1,3 +1,36 @@ -.menu { - margin-left: 500px; +.card { + min-height: 22rem; + margin-left: 75px; + margin-bottom: 30px; + border: 1px solid #f7c02b; + border-radius: 8px; + position: relative; + overflow: hidden; + box-shadow: 5px 5px 5px gray; +} + +.tag { + margin-top: 20px; + background-color: #fad980; + margin-left: -8px; + width: 13rem; + border: 1px solid #fad980; + border-radius: 8px; +} +.bi { + margin-top: 10px; +} + +.btn { + margin-top: 10px; + color: black; + box-shadow: 5px 5px 5px gray; +} + +.jour { + font-weight: bolder; + font-size: 25px; +} +.repas { + font-weight: bold; } diff --git a/src/app/components/card-menu/card-menu.component.ts b/src/app/components/card-menu/card-menu.component.ts index 002fd82..497bc5c 100644 --- a/src/app/components/card-menu/card-menu.component.ts +++ b/src/app/components/card-menu/card-menu.component.ts @@ -35,16 +35,6 @@ public upMenuForm : FormGroup; this.listMenus=[]; this.menuForm = new FormGroup({}); this.upMenuForm = this.initForm(); - } - - //Méthode qui initialise les champs du formulaire avec les infos de la BDD - private initForm(menu?: Menu): FormGroup { - return this.fb.group({ - dateMenu: [menu ? menu.dateMenu : ''], - libelle: [menu ? menu.libelle : ''], - repas: [menu ? menu.repas : ''], - - }); } //delete d'un menu @@ -58,15 +48,17 @@ this.menusService.deleteMenu(id_menu)?.subscribe((resp) => { //updateMenu updateMenu(id_menu : number): void { + const dateValue = this.menuForm.value['dateMenuFc']; - const libelleValue = this.menuForm.value['libelleFc']; - const repasValue = this.menuForm.value['repasFc']; + const repasMidiValue = this.menuForm.value['repasMidiFc']; + const repasSoirValue = this.menuForm.value['repasSoirFc']; + const menu: Menu = { dateMenu: dateValue, - libelle: libelleValue, - repas: repasValue, - id: id_menu + repasMidi: repasMidiValue, + repasSoir: repasSoirValue, + id: 0 }; console.log(id_menu); @@ -77,22 +69,33 @@ updateMenu(id_menu : number): void { }); } + //Méthode qui initialise les champs du formulaire avec les infos de la BDD + private initForm(menu?: Menu): FormGroup { + return this.fb.group({ + dateMenu: [menu ? menu.dateMenu : ''], + libelle: [menu ? menu.repasMidi : ''], + repas: [menu ? menu.repasSoir : ''], + + }); + } + //ajout d'un menu saveMenu(): void { const dateValue = this.menuForm.value['dateMenuFc']; - const libelleValue = this.menuForm.value['libelleFc']; - const repasValue = this.menuForm.value['repasFc']; + const repasMidiValue = this.menuForm.value['repasMidiFc']; + const repasSoirValue = this.menuForm.value['repasSoirFc']; + const menu: Menu = { dateMenu: dateValue, - libelle: libelleValue, - repas: repasValue, + repasMidi: repasMidiValue, + repasSoir: repasSoirValue, id: 0 }; - if (menu.dateMenu !=='' && menu.libelle !== '') { + if (menu.dateMenu !=='') { console.log(menu.dateMenu); this.menusService.addMenu(menu)?.subscribe((resp) => { @@ -110,8 +113,10 @@ saveMenu(): void { this.menusService.getMenu()?.subscribe((listMenus: any[])=>{ console.log(listMenus); this.listMenus=listMenus; + }); + this.menuForm = this.fb.group( { dateMenuFc: new FormControl('',[Validators.required]), diff --git a/src/app/models/menu.ts b/src/app/models/menu.ts index 81b7415..9cc627a 100644 --- a/src/app/models/menu.ts +++ b/src/app/models/menu.ts @@ -2,8 +2,8 @@ import { Membre } from './membre'; import { Team } from './team'; export interface Menu { - libelle: string; dateMenu: string; - repas: string; + repasMidi: string; + repasSoir: string; id: number; } diff --git a/src/app/pages/page-menu-semaine/page-menu-semaine.component.html b/src/app/pages/page-menu-semaine/page-menu-semaine.component.html index 8c5ff56..bfb3f29 100644 --- a/src/app/pages/page-menu-semaine/page-menu-semaine.component.html +++ b/src/app/pages/page-menu-semaine/page-menu-semaine.component.html @@ -1,29 +1,12 @@
- +
-
-

Menu de la semaine

-
+
+

Menu de la semaine

+
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
+
diff --git a/src/app/pages/page-menu-semaine/page-menu-semaine.component.scss b/src/app/pages/page-menu-semaine/page-menu-semaine.component.scss index e69de29..8b13789 100644 --- a/src/app/pages/page-menu-semaine/page-menu-semaine.component.scss +++ b/src/app/pages/page-menu-semaine/page-menu-semaine.component.scss @@ -0,0 +1 @@ + diff --git a/src/app/services/token.service.ts b/src/app/services/token.service.ts index 8fe9e3f..25e4cb6 100644 --- a/src/app/services/token.service.ts +++ b/src/app/services/token.service.ts @@ -24,7 +24,7 @@ tokenKey = environment.tokenKey; const token = this.getToken(); if(token) { const decodedToken = jwt_decode(token); - const userId = decodedToken.sub; + const userId = decodedToken.userId; return userId; } else { return null; diff --git a/src/assets/images/pas de virement permanent.png b/src/assets/images/pas de virement permanent.png new file mode 100644 index 0000000..c53cc3c Binary files /dev/null and b/src/assets/images/pas de virement permanent.png differ diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 0a4331f..90149fd 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - apiUrl: 'http://localhost:8080', + apiUrl: 'http://localhost:8088', tokenKey: 'TOKEN-ORGANIZEE', };