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

Merge branch 'anis' of ssh://git.marbelium.com:10023/Viiciouss/XJC into thierry

Browse Source
thierry
Tmadkaud 7 years ago
parent 43e5f5f92e 25ee778055
commit 16482c0275
15 changed files with 106 additions and 51 deletions
Show Stats Download Patch File Download Diff File

4
src/app/components/admin/demande-op-commercial/demande-op-commercial.component.html
Unescape Escape View File

@ -10,7 +10,7 @@
<div class="col-md-6 d-flex flex-column " id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="subCard1-row d-flex flex-row">
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold text-center">{{commercant.commercialName}}</p></div>
<div class="merchant-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>
@ -75,7 +75,7 @@
<div class="col-md-6 d-flex flex-column " id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="subCard1-row d-flex flex-row">
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold text-center">{{commercant.commercialName}}</p></div>
<div class="merchant-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>

6
src/app/components/admin/demande-op-commercial/demande-op-commercial.component.scss
Unescape Escape View File

@ -38,13 +38,13 @@
}
.merchant-name p {
font-size: 3rem;
font-size: 1.5rem;
}
.merchant-logo {
background-repeat: no-repeat;
background-size:50%;
background-position : center;
background-position : 100%;
}
#image1 {
@ -152,7 +152,7 @@
.subCard1-row {
height: 35vw;
.merchant-name p {
font-size: 2rem;
font-size: 1rem;
}
.operation-data p {
font-size: 1rem;

2
src/app/components/admin/list-carte-envoyer/list-carte-envoyer.component.html
Unescape Escape View File

@ -9,7 +9,7 @@
<div class="col-md-6 d-flex flex-column " id="subCard1">
<img src="{{opComm?.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="subCard1-row d-flex flex-row">
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold">{{opComm?.commercantOpCom.commercialName}}</p></div>
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold text-center">{{opComm?.commercantOpCom.commercialName}}</p></div>
<div class="merchant-logo" [ngStyle]="{ 'background-image': 'url(' + opComm?.commercantOpCom.image.downloadURL + ')'}">
</div>

6
src/app/components/admin/list-carte-envoyer/list-carte-envoyer.component.scss
Unescape Escape View File

@ -31,13 +31,13 @@
}
.merchant-name p {
font-size: 3rem;
font-size: 1.5rem;
}
.merchant-logo {
background-repeat: no-repeat;
background-size:50%;
background-position : center;
background-position : 100%;
}
#image1 {
@ -175,7 +175,7 @@
.subCard1-row {
height: 35vw;
.merchant-name p {
font-size: 2rem;
font-size: 1rem;
}
.operation-data p {
font-size: 1rem;

4
src/app/components/admin/liste-op-commercial/liste-op-commercial.component.html
Unescape Escape View File

@ -27,7 +27,7 @@
<div class="col-md-6 d-flex flex-column " id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="subCard1-row d-flex flex-row">
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold text-center">{{commercant.commercialName}}</p></div>
<div class="merchant-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>
@ -104,7 +104,7 @@
<div class="col-md-6 d-flex flex-column " id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="subCard1-row d-flex flex-row">
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold text-center">{{commercant.commercialName}}</p></div>
<div class="merchant-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>

4
src/app/components/admin/liste-op-commercial/liste-op-commercial.component.scss
Unescape Escape View File

@ -30,7 +30,7 @@
}
.merchant-name p {
font-size: 3rem;
font-size: 1.5rem;
}
.merchant-logo {
@ -190,7 +190,7 @@
.subCard1-row {
height: 35vw;
.merchant-name p {
font-size: 2rem;
font-size: 1rem;
}
.operation-data p {
font-size: 1rem;

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

@ -29,9 +29,9 @@
<p>carte de parrainage !</p>
</div>
<div class="list-group wow fadeInUpBig">
<div *ngFor="let crt of carteParrData | async">
<div *ngFor="let crt of (carteParrData | async); let i = index;">
<div class="card mainCard" *ngIf="(crt.status == statutAffiche) || (statutAffiche == 'Toutes')">
<div class="row no-margin">
<div class="row no-margin maincard-row">
<img class="col-md-6 card-image subCard1" id="image1" src={{crt.carteTemplate.downloadURL}}>
<!--<div class="col-md-6 card-image mb-1 subCard1" [ngStyle]="{ 'background-image': 'url(' + crt.carteTemplate.downloadURL + ')'}">
@ -51,9 +51,17 @@
</div>
</div>-->
<div class="col-md-6 card subCard2">
<label>ID de la carte: {{crt.uid}}</label>
<label>Avantages cumulés: {{crt.avantageCumule === ''? '0' : crt.avantageCumule}} €</label>
<label>Avantages recuperés: {{crt.avantageRecuperer === ''? '0' : crt.avantageRecuperer}} €</label>
<div class="card-block no-margin">
<div class="col-md-12" id="subCard2Part1">
<label>ID de la carte: {{crt.uid}}</label>
<label>Avantages cumulés: {{crt.avantageCumule === ''? '0' : crt.avantageCumule}} €</label>
<label>Avantages recuperés: {{crt.avantageRecuperer === ''? '0' : crt.avantageRecuperer}} €</label>
</div>
<div class="btn-block d-flex flex-lg-row flex-md-column flex-sm-row" id="subCard2Part2">
<button class="btn btn-outline-primary btn-rounded" (click)="hideme[i] = !hideme[i]">{{show ? 'Cacher Détails' : 'Détails'}}</button>
<!--<button class="btn btn-outline-info btn-rounded" (click)="sectionToImage(op.carteTemplate.downloadURL, commercant.image.downloadURL)">screenShot</button>-->
</div>
</div>
</div>
</div>
<!-- Card footer -->
@ -69,6 +77,17 @@
</div>
</div>
<!-- Card footer -->
<div class="card" [hidden]="!hideme[i]" style="height:20rem; overflow-y: auto;">
<div class="card-body">
<ul class="list-group wow fadeInDown">
<p class="font-weight-normal" style="padding-top: 2%" *ngIf="crt.historique === undefined">Aucune opération n'a été effectuée sur cette carte !</p>
<li class="list-group-item justify-content-between align-items-center" *ngFor="let hst of crt.historique">
<p class="font-weight-normal" style="padding-top: 2%">{{hst}}</p>
</li>
</ul>
</div>
</div>
</div>
</div>

67
src/app/components/carteParrainage/carte-parrainage/carte-parrainage.component.scss
Unescape Escape View File

@ -11,33 +11,24 @@
.container {
padding-top: 5%;
}
.mainCard {
margin-top: 5%;
width: 100%;
.maincard-row {
height: 25vh;
}
}
#image1 {
padding-left: 0;
padding-right: 0;
.container {
padding-top:5%;
}
.subCard1 {
height: 15rem;
background-repeat: no-repeat;
background-size:20% auto;
background-position : center;
}
.subCard2 {
display: flex;
justify-content: center;
padding-left: 10%;
}
.subCard2 > label {
padding-bottom: 5%;
height: auto;
background-color: white;
// background-repeat: no-repeat;
// background-size:20% auto;
// background-position : center;
}
.firstRow {
@ -69,6 +60,44 @@
//background-color: yellow;
}
#image1 {
padding-left: 0;
padding-right: 0;
}
#subCard2Part1 {
padding-top: 5%;
display: flex;
flex-direction: column
}
#subCard2Part2 {
padding-top: 5%;
}
#subCard2Part3 {
padding-right: 5%;
padding-top: 0%;
padding-bottom: 1%;
}
#opTitle {
display: flex;
flex-direction: column
}
#opAvantages {
display: flex;
flex-direction: column;
padding-top: 2%;
}
#opLogs {
display: flex;
flex-direction: column;
padding-top: 5%;
}
.no-margin {
margin-right: 0;
margin-left: 0;

2
src/app/components/carteParrainage/carte-parrainage/carte-parrainage.component.ts
Unescape Escape View File

@ -30,9 +30,11 @@ export class CarteParrainageComponent implements OnInit, OnDestroy {
commList: FirebaseListObservable<any[]>;
databaseRef: any;
statutAffiche: string;
hideme = {};
constructor(public afAuth: AngularFireAuth, public afDb: AngularFireDatabase,
private router: Router) {
this.hideme = {}; // init is required
this.carteParr = new CarteParrainage();
this.databaseRef = firebase.database().ref();
this.user = afAuth.authState;

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

@ -239,7 +239,7 @@
Merci de lire avec attention les différentes modalités d’utilisation du présent site avant d’y parcourir ses pages. En vous connectant sur ce site, vous acceptez sans réserves les présentes modalités. Aussi, conformément à l’article n°6 de la Loi n°2004-575 du 21 Juin 2004 pour la confiance dans l’économie numérique, les responsables du présent site internet <a href="http://https://webappparrain.firebaseapp.com/">https://webappparrain.firebaseapp.com/</a> sont :
<br>
<br>
<div class="d-flex flex-lg-row">
<div class="d-flex flex-lg-row flex-md-column flex-sm-column">
<div class="container-fluid">
<p style="color: #b51a00;"><span style="color: rgb(0, 0, 0);"><b>Editeur du Site : </b></span></p>
<p>EIRL XJC INFORMATIQUE</p>

4
src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.html
Unescape Escape View File

@ -76,7 +76,7 @@
</label>
<div class="col-md-6 d-flex flex-column" id="subCard1" [ngStyle]="{ 'background-image': 'url(' + cartePar.carteTemplate.downloadURL + ')'}">
<div class="subCard1-row d-flex flex-row">
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold text-center">{{commercant.commercialName}}</p></div>
<div class="merchant-logo">
<img src="{{commercant.image.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
</div>
@ -170,7 +170,7 @@
<div class="col-md-6 d-flex flex-column " id="subCard1" [ngStyle]="{ 'background-image': 'url(' + cartePar.carteTemplate.downloadURL + ')'}">
<!--<img src="{{cartePar.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">-->
<div class="subCard1-row d-flex flex-row">
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold text-center">{{commercant.commercialName}}</p></div>
<div class="merchant-logo">
<img src="{{commercant.image.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
</div>

17
src/app/components/opCommercial/envoyer-carte/envoyer-carte.component.scss
Unescape Escape View File

@ -36,7 +36,12 @@
}
.merchant-name p {
font-size: 3rem;
font-size: 1.5rem;
}
#image1 {
z-index: 1;
padding: 0;
}
.merchant-logo {
@ -44,13 +49,13 @@
z-index: 5;
background-repeat: no-repeat;
background-size:50%;
background-position : center;
background-position : 100%;
#image1 {
position: absolute;
top: 15%;
left: 0;
width: 50%;
top: 10%;
left: 50%;
width: 40%;
height: auto;
z-index: 1;
padding: 0;
@ -122,7 +127,7 @@
.subCard1-row {
height: 35vw;
.merchant-name p {
font-size: 2rem;
font-size: 1rem;
}
.operation-data p {
font-size: 1rem;

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

@ -52,7 +52,7 @@
<div class="col-md-6 d-flex flex-column " id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="subCard1-row d-flex flex-row">
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="merchant-name d-flex flex-center"><p class="white-text info-text font-bold text-center">{{commercant.commercialName}}</p></div>
<div class="merchant-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>

6
src/app/components/opCommercial/op-commercial/op-commercial.component.scss
Unescape Escape View File

@ -40,13 +40,13 @@
}
.merchant-name p {
font-size: 3rem;
font-size: 1.5rem;
}
.merchant-logo {
background-repeat: no-repeat;
background-size:50%;
background-position : center;
background-position : 100%;
}
#image1 {
@ -150,7 +150,7 @@
.subCard1-row {
height: 35vw;
.merchant-name p {
font-size: 2rem;
font-size: 1rem;
}
.operation-data p {
font-size: 1rem;

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

@ -1,6 +1,6 @@
<div class="card">
<div class="well d-flex flex-column justify-content-center">
<p class="h5 text-center mb-4">Sign up</p>
<p class="h5 text-center mb-4">S'enregistrer</p>
<p class="text-center mb-4" style="padding-top: 2%;">Êtes-vous <strong>Parrain</strong> ou <strong>Commercant</strong> ?</p>
<label>

Write Preview
Loading…
Cancel
Save