Skip to content

Local rama2 #145

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 46 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 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
a42e068
recherche okkkkkk
Feb 27, 2023
d4048dc
description bien
Feb 28, 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
Prev Previous commit
Next Next commit
c'est la fin du login
  • Loading branch information
BaptisteMchlt committed Feb 23, 2023
commit cd43913f463179810a247edb94795859fde9841b
4 changes: 2 additions & 2 deletions src/app/app.routing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import { VisiteComponent } from './components/visite/visite.component';
import { LoginComponent } from './components/login/login.component';
import { DashboardComponent } from './dashboard/dashboard.component';

const routes: Routes =[
const routes: Routes = [
{
path: '',
redirectTo: 'login',
component: LoginComponent,
pathMatch: 'full',
}, {
path: '',
Expand Down
2 changes: 2 additions & 0 deletions src/app/components/components.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { TerrainComponent } from './terrain/terrain.component';
import { VisiteComponent } from './visite/visite.component';
import { LoginComponent } from 'app/components/login/login.component';
import { FormsModule } from '@angular/forms';
import { RegistrationComponent } from './registration/registration.component';

@NgModule({
imports: [
Expand All @@ -39,6 +40,7 @@ import { FormsModule } from '@angular/forms';
TerrainComponent,
VisiteComponent,
LoginComponent,
RegistrationComponent,
],
exports: [
FooterComponent,
Expand Down
45 changes: 34 additions & 11 deletions src/app/components/login/login.component.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,35 @@
<h1>Connectez-vous</h1>
<form (submit)="login()">
<div>
<label for="username">Nom d'utilisateur</label>
<input type="text" class="form-control" [(ngModel)]="credentials.username" name="username">
<style>
body {
margin-top: 25%;
margin-left: 25%;
}

h1 {
color: rgb(114, 40, 40, 0.48);
font-size: 70px;
font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif
}
</style>

<div>
<img src="assets/img/maison.jpg" alt="photoAgence">
</div>

<body>
<div class="form-group col-md-8" style="text-align: center">
<h1>Connectez vous</h1>
<form (submit)="login()">
<div>
<label for="username">Nom d'utilisateur</label>
<input type="text" class="form-control" [(ngModel)]="credentials.username" name="username">
</div>
<div>
<label for="password">Mot de passe</label>
<input type="text" class="form-control" [(ngModel)]="credentials.password" name="password">
<br>
</div>
<button class="btn btn-primary" type="submit">Se connecter</button>
<p>Pas encore de compte ? <a routerLink="/registration">Inscrivez-vous</a></p>
</form>
</div>
<div>
<label for="password">Mot de passe</label>
<input type="text" class="form-control" [(ngModel)]="credentials.password" name="password">
</div>
<button type="submit">Se connecter</button>
</form>
</body>
32 changes: 18 additions & 14 deletions src/app/components/login/login.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,46 @@ import { NgForm } from '@angular/forms';
import { Router } from '@angular/router';
import { AppService } from 'app/app.service';


@Component({
selector: 'app-login',
templateUrl: './login.component.html',
styleUrls: ['./login.component.scss']
})
export class LoginComponent implements OnInit {

username! : string;
password! : string;
credentials = {username : '',password : ''}
constructor(private appService:AppService,private httpClient:HttpClient,private router:Router){}


login(){
this.appService.authenticate(this.credentials,()=>{this.router.navigateByUrl("/home")});
username!: string;
password!: string;
credentials = { username: '', password: '' }
constructor(private appService: AppService, private httpClient: HttpClient, private router: Router) { }


login() {
this.appService.authenticate(this.credentials, () => { this.router.navigateByUrl("/home") });
}


/*onSubmit(form:NgForm) {
// Récupération des données du formulaire
const username = form.value.username;
const password = form.value.password;



// Traitement de la soumission du formulaire
console.log('Username : ' + username);
console.log('Password : ' + password);



// Envoi des données au serveur pour authentification
// ...



// Réinitialisation du formulaire
form.reset();
}*/


ngOnInit(): void {

}
}


}
63 changes: 63 additions & 0 deletions src/app/components/registration/registration.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<h2>Créer un compte</h2>
<div class="row">
<div class="col-md-8">
<div class="card card-user">
<div class="card-header">
<h3 class="card-title">Creer un compte</h3>
</div>
<div class="card-body">
<form (ngSubmit)="saveUtilisateur()">
<div class="row">
<div class="col-md-6 pr-1">
<div class="form-group">
<label>Nom</label>
<input type="text" class="form-control" [(ngModel)]="utilisateur.nomUtilisateur"
name="nomUtilisateur">
</div>
<div class="form-group">
<label>Prénom</label>
<input type="text" class="form-control" [(ngModel)]="utilisateur.prenomUtilisateur"
name="prenomUtilisateur">
</div>
<div class="form-group">
<label>Email</label>
<input type="email" class="form-control" [(ngModel)]="utilisateur.emailUtilisateur"
name="emailUtilisateur">
</div>
<div class="form-group">
<label>Date de Naissance</label>
<input type="date" class="form-control"
[(ngModel)]="utilisateur.dateNaissanceUtilisateur" name="dateNaissanceUtilisateur">
</div>
<div class="form-group">
<label>Telephone</label>
<input type="tel" class="form-control" [(ngModel)]="utilisateur.numTelUtilisateur"
name="numTelUtilisateur">
</div>
<div class="form-group">
<label>Nom d'utilisateur</label>
<input type="text" class="form-control" [(ngModel)]="utilisateur.username"
name="username">
</div>
<div class="form-group">
<label>Mot de passe</label>
<input type="text" class="form-control" [(ngModel)]="utilisateur.password"
name="password">
</div>
<div class="form-group">
<label>Role</label>
<select [(ngModel)]="utilisateur.roles" name="roles">
<option value="">Client</option>
</select>
</div>
</div>
</div>
<div class="row">
<div class="update ml-auto mr-auto">
<button class="btn btn-primary btn-round">Valider</button>
</div>
</div>
</form>
</div>
</div>
</div>
Empty file.
23 changes: 23 additions & 0 deletions src/app/components/registration/registration.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { RegistrationComponent } from './registration.component';

describe('RegistrationComponent', () => {
let component: RegistrationComponent;
let fixture: ComponentFixture<RegistrationComponent>;

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ RegistrationComponent ]
})
.compileComponents();

fixture = TestBed.createComponent(RegistrationComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

it('should create', () => {
expect(component).toBeTruthy();
});
});
35 changes: 35 additions & 0 deletions src/app/components/registration/registration.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { Utilisateur } from 'app/model/utilisateur';
import { UtilisateurService } from 'app/services/utilisateur.service';


@Component({
selector: 'app-registration',
templateUrl: './registration.component.html',
styleUrls: ['./registration.component.scss']
})
export class RegistrationComponent implements OnInit {




users!: any[]
roles!: any[];
utilisateur: Utilisateur = new Utilisateur();
constructor(private utilisateurService: UtilisateurService, private router: Router) { }
ngOnInit(): void {


}


saveUtilisateur() {
this.utilisateurService.save(this.utilisateur).subscribe(
() => {
this.utilisateur = new Utilisateur();
}
)
}
}

15 changes: 7 additions & 8 deletions src/app/components/utilisateur/utilisateur.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,13 @@ export class UtilisateurComponent implements OnInit {


//Méthode save :
save() {
this.currentFileUpload = this.selectedFiles?.item(0) as File;
this.utilisateurService.save(this.currentFileUpload, this.utilisateur).subscribe(() => {
this.findAllUtilisateurs();
this.utilisateur = new Utilisateur();
this.selectedFiles = undefined;
})

saveUtilisateur() {
this.utilisateurService.save(this.utilisateur).subscribe(
() => {
this.findAllUtilisateurs(); // MAJ de la liste des utilisateurs
this.utilisateur = new Utilisateur(); // Vider le formulaire pour avoir une nouvelle ligne
}
)
}
deleteUtilisateur(id: number) {
this.utilisateurService.delete(id).subscribe(
Expand Down
15 changes: 8 additions & 7 deletions src/app/layouts/admin-layout/admin-layout.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ import { IconsComponent } from '../../icons/icons.component';
import { MapsComponent } from '../../maps/maps.component';
import { NotificationsComponent } from '../../notifications/notifications.component';
import { UpgradeComponent } from '../../upgrade/upgrade.component';
import {MatButtonModule} from '@angular/material/button';
import {MatInputModule} from '@angular/material/input';
import {MatRippleModule} from '@angular/material/core';
import {MatFormFieldModule} from '@angular/material/form-field';
import {MatTooltipModule} from '@angular/material/tooltip';
import {MatSelectModule} from '@angular/material/select';
import { MatButtonModule } from '@angular/material/button';
import { MatInputModule } from '@angular/material/input';
import { MatRippleModule } from '@angular/material/core';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatTooltipModule } from '@angular/material/tooltip';
import { MatSelectModule } from '@angular/material/select';


@NgModule({
imports: [
Expand Down Expand Up @@ -45,4 +46,4 @@ import {MatSelectModule} from '@angular/material/select';
]
})

export class AdminLayoutModule {}
export class AdminLayoutModule { }
2 changes: 2 additions & 0 deletions src/app/layouts/admin-layout/admin-layout.routing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { IconsComponent } from '../../icons/icons.component';
import { MapsComponent } from '../../maps/maps.component';
import { NotificationsComponent } from '../../notifications/notifications.component';
import { UpgradeComponent } from '../../upgrade/upgrade.component';
import { RegistrationComponent } from 'app/components/registration/registration.component';

export const AdminLayoutRoutes: Routes = [
// {
Expand Down Expand Up @@ -63,4 +64,5 @@ export const AdminLayoutRoutes: Routes = [
{ path: 'maps', component: MapsComponent },
{ path: 'notifications', component: NotificationsComponent },
{ path: 'upgrade', component: UpgradeComponent },
{ path: 'registration', component: RegistrationComponent },
];
23 changes: 7 additions & 16 deletions src/app/services/utilisateur.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { HttpClient, HttpRequest } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Utilisateur } from 'app/model/utilisateur';
import { Observable } from 'rxjs';
import { HttpClient } from "@angular/common/http";
import { Injectable } from "@angular/core";
import { Observable } from "rxjs";




@Injectable({
providedIn: 'root'
Expand All @@ -14,18 +16,7 @@ export class UtilisateurService {

public findAll(): Observable<any> { return this.httpClient.get(this.BASE_URL); }

public save(image: File, utilisateur: Utilisateur): Observable<any> {
const formData = new FormData(); //permet d'utiliser le resquestParam de la méthode save de la partie back
formData.append('nomFront', utilisateur.nomUtilisateur);
formData.append('prenomFront', utilisateur.prenomUtilisateur);
formData.append('usernameFront', utilisateur.username);
formData.append('passwordFront', utilisateur.password);
formData.append('imageFront', image);
const requestHttp = new HttpRequest('POST', this.BASE_URL, formData, {
reportProgress: true, responseType: 'text'
})
return this.httpClient.request(requestHttp);
}
public save(utilisateur: any): Observable<any> { return this.httpClient.post(this.BASE_URL, utilisateur); }

public delete(id: number): Observable<any> { return this.httpClient.delete(this.BASE_URL + "/" + id); }

Expand Down