Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into aline
This commit is contained in:
commit
e6f59fb84c
27 changed files with 436 additions and 161 deletions
|
|
@ -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);
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue