Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into aline
This commit is contained in:
AlineRinquin
commit
e6f59fb84c
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "organizee-front",
|
||||
"version": "0.0.0",
|
||||
"lockfileVersion": 1,
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
|
|
@ -13371,7 +13371,8 @@
|
|||
"version": "13.1.4",
|
||||
"resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-13.1.4.tgz",
|
||||
"integrity": "sha512-s8gzjG2nYHawFhlkHMkQWYrocHkBI1nF6T9K/oCSTIsq6kvTv//Ahno2VdBSgVq8uMnpv1TymvX0nFC4Dgn1HA==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"@nodelib/fs.scandir": {
|
||||
"version": "2.1.5",
|
||||
|
|
@ -13774,7 +13775,8 @@
|
|||
"version": "1.8.0",
|
||||
"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
|
||||
"integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"adjust-sourcemap-loader": {
|
||||
"version": "4.0.0",
|
||||
|
|
@ -13854,7 +13856,8 @@
|
|||
"version": "3.5.2",
|
||||
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
|
||||
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"ansi-colors": {
|
||||
"version": "4.1.1",
|
||||
|
|
@ -14173,7 +14176,13 @@
|
|||
"bootstrap": {
|
||||
"version": "5.1.3",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
|
||||
"integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q=="
|
||||
"integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
|
||||
"requires": {}
|
||||
},
|
||||
"bootstrap-icons": {
|
||||
"version": "1.8.1",
|
||||
"resolved": "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.8.1.tgz",
|
||||
"integrity": "sha512-IXUqislddPJfwq6H+2nTkHyr9epO9h6u1AG0OZCx616w+TgzeoCjfmI3qJMQqt1J586gN2IxzB4M99Ip4sTZ1w=="
|
||||
},
|
||||
"bootstrap-icons": {
|
||||
"version": "1.8.1",
|
||||
|
|
@ -14371,7 +14380,8 @@
|
|||
"version": "5.2.2",
|
||||
"resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz",
|
||||
"integrity": "sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"clean-stack": {
|
||||
"version": "2.2.0",
|
||||
|
|
@ -14855,7 +14865,8 @@
|
|||
"version": "6.0.2",
|
||||
"resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.2.tgz",
|
||||
"integrity": "sha512-gv0KQBEM+q/XdoKyznovq3KW7ocO7k+FhPP+hQR1MenJdu0uPGS6IZa9PzlbqBeS6XcZJNAoqoFxlAUW461CrA==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"css-select": {
|
||||
"version": "4.2.1",
|
||||
|
|
@ -15199,7 +15210,8 @@
|
|||
"version": "8.2.3",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
|
||||
"integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -16120,7 +16132,8 @@
|
|||
"version": "5.1.0",
|
||||
"resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
|
||||
"integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"ieee754": {
|
||||
"version": "1.2.1",
|
||||
|
|
@ -16810,7 +16823,8 @@
|
|||
"version": "1.7.0",
|
||||
"resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz",
|
||||
"integrity": "sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"karma-source-map-support": {
|
||||
"version": "1.4.0",
|
||||
|
|
@ -18015,7 +18029,8 @@
|
|||
"version": "8.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz",
|
||||
"integrity": "sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-custom-properties": {
|
||||
"version": "12.1.3",
|
||||
|
|
@ -18084,13 +18099,15 @@
|
|||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
|
||||
"integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-gap-properties": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.2.tgz",
|
||||
"integrity": "sha512-EaMy/pbxtQnKDsnbEjdqlkCkROTQZzolcLKgIE+3b7EuJfJydH55cZeHfm+MtIezXRqhR80VKgaztO/vHq94Fw==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-image-set-function": {
|
||||
"version": "4.0.4",
|
||||
|
|
@ -18116,7 +18133,8 @@
|
|||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
|
||||
"integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-lab-function": {
|
||||
"version": "4.0.3",
|
||||
|
|
@ -18142,19 +18160,22 @@
|
|||
"version": "5.0.3",
|
||||
"resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.3.tgz",
|
||||
"integrity": "sha512-P5NcHWYrif0vK8rgOy/T87vg0WRIj3HSknrvp1wzDbiBeoDPVmiVRmkown2eSQdpPveat/MC1ess5uhzZFVnqQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-media-minmax": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
|
||||
"integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-modules-extract-imports": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
|
||||
"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-modules-local-by-default": {
|
||||
"version": "4.0.0",
|
||||
|
|
@ -18198,13 +18219,15 @@
|
|||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.2.tgz",
|
||||
"integrity": "sha512-odBMVt6PTX7jOE9UNvmnLrFzA9pXS44Jd5shFGGtSHY80QCuJF+14McSy0iavZggRZ9Oj//C9vOKQmexvyEJMg==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-page-break": {
|
||||
"version": "3.0.4",
|
||||
"resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
|
||||
"integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-place": {
|
||||
"version": "7.0.3",
|
||||
|
|
@ -18269,7 +18292,8 @@
|
|||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
|
||||
"integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"postcss-selector-not": {
|
||||
"version": "5.0.0",
|
||||
|
|
@ -19182,17 +19206,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"string-width": {
|
||||
"version": "4.2.3",
|
||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
|
||||
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"emoji-regex": "^8.0.0",
|
||||
"is-fullwidth-code-point": "^3.0.0",
|
||||
"strip-ansi": "^6.0.1"
|
||||
}
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "1.3.0",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
|
||||
|
|
@ -19210,6 +19223,17 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"string-width": {
|
||||
"version": "4.2.3",
|
||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
|
||||
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"emoji-regex": "^8.0.0",
|
||||
"is-fullwidth-code-point": "^3.0.0",
|
||||
"strip-ansi": "^6.0.1"
|
||||
}
|
||||
},
|
||||
"strip-ansi": {
|
||||
"version": "6.0.1",
|
||||
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
|
||||
|
|
@ -19940,7 +19964,8 @@
|
|||
"version": "8.4.2",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz",
|
||||
"integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==",
|
||||
"dev": true
|
||||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"y18n": {
|
||||
"version": "5.0.8",
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ import { FicheContactComponent } from './components/fiche-contact/fiche-contact.
|
|||
import { PaginationComponent } from './components/pagination/pagination.component';
|
||||
import { CreneauComponent } from './components/creneau/creneau.component';
|
||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||
import { HttpClientModule } from '@angular/common/http';
|
||||
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
||||
import { PageAjoutContactComponent } from './pages/page-ajout-contact/page-ajout-contact.component';
|
||||
import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component';
|
||||
import { PageCreationTeamComponent } from './pages/page-creation-team/page-creation-team.component';
|
||||
|
|
@ -89,7 +89,9 @@ import { EmoticonComponent } from './emoticon/emoticon.component';
|
|||
FormsModule,
|
||||
AutofocusFixModule.forRoot(),
|
||||
],
|
||||
providers: [],
|
||||
providers: [
|
||||
|
||||
],
|
||||
bootstrap: [AppComponent],
|
||||
})
|
||||
export class AppModule {}
|
||||
|
|
|
|||
|
|
@ -1 +1,5 @@
|
|||
<p>card-menu works!</p>
|
||||
<div class="menu">
|
||||
<div *ngFor="let menu of listMenus">
|
||||
<p>{{ menu.dateMenu }} {{ menu.libelle }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,3 @@
|
|||
.menu {
|
||||
margin-left: 500px;
|
||||
}
|
||||
|
|
@ -1,4 +1,9 @@
|
|||
import { Component, OnInit } from '@angular/core';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { Menu } from 'src/app/models/menu';
|
||||
import { MenusService } from 'src/app/services/menus.service';
|
||||
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-card-menu',
|
||||
|
|
@ -6,10 +11,23 @@ import { Component, OnInit } from '@angular/core';
|
|||
styleUrls: ['./card-menu.component.scss']
|
||||
})
|
||||
export class CardMenuComponent implements OnInit {
|
||||
public listMenus:any[];
|
||||
|
||||
constructor() { }
|
||||
constructor(
|
||||
private menusService: MenusService,
|
||||
private router: Router,
|
||||
private route: ActivatedRoute
|
||||
) {
|
||||
this.listMenus=[];
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
//affichage des menus d'une team
|
||||
this.menusService.getMenu()?.subscribe((listMenus: any[])=>{
|
||||
console.log(listMenus);
|
||||
this.listMenus=listMenus;
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +1,55 @@
|
|||
<input
|
||||
type="text"
|
||||
class="todo-title"
|
||||
placeholder="Titre"
|
||||
value = "{{todo.nom}}"
|
||||
/>
|
||||
<div>
|
||||
<button (click)="effacerList()">Effacer la To Do List</button>
|
||||
</div>
|
||||
<input
|
||||
type="text"
|
||||
class="todo-input"
|
||||
placeholder="Ajoute une nouvelle Tâche"
|
||||
placeholder="+ Nouvelle Tâche"
|
||||
[(ngModel)]="todoTitle"
|
||||
(keyup.enter)="addTitle()"
|
||||
(keyup.enter)="addTache(todo.id)"
|
||||
/>
|
||||
|
||||
<div class="element" *ngFor="let todo of todosFilter()">
|
||||
{{todo}}
|
||||
|
||||
<div class="element" *ngFor="let tache of todo.taches">
|
||||
<div class="element-gauche">
|
||||
<input
|
||||
type="checkbox"
|
||||
[(ngModel)]="todo.completed"
|
||||
(change)="doneEdit(todo)"
|
||||
[(ngModel)]="tache.etat"
|
||||
(change)="doneEdit(tache)"
|
||||
checked="checked"
|
||||
/>
|
||||
<div
|
||||
*ngIf="!todo.editing; else editingTodo"
|
||||
*ngIf="!tache.editing; else editingTodo"
|
||||
class="nomTache"
|
||||
[ngClass]="{ completed: todo.completed }"
|
||||
(dblclick)="modifier(todo)"
|
||||
[ngClass]="{ completed: tache.etat }"
|
||||
(dblclick)="modifier(tache)"
|
||||
>
|
||||
{{ todo.title }}
|
||||
{{ tache.texte }}
|
||||
</div>
|
||||
<ng-template #editingTodo>
|
||||
<input
|
||||
type="text"
|
||||
class="modifier-element"
|
||||
[(ngModel)]="todo.title"
|
||||
(blur)="doneEdit(todo)"
|
||||
(keyup.enter)="doneEdit(todo)"
|
||||
(keyup.esc)="cancelEdit(todo)"
|
||||
[(ngModel)]="tache.texte"
|
||||
(blur)="doneEdit(tache)"
|
||||
(keyup.enter)="doneEdit(tache)"
|
||||
(keyup.esc)="cancelEdit(tache)"
|
||||
autofocus
|
||||
/>
|
||||
</ng-template>
|
||||
</div>
|
||||
<div class="deleteTache" (click)="deleteTodo(todo.id)">×</div>
|
||||
<div class="deleteTache" (click)="deleteTodo(tache.id)">×</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="extra-container">
|
||||
<div>
|
||||
<label
|
||||
|
|
@ -48,7 +63,7 @@
|
|||
<div>{{ toDoRest() }} tâches</div>
|
||||
</div>
|
||||
<div class="extra-container">
|
||||
<div>
|
||||
<!-- <div>
|
||||
<button [ngClass]="{ active: filter === 'tous' }" (click)="filter = 'tous'">
|
||||
Toutes la To Do List
|
||||
</button>
|
||||
|
|
@ -65,8 +80,6 @@
|
|||
Terminées
|
||||
</button>
|
||||
</div>
|
||||
-->
|
||||
|
||||
<div>
|
||||
<button (click)="effacerList()">Effacer la To Do List</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,15 @@
|
|||
.todo-title {
|
||||
width: 25%;
|
||||
padding: 10px 18px;
|
||||
font-size: xx-large;
|
||||
margin-bottom: 16px;
|
||||
&:focus {
|
||||
outline: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.todo-input {
|
||||
width: 100%;
|
||||
width: 20%;
|
||||
padding: 10px 18px;
|
||||
font-size: 18px;
|
||||
margin-bottom: 16px;
|
||||
|
|
@ -7,6 +17,8 @@
|
|||
outline: 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.element {
|
||||
margin-bottom: 12px;
|
||||
display: flex;
|
||||
|
|
@ -16,6 +28,7 @@
|
|||
}
|
||||
|
||||
.deleteTache {
|
||||
width: 75%;
|
||||
cursor: pointer;
|
||||
margin-left: 14px;
|
||||
&:hover {
|
||||
|
|
@ -40,11 +53,12 @@
|
|||
margin-left: 12px;
|
||||
width: 100%;
|
||||
padding: 10px;
|
||||
border: 1px solid #ccc; //override defaults
|
||||
border: 1px solid rgb(204, 204, 204); //override defaults
|
||||
font-family: 'Avenir', Helvetica, Arial, sans-serif;
|
||||
|
||||
&:focus {
|
||||
outline: none;
|
||||
background-color:aquamarine;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -53,15 +67,6 @@
|
|||
color: grey;
|
||||
}
|
||||
|
||||
.extra-container {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-size: 16px;
|
||||
border-top: 1px solid lightgrey;
|
||||
padding-top: 14px;
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
button {
|
||||
font-size: 14px;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
import { Component, OnInit } from '@angular/core';
|
||||
import { Todo } from 'src/app/interfaces/todo';
|
||||
import { Component, Input, OnInit } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
import { Tache} from 'src/app/models/tache';
|
||||
import { ToDoList} from 'src/app/models/to-do-list';
|
||||
import { TodoService } from 'src/app/services/todo.service';
|
||||
import { TodoList } from 'src/app/todo-list';
|
||||
|
||||
@Component({
|
||||
selector: 'app-to-do-list',
|
||||
|
|
@ -7,54 +11,72 @@ import { Todo } from 'src/app/interfaces/todo';
|
|||
styleUrls: ['./to-do-list.component.scss'],
|
||||
})
|
||||
export class ToDoListComponent implements OnInit {
|
||||
@Input() todo!: ToDoList;
|
||||
public beforeEditCache: string;
|
||||
public todos: Todo[];
|
||||
//public todos: ToDoList[];
|
||||
public todoTitle: string;
|
||||
public idTodo: number;
|
||||
public filter : string;
|
||||
public casesRestantes : boolean;
|
||||
public masterSelected: boolean;
|
||||
public result : any;
|
||||
public tache : Tache [];
|
||||
|
||||
constructor() {
|
||||
constructor(private TodoService : TodoService, private router: Router ) {
|
||||
this.beforeEditCache = '';
|
||||
this.todos = [];
|
||||
//this.todos = [];
|
||||
this.todoTitle = '';
|
||||
this.idTodo = 0;
|
||||
this.filter ='';
|
||||
this.casesRestantes=true;
|
||||
this.masterSelected= false;
|
||||
this.tache = [];
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
//this.refreshTodo();
|
||||
this.beforeEditCache = '';
|
||||
this.casesRestantes=true;
|
||||
this.filter='tous';
|
||||
this.idTodo = 4;
|
||||
this.todoTitle = '';
|
||||
this.todos = [
|
||||
/* this.todos = [
|
||||
{
|
||||
id: 1,
|
||||
title: 'Finish Angular Screencast',
|
||||
completed: false,
|
||||
texte: 'Finish Angular Screencast',
|
||||
etat: false,
|
||||
editing: false,
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
title: 'Take over world',
|
||||
completed: false,
|
||||
texte: 'Take over world',
|
||||
etat: false,
|
||||
editing: false,
|
||||
},
|
||||
{
|
||||
id: 3,
|
||||
title: 'One more thing',
|
||||
completed: false,
|
||||
texte: 'One more thing',
|
||||
etat: false,
|
||||
editing: false,
|
||||
},
|
||||
];
|
||||
]; */
|
||||
}
|
||||
//ajouter tache
|
||||
addTitle(): void {
|
||||
if (this.todoTitle.trim().length === 0) {
|
||||
|
||||
addTache(idTodoList : number) {//idTodoList id que la todoList que l'on récupère
|
||||
console.log(idTodoList);
|
||||
const tache: Tache = {
|
||||
id : 0,
|
||||
texte: this.todoTitle,
|
||||
etat : false,
|
||||
editing : false,
|
||||
|
||||
}
|
||||
console.log(this.tache);
|
||||
this.TodoService.addTache(tache,idTodoList).subscribe((resp)=>{
|
||||
window.location.reload();
|
||||
})
|
||||
/* if (this.todoTitle.trim().length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -65,55 +87,65 @@ export class ToDoListComponent implements OnInit {
|
|||
editing: false,
|
||||
});
|
||||
this.todoTitle = '';
|
||||
this.idTodo++;
|
||||
this.idTodo++; */
|
||||
}
|
||||
/* if (contact.nom !== '') {
|
||||
this.repertoireService.addContact(contact).subscribe((resp) => {
|
||||
this.router.navigate(['repertoire/']);
|
||||
}); */
|
||||
|
||||
|
||||
//modifier la tâche
|
||||
modifier(todo: Todo): void {
|
||||
this.beforeEditCache = todo.title;
|
||||
todo.editing = true;
|
||||
modifier(tache: Tache): void {
|
||||
this.beforeEditCache = tache.texte;
|
||||
tache.editing = true;
|
||||
}
|
||||
|
||||
// modifier l'apparence focus
|
||||
doneEdit(todo: Todo): void {
|
||||
if (todo.title.trim().length === 0) {
|
||||
todo.title = this.beforeEditCache;
|
||||
doneEdit(tache: Tache): void {
|
||||
if (tache.texte.trim().length === 0) {
|
||||
tache.texte = this.beforeEditCache;
|
||||
}
|
||||
this.casesRestantes= this.casesQuiRestes();
|
||||
todo.editing = false;
|
||||
tache.editing = false;
|
||||
}
|
||||
|
||||
// annuler la modification
|
||||
cancelEdit(todo: Todo): void {
|
||||
todo.title = this.beforeEditCache;
|
||||
todo.editing = false;
|
||||
cancelEdit(tache: Tache): void {
|
||||
tache.texte = this.beforeEditCache;
|
||||
tache.editing = false;
|
||||
}
|
||||
|
||||
//supprimer la tache
|
||||
deleteTodo(id: number): void {
|
||||
this.todos = this.todos.filter((todo) => todo.id !== id);
|
||||
}
|
||||
deleteTodo(id: number) {
|
||||
this.TodoService.deleteTacheById(id).subscribe(
|
||||
resp =>{
|
||||
window.location.reload();
|
||||
}
|
||||
);}
|
||||
|
||||
|
||||
|
||||
//nombre de tâches restantes
|
||||
toDoRest(): number{
|
||||
return this.todos.filter(todo=> !todo.completed).length;
|
||||
return this.todo.taches.filter((tache: Tache)=> !tache.etat).length;
|
||||
}
|
||||
|
||||
//Cocher toutes les tâches de la liste
|
||||
listComplete(): boolean {
|
||||
return this.todos.filter(todo=> todo.completed).length>0;
|
||||
return this.todo.taches.filter((tache: Tache)=> tache).length>0;
|
||||
}
|
||||
|
||||
//Effacer la to do list
|
||||
|
||||
effacerList(): void {
|
||||
this.todos = [];
|
||||
//this.todo = [];
|
||||
}
|
||||
|
||||
//cocher toutes les cases de la todoList
|
||||
cocherAllTodoList(): void {
|
||||
for (var i = 0; i < this.todos.length; i++) {
|
||||
this.todos[i].completed = this.masterSelected;
|
||||
for (var i = 0; i < this.todo.taches.length; i++) {
|
||||
this.todo.taches[i].etat = this.masterSelected;
|
||||
}
|
||||
this.cocherAllTodoList();
|
||||
}
|
||||
|
|
@ -123,16 +155,16 @@ export class ToDoListComponent implements OnInit {
|
|||
}
|
||||
|
||||
//barre de filtre des tâches
|
||||
todosFilter(): Todo[] {
|
||||
/* todosFilter(): ToDoList[] {
|
||||
if(this.filter === 'tous'){
|
||||
return this.todos
|
||||
return this.todo.taches
|
||||
}else if (this.filter === 'active'){
|
||||
return this.todos.filter(todo=> !todo.completed)
|
||||
return this.todo.taches.filter((tache: Tache)=> !tache.etat)
|
||||
}else if (this.filter === 'complete'){
|
||||
return this.todos.filter(todo=>todo.completed)
|
||||
}
|
||||
return this.todos
|
||||
return this.todo.taches.filter((tache: Tache)=>tache.etat)
|
||||
}
|
||||
return this.todo
|
||||
} */
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
export interface Todo {
|
||||
id : number,
|
||||
title : string,
|
||||
completed: boolean,
|
||||
editing: boolean
|
||||
texte : string,
|
||||
etat: boolean,
|
||||
// todoListId: number // FK
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,5 +6,4 @@ export interface Menu {
|
|||
dateMenu: Date;
|
||||
membre: Membre;
|
||||
team: Team;
|
||||
validationProposition: boolean;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
|
||||
import { ToDoList } from './to-do-list';
|
||||
|
||||
|
||||
export interface Tache {
|
||||
id : number,
|
||||
texte: string,
|
||||
etat : boolean,
|
||||
editing : boolean
|
||||
}
|
||||
|
|
@ -1,7 +1,11 @@
|
|||
import { Tache } from './tache';
|
||||
import { Team } from './team';
|
||||
|
||||
export interface ToDoList {
|
||||
nom: string;
|
||||
team: Team;
|
||||
tache: string;
|
||||
taches: Tache [];
|
||||
id:number;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,3 +2,8 @@
|
|||
<app-side-bar></app-side-bar>
|
||||
<app-meteo></app-meteo>
|
||||
|
||||
|
||||
<div class="d-flex justify-content-center">
|
||||
<button button type="button" class="btn btn-primary btn-lg" routerLink="../creation-team"
|
||||
routerLinkActive="active-custom">Créer ma team</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
.meteo {
|
||||
display: flex;
|
||||
margin-left: 300px;
|
||||
margin-top: -60px;
|
||||
}
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
<app-header></app-header>
|
||||
<app-side-bar></app-side-bar>
|
||||
<app-side-bar></app-side-bar>
|
||||
<app-card-menu></app-card-menu>
|
||||
|
|
|
|||
|
|
@ -126,10 +126,10 @@
|
|||
<button
|
||||
class="w-100 btn btn-lg btn-outline-success"
|
||||
type="submit"
|
||||
[disabled]="signupForm.invalid"
|
||||
>
|
||||
[disabled]="signupForm.invalid">
|
||||
CREER MON COMPTE
|
||||
</button>
|
||||
|
||||
</form>
|
||||
</main>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
<app-header></app-header>
|
||||
<app-side-bar></app-side-bar>
|
||||
<div class="container">
|
||||
<app-to-do-list></app-to-do-list>
|
||||
<div class="d-flex align-items-stretch">
|
||||
<div class="row">
|
||||
<div class="col" *ngFor="let todos of result">
|
||||
<app-to-do-list [todo]="todos"> </app-to-do-list>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
import { Component, OnInit } from '@angular/core';
|
||||
import { TodoService } from 'src/app/services/todo.service';
|
||||
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-page-to-do-list',
|
||||
|
|
@ -6,10 +9,18 @@ import { Component, OnInit } from '@angular/core';
|
|||
styleUrls: ['./page-to-do-list.component.scss']
|
||||
})
|
||||
export class PageToDoListComponent implements OnInit {
|
||||
public result : any;
|
||||
|
||||
constructor() { }
|
||||
constructor(private TodoService : TodoService) { }
|
||||
|
||||
ngOnInit(): void {
|
||||
this.TodoService.getToDoListByTeamId().subscribe((data :any)=>{
|
||||
|
||||
this.result = data;
|
||||
console.log(data);
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,9 +41,9 @@ export class AuthService {
|
|||
|
||||
return this.http.post(`${this.apiUrl}/membres/sign-in`, body).pipe(
|
||||
map((x: any) => {
|
||||
console.log('Service : ', x.accessToken);
|
||||
console.log('Service : ', x.token);
|
||||
// Modification à faire ici
|
||||
localStorage.setItem(this.tokenKey, x.accessToken);
|
||||
localStorage.setItem(this.tokenKey, x.token);
|
||||
return x; // permet de renvoyer la réponse à l'initiateur (page Signin) après le traitement du map
|
||||
})
|
||||
);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
import { TestBed } from '@angular/core/testing';
|
||||
|
||||
import { MenusService } from './menus.service';
|
||||
|
||||
describe('MenusService', () => {
|
||||
let service: MenusService;
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({});
|
||||
service = TestBed.inject(MenusService);
|
||||
});
|
||||
|
||||
it('should be created', () => {
|
||||
expect(service).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { HttpClient } from '@angular/common/http';
|
||||
import { map, Observable } from 'rxjs';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import { Menu } from '../models/menu';
|
||||
import { Router } from '@angular/router';
|
||||
import { TokenService } from './token.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class MenusService {
|
||||
|
||||
apiUrl: string;
|
||||
|
||||
|
||||
constructor(private http: HttpClient, private router: Router, private tokenService: TokenService) {
|
||||
// On se sert des variables d'environnement de notre application
|
||||
this.apiUrl = environment.apiUrl;
|
||||
}
|
||||
|
||||
//on affiche les menus d'une team
|
||||
getMenu(): Observable<any> | void {
|
||||
const teamId = this.tokenService.getCurrentTeamId();
|
||||
if (teamId){
|
||||
return this.http.get(`${this.apiUrl}/menus/team/${teamId}`);
|
||||
}else {
|
||||
this.router.navigate(['accueil']);
|
||||
}
|
||||
}
|
||||
|
||||
getMenuById(id: any): Observable<any> {
|
||||
return this.http.get(`${this.apiUrl}/menus/` + id);
|
||||
}
|
||||
|
||||
addMenu(menu: Menu): Observable<any> {
|
||||
console.log(menu);
|
||||
|
||||
return this.http.post(`${this.apiUrl}/menus/add`, menu);
|
||||
}
|
||||
|
||||
deleteMenu(id: any): Observable<any> {
|
||||
return this.http.delete(`${this.apiUrl}/menus/delete/`+ id);
|
||||
}
|
||||
|
||||
updateMenu(menu: Menu): Observable<any> {
|
||||
return this.http.put(`${this.apiUrl}/contacts/update/`, menu);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
import { HttpClient } from '@angular/common/http';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { environment } from 'src/environments/environment';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class TodoServiceService {
|
||||
private toDoList: any;
|
||||
private apiUrl: string;
|
||||
|
||||
|
||||
constructor(private http: HttpClient) {
|
||||
this.apiUrl = environment.apiUrl;
|
||||
}
|
||||
|
||||
//consulter toDoList
|
||||
getToDoList(){
|
||||
this.toDoList = this.http.get(`${this.apiUrl}/todolist/team/{team_id}`);
|
||||
return this.toDoList;
|
||||
console.log(this.toDoList)
|
||||
}
|
||||
|
||||
//ajouter une tache
|
||||
addTitle(title:string){
|
||||
this.toDoList.push({
|
||||
title:title,
|
||||
isChecked: false
|
||||
});
|
||||
}
|
||||
// cocher et décocher la checkbox
|
||||
checkOrUnCheckTitle($key: string,flag: boolean){
|
||||
this.toDoList.update($key,{isChecked:flag});
|
||||
}
|
||||
|
||||
//supprimer la tache
|
||||
removeTitle($key : string){
|
||||
this.toDoList.remove($key);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
import { TestBed } from '@angular/core/testing';
|
||||
|
||||
import { TodoService } from './todo.service';
|
||||
|
||||
describe('TodoService', () => {
|
||||
let service: TodoService;
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({});
|
||||
service = TestBed.inject(TodoService);
|
||||
});
|
||||
|
||||
it('should be created', () => {
|
||||
expect(service).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
import { HttpClient } from '@angular/common/http';
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Observable } from 'rxjs';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import { Tache } from '../models/tache';
|
||||
import { ToDoList } from '../models/to-do-list';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class TodoService {
|
||||
private toDoList: any;
|
||||
private apiUrl: string;
|
||||
|
||||
constructor(private http: HttpClient) {
|
||||
this.apiUrl = environment.apiUrl;
|
||||
}
|
||||
|
||||
getToDoListByTeamId(): Observable<any> {
|
||||
return this.http.get(`${this.apiUrl}/todolist/team/1`);
|
||||
}
|
||||
|
||||
deleteTacheById(idTache: any): Observable<any> {
|
||||
return this.http.delete(`${this.apiUrl}/taches/delete/${idTache}`,{responseType:'text'});
|
||||
}
|
||||
|
||||
addTache(newtache: Tache,idTodoList:number): Observable<any> {
|
||||
console.log(newtache);
|
||||
return this.http.post(`${this.apiUrl}/taches/add/${idTodoList}`, newtache);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
import { TestBed } from '@angular/core/testing';
|
||||
|
||||
import { TokenService } from './token.service';
|
||||
|
||||
describe('TokenService', () => {
|
||||
let service: TokenService;
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({});
|
||||
service = TestBed.inject(TokenService);
|
||||
});
|
||||
|
||||
it('should be created', () => {
|
||||
expect(service).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
import { Injectable } from '@angular/core';
|
||||
import { environment } from 'src/environments/environment';
|
||||
import jwt_decode from 'jwt-decode';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class TokenService {
|
||||
tokenKey = environment.tokenKey;
|
||||
|
||||
constructor() { }
|
||||
|
||||
public getToken(): string | null {
|
||||
const token = localStorage.getItem(this.tokenKey);
|
||||
if(token) {
|
||||
return token;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public getCurrentMembreId(): number | null {
|
||||
const token = this.getToken();
|
||||
if(token) {
|
||||
const decodedToken = jwt_decode<any>(token);
|
||||
const userId = decodedToken.sub;
|
||||
return userId;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public getCurrentTeamId(): number | null {
|
||||
const token = this.getToken();
|
||||
if(token){
|
||||
const decodedToken = jwt_decode<any>(token);
|
||||
const teamId = decodedToken.teamId;
|
||||
return teamId ;
|
||||
|
||||
}else {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
export interface TodoList {
|
||||
}
|
||||
Loading…
Reference in New Issue