Skip to content
Snippets Groups Projects
Commit 88c61dfb authored by Hugo SUBTIL's avatar Hugo SUBTIL
Browse files

fix: small design fixes on search and structure details

parent 92b6673f
No related branches found
No related tags found
2 merge requests!68Recette,!67Dev
...@@ -165,4 +165,21 @@ export class Structure { ...@@ -165,4 +165,21 @@ export class Structure {
return null; return null;
} }
} }
public getEquipmentsTitle(equipment: Equipment): string {
switch (equipment) {
case Equipment.wifi:
return 'Wifi';
case Equipment.bornes:
return 'Bornes';
case Equipment.printer:
return 'Imprimantes';
case Equipment.tablet:
return 'Tablettes';
case Equipment.computer:
return 'Ordinateurs';
default:
return null;
}
}
} }
...@@ -13,7 +13,7 @@ p { ...@@ -13,7 +13,7 @@ p {
div { div {
border: 1px solid $grey-4; border: 1px solid $grey-4;
box-sizing: border-box; box-sizing: border-box;
border-radius: 4px; border-radius: 16px;
margin-bottom: 24px; margin-bottom: 24px;
padding: 16px 25px; padding: 16px 25px;
max-width: 172px; max-width: 172px;
......
<svg aria-hidden="true" class="icon" [ngClass]="iconClass" [attr.fill]="iconColor" [attr.stroke]="iconColor"> <svg aria-hidden="true" class="icon" [ngClass]="iconClass" [attr.fill]="iconColor" [attr.stroke]="iconColor">
<title *ngIf="title">{{ title }}</title>
<use [attr.xlink:href]="'assets/' + type + '/sprite.svg#' + icon"></use> <use [attr.xlink:href]="'assets/' + type + '/sprite.svg#' + icon"></use>
</svg> </svg>
...@@ -10,5 +10,6 @@ export class SvgIconComponent { ...@@ -10,5 +10,6 @@ export class SvgIconComponent {
@Input() iconClass: string; @Input() iconClass: string;
@Input() type: string; @Input() type: string;
@Input() iconColor: string = 'none'; @Input() iconColor: string = 'none';
@Input() title: string = null;
constructor() {} constructor() {}
} }
...@@ -8,9 +8,6 @@ ...@@ -8,9 +8,6 @@
fxLayoutAlign="end center" fxLayoutAlign="end center"
fxLayoutGap="20px" fxLayoutGap="20px"
> >
<div class="isntPhoneContent" fxLayout="row" fxLayoutAlign="center center">
<span class="indicatorDistance" *ngFor="let i of [].constructor(structure.getDistanceRange())"></span>
</div>
<div> <div>
{{ this.formatDistance() }} {{ this.formatDistance() }}
</div> </div>
...@@ -23,6 +20,7 @@ ...@@ -23,6 +20,7 @@
[type]="'ico'" [type]="'ico'"
[iconColor]="'grey'" [iconColor]="'grey'"
[icon]="structure.getEquipmentsIcon(equipement)" [icon]="structure.getEquipmentsIcon(equipement)"
[title]="structure.getEquipmentsTitle(equipement)"
></app-svg-icon> ></app-svg-icon>
</div> </div>
......
...@@ -3,22 +3,6 @@ ...@@ -3,22 +3,6 @@
@import '../../../../assets/scss/typography'; @import '../../../../assets/scss/typography';
@import '../../../../assets/scss/breakpoint'; @import '../../../../assets/scss/breakpoint';
.indicatorDistance {
width: 34px;
height: 1px;
background: $grey-3;
border-radius: 1px;
&:before {
height: 7px;
width: 33px;
content: '';
margin-top: -3px;
display: block;
border-radius: 1px;
border-left: 1px solid $grey-3;
border-right: 1px solid $grey-3;
}
}
.structure { .structure {
padding: 12px 0 12px 0; padding: 12px 0 12px 0;
border-bottom: 1px dashed $grey !important; border-bottom: 1px dashed $grey !important;
...@@ -43,9 +27,3 @@ ...@@ -43,9 +27,3 @@
border-bottom: none; border-bottom: none;
} }
} }
@media #{$large-phone} {
.isntPhoneContent {
display: none !important;
}
}
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</div> </div>
</div> </div>
</div> </div>
<!-- Démarches --> <!-- Démarches en ligne -->
<div <div
*ngIf="structure.proceduresAccompaniment.length" *ngIf="structure.proceduresAccompaniment.length"
fxLayout="column" fxLayout="column"
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
> >
<div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="8px"> <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="8px">
<app-svg-icon [type]="'ico'" [icon]="'demarches'" [iconClass]="'icon-32'"></app-svg-icon> <app-svg-icon [type]="'ico'" [icon]="'demarches'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Démarches</h2> <h2>Démarches en ligne</h2>
</div> </div>
<div fxLayout="column"> <div fxLayout="column">
<div fxLayout="row wrap" fxLayoutGap="24px"> <div fxLayout="row wrap" fxLayoutGap="24px">
...@@ -206,11 +206,6 @@ ...@@ -206,11 +206,6 @@
fxLayoutGap="13px" fxLayoutGap="13px"
*ngFor="let equipement of structure.equipmentsAndServices" *ngFor="let equipement of structure.equipmentsAndServices"
> >
<app-svg-icon
[type]="'ico'"
[icon]="structure.getEquipmentsIcon(equipement)"
[iconColor]="'currentColor'"
></app-svg-icon>
<p> <p>
{{ getEquipmentsLabel(equipement) }} {{ getEquipmentsLabel(equipement) }}
<span *ngIf="equipement == 'ordinateurs' && structure.nbComputers"> : {{ structure.nbComputers }}</span> <span *ngIf="equipement == 'ordinateurs' && structure.nbComputers"> : {{ structure.nbComputers }}</span>
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
(showDetails)="showDetails($event)" (showDetails)="showDetails($event)"
(hover)="handleCardHover($event)" (hover)="handleCardHover($event)"
></app-card> ></app-card>
<p *ngIf="structureList && structureList.length <= 0">Il n'y a aucune réponse correspondant à votre recherche</p>
</div> </div>
<app-structure-details <app-structure-details
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment