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 0c19a798d7 31a1023c56
commit 69be23c3d4
12 changed files with 296 additions and 155 deletions
Show Stats Download Patch File Download Diff File

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

@ -7,22 +7,18 @@
<div class="list-group wow fadeInLeftBig">
<div class="card mainCard" *ngFor="let op of opCommDataEnCours | async">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="mask pattern-6">
<div class="row firstRow">
<div class="col-md-6 flex-center card-block cardPart1"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
<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-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>
</div>
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p class="white-text info-text font-bold">{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
</div>
</div>
</div>
<div class="subCard1-row d-flex flex-row">
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{op.name}}</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row no-margin">
@ -76,22 +72,18 @@
<div class="card mainCard" *ngFor="let op of opCommDataRejeter | async">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="mark pattern-3">
<div class="row firstRow">
<div class="col-md-6 flex-center card-block cardPart1"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
<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-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>
</div>
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p class="white-text info-text font-bold">{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
</div>
</div>
</div>
<div class="subCard1-row d-flex flex-row">
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{op.name}}</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row no-margin">

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

@ -28,35 +28,46 @@
font-size: 1.05rem;
}
.firstRow {
height: 50%;
.subCard1-row {
height: 100%;
z-index: 3;
}
.secondRow {
height: 50%;
.subCard1-row div {
width: 100%;
}
.cardPart1 {
//background-color: red;
.merchant-name p {
font-size: 3rem;
}
.cardPart2 {
//background-color: orange;
.merchant-logo {
background-repeat: no-repeat;
background-size:50% auto;
background-size:50%;
background-position : center;
}
.cardPart3 {
//background-color: green;
#image1 {
z-index: 1;
padding: 0;
}
.cardPart4 {
//background-color: yellow;
#subCard1::before {
content: ' ';
display: block;
width: 100%;
height: 100%;
position: absolute;
background-color: fade_out(black, 0.5);
left: 0;
top: 0;
z-index: 2;
}
#subCard2Part1 {
padding-top: 5%;
display: flex;
@ -136,3 +147,22 @@
}
}
@media screen and (max-width: 786px) {
.subCard1-row {
height: 35vw;
.merchant-name p {
font-size: 2rem;
}
.operation-data p {
font-size: 1rem;
}
.operation-id p {
font-size: 0.8rem;
font-weight: bold;
}
}
}

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

@ -6,22 +6,18 @@
<h4 class="font-up mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Aperçu de votre opération commerciale</h4>
<div class="card mainCard wow fadeInLeft">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<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="view">
<div class="mask pattern-7">
<div class="row no-margin firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{opComm?.commercantOpCom.commercialName}}</div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + opComm?.commercantOpCom.image.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">{{opComm?.commercantOpCom.commercialName}}</p></div>
<div class="merchant-logo" [ngStyle]="{ 'background-image': 'url(' + opComm?.commercantOpCom.image.downloadURL + ')'}">
</div>
</div>
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{opComm?.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{opComm?.uid}}</p></div>
</div>
</div>
</div>
<div class="subCard1-row d-flex flex-row">
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{opComm?.name}}</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{opComm?.uid}}</p></div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row no-margin">

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

@ -14,54 +14,52 @@
.subCard1 {
height: 15rem;
background-repeat: no-repeat;
background-size:20% auto;
background-position : center;
}
.subCard2 {
display: flex;
justify-content: center;
}
.subCard2issu {
padding-left: 5%;
display: flex;
justify-content: center;
}
.subCard2issu > label {
padding-bottom: 2%;
height: auto;
background-color: white;
padding-left: 0;
padding-right: 0;
font-size: 1.05rem;
}
.firstRow {
height: 50%;
.subCard1-row {
height: 100%;
z-index: 3;
}
.secondRow {
height: 50%;
.subCard1-row div {
width: 100%;
}
.cardPart1 {
//background-color: red;
.merchant-name p {
font-size: 3rem;
}
.cardPart2 {
//background-color: orange;
.merchant-logo {
background-repeat: no-repeat;
background-size:50% auto;
background-size:50%;
background-position : center;
}
.cardPart3 {
//background-color: green;
#image1 {
z-index: 1;
padding: 0;
}
.cardPart4 {
//background-color: yellow;
#subCard1::before {
content: ' ';
display: block;
width: 100%;
height: 100%;
position: absolute;
background-color: fade_out(black, 0.5);
left: 0;
top: 0;
z-index: 2;
}
#subCard2Part1 {
padding-top: 5%;
display: flex;
@ -131,3 +129,62 @@
}
}
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
}
#nouvelleOp {
margin-bottom: 20%;
}
#subCard2Part2 {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.card-data > ul {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.card-data ul li {
margin-bottom: 2%;
}
}
#footerCard > ul {
padding-left: 0;
}
}
@media screen and (max-width: 982px) {
#subCard2Part1 {
padding-left: 0;
}
}
@media screen and (max-width: 786px) {
.subCard1-row {
height: 35vw;
.merchant-name p {
font-size: 2rem;
}
.operation-data p {
font-size: 1rem;
}
.operation-id p {
font-size: 0.8rem;
font-weight: bold;
}
}
}

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

@ -24,22 +24,18 @@
<div class="card mainCard" *ngFor="let op of filteredOpCommercials">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="mask pattern-6">
<div class="row no-margin firstRow">
<div class="col-md-6 flex-center card-block cardPart1"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
<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-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>
</div>
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p class="white-text info-text font-bold">{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
</div>
</div>
</div>
<div class="subCard1-row d-flex flex-row">
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{op.name}}</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row no-margin">
@ -104,22 +100,18 @@
<div class="card mainCard" *ngFor="let op of opCommDataBloquer | async">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="mask pattern-6">
<div class="row no-margin firstRow">
<div class="col-md-6 flex-center card-block cardPart1"><p class="white-text info-text font-bold">{{commercant.commercialName}}</p></div>
<div class="col-md-6 flex-center card-block card-image mb-1 cardPart2 image2" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
<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-logo" [ngStyle]="{ 'background-image': 'url(' + commercant.image.downloadURL + ')'}">
</div>
</div>
<div class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p class="white-text info-text font-bold">{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
</div>
</div>
</div>
<div class="subCard1-row d-flex flex-row">
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{op.name}}</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{op.uid}}</p></div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row no-margin">

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

@ -20,35 +20,43 @@
font-size: 1.05rem;
}
.firstRow {
height: 50%;
.subCard1-row {
height: 100%;
z-index: 3;
}
.secondRow {
height: 50%;
.subCard1-row div {
width: 100%;
}
.cardPart1 {
//background-color: red;
.merchant-name p {
font-size: 3rem;
}
.cardPart2 {
//background-color: orange;
.merchant-logo {
background-repeat: no-repeat;
background-size:50% auto;
background-size:50%;
background-position : center;
}
.cardPart3 {
//background-color: green;
#image1 {
z-index: 1;
padding: 0;
}
.cardPart4 {
//background-color: yellow;
#subCard1::before {
content: ' ';
display: block;
width: 100%;
height: 100%;
position: absolute;
background-color: fade_out(black, 0.5);
left: 0;
top: 0;
z-index: 2;
}
#subCard2Part1 {
padding-top: 5%;
display: flex;
@ -136,4 +144,45 @@
}
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
}
#nouvelleOp {
margin-bottom: 20%;
}
#subCard2Part2 {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.card-data > ul {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.card-data ul li {
margin-bottom: 2%;
}
}
#footerCard > ul {
padding-left: 0;
}
}
@media screen and (max-width: 982px) {
#subCard2Part1 {
padding-left: 0;
}
}

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

@ -32,37 +32,42 @@
<!--Section: Features v.1-->
<section class="section feature-box" id="features">
<section class="section feature-box wow fadeInUp" id="features">
<!--Section heading-->
<h1 class="section-heading pt-4">Why is it so great?</h1>
<h1 class="section-heading pt-4">Comment ça marche ?</h1>
<!--Section description-->
<p class="section-description lead grey-text">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam.</p>
<p class="section-description lead grey-text"><label class="font-bold">ParraineTesAmis.com</label> est le 1er site de parrainage en ligne !
<br>Les <label class="font-bold">Commerçants</label> créent des offres de parrainage et élisent des <label class="font-bold">Parrains</label>.
<br>Les parrains reçoivent leurs <label class="font-bold">Cartes de parrainage</label> numériques et les transfèrent à leurs Filleuls.
<br>Dès lors qu'un Filleul réalise un achat chez un Commerçant, la Carte de parrainage correspondante est créditée.
</p>
<!--Grid row-->
<div class="row features-big">
<!--Grid column-->
<div class="col-md-4 mb-r">
<i class="fa fa-area-chart red-text"></i>
<h5 class="feature-title">Analytics</h5>
<p class="grey-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reprehenderit maiores nam, aperiam minima assumenda deleniti hic.</p>
<div class="col-md-4 mb-r wow fadeInLeft">
<i class="fa fa-handshake-o blue-text"></i>
<h5 class="feature-title">Commercant</h5>
<p class="grey-text">Les Commerçants fixent leurs offres de parrainages.<br>Exemple: 5€ de remise pour le Filleul.<br>5€ de remise pour le Parrain</p>
</div>
<!--Grid column-->
<!--Grid column-->
<div class="col-md-4 mb-r">
<i class="fa fa-book cyan-text"></i>
<h5 class="feature-title">Tutorials</h5>
<p class="grey-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reprehenderit maiores nam, aperiam minima assumenda deleniti hic.</p>
<div class="col-md-4 mb-r wow fadeInUp">
<i class="fa fa-euro blue-text"></i>
<h5 class="feature-title">Parrain</h5>
<p class="grey-text">Les Parrains sont récompensés sur leur Carte à chaque fois qu'un parrainage aboutie.<br>Les filleuls profitent de bons plans.</p>
</div>
<!--Grid column-->
<!--Grid column-->
<div class="col-md-4 mb-r">
<i class="fa fa-coffee orange-text"></i>
<div class="col-md-4 mb-r wow fadeInRight">
<i class="fa fa-line-chart blue-text"></i>
<h5 class="feature-title">Relax</h5>
<p class="grey-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reprehenderit maiores nam, aperiam minima assumenda deleniti hic.</p>
<p class="grey-text">Les Parrains cumulent des récompenses toute l'année.<br> Les Commerçants voient leurs fréquentation augmenter.</p>
</div>
<!--Grid column-->

10
src/app/components/home/home.component.scss
Unescape Escape View File

@ -40,10 +40,18 @@ body {
.feature-box {
width: 98%;
padding-left: 3%;
padding-left: 5%;
padding-right: 5%;
}
.feature-box > p {
font-size: 1.3rem;
}
.features-big p {
font-size: 1.25rem;
}
.features {
align-items: center;
display: flex;

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

@ -12,11 +12,11 @@
<div class="container">
<div class="card">
<div class="well">
<div class="well d-flex flex-column justify-content-center">
<h5 class="mb-5 mt-1 font-bold wow fadeInDown text-center">Envoyer Carte</h5>
<p class="text-center mb-4" style="padding-top: 2%;">Souhaitez-vous envoyer la carte à :</p>
<form class="form-inline flex-center">
<div class="form-inline d-flex flex-row justify-content-center">
<div class="md-form" style="padding-left: 2%;">
<input name="group2" type="radio" class="with-gap" id="Newparrain" value="Newparrain" (click)="initParSelect()" [(ngModel)]="radioParrain">
<label for="Newparrain">Nouveau Parrain</label>
@ -30,9 +30,11 @@
<input name="group2" type="radio" class="with-gap" id="ParrainAffi" value ="ParrainAffi" (click)="initParSelect()" [(ngModel)]="radioParrain">
<label for="ParrainAffi">Parrain Affilier</label>
</div>-->
</form>
</div>
<!-- Si cest un nouveau parrain -->
<div *ngIf="radioParrain === 'Newparrain'">
<!--<some-element [ngClass]="{'first': true, 'second': true, 'third': false}">...</some-element>-->
<div class="newParrain" *ngIf="radioParrain === 'Newparrain'">
<div class="md-form">
<i class="fa fa-user prefix grey-text"></i>
@ -84,9 +86,9 @@
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{cartePar.name}}</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{cartePar.parrainCarte.familyname}} {{cartePar.parrainCarte.firstname}}</p></div>
</div>
<!--<div class="col-md-12 text-center" id="dateFin">
<div class="text-center" id="dateFin">
<label class="white-text info-text font-bold">Valable jusqu'au: {{cartePar.dateFin | date:'dd/MM/yyyy'}}</label>
</div>-->
</div>
</div>
<div class="card-footer" style="margin-top:5%">
<div *ngIf="carteEnvoieEncours">
@ -122,7 +124,7 @@
<!-- Fin Si cest un nouveau parrain -->
<!-- Si cest un parrain existant -->
<div *ngIf="radioParrain === 'ParrainExist'">
<div class="parrainExit" *ngIf="radioParrain === 'ParrainExist'">
<!--
<div class="dropdown" dropdown>
@ -152,7 +154,7 @@
</div>
<div class="md-form" style="padding-top:2%;">
<div class="md-form">
<i class="fa fa-birthday-cake prefix grey-text"></i>
<input type="date" id="orangeForm-Birthday" [(ngModel)]="birthdayTemp" placeholder="Date de naissance" name="birthday" #birthday="ngModel">
<div *ngIf="(birthdayTemp !== parrain.birthday) && (birthday.dirty || birthday.touched)" class="alert alert-danger">
@ -178,7 +180,7 @@
<div class="operation-data flex-center"><p class="white-text info-text font-bold">{{cartePar.name}}</p></div>
<div class="operation-id flex-center"><p class="white-text info-text font-bold">{{cartePar.parrainCarte.familyname}} {{cartePar.parrainCarte.firstname}}</p></div>
</div>
<div class="col-md-12 text-center" id="dateFin">
<div class="text-center" id="dateFin">
<label class="white-text info-text font-bold">Valable jusqu'au: {{cartePar.dateFin | date:'dd/MM/yyyy'}}</label>
</div>
</div>

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

@ -4,11 +4,14 @@
.card {
padding: 5%;
margin-bottom: 10vh;
}
#subCard1 {
display: flex;
justify-content: center;
height: 25vh;
margin-top: 2vh;
margin-right: auto;
margin-left: auto;
}
.subCard1-row {
@ -59,7 +62,11 @@
#dateFin {
height: 10%;
font-size: 0.9rem;
font-size: 0.9rem;
z-index: 2;
}
.parrainExit, .newParrain {
}
@media screen and (max-width: 720px) {

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

@ -47,7 +47,7 @@
</div>
<div class="list-group wow fadeInUpBig">
<div *ngFor="let op of opCommData | async">
<div class="card mainCard" *ngIf="(op.status == statutAffiche) || (statutAffiche == 'Toutes')" style="height: 100%">
<div class="card mainCard" *ngIf="(op.status == statutAffiche) || (statutAffiche == 'Toutes')">
<div class="row no-margin" id="testt">
<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">

5
src/styles.scss
Unescape Escape View File

@ -1 +1,4 @@
/* You can add global styles to this file, and also import other style files */
/* You can add global styles to this file, and also import other style files */
.hidden {
visibility: hidden;
}

Write Preview
Loading…
Cancel
Save