menache
This commit is contained in:
parent
4ccbbf869b
commit
42eff07067
@ -7,7 +7,6 @@ import { PageAgendaComponent } from './pages/page-agenda/page-agenda.component';
|
|||||||
import { PageAjoutContactComponent } from './pages/page-ajout-contact/page-ajout-contact.component';
|
import { PageAjoutContactComponent } from './pages/page-ajout-contact/page-ajout-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 { PageDashboardComponent } from './pages/page-dashboard/page-dashboard.component';
|
import { PageDashboardComponent } from './pages/page-dashboard/page-dashboard.component';
|
||||||
import { PageDeleteAccountComponent } from './pages/page-delete-account/page-delete-account.component';
|
|
||||||
import { PageDeleteMemberComponent } from './pages/page-delete-member/page-delete-member.component';
|
import { PageDeleteMemberComponent } from './pages/page-delete-member/page-delete-member.component';
|
||||||
import { PageForgotPasswordComponent } from './pages/page-forgot-password/page-forgot-password.component';
|
import { PageForgotPasswordComponent } from './pages/page-forgot-password/page-forgot-password.component';
|
||||||
import { PageMenuSemaineComponent } from './pages/page-menu-semaine/page-menu-semaine.component';
|
import { PageMenuSemaineComponent } from './pages/page-menu-semaine/page-menu-semaine.component';
|
||||||
@ -17,7 +16,6 @@ import { PageRepertoireComponent } from './pages/page-repertoire/page-repertoire
|
|||||||
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 { 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 { PageSupportComponent } from './pages/page-support/page-support.component';
|
||||||
import { FooterComponent } from './components/footer/footer.component';
|
import { FooterComponent } from './components/footer/footer.component';
|
||||||
@ -33,7 +31,6 @@ const routes: Routes = [
|
|||||||
{ path: 'agenda', canActivate: [AuthGuard], component: PageAgendaComponent },
|
{ path: 'agenda', canActivate: [AuthGuard], component: PageAgendaComponent },
|
||||||
{ path: 'tableau-de-bord', canActivate: [AuthGuard], component: PageDashboardComponent },
|
{ path: 'tableau-de-bord', canActivate: [AuthGuard], component: PageDashboardComponent },
|
||||||
{ path: 'supprimer-membre', canActivate: [AuthGuard], component: PageDeleteMemberComponent },
|
{ path: 'supprimer-membre', canActivate: [AuthGuard], component: PageDeleteMemberComponent },
|
||||||
{ path: 'supprimer-compte', canActivate: [AuthGuard], component: PageDeleteAccountComponent },
|
|
||||||
{ path: 'password-oublie', component: PageForgotPasswordComponent },
|
{ path: 'password-oublie', component: PageForgotPasswordComponent },
|
||||||
{ path: 'menu', canActivate: [AuthGuard], component: PageMenuSemaineComponent },
|
{ path: 'menu', canActivate: [AuthGuard], component: PageMenuSemaineComponent },
|
||||||
{ path: 'repertoire', canActivate: [AuthGuard], component: PageRepertoireComponent },
|
{ path: 'repertoire', canActivate: [AuthGuard], component: PageRepertoireComponent },
|
||||||
@ -42,7 +39,6 @@ const routes: Routes = [
|
|||||||
{ path: 'page-support', component: PageSupportComponent},
|
{ path: 'page-support', component: PageSupportComponent},
|
||||||
{ path: 'to-do-list', canActivate: [AuthGuard], component: PageToDoListComponent },
|
{ path: 'to-do-list', canActivate: [AuthGuard], component: PageToDoListComponent },
|
||||||
{ path: 'modifier-membre/:id', canActivate: [AuthGuard], component: PageUpdateMemberComponent },
|
{ path: 'modifier-membre/:id', canActivate: [AuthGuard], component: PageUpdateMemberComponent },
|
||||||
{ path: 'modifier-compte', canActivate: [AuthGuard], component: PageUpdateAccountComponent },
|
|
||||||
{ path: 'ajouter-contact', canActivate: [AuthGuard], component: PageAjoutContactComponent },
|
{ path: 'ajouter-contact', canActivate: [AuthGuard], component: PageAjoutContactComponent },
|
||||||
{ path: 'creation-team', canActivate: [AuthGuard], component: PageCreationTeamComponent },
|
{ path: 'creation-team', canActivate: [AuthGuard], component: PageCreationTeamComponent },
|
||||||
{ path: 'footer', component: FooterComponent},
|
{ path: 'footer', component: FooterComponent},
|
||||||
|
@ -26,7 +26,6 @@ import { ToDoListComponent } from './components/to-do-list/to-do-list.component'
|
|||||||
import { TacheComponent } from './components/tache/tache.component';
|
import { TacheComponent } from './components/tache/tache.component';
|
||||||
import { CardMenuComponent } from './components/card-menu/card-menu.component';
|
import { CardMenuComponent } from './components/card-menu/card-menu.component';
|
||||||
import { FicheContactComponent } from './components/fiche-contact/fiche-contact.component';
|
import { FicheContactComponent } from './components/fiche-contact/fiche-contact.component';
|
||||||
import { PaginationComponent } from './components/pagination/pagination.component';
|
|
||||||
import { CreneauComponent } from './components/creneau/creneau.component';
|
import { CreneauComponent } from './components/creneau/creneau.component';
|
||||||
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
|
||||||
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
||||||
@ -35,8 +34,6 @@ import { PageModifierContactComponent } from './pages/page-modifier-contact/page
|
|||||||
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 { 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 { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component';
|
|
||||||
import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular";
|
import { DayPilot, DayPilotModule } from "@daypilot/daypilot-lite-angular";
|
||||||
import { registerLocaleData } from '@angular/common';
|
import { registerLocaleData } from '@angular/common';
|
||||||
import localeFr from '@angular/common/locales/fr';
|
import localeFr from '@angular/common/locales/fr';
|
||||||
@ -74,14 +71,11 @@ registerLocaleData(localeFr)
|
|||||||
TacheComponent,
|
TacheComponent,
|
||||||
CardMenuComponent,
|
CardMenuComponent,
|
||||||
FicheContactComponent,
|
FicheContactComponent,
|
||||||
PaginationComponent,
|
|
||||||
CreneauComponent,
|
CreneauComponent,
|
||||||
PageAjoutContactComponent,
|
PageAjoutContactComponent,
|
||||||
PageModifierContactComponent,
|
PageModifierContactComponent,
|
||||||
PageCreationTeamComponent,
|
PageCreationTeamComponent,
|
||||||
FooterComponent,
|
FooterComponent,
|
||||||
PageDeleteAccountComponent,
|
|
||||||
PageUpdateAccountComponent,
|
|
||||||
CardAvatarComponent,
|
CardAvatarComponent,
|
||||||
DeconnexionComponent,
|
DeconnexionComponent,
|
||||||
HumeurComponent,
|
HumeurComponent,
|
||||||
|
@ -1 +0,0 @@
|
|||||||
<p>pagination works!</p>
|
|
@ -1,25 +0,0 @@
|
|||||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
|
||||||
|
|
||||||
import { PaginationComponent } from './pagination.component';
|
|
||||||
|
|
||||||
describe('PaginationComponent', () => {
|
|
||||||
let component: PaginationComponent;
|
|
||||||
let fixture: ComponentFixture<PaginationComponent>;
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
|
||||||
await TestBed.configureTestingModule({
|
|
||||||
declarations: [ PaginationComponent ]
|
|
||||||
})
|
|
||||||
.compileComponents();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
fixture = TestBed.createComponent(PaginationComponent);
|
|
||||||
component = fixture.componentInstance;
|
|
||||||
fixture.detectChanges();
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should create', () => {
|
|
||||||
expect(component).toBeTruthy();
|
|
||||||
});
|
|
||||||
});
|
|
@ -1,15 +0,0 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'app-pagination',
|
|
||||||
templateUrl: './pagination.component.html',
|
|
||||||
styleUrls: ['./pagination.component.scss']
|
|
||||||
})
|
|
||||||
export class PaginationComponent implements OnInit {
|
|
||||||
|
|
||||||
constructor() { }
|
|
||||||
|
|
||||||
ngOnInit(): void {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -3,7 +3,7 @@
|
|||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-9 offset-2" id="main">
|
<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>
|
<div>
|
||||||
<!-- Pour récupérer le membre connecté-->
|
<!-- Pour récupérer le membre connecté-->
|
||||||
<div class="d-flex justify-content-center">
|
<div class="d-flex justify-content-center">
|
||||||
@ -11,12 +11,13 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="d-flex justify-content-center">
|
<div class="d-flex justify-content-center">
|
||||||
<button
|
<button
|
||||||
id = "bouton-ajout"
|
id="bouton-ajout"
|
||||||
type="button"
|
type="button"
|
||||||
class="btn btn-primary btn-lg"
|
class="btn btn-primary btn-lg"
|
||||||
routerLink="../ajout-membre"
|
routerLink="../ajout-membre"
|
||||||
routerLinkActive="active-custom"
|
routerLinkActive="active-custom"
|
||||||
>Ajouter un membre
|
>
|
||||||
|
Ajouter un membre
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -26,7 +27,7 @@
|
|||||||
<!-- cf. : https://angular.io/guide/built-in-directives#hosting-a-directive-without-a-dom-element-->
|
<!-- cf. : https://angular.io/guide/built-in-directives#hosting-a-directive-without-a-dom-element-->
|
||||||
<ng-container *ngFor="let membreData of listMembres">
|
<ng-container *ngFor="let membreData of listMembres">
|
||||||
<!-- Condition dans ngIf mais une div à la place du ng-container pour le style-->
|
<!-- 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>
|
<app-card-member [membre]="membreData"> </app-card-member>
|
||||||
</div>
|
</div>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
@ -1,7 +1,11 @@
|
|||||||
<app-header></app-header>
|
<app-header></app-header>
|
||||||
<app-side-bar></app-side-bar>
|
<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
|
<!-- <div
|
||||||
class="alert alert-{{ alert.type }}"
|
class="alert alert-{{ alert.type }}"
|
||||||
@ -61,7 +65,9 @@
|
|||||||
>
|
>
|
||||||
|
|
||||||
<!-- DEBUT : Pour le debugage -->
|
<!-- 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 -->
|
<!-- FIN : Pour le debugage -->
|
||||||
|
|
||||||
<span style="float: right"
|
<span style="float: right"
|
||||||
|
@ -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>
|
|
@ -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();
|
|
||||||
});
|
|
||||||
});
|
|
@ -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 {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -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>
|
|
@ -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();
|
|
||||||
});
|
|
||||||
});
|
|
@ -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 {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user