Skip to content

Local ado #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
ad7887b
Ajout composants
AdonisVienet Feb 21, 2023
e9843e2
Merge pull request #1 from AdonisVienet/localAdonis
AdonisVienet Feb 21, 2023
6f401ce
ajout services
Feb 21, 2023
8b31416
ajout des models
BaptisteMchlt Feb 21, 2023
8a1f6f5
Merge pull request #2 from AdonisVienet/localRama
AdonisVienet Feb 21, 2023
35b7c49
Merge pull request #3 from AdonisVienet/localBapt
AdonisVienet Feb 21, 2023
ddbde1c
finition des modeles/services/components
BaptisteMchlt Feb 21, 2023
8690870
Merge pull request #4 from AdonisVienet/localBapt
AdonisVienet Feb 21, 2023
0e1f1e5
premier essai des pages web
BaptisteMchlt Feb 22, 2023
1bea99c
Merge pull request #6 from AdonisVienet/localBapt
AdonisVienet Feb 22, 2023
b5bc227
login ok
Feb 22, 2023
a1e2ccb
Merge https://github.com/AdonisVienet/agenceImmoFront into localRama
Feb 22, 2023
cf01e06
Merge pull request #7 from AdonisVienet/localRama2
AdonisVienet Feb 22, 2023
045d0f8
page d'accueil 1er jet
BaptisteMchlt Feb 23, 2023
67fb214
Merge pull request #8 from AdonisVienet/localBapt
AdonisVienet Feb 23, 2023
9ee94a3
push page d'accueil chocolate
BaptisteMchlt Feb 23, 2023
65d99b9
Merge pull request #10 from AdonisVienet/localBapt
AdonisVienet Feb 23, 2023
cd43913
c'est la fin du login
BaptisteMchlt Feb 23, 2023
9396cca
Merge pull request #11 from AdonisVienet/localBapt
AdonisVienet Feb 23, 2023
c9fc082
Hello Adonis
BaptisteMchlt Feb 23, 2023
feea12a
Merge pull request #12 from AdonisVienet/localBapt
AdonisVienet Feb 23, 2023
0ca6e98
pas ouf comme commit
BaptisteMchlt Feb 23, 2023
b294097
Profil utilisateur
AdonisVienet Feb 23, 2023
48cd4c4
Merge pull request #13 from AdonisVienet/localAdo
AdonisVienet Feb 23, 2023
49080ca
normalement la liste d'utilisateur fonctionne
BaptisteMchlt Feb 24, 2023
0c7ec4d
liste utilisateur fonctionne
BaptisteMchlt Feb 24, 2023
38a0754
Merge branch 'master' into localBapt
AdonisVienet Feb 24, 2023
c414c1b
Merge pull request #14 from AdonisVienet/localBapt
AdonisVienet Feb 24, 2023
c9d8ce7
Ajout list offre (sans image)
AdonisVienet Feb 24, 2023
8138831
Merge pull request #15 from AdonisVienet/localAdo
AdonisVienet Feb 24, 2023
298c7a5
le formulaire d'ajout is terminado
BaptisteMchlt Feb 24, 2023
1108a6a
Merge branch 'master' of https://github.com/AdonisVienet/agenceImmoFr…
BaptisteMchlt Feb 24, 2023
9539581
Merge pull request #16 from AdonisVienet/localBapt
AdonisVienet Feb 24, 2023
964cf02
formulaire okkk
Feb 24, 2023
181e72e
formu okk
Feb 24, 2023
062cf9a
l'onglet contact est fait
BaptisteMchlt Feb 24, 2023
b61cddf
Merge pull request #18 from AdonisVienet/localBapt
AdonisVienet Feb 24, 2023
66916e5
formu okk
Feb 24, 2023
de5c356
Merge branch 'master' of https://github.com/AdonisVienet/agenceImmoFr…
Feb 26, 2023
4c9b323
Recherche avancée
Feb 27, 2023
a9868ba
liste des offres et espace perso fonctionnel
AdonisVienet Feb 27, 2023
885690c
Merge pull request #19 from AdonisVienet/localAdo
AdonisVienet Feb 27, 2023
90d8760
Merge branch 'master' into localRama2
Feb 27, 2023
2220ac6
Merge pull request #20 from AdonisVienet/localRama2
AdonisVienet Feb 27, 2023
c078695
profil utilisateur fini
AdonisVienet Feb 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import { GarageService } from './services/garage.service';
import { TerrainService } from './services/terrain.service';
import { VisiteService } from './services/visite.service';
import { AppService } from './app.service';
import { MatMenuModule } from '@angular/material/menu';
import { MatIconModule } from '@angular/material/icon';

@NgModule({
imports: [
Expand All @@ -27,7 +29,9 @@ import { AppService } from './app.service';
ReactiveFormsModule,
RouterModule,
AppRoutingModule,
ComponentsModule
ComponentsModule,
MatMenuModule,
MatIconModule
],
declarations: [
AppComponent,
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.routing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { QuestionComponent } from './components/question/question.component';
import { RoleComponent } from './components/role/role.component';
import { TerrainComponent } from './components/terrain/terrain.component';
import { UtilisateurComponent } from './components/utilisateur/utilisateur.component';
import { VisiteComponent } from './components/visite/visite.component';
import { VisiteComponent } from './components/utilisateur/visite/visite.component';
import { LoginComponent } from './components/login/login.component';
import { DashboardComponent } from './dashboard/dashboard.component';

Expand Down
1 change: 1 addition & 0 deletions src/app/app.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Router } from '@angular/router';
@Injectable({
providedIn: 'root'
})

export class AppService {
// Authentification
authenticated = false;
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/components.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { OffreComponent } from './offre/offre.component';
import { QuestionComponent } from './question/question.component';
import { RoleComponent } from './role/role.component';
import { TerrainComponent } from './terrain/terrain.component';
import { VisiteComponent } from './visite/visite.component';
import { VisiteComponent } from './utilisateur/visite/visite.component';
import { LoginComponent } from 'app/components/login/login.component';
import { FormsModule } from '@angular/forms';
import { RegistrationComponent } from './registration/registration.component';
Expand Down
1 change: 1 addition & 0 deletions src/app/dashboard/dashboard.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<h1>Hello {{user.prenomUtilisateur}}</h1>
<br>
<br>
<h1>Hello {{user.prenomUtilisateur}}</h1>
<div style="position: relative; left: 10px; background-color: white; border-color: black; border-width: thick;">
<table>
<th>
Expand Down
2 changes: 1 addition & 1 deletion src/app/dashboard/dashboard.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@ export class DashboardComponent implements OnInit {
this.startAnimationForBarChart(websiteViewsChart);
}

}
}
Empty file modified src/app/dashboard/image/maison2.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
141 changes: 15 additions & 126 deletions src/app/user-profile/user-profile.component.html
Original file line number Diff line number Diff line change
@@ -1,135 +1,24 @@
<!--<div>
<h1>Ajouter un utilisateur</h1>
<form (ngSubmit)="save()">
<table>
<tr>
<td>Nom</td>
<td><input type="text" [(ngModel)]="utilisateur.nomUtilisateur" name="nomUtilisateur" /></td>
</tr>
<tr>
<td>Prénom</td>
<td><input type="text" [(ngModel)]="utilisateur.prenomUtilisateur" name="prenomUtilisateur" /></td>
</tr>
<tr>
<td colspan="2"><button (click)="save()">Ajouter</button></td>
</tr>
</table>
</form>
</div>-->







<div class="main-content">
<div class="container-fluid">
<div class="row">
<div class="col-md-8">
<div class="card">
<div class="card-header card-header-danger">
<h4 class="card-title">Modification de votre profil</h4>
<p class="card-category">Vous pouvez modifier certaines de vos informations suite à des changements au cours
de votre vie (changement de téléphone, d'adresse mail, etc.)</p>
</div>
<div class="card-body">
<form>
<div class="row">
<div class="col-md-5">
<mat-form-field class="example-full-width">
<input matInput placeholder="Company (disabled)" disabled>
</mat-form-field>
</div>
<div class="col-md-3">
<mat-form-field class="example-full-width">
<input matInput placeholder="Username">
</mat-form-field>
</div>
<div class="col-md-4">
<mat-form-field class="example-full-width">
<input matInput placeholder="Email address" type="email">
</mat-form-field>
</div>
</div>
<div class="row">
<div class="col-md-6">
<mat-form-field class="example-full-width">
<input matInput placeholder="Fist Name" type="text">
</mat-form-field>
</div>
<div class="col-md-6">
<mat-form-field class="example-full-width">
<input matInput placeholder="Last Name" type="text">
</mat-form-field>
</div>
</div>
<div class="row">
<div class="col-md-12">
<mat-form-field class="example-full-width">
<input matInput placeholder="Adress" type="text">
</mat-form-field>
</div>
</div>
<div class="row">
<div class="col-md-4">
<mat-form-field class="example-full-width">
<input matInput placeholder="City" type="text">
</mat-form-field>
</div>
<div class="col-md-4">
<mat-form-field class="example-full-width">
<input matInput placeholder="Country" type="text">
</mat-form-field>
</div>
<div class="col-md-4">
<mat-form-field class="example-full-width">
<input matInput placeholder="Postal Code" type="text">
</mat-form-field>
</div>
</div>
<div class="row">
<div class="col-md-12">
<label>About Me</label>
<mat-form-field class="example-full-width">
<textarea matInput
placeholder="Lamborghini Mercy, Your chick she so thirsty, I'm in that two seat Lambo."></textarea>
</mat-form-field>
<!-- <div class="form-group">
<div class="card">
<div class="card-header card-header-danger">
<h4 class="card-title">Mon profil</h4>
<p class="card-category">Vous pouvez modifier certaines de vos informations suite à des changements au cours
de votre vie (changement de téléphone, d'adresse mail, etc.)</p>
</div>
<div class="card-chart">
<p>Nom : {{user.nomUtilisateur}}
<input #myTxt type="text" required minlength="1" [(ngModel)]="user.nomUtilisateur">
<button type="submit" (click)="updateProfil(myTxt.value)">Modifier</button>
</p>
<p>Prénom : {{user.prenomUtilisateur}}</p>
<p>Date de Naissance : {{user.nomUtilisateur}}</p>
<p>Adresse E-mail : {{user.emailUtilisateur}}</p>
<p>Numéro de telephone : {{user.numTelUtilisateur}}</p>

<div class="form-group">
<label class="bmd-label-floating"> Lamborghini Mercy, Your chick she so thirsty, I'm in that two seat Lambo.</label>
<textarea class="form-control" rows="5"></textarea>
</div>
</div> -->
</div>
</div>
<button mat-raised-button type="submit" class="btn btn-danger pull-right">Update Profile</button>
<div class="clearfix"></div>
</form>
</div>
</div>
</div>
<div class="col-md-4">
<p>Le respect des données, blabla, ils ne sont pas utilisés à des fins commerciales autres que les notres, etc.
</p>
</div>
<!--<div class="col-md-4">
<div class="card card-profile">
<div class="card-avatar">
<a href="javascript:void(0)">
<img class="img" src="./assets/img/faces/marc.jpg" />
</a>
</div>
<div class="card-body">
<h6 class="card-category text-gray">CEO / Co-Founder</h6>
<h4 class="card-title">Alec Thompson</h4>
<p class="card-description">
Don't be scared of the truth because we need to restart the human foundation in truth And I love you like Kanye loves Kanye I love Rick Owens’ bed design but the back is...
</p>
<a href="javascript:void(0)" class="btn btn-danger btn-round">Follow</a>
</div>
</div>-->
</div>
</div>
</div>
23 changes: 18 additions & 5 deletions src/app/user-profile/user-profile.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { HttpClient, HttpRequest } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { AppService } from 'app/app.service';
import { Utilisateur } from 'app/model/utilisateur';
import { RoleService } from 'app/services/role.service';
import { UtilisateurService } from 'app/services/utilisateur.service';
Expand All @@ -18,11 +19,22 @@ export class UserProfileComponent implements OnInit {
roles!: any[];
utilisateur: Utilisateur = new Utilisateur();

constructor(private utilisateurService: UtilisateurService, private roleService: RoleService, private httpClient: HttpClient, private router: Router) {
// Step 3
idUser: any;
user: Utilisateur = new Utilisateur();

}
constructor(private appService: AppService, private utilisateurService: UtilisateurService, private roleService: RoleService, private httpClient: HttpClient, private router: Router) {

ngOnInit(): void {
}
// Step 5
findOne(id: number) {
this.utilisateurService.findOne(id).subscribe(data => { this.user = data; });
}
ngOnInit() {
// Step 6
this.idUser = this.appService.idUser;
console.log("user profile " + this.idUser);
this.findOne(this.idUser);
this.findAllUtilisateurs();
this.findAllRole();
}
Expand All @@ -35,8 +47,6 @@ export class UserProfileComponent implements OnInit {
this.roleService.findAll().subscribe(data => { this.roles = data; });
}



deleteUtilisateur(id: number) {
this.utilisateurService.delete(id).subscribe(
() => {
Expand All @@ -45,4 +55,7 @@ export class UserProfileComponent implements OnInit {
)
}

updateProfil(value) {
console.log(value);
}
}
Empty file modified src/assets/img/maison.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.