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 77f5ee5d23 a0fb20f07e
commit 93b6c44d80
20 changed files with 413 additions and 85 deletions
Show Stats Download Patch File Download Diff File

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

@ -10,15 +10,17 @@
<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="row firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{commercant.commercialName}}</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="mask 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>
</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 class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
</div>
</div>
</div>
@ -69,15 +71,17 @@
<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="row firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{commercant.commercialName}}</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="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>
</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 class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
</div>
</div>
</div>

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

@ -23,9 +23,9 @@
.subCard1 {
height: auto;
background-color: white;
// background-repeat: no-repeat;
// background-size:20% auto;
// background-position : center;
padding-left: 0;
padding-right: 0;
font-size: 1.05rem;
}
.firstRow {
@ -95,6 +95,44 @@
margin-left: 0;
}
@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;
}
}

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

@ -6,17 +6,19 @@
<div class="card mainCard wow fadeInLeft">
<div class="row no-margin" id="testt">
<div class="col-md-6 mb-1 subCard1" id="subCard1">
<img src="{{opComm?.carteTemplate.downloadURL}}" id="image1" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<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="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="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>
</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 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>

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

@ -99,3 +99,27 @@
margin-right: 0;
margin-left: 0;
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
}
#nouvelleOp {
margin-bottom: 20%;
}
.card-data > ul {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.card-data ul li {
margin-bottom: 2%;
}
}
}

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

@ -25,15 +25,17 @@
<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="row no-margin firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{commercant.commercialName}}</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="mask pattern-3">
<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>
</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 class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
</div>
</div>
</div>
@ -92,15 +94,17 @@
<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="row no-margin firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{commercant.commercialName}}</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="mask pattern-3">
<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>
</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 class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
</div>
</div>
</div>

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

@ -15,9 +15,9 @@
.subCard1 {
height: auto;
background-color: white;
// background-repeat: no-repeat;
// background-size:20% auto;
// background-position : center;
padding-left: 0;
padding-right: 0;
font-size: 1.05rem;
}
.firstRow {
@ -87,5 +87,45 @@
margin-left: 0;
}
@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;
}
}

24
src/app/components/carteParrainage/carte-envoyer/carte-envoyer.component.scss
Unescape Escape View File

@ -84,3 +84,27 @@
margin-right: 0;
margin-left: 0;
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
}
#nouvelleOp {
margin-bottom: 20%;
}
.card-data > ul {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.card-data ul li {
margin-bottom: 2%;
}
}
}

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

@ -1,5 +1,5 @@
<app-nav-parrain></app-nav-parrain>
<div class="container" style="padding-top:5%">
<div class="container">
<h4 class="mb-5 mt-1 font-bold wow fadeInDown text-center" style="padding-top: 5%;">Liste de vos cartes de parrainage</h4>
<div class="list-group wow fadeInUpBig">

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

@ -1,3 +1,7 @@
.container {
padding-top: 5%;
}
.mainCard {
margin-top: 5%;
width: 100%;
@ -59,3 +63,27 @@
margin-right: 0;
margin-left: 0;
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
}
#nouvelleOp {
margin-bottom: 20%;
}
.card-data > ul {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.card-data ul li {
margin-bottom: 2%;
}
}
}

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

@ -65,3 +65,4 @@ body {

24
src/app/components/opCommercial/creation-op-com/creation-op-com.component.scss
Unescape Escape View File

@ -1,3 +1,27 @@
.card {
padding: 5%;
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
}
#nouvelleOp {
margin-bottom: 20%;
}
.card-data > ul {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.card-data ul li {
margin-bottom: 2%;
}
}
}

2
src/app/components/opCommercial/debiter-carte/debiter-carte.component.html
Unescape Escape View File

@ -8,7 +8,7 @@
</ul>-->
<div class="container" style="padding-top:10%">
<div class="container">
<div class="card wow fadeInLeft">
<div class="card-block">
<h5 class="mb-5 mt-1 font-bold wow fadeInDown text-center">Débiter Carte</h5>

26
src/app/components/opCommercial/debiter-carte/debiter-carte.component.scss
Unescape Escape View File

@ -1,3 +1,29 @@
.container {
padding-top: 10%;
}
.card {
padding: 5%;
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
}
#nouvelleOp {
margin-bottom: 20%;
}
.card-data > ul {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.card-data ul li {
margin-bottom: 2%;
}
}
}

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

@ -10,7 +10,7 @@
<app-nav-commercant></app-nav-commercant>
<div class="container" style="padding-top:10%">
<div class="container">
<div class="card">
<div class="well">
<h5 class="mb-5 mt-1 font-bold wow fadeInDown text-center">Envoyer Carte</h5>
@ -73,24 +73,25 @@
données, y compris notre Utilisation des cookies.
</label>
<div class="col-md-12 subCard1 card" id="subCard1">
<img src="{{cartePar.carteTemplate.downloadURL}}" id="image1" crossorigin="anonymous" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<img src="{{cartePar.carteTemplate.downloadURL}}" id="image1" crossorigin="anonymous" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="row firstRow">
<div class="col-md-6 flex-center card-block cardPart1"><label>{{commercant.commercialName}}</label></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="mask 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>
</div>
</div>
<div class="row secondRow">
<div class="col-md-6 flex-center cardPart3 flex-column">
<label>{{cartePar.name}}</label>
<div class="row secondRow">
<div class="col-md-6 flex-center cardPart3 flex-column">
<p class="white-text info-text font-bold">{{cartePar.name}}</p>
</div>
<div class="col-md-6 flex-center cardPart4"><p class="white-text info-text font-bold">{{cartePar.uid}}</p></div>
</div>
<div class="col-md-12 text-center" id="dateFin">
<label class="white-text info-text font-bold">Valable jusqu'au: {{cartePar.dateFin | date:'dd/MM/yyyy'}}</label>
</div>
<div class="col-md-6 flex-center cardPart4"><label>{{cartePar.uid}}</label></div>
</div>
<div class="col-md-12 text-center" id="dateFin">
<label>Valable jusqu'au: {{cartePar.dateFin | date:'dd/MM/yyyy'}}</label>
</div>
</div>
</div>
<div class="text-center" style="margin-top:5%">
@ -145,24 +146,24 @@
données, y compris notre Utilisation des cookies.
</label>
<div class="col-md-12 subCard1 card" id="subCard1">
<img src="{{cartePar.carteTemplate.downloadURL}}" id="image1" crossorigin="anonymous" class="mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<img src="{{cartePar.carteTemplate.downloadURL}}" id="image1" crossorigin="anonymous" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="row firstRow">
<div class="col-md-6 flex-center card-block cardPart1"><label>{{commercant.commercialName}}</label></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="mask 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>
</div>
</div>
<div class="row secondRow">
<div class="col-md-6 flex-center cardPart3 flex-column">
<label>{{cartePar.name}}</label>
<div class="row secondRow">
<div class="col-md-6 flex-center cardPart3 flex-column">
<p class="white-text info-text font-bold">{{cartePar.name}}</p>
</div>
<div class="col-md-6 flex-center cardPart4"><p class="white-text info-text font-bold">{{cartePar.uid}}</p></div>
</div>
<div class="col-md-12 text-center" id="dateFin">
<label class="white-text info-text font-bold">Valable jusqu'au: {{cartePar.dateFin | date:'dd/MM/yyyy'}}</label>
</div>
<div class="col-md-6 flex-center cardPart4"><label>{{cartePar.uid}}</label></div>
</div>
<div class="col-md-12 text-center" id="dateFin">
<label>Valable jusqu'au: {{cartePar.dateFin | date:'dd/MM/yyyy'}}</label>
</div>
</div>
</div>
<div class="text-center" style="margin-top:5%">

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

@ -1,3 +1,7 @@
.container {
padding-top: 10%;
}
.card {
padding: 5%;
}
@ -17,6 +21,9 @@
align-items: center;
margin: auto;
width: 85%;
padding-top: 0;
padding-bottom: 0;
font-size: 1.05rem;
// background-repeat: no-repeat;
// background-size:20% auto;
// background-position : center;
@ -39,3 +46,27 @@
height: 10%;
font-size: 0.9rem;
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
}
#nouvelleOp {
margin-bottom: 20%;
}
.card-data > ul {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.card-data ul li {
margin-bottom: 2%;
}
}
}

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

@ -23,23 +23,25 @@
<div class="card mainCard" *ngFor="let op of opCommData | 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">
<img src="{{op.carteTemplate.downloadURL}}" id="image1" class="img-fluid mx-auto d-block flex-center card-img-overlay" alt="Responsive image">
<div class="view">
<div class="row no-margin firstRow">
<div class="col-md-6 flex-center card-block cardPart1">{{commercant.commercialName}}</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="mask pattern-3">
<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>
</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 class="row no-margin secondRow">
<div class="col-md-6 flex-center cardPart3"><p>{{op.name}}</p></div>
<div class="col-md-6 flex-center cardPart4"><p>{{op.uid}}</p></div>
</div>
</div>
</div>
<div class="col-md-6 card subCard2">
<div class="card-block row">
<div class="col-md-8" id="subCard2Part1">
<div class="card-block row no-margin">
<div class="col-md-8 col-sm-6" id="subCard2Part1">
<div id="opTitle">
<label>Operation Commerciale: {{op.name}}</label>
</div>

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

@ -15,9 +15,9 @@
.subCard1 {
height: auto;
background-color: white;
// background-repeat: no-repeat;
// background-size:20% auto;
// background-position : center;
padding-left: 0;
padding-right: 0;
font-size: 1.05rem;
}
.firstRow {
@ -83,5 +83,48 @@
margin-left: 0;
}
@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;
}
}

24
src/app/components/opCommercial/scanner-carte/scanner-carte.component.scss
Unescape Escape View File

@ -14,3 +14,27 @@
margin-top: 5%;
height: 50%;
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
.mainCard {
margin-bottom: 20%;
}
#nouvelleOp {
margin-bottom: 20%;
}
.card-data > ul {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.card-data ul li {
margin-bottom: 2%;
}
}
}

6
src/app/components/profil/edit-profil/edit-profil.component.scss
Unescape Escape View File

@ -70,6 +70,12 @@
background-color: #722040;
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
}

6
src/app/components/profil/profil.component.scss
Unescape Escape View File

@ -1,3 +1,9 @@
.list-group > .list-group-item {
padding-left: 5%;
}
@media screen and (max-width: 720px) {
.container {
padding-top: 20%;
}
}

Write Preview
Loading…
Cancel
Save