AnisB
/
XJC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trying to fix navbar

Browse Source
thierry
Viiciouss 7 years ago
parent e61e029252
commit 611d192e92
11 changed files with 137 additions and 39 deletions
Show Stats Download Patch File Download Diff File

1
src/app/app.component.html
Unescape Escape View File

@ -1 +1,2 @@
<navigationBar></navigationBar>
<router-outlet></router-outlet>

12
src/app/components/carteParrainage/carte-parrainage/carte-parrainage.component.html
Unescape Escape View File

@ -1,6 +1,10 @@
<div class="card">
<div class="well">
<p class="h5 text-center mb-4">Liste de vos cartes de parrainage</p>
<div class="container" style="padding-top:5%">
<div class="card">
<div class="well">
<p class="h5 text-center mb-4">Liste de vos cartes de parrainage</p>
</div>
</div>
<button (click)="goToProfil()">Profil</button>
</div>
<button (click)="goToProfil()">Back</button>

2
src/app/components/home/home.component.html
Unescape Escape View File

@ -1,8 +1,6 @@
<!--Main Navigation-->
<header>
<navigationBar></navigationBar>
<!-- Intro Section -->
<div class="view hm-white-light jarallax" data-jarallax='{"speed": 0.2}' style="background-image: url(https://mdbootstrap.com/img/Photos/Others/img%20%2844%29.jpg); background-attachment: fixed;">
<div class="full-bg-img">

2
src/app/components/home/home.component.ts
Unescape Escape View File

@ -33,6 +33,8 @@ export class HomeComponent implements OnInit {
this.router.navigate(['/']);
}
ngOnInit() {
firebase.auth().signOut();
}
}

1
src/app/components/login/login.component.ts
Unescape Escape View File

@ -49,6 +49,7 @@ export class LoginComponent implements OnInit, OnDestroy {
this.router.navigate(['/register']);
}
ngOnInit() {
}

15
src/app/components/navigationBar/navigationBar.component.html
Unescape Escape View File

@ -1,5 +1,5 @@
<!--Navbar-->
<navbar SideClass="navbar navbar-expand-lg navbar-dark fixed-top scrolling-navbar">
<navbar SideClass="navbar navbar-expand-lg navbar-dark fixed-top scrolling-navbar indigo">
<logo>
<a class="logo navbar-brand waves-light" mdbRippleRadius href="#"><strong>ParrainApp</strong></a>
</logo>
@ -9,11 +9,20 @@
<a class="nav-link" >Home <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item waves-light" mdbRippleRadius>
<a class="nav-link" (click)="loadRegisterComponent();">Register</a>
<a class="nav-link" (click)="loadRegisterComponent()">{{navElement1}}</a>
</li>
<li class="nav-item waves-light" mdbRippleRadius>
<a class="nav-link" (click)="loadLoginComponent();">Login</a>
<a class="nav-link" (click)="loadLoginComponent()">{{navElement2}}</a>
</li>
<li class="nav-item waves-light" mdbRippleRadius >
<a class="nav-link" (click)="logout()">Logout</a>
</li>
<!-- <li class="nav-item waves-light" mdbRippleRadius *ngIf="afficheLogout === true" >
<a class="nav-link" (click)="logout()">Logout</a>
</li>
-->
</ul>
</links>
</navbar>

76
src/app/components/navigationBar/navigationBar.component.ts
Unescape Escape View File

@ -1,12 +1,82 @@
import { Component } from '@angular/core';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Observable } from 'rxjs/Observable';
import { Router } from '@angular/router';
import { AngularFireDatabase, FirebaseListObservable, FirebaseObjectObservable } from 'angularfire2/database';
import * as firebase from 'firebase/app';
import { AngularFireAuth } from 'angularfire2/auth';
import { FormsModule } from '@angular/forms';
import { ProfilService } from '../../services/profil/profil.service';
import { User } from '../../../models/User';
import { Parrain } from '../../../models/Parrain';
import { Commercant } from '../../../models/Commercant';
import { AuthService } from '../../services/auth/auth.service';
@Component({
moduleId: module.id,
selector: 'navigationBar',
templateUrl: './navigationBar.component.html',
styleUrls: ['./navigationBar.component.scss']
styleUrls: ['./navigationBar.component.scss'],
providers: [AuthService]
})
export class NavigationBarComponent { }
export class NavigationBarComponent implements OnInit, OnDestroy{
user: Observable<firebase.User>;
localUser: any;
parrain: Parrain;
commercant: Commercant;
profileData: FirebaseListObservable<any[]>;
navElement1: string;
navElement2: string;
navElement3: string;
afficheLogout: boolean;
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router, private authService: AuthService) {
this.updateNavBar();
}
updateNavBar() {
firebase.auth().onAuthStateChanged(function(user) {
if (user) {
this.afficheLogout = true;
console.log('is signed in.');
if (user.displayName === 'Parrain') {
this.localUser = user;
this.element1 = 'Profil Parrain';
this.element2 = 'Logout Parrain';
console.log('parrain fct: ' + this.navElement1);
} else if (user.displayName === 'Commercant') {
this.localUser = user;
this.element1 = 'Profil Commercant';
this.element2 = 'Logout Commercant';
}
} else {
this.afficheLogout = false;
console.log('No user is signed in.');
// No user is signed in.
this.element1 = 'Register';
this.element2 = 'login';
console.log('fct dans home: ' + this.navElement1);
}
this.navElement1 = this.element1;
this.navElement2 = this.element2;
});
}
logout() {
this.authService.logout();
this.updateNavBar();
this.router.navigate(['/']);
}
ngOnInit() {
}
ngOnDestroy() {
}
}

21
src/app/components/opCommercial/op-commercial/op-commercial.component.html
Unescape Escape View File

@ -1,11 +1,14 @@
<div class="card">
<div class="well">
<p class="h5 text-center mb-4">Liste de vos operations commercials</p>
<div class="container" style="padding-top:5%">
<div class="card">
<div class="well">
<p class="h5 text-center mb-4">Liste de vos operations commercials</p>
</div>
</div>
</div>
<ul>
<li *ngFor="let op of opCommData | async">Operation Commerciale: {{op.name}}</li>
</ul>
<button (click)="goToCreaOpCom()">Nouvelle opération Commercial</button>
<button (click)="goToProfil()">Back</button>
<ul>
<li *ngFor="let op of opCommData | async">Operation Commerciale: {{op.name}}</li>
</ul>
<button (click)="goToCreaOpCom()">Nouvelle opération Commercial</button>
<button (click)="goToProfil()">Profil</button>
</div>

37
src/app/components/profil/profil.component.html
Unescape Escape View File

@ -1,17 +1,18 @@
<p>
Profil
</p>
<div class="container" style="padding-top: 5%">
<p>
Profil
</p>
<div> ID: {{ (user | async)?.uid }} </div>
<div> Email: {{ (user | async)?.email }} </div>
<div> Statut: {{ (user | async)?.displayName }} </div>
<div> ID: {{ (user | async)?.uid }} </div>
<div> Email: {{ (user | async)?.email }} </div>
<div> Statut: {{ (user | async)?.displayName }} </div>
<!--Grid row-->
<!--Grid column-->
<div class="col-md-12" style="padding-right: 1%; padding-left: 1%;">
<div class="col-md-12" style="padding-right: 2%; padding-left: 2%;">
<!--Card-->
<div class="card testimonial-card">
@ -26,11 +27,11 @@
<div class="card-body">
<!--Name-->
<h4 class="card-title"><p>Salut {{localUser.firstname}} {{localUser.familyname}} {{localUser.uid}} </p></h4>
<hr>
<div *ngIf="(user | async)?.displayName === 'Parrain'" >
<div>
<h4 class="card-title"><p>Salut {{localUser.firstname}} {{localUser.familyname}} {{localUser.uid}} </p></h4>
<hr>
<ul>
<p class="text-left "><label class="text-uppercase">status </label>: {{localUser.status}}</p>
<p class="text-left"><label class="text-uppercase">email </label>: {{localUser.email}}</p>
@ -51,18 +52,19 @@
</div>
<button (click)="goToCarte()">Cartes</button>
</div>
<div *ngIf="(user | async)?.displayName === 'Commercant'" class="alert alert-danger">
<div *ngIf="(user | async)?.displayName === 'Commercant'" >
<div>
<h4 class="card-title"><p>Salut {{localUser.commercialName}} {{localUser.uid}} </p></h4>
<hr>
<ul>
<li class="text-left"><label class="text-uppercase"> raisonSociale</label> : {{localUser.raisonSociale}}</li>
<li class="text-left"><label class="text-uppercase"> siret </label>: {{localUser.siret}}</li>
<li class="text-left"><label class="text-uppercase">email </label> : {{localUser.email}}</li>
<li class="text-left"><label class="text-uppercase"> emailVerified </label> : {{localUser.emailVerified}}</li>
<li class="text-left"><label class="text-uppercase"> password </label> : {{localUser.password}}</li>
<li class="text-left"><label class="text-uppercase">dateInscription </label>: {{localUser.dateInscription}}</li>
<li class="text-left"><label class="text-uppercase">status </label>: {{localUser.status}}</li>
<p class="text-left"><label class="text-uppercase"> raisonSociale</label> : {{localUser.raisonSociale}}</p>
<p class="text-left"><label class="text-uppercase"> siret </label>: {{localUser.siret}}</p>
<p class="text-left"><label class="text-uppercase">email </label> : {{localUser.email}}</p>
<p class="text-left"><label class="text-uppercase"> emailVerified </label> : {{localUser.emailVerified}}</p>
<p class="text-left"><label class="text-uppercase"> password </label> : {{localUser.password}}</p>
<p class="text-left"><label class="text-uppercase">dateInscription </label>: {{localUser.dateInscription}}</p>
<p class="text-left"><label class="text-uppercase">status </label>: {{localUser.status}}</p>
</ul>
</div>
@ -87,3 +89,4 @@
<!--Grid row-->
</div>

2
src/app/components/profil/profil.component.ts
Unescape Escape View File

@ -68,6 +68,7 @@ export class ProfilComponent implements OnInit, OnDestroy {
logout() {
this.authService.logout();
this.user = null;
this.router.navigate(['/']);
}
@ -83,6 +84,7 @@ export class ProfilComponent implements OnInit, OnDestroy {
}
ngOnDestroy() {
firebase.auth().signOut();
/*
this.localUser = {
uid: '',

7
src/app/services/auth/auth.service.ts
Unescape Escape View File

@ -48,7 +48,12 @@ export class AuthService {
firebase.auth().signInWithEmailAndPassword(email, password).then(user => {
if (user) {
console.log('salut le ' + user.displayName + ' ' + user.email + ' has signed!');
this.router.navigate(['/profil']);
if (user.displayName === 'Parrain') {
this.router.navigate(['/carteParrainageComponent']);
}
else if (user.displayName === 'Commercant') {
this.router.navigate(['/opCommercial']);
}
}else {
console.log('error!!');
}

Write Preview
Loading…
Cancel
Save