mise a jour wend

This commit is contained in:
cecilesimplon93 2022-02-18 17:05:29 +01:00
parent 0516b99866
commit 76f26627bd
19 changed files with 185 additions and 76 deletions

21
package-lock.json generated
View file

@ -16,6 +16,7 @@
"@angular/platform-browser": "~13.0.0", "@angular/platform-browser": "~13.0.0",
"@angular/platform-browser-dynamic": "~13.0.0", "@angular/platform-browser-dynamic": "~13.0.0",
"@angular/router": "~13.0.0", "@angular/router": "~13.0.0",
"@daypilot/daypilot-lite-angular": "^3.2.0",
"@ng-bootstrap/ng-bootstrap": "^12.0.0", "@ng-bootstrap/ng-bootstrap": "^12.0.0",
"bootstrap": "^5.1.3", "bootstrap": "^5.1.3",
"bootstrap-icons": "^1.8.1", "bootstrap-icons": "^1.8.1",
@ -2371,6 +2372,18 @@
"postcss": "^8.3" "postcss": "^8.3"
} }
}, },
"node_modules/@daypilot/daypilot-lite-angular": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/@daypilot/daypilot-lite-angular/-/daypilot-lite-angular-3.2.0.tgz",
"integrity": "sha512-tpxwGZOL7Jdm4ACvuHIdWUkEu0iMk4gKznRB+8BUsNeo+gfP+Wx4xEgoeuKEFdA4lSxsrufjjPjK3B6azgZUOg==",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/common": ">=12.0.0",
"@angular/core": ">=12.0.0"
}
},
"node_modules/@discoveryjs/json-ext": { "node_modules/@discoveryjs/json-ext": {
"version": "0.5.6", "version": "0.5.6",
"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz",
@ -12943,6 +12956,14 @@
"postcss-value-parser": "^4.2.0" "postcss-value-parser": "^4.2.0"
} }
}, },
"@daypilot/daypilot-lite-angular": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/@daypilot/daypilot-lite-angular/-/daypilot-lite-angular-3.2.0.tgz",
"integrity": "sha512-tpxwGZOL7Jdm4ACvuHIdWUkEu0iMk4gKznRB+8BUsNeo+gfP+Wx4xEgoeuKEFdA4lSxsrufjjPjK3B6azgZUOg==",
"requires": {
"tslib": "^2.3.0"
}
},
"@discoveryjs/json-ext": { "@discoveryjs/json-ext": {
"version": "0.5.6", "version": "0.5.6",
"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz",

View file

@ -18,6 +18,7 @@
"@angular/platform-browser": "~13.0.0", "@angular/platform-browser": "~13.0.0",
"@angular/platform-browser-dynamic": "~13.0.0", "@angular/platform-browser-dynamic": "~13.0.0",
"@angular/router": "~13.0.0", "@angular/router": "~13.0.0",
"@daypilot/daypilot-lite-angular": "^3.2.0",
"@ng-bootstrap/ng-bootstrap": "^12.0.0", "@ng-bootstrap/ng-bootstrap": "^12.0.0",
"bootstrap": "^5.1.3", "bootstrap": "^5.1.3",
"bootstrap-icons": "^1.8.1", "bootstrap-icons": "^1.8.1",

View file

@ -13,14 +13,15 @@ import { PageForgotPasswordComponent } from './pages/page-forgot-password/page-f
import { PageMenuSemaineComponent } from './pages/page-menu-semaine/page-menu-semaine.component'; import { PageMenuSemaineComponent } from './pages/page-menu-semaine/page-menu-semaine.component';
import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component'; import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component';
import { PageNotFoundComponent } from './pages/page-not-found/page-not-found.component'; import { PageNotFoundComponent } from './pages/page-not-found/page-not-found.component';
import { PageHumeurComponent} from './pages/page-humeur/page-humeur.component';
import { PageRepertoireComponent } from './pages/page-repertoire/page-repertoire.component'; import { PageRepertoireComponent } from './pages/page-repertoire/page-repertoire.component';
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 { 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 { FooterComponent } from './components/footer/footer.component'; import { PageSupportComponent} from './pages/page-support/page-support.component';
const routes: Routes = [ const routes: Routes = [
{ path: '', redirectTo: 'accueil', pathMatch: 'full' }, { path: '', redirectTo: 'accueil', pathMatch: 'full' },
@ -42,8 +43,7 @@ const routes: Routes = [
{ path: 'modifier-compte', component: PageUpdateAccountComponent }, { path: 'modifier-compte', component: PageUpdateAccountComponent },
{ path: 'ajouter-contact', component: PageAjoutContactComponent }, { path: 'ajouter-contact', component: PageAjoutContactComponent },
{ path: 'creation-team', component: PageCreationTeamComponent }, { path: 'creation-team', component: PageCreationTeamComponent },
{ path: 'humeur', component: PageHumeurComponent }, { path: 'page-support', component: PageSupportComponent},
{ path: 'footer', component: FooterComponent},
{ path: '**', component: PageNotFoundComponent }, { path: '**', component: PageNotFoundComponent },
]; ];

View file

@ -35,11 +35,12 @@ import { PageAjoutContactComponent } from './pages/page-ajout-contact/page-ajout
import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-contact.component'; import { PageModifierContactComponent } from './pages/page-modifier-contact/page-modifier-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 { AutofocusFixModule } from 'ngx-autofocus-fix'; import { AutofocusFixModule } from 'ngx-autofocus-fix';
import { PageHumeurComponent } from './pages/page-humeur/page-humeur.component';
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 { PageDeleteAccountComponent } from './pages/page-delete-account/page-delete-account.component';
import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component'; import { PageUpdateAccountComponent } from './pages/page-update-account/page-update-account.component';
import { EmoticonComponent } from './emoticon/emoticon.component'; import { HumeurComponent } from './components/humeur/humeur.component';
import { PageSupportComponent } from './pages/page-support/page-support.component';
@ -64,7 +65,6 @@ import { EmoticonComponent } from './emoticon/emoticon.component';
SigninComponent, SigninComponent,
PageDashboardComponent, PageDashboardComponent,
MeteoComponent, MeteoComponent,
PageHumeurComponent,
CalendrierComponent, CalendrierComponent,
CardMemberComponent, CardMemberComponent,
ToDoListComponent, ToDoListComponent,
@ -76,11 +76,11 @@ import { EmoticonComponent } from './emoticon/emoticon.component';
PageAjoutContactComponent, PageAjoutContactComponent,
PageModifierContactComponent, PageModifierContactComponent,
PageCreationTeamComponent, PageCreationTeamComponent,
PageHumeurComponent,
FooterComponent, FooterComponent,
PageDeleteAccountComponent, PageDeleteAccountComponent,
PageUpdateAccountComponent, PageUpdateAccountComponent,
EmoticonComponent, HumeurComponent,
PageSupportComponent,
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
@ -88,7 +88,7 @@ import { EmoticonComponent } from './emoticon/emoticon.component';
ReactiveFormsModule, ReactiveFormsModule,
HttpClientModule, HttpClientModule,
FormsModule, FormsModule,
// AutofocusFixModule.forRoot(), AutofocusFixModule.forRoot(),
], ],
providers: [ providers: [

View file

@ -1,19 +1,12 @@
<body> <div class="footer text-center" >
<h3>Plan du site</h3>
<p>footer works!</p> <div class="liens">
<h2>PLAN DU SITE</h2>
<a routerLink="../accueil" routerLinkActive="active-custom" class="nav-link">Page d'accueil</a> <a routerLink="../accueil" routerLinkActive="active-custom" class="nav-link">Page d'accueil</a>
<a routerLink="../tableau-de-bord" routerLinkActive="active-custom" class="nav-link">Tableau de bord</a>
<a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">Ma Team</a> <a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">Ma Team</a>
<a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">Répertoire</a> <a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">Répertoire</a>
<a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">To-Do-List</a> <a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">To-Do-List</a>
<a routerLink="../agenda" routerLinkActive="active-custom" class="nav-link">Agenda</a>
<a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">Menus</a> <a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">Menus</a>
<a routerLink="../compte" routerLinkActive="active-custom" class="nav-link">Ma Team</a> </div>
<a routerLink="../repertoire" routerLinkActive="active-custom" class="nav-link">Répertoire</a> </div>
<a routerLink="../to-do-list" routerLinkActive="active-custom" class="nav-link">To-Do-List</a>
<a routerLink="../menu" routerLinkActive="active-custom" class="nav-link">Menus</a>
</body>

View file

@ -1,7 +1,10 @@
body { .liens {
background-color: pink; display: flex;
text-align: left; justify-content: center;
color : blue;
font-size: smaller;
} }
h2 {
color : blue .footer {
margin-top: 20px;
} }

View file

@ -0,0 +1,22 @@
<div>
<h2>Mon humeur :</h2>
<p><img src="{{monHumeurLien}}" alt="{{monHumeurTitle}}" *ngIf="monHumeurLien" ></p>
<p>Je modifie mon avatar :</p>
<div class="humeur" *ngFor="let humor of tabHumeur; let i=index">
<img src="{{humor.lien}}" alt="{{humor.title}}" (click)="onChoixHumeur(i)">
</div>
<div >
</div> </div>

View file

@ -1,6 +1,3 @@
p>img { p>img {
width: 85px; width: 85px;
height: 85px; height: 85px;
@ -9,15 +6,13 @@ p>img {
img { img {
width: 50px; width: 50px;
height: 50px; height: 50px;
} }
.humeur { .humeur {
display: inline; display: inline;
} }
body { div {
background-color: grey; background-color: #87AFC7;
text-align: center; text-align: center;
} }

View file

@ -1,20 +1,20 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { PageHumeurComponent } from './page-humeur.component'; import { HumeurComponent } from './humeur.component';
describe('PageHumeurComponent', () => { describe('HumeurComponent', () => {
let component: PageHumeurComponent; let component: HumeurComponent;
let fixture: ComponentFixture<PageHumeurComponent>; let fixture: ComponentFixture<HumeurComponent>;
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
declarations: [ PageHumeurComponent ] declarations: [ HumeurComponent ]
}) })
.compileComponents(); .compileComponents();
}); });
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(PageHumeurComponent); fixture = TestBed.createComponent(HumeurComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });

View file

@ -1,12 +1,12 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
@Component({ @Component({
selector: 'app-page-humeur', selector: 'app-humeur',
templateUrl: './page-humeur.component.html', templateUrl: './humeur.component.html',
styleUrls: ['./page-humeur.component.scss'] styleUrls: ['./humeur.component.scss']
}) })
export class HumeurComponent implements OnInit {
export class PageHumeurComponent implements OnInit {
monHumeurLien! : string[]; monHumeurLien! : string[];
monHumeurTitle! : string[] ; monHumeurTitle! : string[] ;
@ -31,9 +31,6 @@ console.log("humeur titre est : ", this.monHumeurTitle);
console.log("humeur lien est : ", this.monHumeurLien); console.log("humeur lien est : ", this.monHumeurLien);
console.log("index humeur est : ", numero ); console.log("index humeur est : ", numero );
}
} }
}

View file

@ -1,9 +1,13 @@
<app-header></app-header> <app-header></app-header>
<app-side-bar></app-side-bar> <app-side-bar></app-side-bar>
<app-meteo></app-meteo> <app-meteo></app-meteo>
<app-humeur></app-humeur>
<div class="d-flex justify-content-center"> <div class="d-flex justify-content-center">
<button button type="button" class="btn btn-primary btn-lg" routerLink="../creation-team" <button button type="button" class="btn btn-primary btn-lg" routerLink="../creation-team"
routerLinkActive="active-custom">Créer ma team</button> routerLinkActive="active-custom">Créer ma team</button>
</div> </div>
<app-footer></app-footer>

View file

@ -1,4 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { FormsModule } from '@angular/forms';
@Component({ @Component({
selector: 'app-page-dashboard', selector: 'app-page-dashboard',
@ -12,4 +13,21 @@ export class PageDashboardComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
} }
}
}//fin

View file

@ -1,22 +0,0 @@
<body>
<h2>Mon humeur :</h2>
<p><img src="{{monHumeurLien}}" alt="{{monHumeurTitle}}" *ngIf="monHumeurLien" ></p>
<p>Je modifie mon avatar :</p>
<div class="humeur" *ngFor="let humor of tabHumeur; let i=index">
<img src="{{humor.lien}}" alt="{{humor.title}}" (click)="onChoixHumeur(i)">
</div>
<div >
</div> </body>

View file

@ -0,0 +1,22 @@
<p>page-support works!</p>
<h2>Formulaire de contact</h2>
<form #userEmail="ngForm" (ngSubmit)="onEnvoiForm(userEmail)">
<label>Votre adresse mail</label>
<input type="email"
ngModel
name="lllll"
class="form-control">
<label>Votre message</label>
<input type="text"
ngModel
name="UserName"
class="form-control">
<button type="submit">Validation</button>
</form>

View file

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

View file

@ -0,0 +1,30 @@
import { Component, OnInit } from '@angular/core';
//DRIVEN FORM
@Component({
selector: 'app-page-support',
templateUrl: './page-support.component.html',
styleUrls: ['./page-support.component.scss']
})
export class PageSupportComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
onEnvoiForm(userEmail:any){
console.log(userEmail);
}
}//fin

Binary file not shown.

Before

Width:  |  Height:  |  Size: 443 KiB

After

Width:  |  Height:  |  Size: 123 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 443 KiB