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

Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into sana

Browse source
This commit is contained in:
Sana EL HIRI 2022-03-04 18:10:03 +01:00
commit 4a4c511fcd
16 changed files with 14 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/app/pages/page-account/page-account.component.html
View file

@ -3,7 +3,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-9 offset-2" id="main">
<h1 class="col-md-auto">{{currentTeam.nom}}</h1>
<h1 class="col-md-auto">{{ currentTeam.nom }}</h1>
<div>
<!-- Pour récupérer le membre connecté-->
<div class="d-flex justify-content-center">
@ -11,12 +11,13 @@
</div>
<div class="d-flex justify-content-center">
<button
id = "bouton-ajout"
id="bouton-ajout"
type="button"
class="btn btn-primary btn-lg"
routerLink="../ajout-membre"
routerLinkActive="active-custom"
>Ajouter un membre
>
Ajouter un membre
</button>
</div>
</div>
@ -26,7 +27,7 @@
<!-- cf. : https://angular.io/guide/built-in-directives#hosting-a-directive-without-a-dom-element-->
<ng-container *ngFor="let membreData of listMembres">
<!-- Condition dans ngIf mais une div à la place du ng-container pour le style-->
<div class="col" *ngIf= "membreData.id != currentUser.id" >
<div class="col" *ngIf="membreData.id != currentUser.id">
<app-card-member [membre]="membreData"> </app-card-member>
</div>
</ng-container>

12
src/app/pages/page-agenda/page-agenda.component.html
View file

@ -1,7 +1,11 @@
<app-header></app-header>
<app-side-bar></app-side-bar>
<app-alert *ngIf="isShow" [alert]="alert" (eventClose)="onClickCloseAlert();"></app-alert>
<app-alert
*ngIf="isShow"
[alert]="alert"
(eventClose)="onClickCloseAlert()"
></app-alert>
<!-- <div
class="alert alert-{{ alert.type }}"
@ -59,9 +63,11 @@
(click)="navigateNext($event)"
>Next</a
>
<!-- DEBUT : Pour le debugage -->
<span *ngIf="debug">team : {{ teamId }} - user: {{ userId }} - role: {{ role }}</span>
<span *ngIf="debug"
>team : {{ teamId }} - user: {{ userId }} - role: {{ role }}</span
>
<!-- FIN : Pour le debugage -->
<span style="float: right"

12
src/app/pages/page-delete-account/page-delete-account.component.html
View file

@ -1,12 +0,0 @@
<app-header></app-header>
<div class="row">
<div class="col-md-auto">
<app-side-bar></app-side-bar>
</div>
<div class=" col compte text-center">
<h1>Supprimer votre compte</h1>
<main class="contenu-compte">
</main>
</div>
</div>

0
src/app/pages/page-delete-account/page-delete-account.component.scss
View file

25
src/app/pages/page-delete-account/page-delete-account.component.spec.ts
View file

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

15
src/app/pages/page-delete-account/page-delete-account.component.ts
View file

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

11
src/app/pages/page-update-account/page-update-account.component.html
View file

@ -1,11 +0,0 @@
<app-header></app-header>
<div class="row">
<div class="col-md-auto">
<app-side-bar></app-side-bar>
</div>
<div class="col compte text-center">
<h1>Modifier votre compte</h1>
<main class="contenu-compte"></main>
</div>
</div>

0
src/app/pages/page-update-account/page-update-account.component.scss
View file

25
src/app/pages/page-update-account/page-update-account.component.spec.ts
View file

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

15
src/app/pages/page-update-account/page-update-account.component.ts
View file

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