Skip to content

Commit 1108a6a

Browse files
BaptisteMchltBaptisteMchlt
committed
Merge branch 'master' of https://github.com/AdonisVienet/agenceImmoFront into localBapt
2 parents 298c7a5 + 8138831 commit 1108a6a

16 files changed

+108
-402
lines changed

‎src/app/app.module.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import { GarageService } from './services/garage.service';
1818
import { TerrainService } from './services/terrain.service';
1919
import { VisiteService } from './services/visite.service';
2020
import { AppService } from './app.service';
21+
import { MatMenuModule } from '@angular/material/menu';
22+
import { MatIconModule } from '@angular/material/icon';
2123

2224
@NgModule({
2325
imports: [
@@ -27,7 +29,9 @@ import { AppService } from './app.service';
2729
ReactiveFormsModule,
2830
RouterModule,
2931
AppRoutingModule,
30-
ComponentsModule
32+
ComponentsModule,
33+
MatMenuModule,
34+
MatIconModule
3135
],
3236
declarations: [
3337
AppComponent,

‎src/app/app.routing.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { QuestionComponent } from './components/question/question.component';
1313
import { RoleComponent } from './components/role/role.component';
1414
import { TerrainComponent } from './components/terrain/terrain.component';
1515
import { UtilisateurComponent } from './components/utilisateur/utilisateur.component';
16-
import { VisiteComponent } from './components/visite/visite.component';
16+
import { VisiteComponent } from './components/utilisateur/visite/visite.component';
1717
import { LoginComponent } from './components/login/login.component';
1818
import { DashboardComponent } from './dashboard/dashboard.component';
1919

‎src/app/app.service.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { Router } from '@angular/router';
55
@Injectable({
66
providedIn: 'root'
77
})
8+
89
export class AppService {
910
// Authentification
1011
authenticated = false;

‎src/app/components/components.module.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { OffreComponent } from './offre/offre.component';
1414
import { QuestionComponent } from './question/question.component';
1515
import { RoleComponent } from './role/role.component';
1616
import { TerrainComponent } from './terrain/terrain.component';
17-
import { VisiteComponent } from './visite/visite.component';
17+
import { VisiteComponent } from './utilisateur/visite/visite.component';
1818
import { LoginComponent } from 'app/components/login/login.component';
1919
import { FormsModule } from '@angular/forms';
2020
import { RegistrationComponent } from './registration/registration.component';

‎src/app/components/visite/visite.component.html‎ renamed to ‎src/app/components/utilisateur/visite/visite.component.html‎

File renamed without changes.

‎src/app/components/visite/visite.component.scss‎ renamed to ‎src/app/components/utilisateur/visite/visite.component.scss‎

File renamed without changes.

‎src/app/components/visite/visite.component.spec.ts‎ renamed to ‎src/app/components/utilisateur/visite/visite.component.spec.ts‎

File renamed without changes.

‎src/app/components/visite/visite.component.ts‎ renamed to ‎src/app/components/utilisateur/visite/visite.component.ts‎

File renamed without changes.

‎src/app/dashboard/dashboard.component.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
<html>
33
<div>
44

5+
6+
<br>
7+
<br>
8+
<br>
9+
<br>
10+
<h1>Hello {{user.prenomUtilisateur}}</h1>
11+
512
<div style="position: relative; left: 10px; background-color: white; border-color: black; border-width: thick;">
613
<br>
714
<br>

‎src/app/dashboard/dashboard.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,4 @@ export class DashboardComponent implements OnInit {
161161
this.startAnimationForBarChart(websiteViewsChart);
162162
}
163163

164-
}
164+
}

0 commit comments

Comments
 (0)