diff --git a/src/app/admin/components/structures-list/admin-structures-list.component.html b/src/app/admin/components/structures-list/admin-structures-list.component.html
index 822a58dd1f3dc93ff83d9b28d11e8a0cd0837146..6a241bbcfb51e0f75f7d7dbae24bbdfc02e3ba3c 100644
--- a/src/app/admin/components/structures-list/admin-structures-list.component.html
+++ b/src/app/admin/components/structures-list/admin-structures-list.component.html
@@ -2,7 +2,7 @@
<div *ngIf="isLoading" class="loader" aria-busy="true">
<img class="loader-gif" src="/assets/gif/loader_circle.gif" alt />
</div>
-<div *ngIf="!isLoading" class="adminLayout" fxLayout="column" fxLayoutAlign="center center">
+<div *ngIf="!isLoading" class="adminLayout">
<h2>Liste structures</h2>
<h3>Structures avec des données manquantes ({{ structuresIncomplete ? structuresIncomplete.length : 0 }})</h3>
<ag-grid-angular
diff --git a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
index 708beea1acaa687ac6963c87734c81c063ae41ba..872fe459bf5c864333b6c3cdf3d1f703f839f00b 100644
--- a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
+++ b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.html
@@ -20,35 +20,27 @@
<div class="structure-list">
<div
*ngFor="let structure of structures"
- class="filet"
tabindex="0"
+ class="form-list"
+ [ngClass]="{
+ 'already-selected': structure.alreadySelected,
+ 'item-selected': isSelectedStructure(structure)
+ }"
(click)="selectedResult(structure)"
(keyup.enter)="selectedResult(structure)"
>
- <div
- fxLayout="column"
- fxLayoutAlign="space-around"
- class="form-list"
- [ngClass]="{
- 'already-selected': structure.alreadySelected,
- 'item-selected': isSelectedStructure(structure)
- }"
- >
- <div fxLayout="row" fxLayoutAlign="space-between center">
- <div class="item-frame">
- <div class="name">{{ structure.structureName }}</div>
- <div class="commune">{{ structure.address.commune }}</div>
- </div>
- <app-svg-icon
- *ngIf="isSelectedStructure(structure)"
- class="form-icon"
- [iconClass]="'icon-26'"
- [folder]="'form'"
- [icon]="'validate'"
- />
- <div *ngIf="structure.alreadySelected" class="sticker">Déjà <br />sélectionnée</div>
- </div>
+ <div class="item-frame">
+ <div class="name">{{ structure.structureName }}</div>
+ <div class="commune">{{ structure.address.commune }}</div>
</div>
+ <app-svg-icon
+ *ngIf="isSelectedStructure(structure)"
+ class="form-icon"
+ [iconClass]="'icon-26'"
+ [folder]="'form'"
+ [icon]="'validate'"
+ />
+ <div *ngIf="structure.alreadySelected" class="sticker">Déjà <br />sélectionnée</div>
</div>
<div class="item-frame">
<div class="create-text">
diff --git a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss
index aec03e13eb2ad45c5af491de54deeed418d33735..8e9986bc81ca9d515894a49b19237d4b4ebc9895 100644
--- a/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss
+++ b/src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.scss
@@ -2,27 +2,6 @@
@import 'typography';
@import 'breakpoint';
-.search {
- display: flex;
- justify-content: space-between;
- width: 380px;
- border-radius: 20px;
- padding: 0px 0px 0px 8px;
-
- .search-input {
- height: 34px;
- border: 0px;
- @include font-regular-15;
- font-style: italic;
- padding: 0px;
- margin: 0px 0px 0px 5px;
- }
-}
-
-::ng-deep .searchIcon {
- padding-right: 12px;
-}
-
.content {
width: 600px;
}
@@ -47,18 +26,14 @@
margin: 16px 0px;
}
-.filet {
- border-width: 0px 0px 1px 0px;
- border-style: solid;
- border-color: $grey-9;
-}
-
.form-list {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
cursor: pointer;
height: 68px;
- border-width: 2px;
- border-style: solid;
- border-color: $white;
+ border: 2px solid white;
+ border-bottom-color: $grey-9;
&:hover {
.name {
@@ -79,9 +54,7 @@
border-color: $grey-9;
.sticker {
- @include font-regular-10;
- font-weight: 700;
- background: $white;
+ @include font-bold-10;
margin: 0px 10px;
width: 110px;
height: 32px;
diff --git a/src/app/profile/edit/edit.component.html b/src/app/profile/edit/edit.component.html
index b4e4c4a7f86154fc5ed4c538082a259f3fac3355..370c0ad7c92d021174b0e4bba56ac7afa2bb2811 100644
--- a/src/app/profile/edit/edit.component.html
+++ b/src/app/profile/edit/edit.component.html
@@ -122,20 +122,17 @@
</div>
</div>
- <div *ngIf="currentTab === tabsEnum.employer">
- <div class="search-structure">
- <div fxLayout="column" fxLayoutAlign="space-between" class="form-group search">
- <div fxLayout="row" fxLayoutGap="13px">
- <app-input
- id="search-employer"
- label="Employeur"
- description="Recherchez votre employeur dans la liste suivante"
- [value]="selectedEmployer?.name"
- (valueChange)="onSearchChange($event)"
- (click)="onSearchChange(selectedEmployer?.name || '')"
- />
- </div>
- </div>
+ <div *ngIf="currentTab === tabsEnum.employer" class="employerJob">
+ <div>
+ <app-input
+ id="search-employer"
+ label="Employeur"
+ description="Recherchez votre employeur dans la liste suivante"
+ [value]="selectedEmployer?.name"
+ (valueChange)="onSearchChange($event)"
+ (click)="onSearchChange(selectedEmployer?.name || '')"
+ />
+
<div class="structureResults">
<div *ngIf="!isAlreadySearching" class="autocomplete-items">
<p
@@ -149,8 +146,9 @@
</div>
</div>
</div>
- <p class="subTitle">Fonction</p>
- <div fxLayout="column" fxLayoutGap="32px">
+
+ <div>
+ <p class="subTitle">Fonction</p>
<div class="tagList">
<app-tag-item
*ngFor="let job of jobs"
@@ -167,6 +165,7 @@
(valueChange)="updateNewJob($event)"
/>
</div>
+
<app-appointment-choice
*ngIf="hasPersonalOffer"
[selectedRdvChoice]="selectedRdvChoice === undefined ? null : selectedRdvChoice"
diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss
index 160aeb4b87178586ac4b3ea4be82122adae3348d..3735abc6ab1a24a2593d8522175586f4e41b4912 100644
--- a/src/app/profile/edit/edit.component.scss
+++ b/src/app/profile/edit/edit.component.scss
@@ -91,6 +91,7 @@
margin-bottom: 4px;
}
+ .employerJob,
.detailsTab {
display: flex;
flex-direction: column;
diff --git a/src/app/reset-email/reset-email.component.html b/src/app/reset-email/reset-email.component.html
index 0d5ba6a00db84a1f7546b9bdd4622ee3113d1915..675bbf2729856185ab3ffe2d0116b2be0a8acd93 100644
--- a/src/app/reset-email/reset-email.component.html
+++ b/src/app/reset-email/reset-email.component.html
@@ -1,5 +1,5 @@
-<div fxLayout="column" class="content-container full-screen">
- <div class="section-container" fxLayout="colum" fxLayoutAlign="center center">
+<div class="content-container full-screen">
+ <div class="section-container">
<p *ngIf="changeSuccess">
Vous avez correctement changé votre email associé a votre compte. Vous pouvez désormais vous reconnecter avec
votre nouvel email
@@ -7,6 +7,5 @@
<p *ngIf="!changeSuccess">
Une erreur est survenue lors de la validation du changement de votre email... Veuillez envoyer un mail au support.
</p>
- <div></div>
</div>
</div>
diff --git a/src/app/shared/components/index.ts b/src/app/shared/components/index.ts
index 7db8c69e0f1384f04e384eeebad86b6f81e38b83..458a8cfab0049963501b612cff1e19f33b384bb8 100644
--- a/src/app/shared/components/index.ts
+++ b/src/app/shared/components/index.ts
@@ -25,7 +25,6 @@ import { PrintStructuresGridComponent } from './print-structures-grid/print-stru
import { RadioOptionComponent } from './radio-option/radio-option.component';
import { RadioComponent } from './radio/radio.component';
import { SearchBarComponent } from './search-bar/search-bar.component';
-import { StructureDetailPrintComponent } from './structure-detail-print/structure-detail-print.component';
import { StructureHoursListComponent } from './structure-hours/structure-hours-list.component';
import { StructurePmrComponent } from './structure-pmr/structure-pmr.component';
import { SvgIconComponent } from './svg-icon/svg-icon.component';
@@ -54,7 +53,6 @@ export {
PrintStructuresGridComponent,
ProgressBarComponent,
RadioOptionComponent,
- StructureDetailPrintComponent,
StructureHoursListComponent,
StructurePmrComponent,
StructurePublicTargetComponent,
@@ -91,7 +89,6 @@ export const SharedComponents = [
RadioOptionComponent,
RadioComponent,
SearchBarComponent,
- StructureDetailPrintComponent,
StructurePmrComponent,
StructurePublicTargetComponent,
SvgIconComponent,
diff --git a/src/app/shared/components/structure-detail-print/structure-detail-print.component.html b/src/app/shared/components/structure-detail-print/structure-detail-print.component.html
deleted file mode 100644
index a5885191fb57d9d09d0f19ffe9247a76bece186a..0000000000000000000000000000000000000000
--- a/src/app/shared/components/structure-detail-print/structure-detail-print.component.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<div *ngIf="structure" class="structure-details-container">
- <!-- Header info -->
- <div
- fxLayout="row"
- class="structure-details-block structureDetails"
- fxLayoutAlign="baseline baseline"
- fxLayoutGap="8px"
- >
- <div fxLayout="column" fxLayoutGap="10px" fxFlex="100%">
- <div fxLayout="column" class="no-margin" fxLayoutAlign="space-between start">
- <h3 class="bold">{{ structure.structureName }}</h3>
- </div>
- <div class="mobile-column">
- <div fxLayout="column" fxFlex="100%">
- <div *ngIf="structure.address" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
- <app-svg-icon [folder]="'ico'" [icon]="'address'" [iconClass]="'icon-22'" />
- <p>{{ structure.address.numero }} {{ structure.address.street }}, {{ structure.address.commune }}</p>
- </div>
- <div *ngIf="structure.contactPhone" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
- <app-svg-icon [folder]="'ico'" [icon]="'tel'" [iconClass]="'icon-22'" />
- <p>{{ structure.contactPhone | phone }}</p>
- </div>
- <div *ngIf="structure.contactMail" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
- <app-svg-icon [folder]="'ico'" [icon]="'email'" [iconClass]="'grey-1 icon-22'" />
- <p>{{ structure.contactMail }}</p>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- Accueil -->
- <div *ngIf="tclStopPoints || structure.hours.hasData()" class="structure-details-block accessDetails flex column">
- <!-- Opening Hours -->
- <div class="w-100 mobile-column flex row mb20">
- <div *ngIf="structure.hours.hasData()" class="timeContainer">
- <h3 class="subtitle uppercase">horaires</h3>
- <div *ngFor="let day of structure.hours">
- <div *ngIf="day.value.open" class="mb4">
- <h4>{{ day.key | day }}</h4>
- <div class="opening-time w100">
- <div *ngFor="let timeRange of day.value.time">
- <p *ngIf="timeRange.opening">{{ timeRange.opening }} - {{ timeRange.closing }}</p>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- accessModality -->
- <div *ngIf="tclStopPoints.length">
- <h3 class="subtitle uppercase">accès</h3>
- <div class="flex column container">
- <div *ngFor="let tclStop of tclStopPoints | slice: 0 : 3" class="flex column tclStop">
- <p>{{ tclStop.name }}</p>
- <div class="flex">
- <p *ngIf="tclStop.subLines.length" class="bold">Métro : </p>
- <p *ngFor="let sub of tclStop.subLines" class="line">{{ sub }}</p>
- </div>
- <div class="flex">
- <p *ngIf="tclStop.tramLines.length" class="bold">Tram : </p>
- <p *ngFor="let tram of tclStop.tramLines" class="line">{{ tram }}</p>
- </div>
- <div class="flex">
- <p *ngIf="tclStop.busLines.length" class="bold">Bus : </p>
- <p *ngFor="let bus of tclStop.busLines" class="line">{{ bus }}</p>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div *ngIf="structure.exceptionalClosures" class="mb20">
- <h3 class="subtitle uppercase">précisions sur les horaires</h3>
- <p>{{ structure.exceptionalClosures }}</p>
- </div>
- </div>
-</div>
diff --git a/src/app/shared/components/structure-detail-print/structure-detail-print.component.scss b/src/app/shared/components/structure-detail-print/structure-detail-print.component.scss
deleted file mode 100644
index 19e1cde56e9355ab37c805702b9bae1ff6ae2b18..0000000000000000000000000000000000000000
--- a/src/app/shared/components/structure-detail-print/structure-detail-print.component.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-@import 'color';
-@import 'typography';
-@import 'z-index';
-@import 'layout';
-@import 'breakpoint';
-
-h2 {
- margin-top: 0;
- margin-bottom: 5px;
- @include font-regular-26;
-}
-h3 {
- margin: 0 0 8px 0;
- @include font-regular-14;
-}
-h4 {
- margin: 0;
- @include font-regular-14;
- color: $grey-2;
- text-transform: capitalize;
-}
-p,
-.custom-link {
- @include font-regular-14;
- margin-top: 9px;
- margin-bottom: 9px;
- &.no-margin {
- margin-top: unset;
- margin-bottom: unset;
- }
- &.no-margin-bottom {
- margin-bottom: unset;
- }
-}
-
-a {
- padding: unset;
-}
-
-.structure-details-container {
- break-inside: avoid-page;
- margin: 24px 0px 24px 32px;
- @media #{$tablet} {
- width: calc(100% - 2 * 24px);
- position: inherit;
- height: 100%;
- .printButton {
- display: none !important;
- }
- }
- .printButton {
- margin-right: 75px;
- }
-}
-
-.subtitle {
- @include font-bold-14;
- margin-bottom: 8px;
- color: $grey-3;
-}
-
-.structure-details-container > .structure-details-block ~ .structure-details-block {
- padding: 24px 0 0 0;
-}
-
-.structure-details-block:last-child {
- border-bottom: none !important;
-}
-
-.opening-time {
- p {
- margin: 0 0 0 4px;
- }
-}
-.typeInformationHeader {
- color: $grey-3;
-}
-
-.bold-info {
- @include font-bold-14;
-}
-
-@media print {
- .hide-on-print {
- display: none !important;
- }
-}
-
-.info {
- color: $red;
-}
-
-.wrapper {
- width: 100%;
- display: grid;
- gap: 20px 30px;
- grid-template-columns: 1fr 1fr;
-}
-
-.mobile-column {
- p {
- margin: 0;
- }
- @media #{$tablet} {
- flex-direction: row;
- }
- @media #{$desktop} {
- flex-direction: row;
- }
- @media #{$large-desktop} {
- flex-direction: row;
- }
- @media #{$phone} {
- flex-direction: column;
- }
- @media #{$small-phone} {
- flex-direction: column;
- }
- @media #{$large-phone} {
- flex-direction: column;
- }
-}
-
-.tclStop {
- margin-bottom: 4px;
- .line:not(:empty):not(:last-child):after {
- content: ',\00a0';
- }
- p {
- margin-top: 0;
- }
-}
-
-.timeContainer {
- flex: 1;
- box-sizing: border-box;
- max-width: 50%;
-}
-.mb4 {
- margin-bottom: 4px;
-}
-
-.mb20 {
- margin-bottom: 20px;
-}
diff --git a/src/app/shared/components/structure-detail-print/structure-detail-print.component.ts b/src/app/shared/components/structure-detail-print/structure-detail-print.component.ts
deleted file mode 100644
index 7351d536336fef163c821c8782a3bb53cee5ba8a..0000000000000000000000000000000000000000
--- a/src/app/shared/components/structure-detail-print/structure-detail-print.component.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Structure } from '../../../models/structure.model';
-import { TclStopPoint } from '../../../models/tclStopPoint.model';
-import { AuthService } from '../../../services/auth.service';
-import { TclService } from '../../../services/tcl.service';
-import { AccessModality } from '../../../structure-list/enum/access-modality.enum';
-@Component({
- selector: 'app-structure-detail-print',
- templateUrl: './structure-detail-print.component.html',
- styleUrls: ['./structure-detail-print.component.scss'],
-})
-export class StructureDetailPrintComponent implements OnInit {
- @Input() public structure: Structure;
- @Output() public closeDetails: EventEmitter<boolean> = new EventEmitter<boolean>();
- @Output() public dataReady: EventEmitter<boolean> = new EventEmitter<boolean>();
- public accessModality = AccessModality;
- public tclStopPoints: TclStopPoint[] = [];
-
- constructor(
- private tclService: TclService,
- private authService: AuthService,
- ) {}
-
- async ngOnInit(): Promise<void> {
- // GetTclStopPoints
- this.getTclStopPoints();
- }
-
- public userIsLoggedIn(): boolean {
- return this.authService.isLoggedIn();
- }
-
- public getTclStopPoints(): void {
- this.tclService.getTclStopPointBycoord(this.structure.getLon(), this.structure.getLat()).subscribe((res) => {
- this.tclStopPoints = res;
- });
- }
-}
diff --git a/src/app/structure/structure-join/structure-join.component.html b/src/app/structure/structure-join/structure-join.component.html
index 6d1f875c9215360dd4c667908931cacfbc827060..342fcd2c17cdb351b55f3a788ef721d8c746ea7a 100644
--- a/src/app/structure/structure-join/structure-join.component.html
+++ b/src/app/structure/structure-join/structure-join.component.html
@@ -1,4 +1,4 @@
-<div fxLayout="column" class="content-container full-screen">
+<div class="content-container full-screen joinRequest">
<ng-container *ngIf="structureName">
<div class="container">
<div class="page">
diff --git a/src/app/structure/structure-join/structure-join.component.scss b/src/app/structure/structure-join/structure-join.component.scss
index 402b3322fefe75ba4c4e4bce7bcf82b73c8ec5fb..7d9ae067526aef44392890f244d96c11c8e04eac 100644
--- a/src/app/structure/structure-join/structure-join.component.scss
+++ b/src/app/structure/structure-join/structure-join.component.scss
@@ -1,6 +1,10 @@
@import 'color';
@import 'breakpoint';
+.joinRequest {
+ display: flex;
+}
+
.container {
/* Auto layout */
display: flex;