From e842fc5fd5fc41718b136119b89a523ca9b20702 Mon Sep 17 00:00:00 2001 From: Bastien DUMONT <bdumont@grandlyon.com> Date: Mon, 27 Feb 2023 09:23:59 +0000 Subject: [PATCH] chore: self closing tags --- package-lock.json | 22 +- package.json | 28 +- .../manage-employers.component.html | 4 +- .../manage-jobs/manage-jobs.component.html | 4 +- .../manage-users/manage-users.component.html | 10 +- .../components/panel/panel.component.html | 44 +-- src/app/annuaire/annuaire.component.html | 6 +- .../filter-modal/filter-modal.component.html | 9 +- .../result-list/result-list.component.html | 12 +- .../search-bar/search-bar.component.html | 8 +- src/app/app.component.html | 2 +- src/app/carto/carto.component.html | 8 +- src/app/contact/contact.component.html | 20 +- .../footer-form/footer-form.component.html | 8 +- .../account-credentials.component.html | 36 +- .../account-form/account-form.component.html | 11 +- .../account-info/account-info.component.html | 17 +- .../form/form-view/form-view.component.html | 14 +- .../information-step.component.html | 10 +- .../personal-offer-form.component.html | 8 +- ...ersonal-offer-training-type.component.html | 2 +- .../profile-form/profile-form.component.html | 16 +- .../profile-job-selection.component.html | 2 +- .../profile-structure-choice.component.html | 10 +- .../structure-access-modality.component.html | 12 +- .../structure-consent.component.html | 4 +- ...tructure-contact-completion.component.html | 10 +- .../structure-contact.component.html | 10 +- .../structure-covid-info.component.html | 2 +- .../structure-description.component.html | 2 +- ...gital-helping-accompaniment.component.html | 4 +- .../structure-equipments.component.html | 6 +- .../structure-form.component.html | 42 +-- .../structure-hours.component.html | 4 +- .../structure-labels.component.html | 2 +- .../structure-name-and-address.component.html | 8 +- ...ructure-public-target-other.component.html | 2 +- .../structure-public-target.component.html | 12 +- ...ructure-solidarity-material.component.html | 4 +- .../structure-training-price.component.html | 2 +- .../structure-training-type.component.html | 4 +- .../structure-type.component.html | 6 +- ...ture-web-and-social-network.component.html | 22 +- .../structure-wifi.component.html | 2 +- .../base-skills-choice.component.html | 2 +- .../base-skills/base-skills.component.html | 2 +- .../equipment-access-choice.component.html | 2 +- .../equipment-access.component.html | 4 +- .../equipment-buy-type.component.html | 2 +- .../equipment-buy.component.html | 4 +- .../login-modal/login-modal.component.html | 6 +- .../mediation-recap.component.html | 4 +- .../multi-radio-form.component.html | 7 +- .../navigation/navigation.component.html | 12 +- .../needs-selection.component.html | 2 +- .../structure-orientator.component.html | 14 +- ...ediation-language-selection.component.html | 2 +- .../accompaniment-type.component.html | 6 +- .../online-demarch.component.html | 4 +- .../mediation-beneciary-info.component.html | 27 +- .../onlineDemarch-form.component.html | 32 +- .../orientation-form-view.component.html | 16 +- ...ientation-structure-address.component.html | 2 +- .../orientation-structure-list.component.html | 12 +- src/app/header/header.component.html | 26 +- src/app/login/login.component.html | 9 +- .../post-card/post-card.component.html | 4 +- .../post-details/post-details.component.html | 4 +- .../post-header/post-header.component.html | 14 +- .../post-list/post-list.component.html | 4 +- .../post-modal-filters.component.html | 2 +- src/app/post/news.component.html | 2 +- src/app/profile/edit/edit.component.html | 104 ++---- .../personal-offer-edition.component.html | 26 +- .../personal-offer.component.html | 10 +- .../profile-structure-member.component.html | 7 +- .../profile-structure.component.html | 31 +- src/app/profile/profile.component.html | 22 +- .../structure-add-member-modal.component.html | 8 +- .../missing-information.component.html | 2 +- .../structure-edition-summary.component.html | 160 ++++---- ...tructure-members-management.component.html | 22 +- .../structures-management.component.html | 20 +- .../reset-password.component.html | 8 +- .../accompaniment-picker.component.html | 2 +- .../components/button/button.component.html | 47 ++- .../custom-modal/custom-modal.component.html | 4 +- .../data-share-consent.component.html | 4 +- .../hour-picker/hour-picker.component.html | 6 +- .../modal-confirmation.component.html | 4 +- .../modal-join-confirmation.component.html | 4 +- .../password-form.component.html | 42 +-- .../structure-detail-print.component.html | 15 +- .../structure-list-print.component.html | 2 +- .../structure-pmr.component.html | 4 +- .../structure-type-picker.component.html | 16 +- .../text-input-modal.component.html | 4 +- .../training-type-picker.component.html | 2 +- .../components/card/card.component.html | 6 +- .../more-filters/more-filters.component.html | 2 +- .../structure-details.component.html | 346 ++++++++---------- .../structure-list-search.component.html | 10 +- .../structure-list.component.html | 6 +- .../structure-exclude.component.html | 15 +- .../structure-join.component.html | 6 +- src/index.html | 2 +- 106 files changed, 738 insertions(+), 929 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3b4a1da99..c439daa97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,17 @@ "@angular/platform-browser-dynamic": "^15.1.3", "@angular/router": "^15.1.3", "@angular/service-worker": "^15.1.3", + "@angular/animations": "^15.1.3", + "@angular/cdk": "^15.1.2", + "@angular/common": "^15.1.3", + "@angular/compiler": "^15.1.3", + "@angular/core": "^15.1.3", + "@angular/flex-layout": "^15.0.0-beta.42", + "@angular/forms": "^15.1.3", + "@angular/platform-browser": "^15.1.3", + "@angular/platform-browser-dynamic": "^15.1.3", + "@angular/router": "^15.1.3", + "@angular/service-worker": "^15.1.3", "@asymmetrik/ngx-leaflet": "^8.1.0", "@ngx-translate/core": "^14.0.0", "ag-grid-angular": "^28.0.0", @@ -69,7 +80,7 @@ "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "^2.0.0", "ng-packagr": "^15.1.1", - "prettier": "^2.1.2", + "prettier": "^2.8.3", "standard-version": "^9.3.2", "ts-node": "~8.10.0", "tslint": "~6.1.0", @@ -19248,15 +19259,18 @@ } }, "node_modules/prettier": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", - "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", + "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", "dev": true, "bin": { "prettier": "bin-prettier.js" }, "engines": { "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/pretty-bytes": { diff --git a/package.json b/package.json index 2a89c191e..a9d6adba3 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,17 @@ "@angular/platform-browser-dynamic": "^15.1.3", "@angular/router": "^15.1.3", "@angular/service-worker": "^15.1.3", + "@angular/animations": "^15.1.3", + "@angular/cdk": "^15.1.2", + "@angular/common": "^15.1.3", + "@angular/compiler": "^15.1.3", + "@angular/core": "^15.1.3", + "@angular/flex-layout": "^15.0.0-beta.42", + "@angular/forms": "^15.1.3", + "@angular/platform-browser": "^15.1.3", + "@angular/platform-browser-dynamic": "^15.1.3", + "@angular/router": "^15.1.3", + "@angular/service-worker": "^15.1.3", "@asymmetrik/ngx-leaflet": "^8.1.0", "@ngx-translate/core": "^14.0.0", "ag-grid-angular": "^28.0.0", @@ -43,6 +54,16 @@ "zone.js": "~0.12.0" }, "devDependencies": { + "@angular-builders/jest": "^15.0.0", + "@angular-devkit/build-angular": "^15.1.4", + "@angular-eslint/builder": "^15.2.0", + "@angular-eslint/eslint-plugin": "^15.2.0", + "@angular-eslint/eslint-plugin-template": "^15.2.0", + "@angular-eslint/schematics": "^15.2.0", + "@angular-eslint/template-parser": "^15.2.0", + "@angular/cli": "^15.1.4", + "@angular/compiler-cli": "^15.1.3", + "@angular/localize": "^15.1.3", "@angular-builders/jest": "^15.0.0", "@angular-devkit/build-angular": "^15.1.4", "@angular-eslint/builder": "^15.2.0", @@ -62,14 +83,19 @@ "@types/node": "^16.0.0", "@typescript-eslint/eslint-plugin": "^5.43.0", "@typescript-eslint/parser": "^5.43.0", + "@typescript-eslint/eslint-plugin": "^5.43.0", + "@typescript-eslint/parser": "^5.43.0", "codelyzer": "^6.0.2", "eslint": "^8.28.0", + "eslint": "^8.28.0", "eslint-plugin-jest": "^27.0.0", "http-server": "^14.1.0", "jasmine-core": "~4.5.0", "jasmine-spec-reporter": "~7.0.0", "jest": "^28.0.0", "jest-preset-angular": "^12.2.6", + "jest": "^28.0.0", + "jest-preset-angular": "^12.2.6", "karma": "^6.4.0", "karma-browserify": "^8.0.0", "karma-chrome-launcher": "~3.1.0", @@ -78,7 +104,7 @@ "karma-jasmine-html-reporter": "^2.0.0", "karma-jasmine": "~5.1.0", "ng-packagr": "^15.1.1", - "prettier": "^2.1.2", + "prettier": "^2.8.3", "standard-version": "^9.3.2", "ts-node": "~8.10.0", "tslint": "~6.1.0", diff --git a/src/app/admin/components/manage-employers/manage-employers.component.html b/src/app/admin/components/manage-employers/manage-employers.component.html index 8727f210c..acdc13365 100644 --- a/src/app/admin/components/manage-employers/manage-employers.component.html +++ b/src/app/admin/components/manage-employers/manage-employers.component.html @@ -51,10 +51,10 @@ [openned]="deleteModalOpenned" [content]="'Voulez-vous vraiment supprimer cet employeur ? (' + employerToDelete.name + ')'" (closed)="deleteEmployer(employerToDelete, $event)" -></app-modal-confirmation> +/> <app-modal-confirmation *ngIf="mergeOpe.newEmployer" [openned]="mergeEmployerModalOpenned" [content]="'Voulez-vous vraiment fusionner cet employeur avec : ' + mergeOpe.newEmployer.name" (closed)="mergeEmployer(mergeOpe.newEmployer._id, mergeOpe.formerId, $event, contextRow)" -></app-modal-confirmation> +/> diff --git a/src/app/admin/components/manage-jobs/manage-jobs.component.html b/src/app/admin/components/manage-jobs/manage-jobs.component.html index b35f3cceb..e34a301a7 100644 --- a/src/app/admin/components/manage-jobs/manage-jobs.component.html +++ b/src/app/admin/components/manage-jobs/manage-jobs.component.html @@ -49,10 +49,10 @@ [openned]="deleteModalOpenned" [content]="'Voulez-vous vraiment supprimer cette fonction ? (' + jobToDelete.name + ')'" (closed)="deleteJob(jobToDelete, $event)" -></app-modal-confirmation> +/> <app-modal-confirmation *ngIf="mergeOpe.newJob" [openned]="mergeJobModalOpenned" [content]="'Voulez-vous vraiment fusionner cette fonction avec : ' + mergeOpe.newJob.name" (closed)="mergeJob(mergeOpe.newJob._id, mergeOpe.formerId, $event, contextRow)" -></app-modal-confirmation> +/> diff --git a/src/app/admin/components/manage-users/manage-users.component.html b/src/app/admin/components/manage-users/manage-users.component.html index ccdf311f3..43bb2155c 100644 --- a/src/app/admin/components/manage-users/manage-users.component.html +++ b/src/app/admin/components/manage-users/manage-users.component.html @@ -30,7 +30,7 @@ [text]="'Exporter'" [style]="buttonTypeEnum.Tertiary" (click)="exportUsers('unattached')" - ></app-button> + /> </h3> <ag-grid-angular *ngIf="validatedJobs && validatedEmployers" @@ -49,7 +49,7 @@ <div> <h3 class="title" *ngIf="attachedUsers"> Utilisateurs rattachés ({{ attachedUsers.length }}) - <app-button [text]="'Exporter'" [style]="buttonTypeEnum.Tertiary" (click)="exportUsers('attached')"></app-button> + <app-button [text]="'Exporter'" [style]="buttonTypeEnum.Tertiary" (click)="exportUsers('attached')"/> </h3> <ag-grid-angular *ngIf="validatedJobs && validatedEmployers" @@ -71,7 +71,7 @@ [openned]="deleteModalOpenned" [content]="'Voulez-vous vraiment supprimer cet utilisateur ? (' + userToDelete.email + ')'" (closed)="deleteUser(userToDelete, $event)" -></app-modal-confirmation> +/> <app-modal-confirmation *ngIf="changingJobs" [openned]="editJobModalOpenned" @@ -83,7 +83,7 @@ ')' " (closed)="editJob(changingJobs[0], changingJobs[1], $event, contextRow)" -></app-modal-confirmation> +/> <app-modal-confirmation *ngIf="changingEmployers" [openned]="editEmployerModalOpenned" @@ -95,4 +95,4 @@ ')' " (closed)="editEmployer(changingEmployers[0], changingEmployers[1], $event, contextRow)" -></app-modal-confirmation> +/> diff --git a/src/app/admin/components/panel/panel.component.html b/src/app/admin/components/panel/panel.component.html index 3c826f458..316eaf569 100644 --- a/src/app/admin/components/panel/panel.component.html +++ b/src/app/admin/components/panel/panel.component.html @@ -5,50 +5,46 @@ [text]="'Revendication structure'" [style]="buttonTypeEnum.Secondary" (click)="changeActiveFeature(features.pendingStructures)" - ></app-button> + /> <app-button [text]="'Liste structures'" [style]="buttonTypeEnum.Secondary" (click)="changeActiveFeature(features.structuresList)" - ></app-button> + /> <app-button [text]="'Gestion des utilisateurs'" [style]="buttonTypeEnum.Secondary" (click)="changeActiveFeature(features.manageUsers)" - ></app-button> + /> <app-button [text]="'Infos covid'" [style]="buttonTypeEnum.Secondary" (click)="changeActiveFeature(features.lockdownInfo)" - ></app-button> + /> <app-button [text]="'Fonctions'" [style]="buttonTypeEnum.Secondary" (click)="changeActiveFeature(features.jobsList)" - ></app-button> + /> <app-button [text]="'Employeurs'" [style]="buttonTypeEnum.Secondary" (click)="changeActiveFeature(features.employersList)" - ></app-button> + /> <a target="_blank" class="custom-link" rel="noopener noreferrer" [href]="ghostLink">Ghost</a> </div> - <div *ngIf="selectedFeature === features.structuresList"> - <app-admin-structures-list></app-admin-structures-list> - </div> - <div *ngIf="selectedFeature === features.manageUsers"> - <app-admin-manage-users></app-admin-manage-users> - </div> - <div *ngIf="selectedFeature === features.pendingStructures"> - <app-admin-claim-structure></app-admin-claim-structure> - </div> - <div *ngIf="selectedFeature === features.lockdownInfo"> - <app-admin-manage-lockdown-info></app-admin-manage-lockdown-info> - </div> - <div *ngIf="selectedFeature === features.jobsList"> - <app-admin-manage-jobs></app-admin-manage-jobs> - </div> - <div *ngIf="selectedFeature === features.employersList"> - <app-admin-manage-employers></app-admin-manage-employers> - </div> + + <app-admin-structures-list *ngIf="selectedFeature === features.structuresList"/> + + + <app-admin-manage-users *ngIf="selectedFeature === features.manageUsers" /> + + <app-admin-claim-structure *ngIf="selectedFeature === features.pendingStructures" /> + + <app-admin-manage-lockdown-info *ngIf="selectedFeature === features.lockdownInfo" /> + + <app-admin-manage-jobs *ngIf="selectedFeature === features.jobsList" /> + + <app-admin-manage-employers *ngIf="selectedFeature === features.employersList" /> + </div> diff --git a/src/app/annuaire/annuaire.component.html b/src/app/annuaire/annuaire.component.html index f65070b47..60972f469 100644 --- a/src/app/annuaire/annuaire.component.html +++ b/src/app/annuaire/annuaire.component.html @@ -5,7 +5,7 @@ (searchEvent)="getUsers($event)" [shouldResetFilters]="resetFilters" [shouldShowMore]="nextPage" - ></app-search-bar> + /> <app-result-list [userList]="userList" [totalUserResult]="totalUserResult" @@ -13,7 +13,7 @@ [filterActive]="filterActive" (resetEvent)="shouldResetFilters()" (showMoreEvent)="showMore($event)" - ></app-result-list> + /> </div> <app-result-list @@ -21,5 +21,5 @@ [userList]="[]" [isLogged]="false" [totalUserResult]="totalUserResult" - ></app-result-list> + /> </div> diff --git a/src/app/annuaire/filter-modal/filter-modal.component.html b/src/app/annuaire/filter-modal/filter-modal.component.html index 6f2058d6b..33f2af0c0 100644 --- a/src/app/annuaire/filter-modal/filter-modal.component.html +++ b/src/app/annuaire/filter-modal/filter-modal.component.html @@ -31,10 +31,15 @@ </div> <div class="footer"> <div class="half-width"> - <app-button [style]="buttonTypeEnum.modalSecondary" [text]="'Effacer'" (click)="clearFilters()"></app-button> + <app-button + [style]="buttonTypeEnum.modalSecondary" + [text]="'Effacer'" + (click)="clearFilters()" + tabindex="0" + /> </div> <div class="half-width"> - <app-button [style]="buttonTypeEnum.modalPrimary" [text]="'Appliquer'" (click)="onSubmitFilters()"></app-button> + <app-button [style]="buttonTypeEnum.modalPrimary" [text]="'Appliquer'" (click)="onSubmitFilters()"/> </div> </div> </div> diff --git a/src/app/annuaire/result-list/result-list.component.html b/src/app/annuaire/result-list/result-list.component.html index ed33e9917..236e2c606 100644 --- a/src/app/annuaire/result-list/result-list.component.html +++ b/src/app/annuaire/result-list/result-list.component.html @@ -11,7 +11,7 @@ (keyup.enter)="goToUser(user._id)" > <div class="avatar-container"> - <app-svg-icon class="avatar" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'"></app-svg-icon> + <app-svg-icon class="avatar" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" /> </div> <div class="identity"> <p class="name">{{ user.name | userName }} {{ user.surname | uppercase }}</p> @@ -30,7 +30,7 @@ [text]="'Voir plus'" (click)="showMore()" tabindex="0" - ></app-button> + /> </div> </div> @@ -44,7 +44,7 @@ [text]="'Réinitialiser les filtres'" (click)="resetFilters()" tabindex="0" - ></app-button> + /> </div> <div class="results unlogged" *ngIf="!isLogged && totalUserResult"> @@ -66,14 +66,12 @@ [text]="'Se créer un compte'" [style]="buttonTypeEnum.Secondary" [extraClass]="'fullWidth'" - > - </app-button> + /> <app-button (action)="goLogin()" [text]="'Se connecter'" [style]="buttonTypeEnum.Primary" [extraClass]="'fullWidth'" - > - </app-button> + /> </div> </div> diff --git a/src/app/annuaire/search-bar/search-bar.component.html b/src/app/annuaire/search-bar/search-bar.component.html index 3db6c8baa..67a3bac2d 100644 --- a/src/app/annuaire/search-bar/search-bar.component.html +++ b/src/app/annuaire/search-bar/search-bar.component.html @@ -20,7 +20,7 @@ <div class="ico-close-search"></div> </button> <span *ngIf="this.searchForm.get('searchTerm').value?.length > 0" class="separation"></span> - <app-button [style]="buttonTypeEnum.searchIcon" [iconBtn]="'search'" [type]="'submit'"></app-button> + <app-button [style]="buttonTypeEnum.searchIcon" [iconBtn]="'search'" [type]="'submit'" /> </div> </form> <div (appClickOutside)="closeModal()" class="btn-container"> @@ -61,7 +61,7 @@ [filtersTypes]="getModalCategory()" (searchEvent)="fetchResults($event)" (closeEvent)="closeModal()" - ></app-filter-modal> + /> </div> </div> </div> @@ -79,7 +79,7 @@ [style]="buttonTypeEnum.TagCloudButton" [text]="filter" (action)="removeFilter(filter)" - ></app-button> - <app-button [style]="buttonTypeEnum.TagCloudResetButton" (action)="resetFilters()"></app-button> + /> + <app-button [style]="buttonTypeEnum.TagCloudResetButton" (action)="resetFilters()" /> </div> </div> diff --git a/src/app/app.component.html b/src/app/app.component.html index 337f59111..bba0323c7 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,5 +1,5 @@ <div class="app-container"> - <app-header></app-header> + <app-header /> <div class="app-body"> <div *ngIf="loading" class="loader"> <img class="loader-gif" src="/assets/gif/loader_circle_grey.gif" alt /> diff --git a/src/app/carto/carto.component.html b/src/app/carto/carto.component.html index 36fcc3544..f202bbc18 100644 --- a/src/app/carto/carto.component.html +++ b/src/app/carto/carto.component.html @@ -1,6 +1,6 @@ <div class="content-container no-pt" [ngClass]="{ 'height-100': isOrientationForm }"> <div class="hide-on-print"> - <app-structure-list-search (searchEvent)="getStructures($event)" [filters]="filters"></app-structure-list-search> + <app-structure-list-search (searchEvent)="getStructures($event)" [filters]="filters" /> </div> <div class="panes-container" fxLayout="row"> <app-structure-list @@ -16,14 +16,14 @@ class="left-pane" [ngClass]="{ mapPhone: isMapPhone === true }" fxLayout="column" - ></app-structure-list> + /> <div class="btnSwitch"> <app-button [style]="buttonTypeEnum.ButtonPhone" [text]="isMapPhone ? 'Liste' : 'Carte'" [iconBtn]="isMapPhone ? 'liste' : 'map-markerButtonPhone'" (action)="switchMapList()" - ></app-button> + /> </div> <app-map [isOrientationForm]="isOrientationForm" @@ -36,6 +36,6 @@ [searchedValue]="searchedValue || userLocate" class="right-pane" [ngClass]="{ mapPhone: isMapPhone === true }" - ></app-map> + /> </div> </div> diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html index 235751e47..d340e7ab4 100644 --- a/src/app/contact/contact.component.html +++ b/src/app/contact/contact.component.html @@ -13,13 +13,13 @@ [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="contactForm.get('name').value && !contactForm.get('name').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> @@ -32,13 +32,13 @@ [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="contactForm.get('email').value && !contactForm.get('email').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> @@ -58,13 +58,13 @@ [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="contactForm.get('phone').value && !contactForm.get('phone').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> @@ -77,13 +77,13 @@ [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="contactForm.get('subject').value && !contactForm.get('subject').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> @@ -101,13 +101,13 @@ [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="contactForm.get('message').value && !contactForm.get('message').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> <p>{{ contactForm.get('message').value ? contactForm.get('message').value.length : 0 }}/500</p> </div> diff --git a/src/app/form/footer-form/footer-form.component.html b/src/app/form/footer-form/footer-form.component.html index b2df18ca6..1fdd2aa18 100644 --- a/src/app/form/footer-form/footer-form.component.html +++ b/src/app/form/footer-form/footer-form.component.html @@ -5,7 +5,7 @@ [text]="!isEditMode ? btnName[0] : 'Annuler'" [iconType]="'form'" [iconBtn]="!isEditMode && 'chevronLeft'" - ></app-button> + /> <app-button *ngIf="!isLastFormStep && !isNextFormTransition && !isEditMode" @@ -16,8 +16,7 @@ [iconType]="'form'" [iconPos]="'right'" [style]="buttonTypeEnum.Primary" - > - </app-button> + /> <app-button *ngIf="isEditMode" @@ -25,6 +24,5 @@ [disabled]="!isValid" [text]="'Valider'" [style]="buttonTypeEnum.Primary" - > - </app-button> + /> </div> diff --git a/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html b/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html index 6bf751e86..16b9c22c0 100644 --- a/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html +++ b/src/app/form/form-view/account-form/account-credentials/account-credentials.component.html @@ -27,13 +27,13 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('email').invalid && accountForm.get('email').value" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -59,13 +59,13 @@ [iconClass]="'icon-16'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('password').value.length < 8" [iconClass]="'icon-16'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> <p>8 caractères</p> </li> <li @@ -82,13 +82,13 @@ [iconClass]="'icon-16'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!checkIfPasswordHasSpecialChar(accountForm.get('password').value)" [iconClass]="'icon-16'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> <p>un caractère spécial</p> </li> <li @@ -105,13 +105,13 @@ [iconClass]="'icon-16'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!checkIfPasswordHasLowerCase(accountForm.get('password').value); s" [iconClass]="'icon-16'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> <p>un caractère en minuscule</p> </li> <li @@ -128,13 +128,13 @@ [iconClass]="'icon-16'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!checkIfPasswordHasUpperCase(accountForm.get('password').value); s" [iconClass]="'icon-16'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> <p>un caractère en majuscule</p> </li> <li @@ -151,13 +151,13 @@ [iconClass]="'icon-16'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!checkIfPasswordHasDigit(accountForm.get('password').value)" [iconClass]="'icon-16'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> <p>un chiffre</p> </li> </ul> @@ -174,19 +174,19 @@ [type]="'form'" [icon]="'eyePassword'" (click)="showPassword()" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('password').valid" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('password').invalid && accountForm.get('password').value" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -204,19 +204,19 @@ [type]="'form'" [icon]="'eyePassword'" (click)="showConfirmPassword()" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('confirmPassword').valid && accountForm.get('confirmPassword').value" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('confirmPassword').invalid && accountForm.get('confirmPassword').value" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> </form> diff --git a/src/app/form/form-view/account-form/account-form.component.html b/src/app/form/form-view/account-form/account-form.component.html index deda50a65..ab5eb2d54 100644 --- a/src/app/form/form-view/account-form/account-form.component.html +++ b/src/app/form/form-view/account-form/account-form.component.html @@ -5,7 +5,7 @@ [isClaimMode]="isClaimMode" [profile]="profile" (validateForm)="setValidationsForm($event)" - ></app-account-info> + /> </ng-container> <ng-container *ngIf="currentStep === accountFormStepEnum.accountCredentials"> <app-account-credentials @@ -14,19 +14,16 @@ [isAccountMode]="isAccountMode" (validateForm)="setValidationsForm($event)" (userExists)="verifyUserExist($event)" - ></app-account-credentials> + /> </ng-container> <ng-container *ngIf="currentStep === accountFormStepEnum.accountNewsletter"> <app-account-newsletter [accountForm]="accountForm" [profile]="profile" (acceptNewsletter)="acceptReceiveNewsletter($event)" - ></app-account-newsletter> + /> </ng-container> <ng-container *ngIf="currentStep === accountFormStepEnum.confirmEmailSentInfo"> - <app-information-step - [step]="accountFormStepEnum.confirmEmailSentInfo" - [formType]="formType.account" - ></app-information-step> + <app-information-step [step]="accountFormStepEnum.confirmEmailSentInfo" [formType]="formType.account" /> </ng-container> </div> diff --git a/src/app/form/form-view/account-form/account-info/account-info.component.html b/src/app/form/form-view/account-form/account-info/account-info.component.html index d22955e49..1b0aef8ba 100644 --- a/src/app/form/form-view/account-form/account-info/account-info.component.html +++ b/src/app/form/form-view/account-form/account-info/account-info.component.html @@ -6,18 +6,13 @@ <label for="name">Prénom</label> <div fxLayout="row" fxLayoutGap="13px"> <input type="text" (input)="setValidationsForm()" formControlName="name" class="form-input" /> - <app-svg-icon - *ngIf="accountForm.get('name').valid" - [iconClass]="'icon-26'" - [type]="'form'" - [icon]="'validate'" - ></app-svg-icon> + <app-svg-icon *ngIf="accountForm.get('name').valid" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" /> <app-svg-icon *ngIf="accountForm.get('name').invalid && accountForm.get('name').value" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -29,13 +24,13 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('surname').invalid && accountForm.get('surname').value" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -52,13 +47,13 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('phone').invalid && accountForm.get('phone').value" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> </form> diff --git a/src/app/form/form-view/form-view.component.html b/src/app/form/form-view/form-view.component.html index 6b5bf0677..42d920d26 100644 --- a/src/app/form/form-view/form-view.component.html +++ b/src/app/form/form-view/form-view.component.html @@ -3,13 +3,13 @@ [openned]="showConfirmationModal" [content]="'Il vous faudra de nouveau remplir le formulaire si vous quittez'" (closed)="hasRedirectionAccepted($event)" - ></app-modal-confirmation> + /> <app-progress-bar *ngIf="!isEditMode" [formType]="formType[routeParam]" [currentPage]="currentPage - 1" [nbSteps]="nbSteps" - ></app-progress-bar> + /> <div class="page"> <app-account-form *ngIf="formType[routeParam] === formType.account || formType[this.routeParam] === formType.register" @@ -21,7 +21,7 @@ (goNext)="nextPage()" (pageValid)="validatePage($event)" (acceptNewsletter)="acceptReceiveNewsletter($event)" - ></app-account-form> + /> <app-profile-form *ngIf="formType[routeParam] === formType.profile" [nbSteps]="nbSteps" @@ -29,7 +29,7 @@ [currentStep]="currentPage" (goNext)="nextPage()" (pageValid)="validatePage($event)" - ></app-profile-form> + /> <app-structure-form *ngIf="formType[routeParam] === formType.structure" [nbSteps]="nbSteps" @@ -43,7 +43,7 @@ (pageValid)="validatePage($event)" (updateHoursForm)="updateHours($event)" (setEditStep)="setCurrentStep($event)" - ></app-structure-form> + /> <app-personal-offer-form *ngIf="formType[routeParam] === formType.personaloffer" [nbSteps]="nbSteps" @@ -52,7 +52,7 @@ [structureName]="structure.structureName" (setHasOtherOffer)="setHasOtherPersonalOffer($event)" (pageValid)="validatePage($event)" - ></app-personal-offer-form> + /> </div> <app-footer-form @@ -71,5 +71,5 @@ (endForm)="endForm($event)" (changeCurrentStep)="setCurrentStep($event)" (saveEditedStructure)="saveEditedStructure()" - ></app-footer-form> + /> </div> diff --git a/src/app/form/form-view/global-components/information-step/information-step.component.html b/src/app/form/form-view/global-components/information-step/information-step.component.html index 98b1310ce..542aa84a4 100644 --- a/src/app/form/form-view/global-components/information-step/information-step.component.html +++ b/src/app/form/form-view/global-components/information-step/information-step.component.html @@ -15,8 +15,8 @@ </p> <img src="../../assets/form/profileSkip.svg" alt="Image profil" /> <div class="footerForm" fxLayout="row" fxLayoutGap="10px" fxLayoutAlign="center center"> - <app-button (action)="goToHome()" [text]="'Plus tard'"></app-button> - <app-button (action)="goToNextPage()" [text]="'C\'est parti !'" [style]="buttonTypeEnum.Primary"></app-button> + <app-button (action)="goToHome()" [text]="'Plus tard'" /> + <app-button (action)="goToNextPage()" [text]="'C\'est parti !'" [style]="buttonTypeEnum.Primary" /> </div> </div> </ng-container> @@ -72,8 +72,7 @@ [text]="'Voir mon compte'" [iconType]="'form'" (action)="goBackProfile()" - > - </app-button> + /> </div> </div> </ng-container> @@ -89,8 +88,7 @@ [text]="'Voir mon compte'" [iconType]="'form'" (action)="goBackProfile()" - > - </app-button> + /> </div> </div> </ng-container> diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-form.component.html b/src/app/form/form-view/personal-offer-form/personal-offer-form.component.html index 80e78e533..a05624f3d 100644 --- a/src/app/form/form-view/personal-offer-form/personal-offer-form.component.html +++ b/src/app/form/form-view/personal-offer-form/personal-offer-form.component.html @@ -4,14 +4,14 @@ [structureName]="structureName" [personalOfferForm]="personalOfferForm" [onlineProcedures]="onlineProcedures" - ></app-personal-offer-accompaniment> + /> </ng-container> <ng-container *ngIf="currentStep === personalOfferFormStep.personalOfferTrainingType"> <app-personal-offer-training-type [structureName]="structureName" [personalOfferForm]="personalOfferForm" [trainingCategories]="trainingCategories" - ></app-personal-offer-training-type> + /> </ng-container> <ng-container *ngIf="currentStep === personalOfferFormStep.personalOfferStructureChoice"> <app-personal-offer-other-structure-choice @@ -19,12 +19,12 @@ [personalOfferForm]="personalOfferForm" (setOtherOffer)="setOtherOffer($event)" (pageValid)="validPage()" - ></app-personal-offer-other-structure-choice> + /> </ng-container> <ng-container *ngIf="currentStep === personalOfferFormStep.personalOfferFinishedInfo"> <app-information-step [step]="personalOfferFormStep.personalOfferFinishedInfo" [formType]="formTypeEnum.personaloffer" (goNext)="goToProfile()" - ></app-information-step> + /> </ng-container> diff --git a/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html b/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html index fb1af6343..f637bcd9d 100644 --- a/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html +++ b/src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.html @@ -9,5 +9,5 @@ [advancedSkills]="personalOfferForm.get('categories').get('advancedSkills').value" [trainingCategories]="trainingCategories" (selectedType)="setTrainingsFromCategories($event)" - ></app-training-type-picker> + /> </form> diff --git a/src/app/form/form-view/profile-form/profile-form.component.html b/src/app/form/form-view/profile-form/profile-form.component.html index bd037bfc1..9949d1aa9 100644 --- a/src/app/form/form-view/profile-form/profile-form.component.html +++ b/src/app/form/form-view/profile-form/profile-form.component.html @@ -1,21 +1,11 @@ <div class="no-max-width"> <ng-container *ngIf="currentStep === profileFormStepEnum.profileBeginningInfo"> - <app-information-step - [step]="0" - (goNext)="setValidationsForm()" - [formType]="formTypeEnum.profile" - ></app-information-step> + <app-information-step [step]="0" (goNext)="setValidationsForm()" [formType]="formTypeEnum.profile" /> </ng-container> <ng-container *ngIf="currentStep === profileFormStepEnum.profileEmployerSelection"> - <app-profile-employer-selection - [profileForm]="profileForm" - (validateForm)="setValidationsForm()" - ></app-profile-employer-selection> + <app-profile-employer-selection [profileForm]="profileForm" (validateForm)="setValidationsForm()" /> </ng-container> <ng-container *ngIf="currentStep === profileFormStepEnum.profileJobSelection"> - <app-profile-job-selection - [profileForm]="profileForm" - (validateForm)="setValidationsForm()" - ></app-profile-job-selection> + <app-profile-job-selection [profileForm]="profileForm" (validateForm)="setValidationsForm()" /> </ng-container> </div> diff --git a/src/app/form/form-view/profile-form/profile-job-selection/profile-job-selection.component.html b/src/app/form/form-view/profile-form/profile-job-selection/profile-job-selection.component.html index 7bf4a9e30..9761f845a 100644 --- a/src/app/form/form-view/profile-form/profile-job-selection/profile-job-selection.component.html +++ b/src/app/form/form-view/profile-form/profile-job-selection/profile-job-selection.component.html @@ -12,7 +12,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="job.name" (action)="selectedResult(job)" - ></app-button> + /> </span> </div> <div *ngIf="isUnexistingJob()" fxLayout="column" fxLayoutAlign="space-between" class="form-group search"> 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 76f32f098..9f5346749 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 @@ -10,7 +10,7 @@ class="form-input search-input" autocomplete="off" /> - <app-svg-icon [iconClass]="'searchIcon icon-32'" [type]="'ico'" [icon]="'search'"></app-svg-icon> + <app-svg-icon [iconClass]="'searchIcon icon-32'" [type]="'ico'" [icon]="'search'" /> </div> <div class="scroll"> <div *ngIf="!isAlreadySearching"> @@ -52,7 +52,7 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <div *ngIf="structure.alreadySelected" class="sticker">Déjà<br />sélectionnée</div> </div> </div> @@ -62,11 +62,7 @@ Cette structure n’existe pas encore sur Res’in.<br /> <span class="question">Souhaitez-vous la référencer ?</span> </div> - <app-button - (action)="addStructure()" - [text]="'Créer une structure'" - [style]="buttonTypeEnum.Primary" - ></app-button> + <app-button (action)="addStructure()" [text]="'Créer une structure'" [style]="buttonTypeEnum.Primary" /> </div> </div> </div> diff --git a/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html b/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html index 816336dfb..1ca532dc2 100644 --- a/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html +++ b/src/app/form/form-view/structure-form/structure-access-modality/structure-access-modality.component.html @@ -1,21 +1,13 @@ <form [formGroup]="structureForm" *ngIf="structureForm"> <div class="title" [ngClass]="{ editTitle: isEditMode }"> - <app-svg-icon - *ngIf="isEditMode" - [iconClass]="'backArrow'" - [type]="'ico'" - [icon]="'arrowBack'" - tabindex="0" - (click)="goBack()" - (keyup.enter)="goBack()" - ></app-svg-icon> + <app-svg-icon (click)="goBack()" *ngIf="isEditMode" [iconClass]="'backArrow'" [type]="'ico'" [icon]="'arrowBack'" /> <div class="titleContent"> <h3>Quelles sont les modalités d'accueil de la structure ?</h3> <p>Plusieurs choix possibles</p> </div> </div> <p class="missing-information" *ngIf="isEditMode && !structureForm.get('categories').get('accessModality').valid"> - <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon"></app-svg-icon> + <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon" /> <span>Il faut renseigner au moins un champ</span> </p> <div *ngIf="accessModality" fxLayout="column wrap" fxLayoutAlign="flex-start" class="welcomingTerms"> diff --git a/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html b/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html index 204468e21..6697b7340 100644 --- a/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html +++ b/src/app/form/form-view/structure-form/structure-consent/structure-consent.component.html @@ -20,7 +20,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3> Acceptez-vous que les informations de votre structure soient mises à disposition sur la plateforme @@ -35,7 +35,7 @@ [text]="'J\'accepte'" (checkEvent)="acceptOpenData($event)" [isChecked]="false" - ></app-checkbox-form> + /> <div class="dataShareConsent"> <app-radio-form *ngIf="isEditMode" diff --git a/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html b/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html index 495b7ad5e..3c95ba828 100644 --- a/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html +++ b/src/app/form/form-view/structure-form/structure-contact-completion/structure-contact-completion.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Quelle personne pourrait connaître ces informations ?</h3> <p>Informations demandées : téléphone, email, accessibilité PMR, type de public...</p> @@ -30,7 +30,7 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -49,7 +49,7 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -68,13 +68,13 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="structureForm.get('contactPersonEmail').invalid && structureForm.get('contactPersonEmail').value" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> </form> diff --git a/src/app/form/form-view/structure-form/structure-contact/structure-contact.component.html b/src/app/form/form-view/structure-form/structure-contact/structure-contact.component.html index 66f502d4e..e1d845282 100644 --- a/src/app/form/form-view/structure-form/structure-contact/structure-contact.component.html +++ b/src/app/form/form-view/structure-form/structure-contact/structure-contact.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Comment joindre votre structure ?</h3> <span class="label-optional">Veuillez renseigner au moins un des 2 champs</span> @@ -23,13 +23,13 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="structureForm.get('contactMail').invalid && structureForm.get('contactMail').value !== null" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -48,13 +48,13 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="structureForm.get('contactPhone').invalid && structureForm.get('contactPhone').value" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> </form> diff --git a/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html b/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html index 850eec61b..94efdf5a8 100644 --- a/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html +++ b/src/app/form/form-view/structure-form/structure-covid-info/structure-covid-info.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Y a-t-il des informations spécifiques à la période COVID ?</h3> <p>Facultatif</p> diff --git a/src/app/form/form-view/structure-form/structure-description/structure-description.component.html b/src/app/form/form-view/structure-form/structure-description/structure-description.component.html index 4a1e587bb..5fa012dec 100644 --- a/src/app/form/form-view/structure-form/structure-description/structure-description.component.html +++ b/src/app/form/form-view/structure-form/structure-description/structure-description.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Pouvez-vous présenter la structure en quelques mots ?</h3> <p>Facultatif</p> diff --git a/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.html b/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.html index 6f39916f8..54c7bd657 100644 --- a/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.html +++ b/src/app/form/form-view/structure-form/structure-digital-helping-accompaniment/structure-digital-helping-accompaniment.component.html @@ -12,7 +12,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Quelles aides aux démarches en ligne votre structure propose-t-elle ?</h3> <p>Facultatif</p> @@ -26,7 +26,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="accompaniment.name" (action)="updateChoiceAccompaniment(accompaniment.id)" - ></app-button> + /> </span> </div> </form> diff --git a/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html b/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html index fd1da98b8..252f4827a 100644 --- a/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html +++ b/src/app/form/form-view/structure-form/structure-equipments/structure-equipments.component.html @@ -1,14 +1,12 @@ <form [formGroup]="structureForm" (keyup.enter)="(!isEditMode ? '' : null)"> <div class="title" [ngClass]="{ editTitle: isEditMode }"> <app-svg-icon + (click)="goBack()" *ngIf="isEditMode" [iconClass]="'backArrow'" [type]="'ico'" [icon]="'arrowBack'" - tabindex="0" - (click)="goBack()" - (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Quel matériel est mis à disposition par la structure ?</h3> <p>Facultatif</p> diff --git a/src/app/form/form-view/structure-form/structure-form.component.html b/src/app/form/form-view/structure-form/structure-form.component.html index feff1ff42..5e478b674 100644 --- a/src/app/form/form-view/structure-form/structure-form.component.html +++ b/src/app/form/form-view/structure-form/structure-form.component.html @@ -5,7 +5,7 @@ [structureForm]="structureForm" (validateForm)="setValidationsForm()" (createStructure)="goToCreateStructure($event)" - ></app-profile-structure-choice> + /> </ng-container> <ng-container *ngIf=" @@ -21,7 +21,7 @@ (goNext)="setValidationsForm()" [formType]="formTypeEnum.structure" [isClaimed]="structure.isClaimed" - ></app-information-step> + /> </ng-container> <div *ngIf="currentStep === structureFormStep.structureNameAndAddress"> <app-structure-name-and-address @@ -29,14 +29,14 @@ [structureForm]="structureForm" (validateForm)="setValidationsForm()" (addressStructure)="setAddressStructure($event)" - ></app-structure-name-and-address> + /> </div> <div *ngIf="currentStep === structureFormStep.structureContact"> <app-structure-contact [isEditMode]="isEditMode" [structureForm]="structureForm" (validateForm)="setValidationsForm()" - ></app-structure-contact> + /> </div> <div *ngIf="currentStep === structureFormStep.structureAccompanimentChoice"> <app-structure-accompaniment-choice @@ -44,14 +44,14 @@ [structureForm]="structureForm" (validateForm)="setValidationsForm()" (radioChange)="onRadioChange($event)" - ></app-structure-accompaniment-choice> + /> </div> <div *ngIf="currentStep === structureFormStep.structureContactCompletion"> <app-structure-contact-completion [isEditMode]="isEditMode" [structureForm]="structureForm" (validateForm)="setValidationsForm()" - ></app-structure-contact-completion> + /> </div> <div *ngIf="currentStep === structureFormStep.structureType"> <app-structure-type @@ -59,7 +59,7 @@ [structureForm]="structureForm" (validateForm)="setValidationsForm()" (typeStructure)="setTypeStructure($event)" - ></app-structure-type> + /> </div> <div *ngIf="currentStep === structureFormStep.structureAccessModality"> <app-structure-access-modality @@ -68,7 +68,7 @@ [accessModality]="accessModality" (validateForm)="setValidationsForm()" (checkChange)="onCheckChange($event)" - ></app-structure-access-modality> + /> </div> <div *ngIf="currentStep === structureFormStep.structureHours"> <app-structure-hours @@ -78,7 +78,7 @@ (validateForm)="setValidationsForm()" (hours)="updateHours($event)" (hoursError)="setHoursError()" - ></app-structure-hours> + /> </div> <div *ngIf="currentStep === structureFormStep.structurePmr"> <app-structure-pmr @@ -87,7 +87,7 @@ (radioChange)="onRadioChange($event)" [isPageValid]="setValidationsForm()" [title]="'La structure est-elle accessible pour les personnes à mobilité réduite ?'" - ></app-structure-pmr> + /> </div> <div *ngIf="currentStep === structureFormStep.structureWebAndSocialNetwork"> <app-structure-web-and-social-network @@ -139,7 +139,7 @@ [structureForm]="structureForm" [trainingCategories]="trainingCategories" (validateForm)="setValidationsForm()" - ></app-structure-training-type> + /> </div> <div *ngIf="currentStep === structureFormStep.structureTrainingPrice"> <app-structure-training-price @@ -147,7 +147,7 @@ [structureForm]="structureForm" (validateForm)="setValidationsForm()" (radioChange)="onRadioChange($event)" - ></app-structure-training-price> + /> </div> <div *ngIf="currentStep === structureFormStep.structureWifi"> <app-structure-wifi @@ -156,7 +156,7 @@ (validateForm)="setValidationsForm($event)" (checkChange)="onCheckChange($event)" (radioChange)="onRadioChange($event)" - ></app-structure-wifi> + /> </div> <div *ngIf="currentStep === structureFormStep.structureEquipments"> <app-structure-equipments @@ -165,7 +165,7 @@ (validateForm)="setValidationsForm($event)" [isEditMode]="isEditMode" (inArray)="isInArray($event)" - ></app-structure-equipments> + /> </div> <div *ngIf="currentStep === structureFormStep.structureLabels"> <app-structure-labels @@ -174,7 +174,7 @@ [isEditMode]="isEditMode" (checkChange)="onCheckChange($event)" (validateForm)="setValidationsForm($event)" - ></app-structure-labels> + /> </div> <div *ngIf="currentStep === structureFormStep.structureSolidarityMaterial"> <app-structure-solidarity-material @@ -183,7 +183,7 @@ [isEditMode]="isEditMode" (validateForm)="setValidationsForm($event)" (updateChoice)="updateChoice($event)" - ></app-structure-solidarity-material> + /> </div> <div *ngIf="currentStep === structureFormStep.structureDigitalHelpingAccompaniment"> <app-structure-digital-helping-accompaniment @@ -192,7 +192,7 @@ [onlineProcedures]="onlineProcedures" (validateForm)="setValidationsForm($event)" (updateChoice)="updateChoice($event)" - ></app-structure-digital-helping-accompaniment> + /> </div> <div *ngIf="currentStep === structureFormStep.structureDescription"> <app-structure-description @@ -200,14 +200,14 @@ [structureForm]="structureForm" (validateForm)="setValidationsForm($event)" [isEditMode]="isEditMode" - ></app-structure-description> + /> </div> <div *ngIf="currentStep === structureFormStep.structureCovidInfo"> <app-structure-covid-info [isEditMode]="isEditMode" [structureForm]="structureForm" (validateForm)="setValidationsForm($event)" - ></app-structure-covid-info> + /> </div> <div *ngIf="currentStep === structureFormStep.structureConsent"> <app-structure-consent @@ -215,7 +215,7 @@ [isEditMode]="isEditMode" (clickAcceptOpenData)="acceptOpenData($event)" (clickAcceptDataBeSaved)="acceptDataBeSaved($event)" - ></app-structure-consent> + /> </div> <div *ngIf="currentStep === structureFormStep.structureCreationFinishedInfo" class="no-max-width"> <app-information-step @@ -224,6 +224,6 @@ [step]="currentStep" [formType]="formTypeEnum.structure" [hasPersonalOffer]="profile.job ? profile.job.hasPersonalOffer : false" - ></app-information-step> + /> </div> </div> diff --git a/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html b/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html index e551965e5..c85b46952 100644 --- a/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html +++ b/src/app/form/form-view/structure-form/structure-hours/structure-hours.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Quels sont les horaires d'ouverture de la structure ?</h3> <p>Facultatif</p> @@ -19,7 +19,7 @@ (updateForm)="updateHours($event)" (updateFormError)="setHoursError()" [structureInput]="hoursForm" - ></app-hour-picker> + /> <div class="title secondTitle"> <h3>Avez-vous des précisions à apporter sur les horaires ?</h3> diff --git a/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html b/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html index ce9336eca..baf143119 100644 --- a/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html +++ b/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>La structure est-elle labellisée ?</h3> <p>Facultatif</p> diff --git a/src/app/form/form-view/structure-form/structure-name-and-address/structure-name-and-address.component.html b/src/app/form/form-view/structure-form/structure-name-and-address/structure-name-and-address.component.html index 63a9feeeb..e7f3423d9 100644 --- a/src/app/form/form-view/structure-form/structure-name-and-address/structure-name-and-address.component.html +++ b/src/app/form/form-view/structure-form/structure-name-and-address/structure-name-and-address.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Quelle structure voulez-vous référencer ?</h3> </div> @@ -27,7 +27,7 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -37,14 +37,14 @@ [address]="structureForm.get('address').valid ? structureForm.get('address').value : null" (inputAddress)="setAddressStructure()" (selectedAddress)="setAddressStructure($event)" - ></app-address-autocomplete> + /> <app-svg-icon *ngIf="structureForm.get('address').valid" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" class="validateIcon" - ></app-svg-icon> + /> </div> </div> </form> diff --git a/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.html b/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.html index 8ab015ef3..735219860 100644 --- a/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.html +++ b/src/app/form/form-view/structure-form/structure-public-target-other/structure-public-target-other.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Quelles sont les autres démarches ?</h3> </div> diff --git a/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html b/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html index 261812417..6be3a0164 100644 --- a/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html +++ b/src/app/form/form-view/structure-form/structure-public-target/structure-public-target.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3> {{ @@ -21,7 +21,7 @@ </div> </div> <p class="missing-information" *ngIf="isEditMode && !structureForm.get('categories').get('age').valid"> - <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon"></app-svg-icon> + <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon" /> <span>Il faut renseigner au moins un champ</span> </p> <ng-container *ngIf="!isMandatoryFields"> @@ -37,7 +37,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="choice.name" (action)="updateChoicePublic(choice.id, 'languageAndIlliteracy')" - ></app-button> + /> </div> </div> <div *ngIf="handicaps"> @@ -53,7 +53,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="choice.name" (action)="updateChoicePublic(choice.id, 'handicaps')" - ></app-button> + /> </div> </div> <div *ngIf="publicOthers"> @@ -68,7 +68,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="choice.name" (action)="updateChoicePublic(choice.id, 'publicOthers')" - ></app-button> + /> </div> </div> </ng-container> @@ -86,7 +86,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="choice.name" (action)="updateChoicePublic(choice.id, 'age')" - ></app-button> + /> </div> </div> </ng-container> diff --git a/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.html b/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.html index 38e16489a..6024ef8ce 100644 --- a/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.html +++ b/src/app/form/form-view/structure-form/structure-solidarity-material/structure-solidarity-material.component.html @@ -12,7 +12,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Quel matériel numérique vendez-vous à tarif solidaire ?</h3> <p>Facultatif</p> @@ -26,7 +26,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="material.name" (action)="updateChoiceSolidarityMaterial(material.id)" - ></app-button> + /> </span> </div> </form> diff --git a/src/app/form/form-view/structure-form/structure-training-price/structure-training-price.component.html b/src/app/form/form-view/structure-form/structure-training-price/structure-training-price.component.html index 7ce340990..5a845d097 100644 --- a/src/app/form/form-view/structure-form/structure-training-price/structure-training-price.component.html +++ b/src/app/form/form-view/structure-form/structure-training-price/structure-training-price.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Ces accompagnements sont-ils gratuits ?</h3> </div> diff --git a/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html b/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html index 7a669da2a..58a793a6b 100644 --- a/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html +++ b/src/app/form/form-view/structure-form/structure-training-type/structure-training-type.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Quels accompagnements au numérique votre structure propose-t-elle ?</h3> <p>Facultatif</p> @@ -19,5 +19,5 @@ [advancedSkills]="structureForm.get('categories').get('advancedSkills').value" [trainingCategories]="trainingCategories" (selectedType)="setTrainingsFromCategories($event)" - ></app-training-type-picker> + /> </form> diff --git a/src/app/form/form-view/structure-form/structure-type/structure-type.component.html b/src/app/form/form-view/structure-form/structure-type/structure-type.component.html index 2f33ae490..cfb59f085 100644 --- a/src/app/form/form-view/structure-form/structure-type/structure-type.component.html +++ b/src/app/form/form-view/structure-form/structure-type/structure-type.component.html @@ -8,20 +8,20 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Quel type de structure ?</h3> <p>1 seul choix possible</p> </div> </div> <p class="missing-information" *ngIf="isEditMode && !structureForm.get('structureType').valid"> - <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon"></app-svg-icon> + <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon" /> <span>Il faut renseigner un champ</span> </p> <div class="type-picker"> <app-structure-type-picker [pickedTypeId]="structureForm.get('structureType').valid ? structureForm.get('structureType').value : null" (selectedType)="setTypeStructure($event)" - ></app-structure-type-picker> + /> </div> </form> diff --git a/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html b/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html index 8e7f289ef..5d653b5db 100644 --- a/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html +++ b/src/app/form/form-view/structure-form/structure-web-and-social-network/structure-web-and-social-network.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Votre présence sur internet et les réseaux sociaux</h3> <p>Facultatif</p> @@ -54,14 +54,14 @@ [type]="'form'" [icon]="'validate'" class="validationIcon" - ></app-svg-icon> + /> <app-svg-icon *ngIf="structureForm.get('website').invalid" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon" - ></app-svg-icon> + /> </div> </div> </div> @@ -117,14 +117,14 @@ [type]="'form'" [icon]="'validate'" class="validationIcon" - ></app-svg-icon> + /> <app-svg-icon *ngIf="structureForm.get('facebook').invalid" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon" - ></app-svg-icon> + /> </div> </div> <div class="form-group twitter"> @@ -149,14 +149,14 @@ [type]="'form'" [icon]="'validate'" class="validationIcon" - ></app-svg-icon> + /> <app-svg-icon *ngIf="structureForm.get('twitter').invalid" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon" - ></app-svg-icon> + /> </div> </div> <div class="form-group instagram"> @@ -182,14 +182,14 @@ [type]="'form'" [icon]="'validate'" class="validationIcon" - ></app-svg-icon> + /> <app-svg-icon *ngIf="structureForm.get('instagram').invalid" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon" - ></app-svg-icon> + /> </div> </div> <div class="form-group linkedin"> @@ -214,14 +214,14 @@ [type]="'form'" [icon]="'validate'" class="validationIcon" - ></app-svg-icon> + /> <app-svg-icon *ngIf="structureForm.get('linkedin').invalid" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon" - ></app-svg-icon> + /> </div> </div> </div> diff --git a/src/app/form/form-view/structure-form/structure-wifi/structure-wifi.component.html b/src/app/form/form-view/structure-form/structure-wifi/structure-wifi.component.html index 360f8851f..f0f0b244d 100644 --- a/src/app/form/form-view/structure-form/structure-wifi/structure-wifi.component.html +++ b/src/app/form/form-view/structure-form/structure-wifi/structure-wifi.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>Votre structure propose-t-elle du wifi en accès libre ?</h3> </div> diff --git a/src/app/form/orientation-form-view/base-skills/base-skills-choice/base-skills-choice.component.html b/src/app/form/orientation-form-view/base-skills/base-skills-choice/base-skills-choice.component.html index b11c82676..ab87c686e 100644 --- a/src/app/form/orientation-form-view/base-skills/base-skills-choice/base-skills-choice.component.html +++ b/src/app/form/orientation-form-view/base-skills/base-skills-choice/base-skills-choice.component.html @@ -9,7 +9,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="module.name" (action)="handleClick(module)" - ></app-button> + /> </span> </div> </div> diff --git a/src/app/form/orientation-form-view/base-skills/base-skills.component.html b/src/app/form/orientation-form-view/base-skills/base-skills.component.html index 7347d6a55..f53b20288 100644 --- a/src/app/form/orientation-form-view/base-skills/base-skills.component.html +++ b/src/app/form/orientation-form-view/base-skills/base-skills.component.html @@ -4,4 +4,4 @@ [currentType]="currentType" [form]="form" (checkValidation)="checkValidation($event)" -></app-base-skills-choice> +/> diff --git a/src/app/form/orientation-form-view/equipment-access/equipment-access-choice/equipment-access-choice.component.html b/src/app/form/orientation-form-view/equipment-access/equipment-access-choice/equipment-access-choice.component.html index 75484dec0..e5f682104 100644 --- a/src/app/form/orientation-form-view/equipment-access/equipment-access-choice/equipment-access-choice.component.html +++ b/src/app/form/orientation-form-view/equipment-access/equipment-access-choice/equipment-access-choice.component.html @@ -9,7 +9,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="module.name" (action)="handleClick(module)" - ></app-button> + /> </span> </div> </div> diff --git a/src/app/form/orientation-form-view/equipment-access/equipment-access.component.html b/src/app/form/orientation-form-view/equipment-access/equipment-access.component.html index 684e8543a..9f8dd5720 100644 --- a/src/app/form/orientation-form-view/equipment-access/equipment-access.component.html +++ b/src/app/form/orientation-form-view/equipment-access/equipment-access.component.html @@ -5,7 +5,7 @@ [form]="form" [filters]="filters" (checkValidation)="checkValidation($event)" -></app-equipment-access-choice> +/> <app-orientation-structure-list *ngIf="currentType === GenericOrientationSteps.structureList" [form]="orientationForm" @@ -13,4 +13,4 @@ [filters]="filters" [profile]="profile" (validatePage)="checkValidation()" -></app-orientation-structure-list> +/> diff --git a/src/app/form/orientation-form-view/equipment-buy/equipment-buy-type/equipment-buy-type.component.html b/src/app/form/orientation-form-view/equipment-buy/equipment-buy-type/equipment-buy-type.component.html index 8cbd52cbf..dbd280f83 100644 --- a/src/app/form/orientation-form-view/equipment-buy/equipment-buy-type/equipment-buy-type.component.html +++ b/src/app/form/orientation-form-view/equipment-buy/equipment-buy-type/equipment-buy-type.component.html @@ -9,7 +9,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="module.name" (action)="handleClick(module)" - ></app-button> + /> </span> </div> </div> diff --git a/src/app/form/orientation-form-view/equipment-buy/equipment-buy.component.html b/src/app/form/orientation-form-view/equipment-buy/equipment-buy.component.html index c59e5db73..5adbf3418 100644 --- a/src/app/form/orientation-form-view/equipment-buy/equipment-buy.component.html +++ b/src/app/form/orientation-form-view/equipment-buy/equipment-buy.component.html @@ -5,7 +5,7 @@ [form]="form" [filters]="filters" (checkValidation)="checkValidation($event)" -></app-equipment-buy-type> +/> <app-orientation-structure-list *ngIf="currentType === GenericOrientationSteps.structureList" [form]="orientationForm" @@ -13,4 +13,4 @@ [filters]="filters" [profile]="profile" (validatePage)="checkValidation()" -></app-orientation-structure-list> +/> diff --git a/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.html b/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.html index 07294b530..ad08bb6c7 100644 --- a/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.html +++ b/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.html @@ -10,7 +10,7 @@ tabindex="0" (click)="handleClose()" (keyup.enter)="handleClose()" - ></app-svg-icon> + /> </div> <div class="content"> <img src="../../../../../assets/img/resin-login.svg" alt="resin-login-image" class="loginimg" /> @@ -21,13 +21,13 @@ [text]="'Se connecter'" [style]="buttonTypeEnum.modalPrimary" [ngClass]="'fullWidth'" - ></app-button> + /> <app-button (action)="handleClose()" [text]="'Continuer sans compte'" [style]="buttonTypeEnum.Tertiary" [ngClass]="'fullWidth'" - ></app-button> + /> </div> </div> </div> diff --git a/src/app/form/orientation-form-view/global-components/mediation-recap/mediation-recap.component.html b/src/app/form/orientation-form-view/global-components/mediation-recap/mediation-recap.component.html index 7c4de0e0e..9af0cbfca 100644 --- a/src/app/form/orientation-form-view/global-components/mediation-recap/mediation-recap.component.html +++ b/src/app/form/orientation-form-view/global-components/mediation-recap/mediation-recap.component.html @@ -1,4 +1,4 @@ -<app-print-header></app-print-header> +<app-print-header /> <div class="container" [ngClass]="{ onlineMediation: date }"> <div class="orientator header" *ngIf="isOrientator()"> <h3>Orienté par</h3> @@ -45,7 +45,7 @@ </div> <!-- Structure list --> <div class="multi-print" *ngFor="let structure of structuresToPrint"> - <app-structure-detail-print [structure]="structure"></app-structure-detail-print> + <app-structure-detail-print [structure]="structure" /> </div> </div> </div> diff --git a/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.html b/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.html index b9170d535..ee66e306d 100644 --- a/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.html +++ b/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.html @@ -10,12 +10,7 @@ <use [attr.xlink:href]="'assets/form/sprite.svg#checkVectorFull'"></use> </svg> </div> - <app-svg-icon - *ngIf="displayIcon" - [iconClass]="'icon-40'" - [type]="'form'" - [icon]="'orientationIndex' + index" - ></app-svg-icon> + <app-svg-icon *ngIf="displayIcon" [iconClass]="'icon-40'" [type]="'form'" [icon]="'orientationIndex' + index" /> <div [fxLayout]="'column'" [fxLayoutGap]="'8px'"> <div class="title">{{ item.title }}</div> <div class="hint">{{ item.hint }}</div> diff --git a/src/app/form/orientation-form-view/global-components/navigation/navigation.component.html b/src/app/form/orientation-form-view/global-components/navigation/navigation.component.html index 8c8c235f7..52e3fd813 100644 --- a/src/app/form/orientation-form-view/global-components/navigation/navigation.component.html +++ b/src/app/form/orientation-form-view/global-components/navigation/navigation.component.html @@ -6,7 +6,7 @@ [text]="'Précédent'" [iconType]="'form'" [iconBtn]="'chevronLeft'" - ></app-button> + /> <app-button *ngIf="!isRdvsWindowStep && !hideNavButtons" (action)="nextPage()" @@ -16,8 +16,7 @@ [iconPos]="!isLastStep ? 'right' : 'left'" [style]="buttonTypeEnum.Primary" [disabled]="!isPageValid" - > - </app-button> + /> <app-button *ngIf="isRdvsWindowStep && !hideNavButtons" (action)="nextPage()" @@ -27,11 +26,10 @@ [iconPos]="'left'" [style]="buttonTypeEnum.RdvsButton" [disabled]="!isPageValid" - > - </app-button> + /> </ng-container> <ng-container *ngIf="shouldResetOrientation"> - <app-button (action)="goCarto()" [text]="'Aller à la cartographie'"> </app-button> - <app-button (action)="resetOrientation()" [text]="'Recommencer'" [style]="buttonTypeEnum.Primary"> </app-button> + <app-button (action)="goCarto()" [text]="'Aller à la cartographie'" /> + <app-button (action)="resetOrientation()" [text]="'Recommencer'" [style]="buttonTypeEnum.Primary" /> </ng-container> </div> diff --git a/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html b/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html index b7d5de3f3..2f650951f 100644 --- a/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html +++ b/src/app/form/orientation-form-view/global-components/needs-selection/needs-selection.component.html @@ -4,4 +4,4 @@ [displayIcon]="true" [selected]="getSelected()" (handleSelect)="selectNeed($event)" -></app-multi-radio-form> +/> diff --git a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html index 509373203..3119af5be 100644 --- a/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html +++ b/src/app/form/orientation-form-view/global-components/structure-orientator/structure-orientator.component.html @@ -19,7 +19,7 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> </div> </div> <div *ngIf="!hasStructures" class="select-structure"> @@ -39,13 +39,13 @@ [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="form.get('structureName').value && !form.get('structureName').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -64,13 +64,13 @@ [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="form.get('structureMail').value && !form.get('structureMail').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -89,13 +89,13 @@ [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="form.get('structurePhone').value && !form.get('structurePhone').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> </form> diff --git a/src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.html b/src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.html index 017627a72..46ccf846d 100644 --- a/src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.html +++ b/src/app/form/orientation-form-view/online-demarch/mediation-language-selection/mediation-language-selection.component.html @@ -5,4 +5,4 @@ [selected]="selected" (handleSelect)="handleSelect($event)" [smallWidth]="true" -></app-multi-radio-form> +/> diff --git a/src/app/form/orientation-form-view/online-demarch/online-demarch-common/accompaniment-type/accompaniment-type.component.html b/src/app/form/orientation-form-view/online-demarch/online-demarch-common/accompaniment-type/accompaniment-type.component.html index b4e129f5b..5cf5caeb6 100644 --- a/src/app/form/orientation-form-view/online-demarch/online-demarch-common/accompaniment-type/accompaniment-type.component.html +++ b/src/app/form/orientation-form-view/online-demarch/online-demarch-common/accompaniment-type/accompaniment-type.component.html @@ -1,7 +1,3 @@ <h2>De quel accompagnement a besoin le bénéficiaire ?</h2> -<app-multi-radio-form - [items]="accompanimentTypes" - [selected]="selected" - (handleSelect)="handleSelect($event)" -></app-multi-radio-form> +<app-multi-radio-form [items]="accompanimentTypes" [selected]="selected" (handleSelect)="handleSelect($event)" /> diff --git a/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.html b/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.html index adc5a7c74..b5abf01b6 100644 --- a/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.html +++ b/src/app/form/orientation-form-view/online-demarch/online-demarch-common/online-demarch.component.html @@ -7,7 +7,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="module.name" (action)="handleClick(module)" - ></app-button> + /> </span> </div> <app-modal-confirmation @@ -18,4 +18,4 @@ [customConfirmationText]="'Ok'" [singleButton]="true" (closed)="handleClose()" -></app-modal-confirmation> +/> diff --git a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneciary-info/mediation-beneciary-info.component.html b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneciary-info/mediation-beneciary-info.component.html index f3dcc7a8b..86cf8ded8 100644 --- a/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneciary-info/mediation-beneciary-info.component.html +++ b/src/app/form/orientation-form-view/online-demarch/online-mediation/mediation-beneciary-info/mediation-beneciary-info.component.html @@ -10,18 +10,13 @@ class="form-input" (input)="updatedForm('name', $event.target.value)" /> - <app-svg-icon - *ngIf="form.get('name').valid" - [iconClass]="'validation'" - [type]="'form'" - [icon]="'validate'" - ></app-svg-icon> + <app-svg-icon *ngIf="form.get('name').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" /> <app-svg-icon *ngIf="form.get('name').value && !form.get('name').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -34,18 +29,13 @@ class="form-input" (input)="updatedForm('surname', $event.target.value)" /> - <app-svg-icon - *ngIf="form.get('surname').valid" - [iconClass]="'validation'" - [type]="'form'" - [icon]="'validate'" - ></app-svg-icon> + <app-svg-icon *ngIf="form.get('surname').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" /> <app-svg-icon *ngIf="form.get('surname').value && !form.get('surname').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> @@ -59,18 +49,13 @@ formControlName="phone" class="form-input" /> - <app-svg-icon - *ngIf="form.get('phone').valid" - [iconClass]="'validation'" - [type]="'form'" - [icon]="'validate'" - ></app-svg-icon> + <app-svg-icon *ngIf="form.get('phone').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" /> <app-svg-icon *ngIf="form.get('phone').value && !form.get('phone').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> </form> diff --git a/src/app/form/orientation-form-view/online-demarch/onlineDemarch-form.component.html b/src/app/form/orientation-form-view/online-demarch/onlineDemarch-form.component.html index 74e6d5968..f25399bfa 100644 --- a/src/app/form/orientation-form-view/online-demarch/onlineDemarch-form.component.html +++ b/src/app/form/orientation-form-view/online-demarch/onlineDemarch-form.component.html @@ -4,12 +4,12 @@ *ngIf="currentStep === onlineDemarchesCommonStepsEnum.onlineDemarche" [form]="form" (checkValidation)="checkValidation()" - ></app-online-demarch> + /> <app-accompaniment-type *ngIf="currentStep === onlineDemarchesCommonStepsEnum.accompanimentType" [form]="form" (checkValidation)="checkValidation()" - ></app-accompaniment-type> + /> </ng-container> <!-- MEETING FORM (RDVS) --> <ng-container *ngIf="currentType === onlineDemarcheTypeEnum.meetings"> @@ -17,13 +17,13 @@ *ngIf="currentStep === onlineDemarchesMeetingSteps.infoScreen" [currentType]="currentType" (checkValidation)="checkValidation()" - ></app-information-screen> + /> <app-structure-orientator *ngIf="currentStep === onlineDemarchesMeetingSteps.structureOrientator" [profile]="profile" [form]="form" (validatePage)="checkValidation()" - ></app-structure-orientator> + /> <app-structure-public-target *ngIf=" currentStep === onlineDemarchesMeetingSteps.publicTypeMandatory || @@ -44,35 +44,35 @@ [structureForm]="form" (validateForm)="checkValidation()" (radioChange)="onRadioChange($event)" - ></app-structure-pmr> + /> <app-meeting-digital-pass *ngIf="currentStep === onlineDemarchesMeetingSteps.digitalPass" [form]="form" [labelsQualifications]="categories.labelsQualifications" (checkValidation)="checkValidation()" - ></app-meeting-digital-pass> + /> <app-orientation-structure-address *ngIf="currentStep === onlineDemarchesMeetingSteps.location" [form]="form" (addressStructure)="checkValidation($event)" - ></app-orientation-structure-address> + /> <app-meeting-rdvs-doing *ngIf="currentStep === onlineDemarchesMeetingSteps.rdvsDoing" (checkValidation)="checkValidation()" (setResetOrientation)="showResetOrientation()" [form]="form" - ></app-meeting-rdvs-doing> + /> <app-meeting-rdvs-callback *ngIf="currentStep === onlineDemarchesMeetingSteps.rdvsCallback" (checkValidation)="checkValidation()" [form]="form" - ></app-meeting-rdvs-callback> + /> <app-mediation-recap *ngIf="currentStep === onlineDemarchesMeetingSteps.recap" [form]="form" [recapType]="recapsType.structure" (checkValidation)="checkValidation()" - ></app-mediation-recap> + /> </ng-container> <!-- ONLINE MEDIATION FORM --> <ng-container *ngIf="currentType === onlineDemarcheTypeEnum.onlineMediation"> @@ -80,28 +80,28 @@ *ngIf="currentStep === HotlineMediationStepsEnum.infoScreen" [currentType]="currentType" (checkValidation)="checkValidation()" - ></app-information-screen> + /> <app-mediation-beneciary-info *ngIf="currentStep === HotlineMediationStepsEnum.mediationBeneciaryInfo" [form]="form" (checkValidation)="checkValidation()" - ></app-mediation-beneciary-info> + /> <app-mediation-hours-selection *ngIf="currentStep === HotlineMediationStepsEnum.mediationHoursSelection" [form]="form" (checkValidation)="checkValidation()" - ></app-mediation-hours-selection> + /> <app-mediation-language-selection *ngIf="currentStep === HotlineMediationStepsEnum.mediationLanguageSelection" [form]="form" (checkValidation)="checkValidation()" - ></app-mediation-language-selection> + /> <app-mediation-recap *ngIf="currentStep === HotlineMediationStepsEnum.mediationRecap" [form]="form" [recapType]="recapsType.onlineMediation" (checkValidation)="checkValidation()" - ></app-mediation-recap> + /> </ng-container> <!-- STRUCTURE LIST FORM --> <app-orientation-structure-list @@ -111,4 +111,4 @@ [filters]="filters" [profile]="profile" (validatePage)="checkValidation()" -></app-orientation-structure-list> +/> diff --git a/src/app/form/orientation-form-view/orientation-form-view.component.html b/src/app/form/orientation-form-view/orientation-form-view.component.html index 9d60f5400..45d15d0d6 100644 --- a/src/app/form/orientation-form-view/orientation-form-view.component.html +++ b/src/app/form/orientation-form-view/orientation-form-view.component.html @@ -1,12 +1,12 @@ <div class="orientation"> - <app-progress-bar [currentPage]="currentStep" [nbSteps]="nbSteps"></app-progress-bar> + <app-progress-bar [currentPage]="currentStep" [nbSteps]="nbSteps" /> <div class="container" [ngClass]="{ 'no-max-width': fullScreen }"> <app-needs-selection *ngIf="currentStep === null" [currentNeed]="needType" (setNeedType)="setCurrentNeedType($event)" (validate)="validatePage(true)" - ></app-needs-selection> + /> <ng-container *ngIf="currentStep !== null"> <app-equipment-access *ngIf="needType === needEnum.equipmentAccess" @@ -17,7 +17,7 @@ [filters]="filters" [profile]="profile" (validatePage)="validatePage($event)" - ></app-equipment-access> + /> <app-equipment-buy *ngIf="needType === needEnum.equipmentBuy" [currentStep]="currentStep" @@ -38,7 +38,7 @@ [categories]="categories" (validatePage)="validatePage($event)" (setResetOrientation)="setResetOrientation()" - ></app-online-demarch-form> + /> <app-base-skills *ngIf="needType === needEnum.learnSkills" [currentStep]="currentStep" @@ -46,7 +46,7 @@ [form]="filtersForm" [filters]="filters" (validatePage)="validatePage($event)" - ></app-base-skills> + /> </ng-container> </div> <div class="navButtons"> @@ -61,12 +61,12 @@ [shouldResetOrientation]="shouldResetOrientation" (goNext)="nextPage()" (goPrev)="prevPage()" - ></app-navigation> + /> </div> <app-modal-confirmation [openned]="showConfirmationModal" [content]="'Il vous faudra de nouveau remplir le formulaire si vous quittez'" (closed)="hasRedirectionAccepted($event)" - ></app-modal-confirmation> - <app-login-modal [openned]="showLoginModal"></app-login-modal> + /> + <app-login-modal [openned]="showLoginModal" /> </div> diff --git a/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-address/orientation-structure-address.component.html b/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-address/orientation-structure-address.component.html index 48567d75a..50f1dcfef 100644 --- a/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-address/orientation-structure-address.component.html +++ b/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-address/orientation-structure-address.component.html @@ -10,7 +10,7 @@ [address]="form.get('address').valid ? form.get('address').value : null" (inputAddress)="setAddressStructure()" (selectedAddress)="setAddressStructure($event)" - ></app-address-autocomplete> + /> </div> </div> </form> diff --git a/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-list.component.html b/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-list.component.html index 22da73690..2ca775e89 100644 --- a/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-list.component.html +++ b/src/app/form/orientation-form-view/orientation-structure-list/orientation-structure-list.component.html @@ -3,7 +3,7 @@ *ngIf="currentStep === structuresListStepsEnum.pmrAccess" [structureForm]="form" (radioChange)="radioChange($event)" - ></app-structure-pmr> + /> <app-orientation-structure-address *ngIf="currentStep === structuresListStepsEnum.address" [form]="form" @@ -18,30 +18,30 @@ [userLongitude]="form.get('address').value?.coordinates[0]" [userLatitude]="form.get('address').value?.coordinates[1]" (structureSelection)="checkValidation($event)" - ></app-carto> + /> <app-structure-orientator *ngIf="currentStep === structuresListStepsEnum.structureOrientator" [profile]="profile" [form]="form" (validatePage)="checkValidation($event)" - ></app-structure-orientator> + /> <app-mediation-beneciary-info *ngIf="currentStep === structuresListStepsEnum.mediationBeneciaryInfo" [form]="form" (checkValidation)="checkValidation()" - ></app-mediation-beneciary-info> + /> <app-orientation-comments *ngIf="currentStep === structuresListStepsEnum.comments" [form]="form" (checkValidation)="checkValidation()" - ></app-orientation-comments> + /> <app-mediation-recap *ngIf="currentStep === structuresListStepsEnum.mediationRecap" [form]="form" [recapType]="recapsType.structure" (checkValidation)="checkValidation()" - ></app-mediation-recap> + /> </ng-container> diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html index 7f78a4070..e91adb31a 100644 --- a/src/app/header/header.component.html +++ b/src/app/header/header.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="openMenu()" (keyup.enter)="openMenu()" - ></app-svg-icon> + /> </div> <div class="logo clickable" routerLink="/home" tabindex="0"> <img @@ -21,15 +21,7 @@ /> </div> <div class="containerIconMenu"> - <app-svg-icon - [type]="'ico'" - [icon]="'profile'" - [iconClass]="'icon-32'" - class="clickable" - tabindex="0" - (click)="isLoggedIn ? openProfileMenu() : goToLoginPage()" - (keyup.enter)="isLoggedIn ? openProfileMenu() : goToLoginPage()" - ></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="'profile'" [iconClass]="'icon-32'" /> </div> <div fxLayout="row" class="right-header" fxLayoutAlign="center center" fxLayoutGap="3vw"> <a routerLink="/news" [routerLinkActive]="'active'" i18n>Actualités</a> @@ -45,7 +37,7 @@ (action)="goToLoginPage()" [text]="'Se connecter'" [style]="buttonTypeEnum.Secondary" - ></app-button> + /> </div> </div> @@ -82,13 +74,12 @@ <div class="profileInformation"> <app-svg-icon class="avatar" + (click)="isLoggedIn ? openProfileMenu() : goToLoginPage()" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" tabindex="0" - (click)="isLoggedIn ? openProfileMenu() : goToLoginPage()" - (keyup.enter)="isLoggedIn ? openProfileMenu() : goToLoginPage()" - ></app-svg-icon> + /> <span class="name">{{ displayFullName }}</span> </div> <app-button @@ -96,15 +87,12 @@ [text]="'Voir mon compte'" [style]="buttonTypeEnum.SecondaryWide" (click)="goToProfile()" - ></app-button> + /> <app-button (action)="logout()" [text]="'Se déconnecter'" [style]="buttonTypeEnum.SecondaryWide"></app-button> </div> </div> -<app-data-share-consent - *ngIf="isDisplayDataShare" - [dataConsentPendingStructures]="dataConsentPendingStructures" -></app-data-share-consent> +<app-data-share-consent *ngIf="isDisplayDataShare" [dataConsentPendingStructures]="dataConsentPendingStructures" /> <ng-template #customTitle> <img class="desktop-show logo-grand-lyon" width="108" height="37" src="/assets/logos/resin.svg" alt /> diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html index 7acb5d8b3..c8e14578d 100644 --- a/src/app/login/login.component.html +++ b/src/app/login/login.component.html @@ -50,24 +50,21 @@ [text]="'Mot de passe oublié'" [style]="buttonTypeEnum.Secondary" [extraClass]="'fullWidth'" - > - </app-button> + /> <app-button [type]="'submit'" [text]="'Se connecter'" [disabled]="loginForm.invalid || loading" [style]="buttonTypeEnum.Primary" [extraClass]="'fullWidth'" - > - </app-button> + /> </div> <app-button (action)="goToAccountCreation()" [text]="'Je n’ai pas encore de compte'" [style]="buttonTypeEnum.Tertiary" [extraClass]="'fullWidth'" - > - </app-button> + /> </form> </div> </div> diff --git a/src/app/post/components/post-card/post-card.component.html b/src/app/post/components/post-card/post-card.component.html index b63ba47a2..e3999204a 100644 --- a/src/app/post/components/post-card/post-card.component.html +++ b/src/app/post/components/post-card/post-card.component.html @@ -27,14 +27,14 @@ /> </div> <div fxLayout="column" fxLayoutGap="8px" fxLayoutAlign="center"> - <app-post-tag [post]="post"></app-post-tag> + <app-post-tag [post]="post" /> <h2 fxLayout="row" class="title"> {{ post.title }} </h2> <div fxLayout="column" class="informations"> <div>{{ post.author }}</div> <div> - {{ post.created_at | date: 'd MMM y' }} + {{ post.created_at | date : 'd MMM y' }} </div> </div> </div> diff --git a/src/app/post/components/post-details/post-details.component.html b/src/app/post/components/post-details/post-details.component.html index e8e3777e2..930a38e68 100644 --- a/src/app/post/components/post-details/post-details.component.html +++ b/src/app/post/components/post-details/post-details.component.html @@ -16,12 +16,12 @@ </div> <div class="gh-canvas"> <div fxLayout="column" fxLayoutAlign="center none"> - <app-post-tag [post]="post"></app-post-tag> + <app-post-tag [post]="post" /> <h2 fxLayout="row" class="title">{{ post.title }}</h2> <div fxLayout="column" class="informations"> <div>{{ post.author }}</div> <div> - {{ post.created_at | date: 'dd MMM y' }} + {{ post.created_at | date : 'dd MMM y' }} </div> </div> </div> diff --git a/src/app/post/components/post-header/post-header.component.html b/src/app/post/components/post-header/post-header.component.html index 0c4f11432..3e1447c10 100644 --- a/src/app/post/components/post-header/post-header.component.html +++ b/src/app/post/components/post-header/post-header.component.html @@ -1,13 +1,7 @@ <div class="header-container"> <div class="section-container news" fxLayout="column" fxLayoutAlign="space-between"> <div class="section-container title" fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="8px"> - <app-svg-icon - class="icon" - [type]="'ico'" - [iconClass]="'icon-80'" - [icon]="'news-header'" - role="img" - ></app-svg-icon> + <app-svg-icon class="icon" [type]="'ico'" [iconClass]="'icon-80'" [icon]="'news-header'" role="img" /> <div> <h1 class="no-margin">Fil d’actualité</h1> <p class="subtitle no-margin onlyOnDesktop">du réseau d’inclusion numérique</p> @@ -33,7 +27,7 @@ class="publish-button hide-on-mobile" [text]="'Publier votre actu'" (action)="togglePublishNews()" - ></app-button> + /> </div> <!-- <div class="btnSection" @@ -59,7 +53,7 @@ [type]="'ico'" [iconClass]="modalTypeOpened === TypeModal.public ? 'white icon-32' : 'grey-1 icon-32'" [icon]="'news-public'" - ></app-svg-icon> + /> <div class="arrow"></div> </button> <button @@ -80,7 +74,7 @@ [type]="'ico'" [iconClass]="modalTypeOpened === TypeModal.location ? 'white' : 'grey-1'" [icon]="'news-location'" - ></app-svg-icon> + /> <div class="arrow"></div> </button> <div *ngIf="modalTypeOpened"> diff --git a/src/app/post/components/post-list/post-list.component.html b/src/app/post/components/post-list/post-list.component.html index 064803ddf..2c4f92d97 100644 --- a/src/app/post/components/post-list/post-list.component.html +++ b/src/app/post/components/post-list/post-list.component.html @@ -11,7 +11,7 @@ (click)="removeTag(filter)" > <p>{{ filter.slug | titlecase }}</p> - <app-svg-icon [type]="'ico'" [iconColor]="'currentColor'" [icon]="'cancel'"></app-svg-icon> + <app-svg-icon [type]="'ico'" [iconColor]="'currentColor'" [icon]="'cancel'"/> </div> </div> </div> --> @@ -21,7 +21,7 @@ </div> <div fxLayout="row" fxLayoutGap="33px"> <div class="posts-container" role="list"> - <app-post-card [post]="news" class="col" *ngFor="let news of allPosts"></app-post-card> + <app-post-card [post]="news" class="col" *ngFor="let news of allPosts" /> </div> </div> <div *ngIf="isLoading" class="loader"> diff --git a/src/app/post/components/post-modal-filters/post-modal-filters.component.html b/src/app/post/components/post-modal-filters/post-modal-filters.component.html index 0aff2fd3d..8b353e369 100644 --- a/src/app/post/components/post-modal-filters/post-modal-filters.component.html +++ b/src/app/post/components/post-modal-filters/post-modal-filters.component.html @@ -28,7 +28,7 @@ </div> <div class="footer" fxLayout="row" fxLayoutAlign="end center" fxLayoutGap="3vw"> <a tabindex="0" (click)="clearFilters()" (keyup.enter)="clearFilters()" tabindex="0">Effacer</a> - <app-button [text]="'Appliquer'" (click)="emit(checkedTags)"></app-button> + <app-button [text]="'Appliquer'" (click)="emit(checkedTags)" /> </div> </div> </div> diff --git a/src/app/post/news.component.html b/src/app/post/news.component.html index 06566da7f..d9671f868 100644 --- a/src/app/post/news.component.html +++ b/src/app/post/news.component.html @@ -1,4 +1,4 @@ -<app-post-header (filterTags)="setFilters($event)"></app-post-header> +<app-post-header (filterTags)="setFilters($event)" /> <div class="section-container no-padding news"> <router-outlet></router-outlet> </div> diff --git a/src/app/profile/edit/edit.component.html b/src/app/profile/edit/edit.component.html index 2aa853f04..bae5ae0f8 100644 --- a/src/app/profile/edit/edit.component.html +++ b/src/app/profile/edit/edit.component.html @@ -16,7 +16,7 @@ [iconType]="'ico'" [iconBtn]="'removeCross'" (action)="showDeleteAccountModal()" - ></app-button> + /> <app-button class="hide-on-desktop" [style]="buttonTypeEnum.SecondaryOnlyIcon" @@ -24,7 +24,7 @@ [iconType]="'ico'" [iconBtn]="'deleteAccount'" (action)="showDeleteAccountModal()" - ></app-button> + /> </div> <!-- Navigation --> <div class="navigation" role="menu"> @@ -76,54 +76,24 @@ <label for="name">Prénom</label> <div fxLayout="row" fxLayoutGap="13px"> <input type="text" class="form-input" [(ngModel)]="userProfile.name" /> - <app-svg-icon - *ngIf="nameValid()" - [iconClass]="'icon-26'" - [type]="'form'" - [icon]="'validate'" - ></app-svg-icon> - <app-svg-icon - *ngIf="!nameValid()" - [iconClass]="'icon-26'" - [type]="'form'" - [icon]="'notValidate'" - ></app-svg-icon> + <app-svg-icon *ngIf="nameValid()" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" /> + <app-svg-icon *ngIf="!nameValid()" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" /> </div> </div> <div class="form-group" fxLayout="column"> <label for="surname">Nom</label> <div fxLayout="row" fxLayoutGap="13px"> <input type="text" class="form-input" [(ngModel)]="userProfile.surname" /> - <app-svg-icon - *ngIf="surnameValid()" - [iconClass]="'icon-26'" - [type]="'form'" - [icon]="'validate'" - ></app-svg-icon> - <app-svg-icon - *ngIf="!surnameValid()" - [iconClass]="'icon-26'" - [type]="'form'" - [icon]="'notValidate'" - ></app-svg-icon> + <app-svg-icon *ngIf="surnameValid()" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" /> + <app-svg-icon *ngIf="!surnameValid()" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" /> </div> </div> <div class="form-group" fxLayout="column"> <label for="phone">Téléphone</label> <div fxLayout="row" fxLayoutGap="13px"> <input type="text" class="form-input phone" [(ngModel)]="userProfile.phone" /> - <app-svg-icon - *ngIf="phoneValid()" - [iconClass]="'icon-26'" - [type]="'form'" - [icon]="'validate'" - ></app-svg-icon> - <app-svg-icon - *ngIf="!phoneValid()" - [iconClass]="'icon-26'" - [type]="'form'" - [icon]="'notValidate'" - ></app-svg-icon> + <app-svg-icon *ngIf="phoneValid()" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" /> + <app-svg-icon *ngIf="!phoneValid()" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" /> </div> </div> </div> @@ -138,16 +108,14 @@ [iconType]="'ico'" [iconBtn]="'emailOutline'" [style]="buttonTypeEnum.Secondary" - > - </app-button> + /> <app-button [text]="'Changer mon mot de passe'" (action)="showPasswordModal()" [iconType]="'ico'" [iconBtn]="'passwordOutline'" [style]="buttonTypeEnum.Secondary" - > - </app-button> + /> </div> </div> @@ -189,7 +157,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="job.name" (action)="selectJob(job)" - ></app-button> + /> </span> </div> <div *ngIf="isUnexistingJob()" fxLayout="column" fxLayoutAlign="space-between" class="form-group search"> @@ -223,7 +191,7 @@ <!-- Footer --> <div class="footer" *ngIf="currentTab !== tabsEnum.credentials"> - <app-button *ngIf="profileChanged()" [text]="'Annuler'" [iconBtn]="'close'" (action)="cancel()"></app-button> + <app-button *ngIf="profileChanged()" [text]="'Annuler'" [iconBtn]="'close'" (action)="cancel()" /> <app-button [text]="'Valider'" [iconBtn]="'check'" @@ -231,8 +199,7 @@ (action)="confirm()" [style]="buttonTypeEnum.Primary" [extraClass]="svgCheck" - > - </app-button> + /> </div> </div> @@ -252,18 +219,13 @@ <label for="email">Nouvel email</label> <div fxLayout="row" fxLayoutGap="13px"> <input id="email" type="text" class="form-input email-placeholder" [(ngModel)]="newEmail" /> - <app-svg-icon - *ngIf="emailValid(newEmail)" - [iconClass]="'icon-26'" - [type]="'form'" - [icon]="'validate'" - ></app-svg-icon> + <app-svg-icon *ngIf="emailValid(newEmail)" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" /> <app-svg-icon *ngIf="!emailValid(newEmail)" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> @@ -276,24 +238,24 @@ [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!emailValid(newEmailConfirm)" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="buttons"> - <app-button [text]="'Annuler'" (action)="closeModal()"></app-button> + <app-button [text]="'Annuler'" (action)="closeModal()" /> <app-button [text]="'Valider'" [style]="buttonTypeEnum.Primary" [disabled]="!isPageValid()" (action)="confirm()" - ></app-button> + /> </div> </div> </div> @@ -329,19 +291,19 @@ tabindex="0" (click)="showPassword('oldPassword')" (keyup.enter)="showPassword('oldPassword')" - ></app-svg-icon> + /> <app-svg-icon *ngIf="passwordValid(oldPassword)" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!passwordValid(oldPassword)" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> @@ -362,19 +324,19 @@ tabindex="0" (click)="showPassword('newPassword')" (keyup.enter)="showPassword('newPassword')" - ></app-svg-icon> + /> <app-svg-icon *ngIf="passwordValid(newPassword)" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!passwordValid(newPassword)" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> </div> @@ -399,29 +361,29 @@ tabindex="0" (click)="showPassword('newPasswordConfirm')" (keyup.enter)="showPassword('newPasswordConfirm')" - ></app-svg-icon> + /> <app-svg-icon *ngIf="passwordValid(newPasswordConfirm)" [iconClass]="'icon-26'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!passwordValid(newPasswordConfirm)" [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="buttons"> - <app-button [text]="'Annuler'" (action)="closeModal()"></app-button> + <app-button [text]="'Annuler'" (action)="closeModal()" /> <app-button [text]="'Valider'" [style]="buttonTypeEnum.Primary" [disabled]="!isPageValid()" (action)="confirm()" - ></app-button> + /> </div> </div> </div> @@ -457,18 +419,18 @@ [type]="'form'" [icon]="'eyePassword'" (click)="showPassword('oldPassword')" - ></app-svg-icon> + /> </div> </div> <div class="buttons"> - <app-button [text]="'Annuler'" (action)="closeModal()"></app-button> + <app-button [text]="'Annuler'" (action)="closeModal()" /> <app-button [text]="'Supprimer'" [style]="buttonTypeEnum.Primary" [disabled]="!passwordValid(oldPassword)" (action)="confirmDeleteAccount()" - ></app-button> + /> </div> </div> </div> diff --git a/src/app/profile/personal-offer-edition/personal-offer-edition.component.html b/src/app/profile/personal-offer-edition/personal-offer-edition.component.html index 8890e57e7..70f2251cf 100644 --- a/src/app/profile/personal-offer-edition/personal-offer-edition.component.html +++ b/src/app/profile/personal-offer-edition/personal-offer-edition.component.html @@ -16,7 +16,7 @@ [iconType]="'ico'" [iconBtn]="'removeCross'" (action)="showDeleteOfferModal()" - ></app-button> + /> <app-button class="hide-on-desktop" [style]="buttonTypeEnum.SecondaryOnlyIcon" @@ -24,7 +24,7 @@ [iconType]="'ico'" [iconBtn]="'deleteAccount'" (action)="showDeleteOfferModal()" - ></app-button> + /> </div> <!-- Navigation --> <div class="navigation"> @@ -50,7 +50,7 @@ *ngIf="personalOfferForm" [personalOfferForm]="personalOfferForm" [onlineProcedures]="onlineProcedures" - ></app-accompaniment-picker> + /> </div> <div *ngIf="currentTab === tabsEnum.digitalSkills"> @@ -60,26 +60,20 @@ [advancedSkills]="personalOfferForm.get('categories').get('advancedSkills').value" [trainingCategories]="trainingCategories" (selectedType)="setTrainingsFromCategories($event)" - ></app-training-type-picker> + /> </div> </div> <!-- Footer --> <div class="footer"> - <app-button - [text]="'Annuler'" - [iconBtn]="'close'" - (action)="cancel()" - [disabled]="personalOfferForm?.pristine" - ></app-button> + <app-button [text]="'Annuler'" [iconBtn]="'close'" (action)="cancel()" [disabled]="personalOfferForm?.pristine" /> <app-button [text]="'Valider'" [iconBtn]="'check'" (action)="confirm()" [style]="buttonTypeEnum.Primary" [disabled]="personalOfferForm?.pristine" - > - </app-button> + /> </div> </div> @@ -100,12 +94,8 @@ </p> <div class="buttons"> - <app-button [text]="'Annuler'" (action)="closeModal()"></app-button> - <app-button - [text]="'Supprimer'" - [style]="buttonTypeEnum.Primary" - (action)="confirmDeleteOffer()" - ></app-button> + <app-button [text]="'Annuler'" (action)="closeModal()" /> + <app-button [text]="'Supprimer'" [style]="buttonTypeEnum.Primary" (action)="confirmDeleteOffer()" /> </div> </div> </div> diff --git a/src/app/profile/profile-structure/personal-offer/personal-offer.component.html b/src/app/profile/profile-structure/personal-offer/personal-offer.component.html index 32f3938b1..00a5bfa2f 100644 --- a/src/app/profile/profile-structure/personal-offer/personal-offer.component.html +++ b/src/app/profile/profile-structure/personal-offer/personal-offer.component.html @@ -9,7 +9,7 @@ [style]="buttonTypeEnum.SecondaryWide" routerLink="./edit-personal-offer/{{ this.personalOffer._id }}" tabindex="none" - ></app-button> + /> <app-button *ngIf="!isPublic" class="hide-on-desktop" @@ -17,7 +17,7 @@ [style]="buttonTypeEnum.SecondaryOnlyIcon" routerLink="./edit-personal-offer/{{ this.personalOffer._id }}" tabindex="none" - ></app-button> + /> </div> <div class="content"> <div class="dropDown" *ngIf="this.personalOffer.categoriesDisplay.onlineProcedures.length"> @@ -34,7 +34,7 @@ [type]="'ico'" [icon]="'fold'" [iconClass]="'icon-26'" - ></app-svg-icon> + /> </div> <div class="collapseContent" [@collapse]="showOnlineProcedures"> <ul> @@ -53,7 +53,7 @@ [type]="'ico'" [icon]="'fold'" [iconClass]="'icon-26'" - ></app-svg-icon> + /> </div> <div class="collapseContent" [@collapse]="showBaseSkills"> <ul> @@ -70,7 +70,7 @@ [type]="'ico'" [icon]="'fold'" [iconClass]="'icon-26'" - ></app-svg-icon> + /> </div> <div class="collapseContent" [@collapse]="showAdvancedSkills"> <ul> diff --git a/src/app/profile/profile-structure/profile-structure-member/profile-structure-member.component.html b/src/app/profile/profile-structure/profile-structure-member/profile-structure-member.component.html index 6c2d4fffb..857d8b022 100644 --- a/src/app/profile/profile-structure/profile-structure-member/profile-structure-member.component.html +++ b/src/app/profile/profile-structure/profile-structure-member/profile-structure-member.component.html @@ -1,10 +1,5 @@ <div class="structureMember"> - <app-svg-icon - class="avatar hide-on-mobile" - [type]="'avatar'" - [icon]="'defaultAvatar'" - [iconClass]="'icon-40'" - ></app-svg-icon> + <app-svg-icon class="avatar hide-on-mobile" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" /> <div class="nameJobSection"> <a routerLink="/profile/{{ member._id }}" class="name" >{{ member.name | userName }} {{ member.surname | uppercase }}</a diff --git a/src/app/profile/profile-structure/profile-structure.component.html b/src/app/profile/profile-structure/profile-structure.component.html index 6dace8120..a97d7c1b5 100644 --- a/src/app/profile/profile-structure/profile-structure.component.html +++ b/src/app/profile/profile-structure/profile-structure.component.html @@ -6,7 +6,7 @@ (keyup.enter)="toggleDetails(); $event.stopPropagation()" > <div class="left"> - <app-svg-icon [type]="'ico'" [icon]="getStructureTypeIcon()" [iconClass]="'icon-52'"></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="getStructureTypeIcon()" [iconClass]="'icon-52'" /> <div class="structureInfos"> <p class="structureName">{{ structure.structureName }}</p> <p class="structureType">{{ getStructureTypeLabel() }}</p> @@ -14,7 +14,7 @@ </div> <div class="right"> <div class="missingData" *ngIf="!isPublic && !isValid() && !isPending"> - <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'"></app-svg-icon> + <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" /> <p class="invalidText hide-on-mobile"> Informations <br /> @@ -34,14 +34,14 @@ [text]="'Annuler la demande'" [style]="buttonTypeEnum.Secondary" (click)="handleCancelJoin(structure._id); $event.stopPropagation()" - ></app-button> + /> <app-svg-icon class="showDetails" [ngClass]="!showDetails ? 'visible' : 'hidden'" [type]="'ico'" [icon]="'fold'" [iconClass]="'icon-26'" - ></app-svg-icon> + /> </div> </div> <div [@collapse]="showDetails" class="collapseContent"> @@ -59,7 +59,7 @@ [queryParams]="{ id: structure._id }" [routerLinkActive]="'active'" tabindex="none" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'eyePassword'" @@ -69,7 +69,7 @@ [queryParams]="{ id: structure._id }" [routerLinkActive]="'active'" tabindex="none" - ></app-button> + /> <app-button *ngIf="!isPublic && !isPending" class="hide-on-mobile" @@ -80,7 +80,7 @@ routerLink="./edit-structure/{{ structure._id }}" [routerLinkActive]="'active'" tabindex="none" - ></app-button> + /> <app-button *ngIf="!isPublic && !isPending" class="hide-on-desktop" @@ -90,7 +90,7 @@ routerLink="./edit-structure/{{ structure._id }}" [routerLinkActive]="'active'" tabindex="none" - ></app-button> + /> </div> </div> <div class="sectionContent infoSection"> @@ -123,7 +123,7 @@ [style]="buttonTypeEnum.SecondaryWide" routerLink="./structure-members-management/{{ structure._id }}" [routerLinkActive]="'active'" - ></app-button> + /> <app-button *ngIf="!isPublic && !isPending" class="hide-on-desktop" @@ -131,13 +131,10 @@ [style]="buttonTypeEnum.SecondaryOnlyIcon" routerLink="./structure-members-management/{{ structure._id }}" [routerLinkActive]="'active'" - ></app-button> + /> </div> <div class="sectionContent members"> - <app-profile-structure-member - *ngFor="let member of members; let i = index" - [member]="member" - ></app-profile-structure-member> + <app-profile-structure-member *ngFor="let member of members; let i = index" [member]="member" /> </div> </div> <div class="call-to-action" *ngIf="!isPublic && members.length === 0 && !isPending"> @@ -147,7 +144,7 @@ [style]="buttonTypeEnum.SecondaryUltraWide" [routerLinkActive]="'active'" (click)="addMemberModalOpenned = true" - ></app-button> + /> </div> <div class="call-to-action" @@ -159,7 +156,7 @@ [style]="buttonTypeEnum.SecondaryUltraWide" [routerLinkActive]="'active'" (click)="goToOffer()" - ></app-button> + /> </div> </div> </div> @@ -168,4 +165,4 @@ [openned]="addMemberModalOpenned" [structure]="structureWithOwners" (closed)="closeAddMemberModal($event)" -></app-structure-add-member-modal> +/> diff --git a/src/app/profile/profile.component.html b/src/app/profile/profile.component.html index 61bdc9e02..f132e4d81 100644 --- a/src/app/profile/profile.component.html +++ b/src/app/profile/profile.component.html @@ -10,7 +10,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <h1>Profil</h1> <app-button *ngIf="!isPublic" @@ -21,7 +21,7 @@ routerLink="/profile/edit" [routerLinkActive]="'active'" tabindex="none" - ></app-button> + /> <app-button *ngIf="!isPublic" class="hide-on-desktop" @@ -30,7 +30,7 @@ routerLink="/profile/edit" [routerLinkActive]="'active'" tabindex="none" - ></app-button> + /> </div> <div class="profile" fxLayout="row"> <app-svg-icon @@ -41,7 +41,7 @@ tabindex="0" (click)="isLoggedIn ? openProfileMenu() : goToLoginPage()" (keyup.enter)="isLoggedIn ? openProfileMenu() : goToLoginPage()" - ></app-svg-icon> + /> <div class="information"> <div class="name">{{ userProfile.name | userName }} {{ userProfile.surname | uppercase }}</div> <div *ngIf="utils.getJobEmployer(userProfile)" class="job">{{ utils.getJobEmployer(userProfile) }}</div> @@ -60,7 +60,7 @@ [state]="{ data: 'description' }" [routerLinkActive]="'active'" tabindex="none" - ></app-button> + /> </div> </section> <!-- Private profile with pending structures --> @@ -79,7 +79,7 @@ routerLink="./structures-management" [routerLinkActive]="'active'" tabindex="none" - ></app-button> + /> <app-button *ngIf="userProfile.structuresLink.length > 0" class="hide-on-desktop" @@ -88,7 +88,7 @@ routerLink="./structures-management" [routerLinkActive]="'active'" tabindex="none" - ></app-button> + /> </div> <div class="structuresContainer" @@ -102,14 +102,14 @@ [isPending]="true" [joinRequestDate]="userProfile.pendingStructuresLink[i].createdAt" (cancelJoin)="cancelJoin($event)" - ></app-profile-structure> + /> <app-profile-structure *ngFor="let structure of structures; let i = index" [structureWithOwners]="structure" [userProfile]="this.userProfile" [isPublic]="this.isPublic" - ></app-profile-structure> + /> </div> <app-button class="addStructure" @@ -118,7 +118,7 @@ [text]="'Ajouter une structure'" routerLink="/form/structure" tabindex="none" - ></app-button> + /> </section> <!-- Public profile --> <section *ngIf="isPublic && userProfile.structuresLink.length > 0"> @@ -137,7 +137,7 @@ [structureWithOwners]="structure" [userProfile]="this.userProfile" [isPublic]="this.isPublic" - ></app-profile-structure> + /> </div> </section> diff --git a/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html b/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html index 1096cda71..e226ebe23 100644 --- a/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html +++ b/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.html @@ -9,22 +9,22 @@ <p *ngIf="ownerAlreadyLinked" class="special invalid">L'email est déjà rattaché à la structure.</p> <div fxLayout="row" fxLayoutGap="13px"> <input type="text" formControlName="email" class="form-input" autocomplete="on" /> - <app-svg-icon *ngIf="fAddAccount.email.valid" [type]="'form'" [icon]="'validate'"></app-svg-icon> + <app-svg-icon *ngIf="fAddAccount.email.valid" [type]="'form'" [icon]="'validate'" /> <app-svg-icon *ngIf="fAddAccount.email.invalid && fAddAccount.email.value" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="buttons" fxLayout="row" fxLayoutAlign="space-between center"> - <app-button [text]="'Annuler'" (action)="closeModal(false)"></app-button> + <app-button [text]="'Annuler'" (action)="closeModal(false)" /> <app-button [text]="'Ajouter'" [disabled]="formAddAccount.invalid" (action)="addOwner()" [style]="buttonTypeEnum.Primary" - ></app-button> + /> </div> </form> </div> diff --git a/src/app/profile/structure-edition-summary/missing-information/missing-information.component.html b/src/app/profile/structure-edition-summary/missing-information/missing-information.component.html index 345879c80..6d28bd801 100644 --- a/src/app/profile/structure-edition-summary/missing-information/missing-information.component.html +++ b/src/app/profile/structure-edition-summary/missing-information/missing-information.component.html @@ -1,4 +1,4 @@ <p class="warning" fxLayout="row"> - <app-svg-icon [type]="'ico'" [icon]="'warningMini'"></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="'warningMini'" /> <span>Information manquante</span> </p> diff --git a/src/app/profile/structure-edition-summary/structure-edition-summary.component.html b/src/app/profile/structure-edition-summary/structure-edition-summary.component.html index e8ac5dd11..10a0e26d7 100644 --- a/src/app/profile/structure-edition-summary/structure-edition-summary.component.html +++ b/src/app/profile/structure-edition-summary/structure-edition-summary.component.html @@ -8,7 +8,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <h1> {{ isUpdateStructure ? 'Mettre à jour la structure' : 'Modifier la structure' }} <span> @@ -26,13 +26,13 @@ [style]="buttonTypeEnum.SecondaryWide" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureNameAndAddress)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureNameAndAddress)" - ></app-button> + /> </div> <div class="content"> <p> @@ -53,13 +53,13 @@ [style]="buttonTypeEnum.SecondaryWide" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureType)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureType)" - ></app-button> + /> </div> <div class="content"> <p>{{ structure.structureType.category }} - {{ structure.getLabelTypeStructure() }}</p> @@ -75,18 +75,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureContact)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureContact)" - ></app-button> + /> </div> <div class="content"> - <app-missing-information - *ngIf="!isFieldValid('contactPhone') && !isFieldValid('contactMail')" - ></app-missing-information> + <app-missing-information *ngIf="!isFieldValid('contactPhone') && !isFieldValid('contactMail')" /> <p *ngIf="isFieldValid('contactPhone')"> {{ structure.contactPhone }} </p> @@ -107,16 +105,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureDescription)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureDescription)" - ></app-button> + /> </div> <div class="content"> - <app-no-information *ngIf="!structure.description"></app-no-information> + <app-no-information *ngIf="!structure.description" /> <p *ngIf="structure.description">{{ structure.description }}</p> </div> </div> @@ -130,16 +128,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureAccessModality)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureAccessModality)" - ></app-button> + /> </div> <div class="content"> - <app-missing-information *ngIf="!isFieldValid('accessModality', 'categories')"></app-missing-information> + <app-missing-information *ngIf="!isFieldValid('accessModality', 'categories')" /> <ng-container *ngIf="isFieldValid('accessModality', 'categories')"> <div class="list" *ngFor="let accessModality of structure.categoriesDisplay.accessModality"> <p class="accessModilty"> @@ -159,18 +157,18 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureHours)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureHours)" - ></app-button> + /> </div> <div class="content"> - <app-no-information *ngIf="!containsHours()"></app-no-information> + <app-no-information *ngIf="!containsHours()" /> <ng-container *ngIf="containsHours()"> - <div *ngFor="let day of structure.hours | keyvalue: keepOriginalOrder"> + <div *ngFor="let day of structure.hours | keyvalue : keepOriginalOrder"> <div class="hours" *ngIf="day.value.open"> <p class="day">{{ day.key | day }}</p> <div class="openingTime"> @@ -197,16 +195,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structurePmr)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structurePmr)" - ></app-button> + /> </div> <div class="content"> - <app-missing-information *ngIf="structure.pmrAccess === null"></app-missing-information> + <app-missing-information *ngIf="structure.pmrAccess === null" /> <p *ngIf="structure.pmrAccess !== null"> {{ structure.pmrAccess ? 'Oui' : 'Non' }} </p> @@ -222,16 +220,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureWebAndSocialNetwork)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureWebAndSocialNetwork)" - ></app-button> + /> </div> <div class="content"> - <app-no-information *ngIf="!hasWebsite() && !hasSocialNetworks()"></app-no-information> + <app-no-information *ngIf="!hasWebsite() && !hasSocialNetworks()" /> <ng-container *ngIf="hasWebsite() || hasSocialNetworks()"> <div *ngIf="structure.website"> <a href="{{ structure.website }}">{{ structure.website }}</a> @@ -246,12 +244,7 @@ rel="noopener noreferrer" [href]="'http://' + structure.facebook" > - <app-svg-icon - [type]="'ico'" - [icon]="'facebook'" - [title]="'Facebook'" - [iconClass]="'icon-30'" - ></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="'facebook'" [title]="'Facebook'" [iconClass]="'icon-30'" /> </a> <a *ngIf="structure.twitter" @@ -260,12 +253,7 @@ rel="noopener noreferrer" [href]="'http://' + structure.twitter" > - <app-svg-icon - [type]="'ico'" - [icon]="'twitter'" - [title]="'Twitter'" - [iconClass]="'icon-30'" - ></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="'twitter'" [title]="'Twitter'" [iconClass]="'icon-30'" /> </a> <a *ngIf="structure.instagram" @@ -274,12 +262,7 @@ rel="noopener noreferrer" [href]="'http://' + structure.instagram" > - <app-svg-icon - [type]="'ico'" - [icon]="'instagram'" - [title]="'Instagram'" - [iconClass]="'icon-30'" - ></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="'instagram'" [title]="'Instagram'" [iconClass]="'icon-30'" /> </a> <a *ngIf="structure.linkedin" @@ -288,12 +271,7 @@ rel="noopener noreferrer" [href]="'http://' + structure.linkedin" > - <app-svg-icon - [type]="'ico'" - [icon]="'linkedin'" - [title]="'Linkedin'" - [iconClass]="'icon-30'" - ></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="'linkedin'" [title]="'Linkedin'" [iconClass]="'icon-30'" /> </a> </div> </ng-container> @@ -309,13 +287,13 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structurePublicTarget)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structurePublicTarget)" - ></app-button> + /> </div> <div class="content"> <ng-container *ngIf="isFieldValid('age', 'categories') && structure.categoriesDisplay.age"> @@ -325,8 +303,8 @@ </ng-container> <ng-container *ngIf="!isFieldValid('age', 'categories') && structure.categoriesDisplay.age"> - <app-no-information *ngIf="!structure.otherDescription"></app-no-information> - <app-missing-information></app-missing-information> + <app-no-information *ngIf="!structure.otherDescription" /> + <app-missing-information /> </ng-container> </div> </div> @@ -340,13 +318,13 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structurePublicTargetOptional)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structurePublicTargetOptional)" - ></app-button> + /> </div> <div class="content"> <ng-container @@ -395,7 +373,7 @@ structure.categoriesDisplay.handicaps.length === 0 " > - <app-no-information></app-no-information> + <app-no-information /> </ng-container> </div> </div> @@ -409,16 +387,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureDigitalHelpingAccompaniment)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureDigitalHelpingAccompaniment)" - ></app-button> + /> </div> <div class="content"> - <app-no-information *ngIf="!containsDigitalHelp()"></app-no-information> + <app-no-information *ngIf="!containsDigitalHelp()" /> <ng-container *ngIf="containsDigitalHelp()"> <div *ngFor="let digitalHelp of structure.categoriesDisplay.onlineProcedures" class="list"> <p>{{ digitalHelp }}</p> @@ -436,16 +414,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureDigitalHelpingAccompanimentOther)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureDigitalHelpingAccompanimentOther)" - ></app-button> + /> </div> <div class="content"> - <app-no-information *ngIf="!structure.otherDescription"></app-no-information> + <app-no-information *ngIf="!structure.otherDescription" /> <ng-container *ngIf="structure.otherDescription"> <p>{{ structure.otherDescription }}</p> </ng-container> @@ -461,16 +439,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureTrainingType)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureTrainingType)" - ></app-button> + /> </div> <div class="content"> - <app-no-information *ngIf="!containsDigitalLearning()"></app-no-information> + <app-no-information *ngIf="!containsDigitalLearning()" /> <div class="formationDetails" *ngIf="containsDigitalLearning()"> <div *ngIf="isBaseSkills()" class="collapse" [ngClass]="{ notCollapsed: !showBaseSkills }"> <div> @@ -530,16 +508,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureTrainingPrice)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureTrainingPrice)" - ></app-button> + /> </div> <div class="content"> - <app-missing-information *ngIf="!isFieldValid('freeWorkShop')"></app-missing-information> + <app-missing-information *ngIf="!isFieldValid('freeWorkShop')" /> <p *ngIf="isFieldValid('freeWorkShop')">{{ structure.freeWorkShop }}</p> </div> </div> @@ -553,13 +531,13 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureWifi)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureWifi)" - ></app-button> + /> </div> <div class="content"> <p> @@ -577,16 +555,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureEquipments)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureEquipments)" - ></app-button> + /> </div> <div class="content"> - <app-no-information *ngIf="!hasEquipments(structure)"></app-no-information> + <app-no-information *ngIf="!hasEquipments(structure)" /> <!-- TODO: refactor --> <div *ngIf="!!filterOnlyEquipments(structure.categories.selfServiceMaterial)"> <p *ngIf="structure.nbComputers"> @@ -611,18 +589,18 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureLabels)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureLabels)" - ></app-button> + /> </div> <div class="content"> - <app-no-information *ngIf="structure.categories.labelsQualifications.length === 0"></app-no-information> + <app-no-information *ngIf="structure.categories.labelsQualifications.length === 0" /> <div *ngFor="let labels of structure.categories.labelsQualifications.sort()"> - <app-logo-card [name]="labels"></app-logo-card> + <app-logo-card [name]="labels" /> </div> </div> </div> @@ -635,16 +613,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureSolidarityMaterial)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureSolidarityMaterial)" - ></app-button> + /> </div> <div class="content"> - <app-no-information *ngIf="structure.categoriesDisplay.solidarityMaterial.length === 0"></app-no-information> + <app-no-information *ngIf="structure.categoriesDisplay.solidarityMaterial.length === 0" /> <div *ngFor="let material of structure.categoriesDisplay.solidarityMaterial" class="list"> <p>{{ material }}</p> </div> @@ -659,16 +637,16 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureCovidInfo)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureCovidInfo)" - ></app-button> + /> </div> <div class="content"> - <app-no-information *ngIf="!structure.lockdownActivity"></app-no-information> + <app-no-information *ngIf="!structure.lockdownActivity" /> <p *ngIf="structure.lockdownActivity">{{ structure.lockdownActivity }}</p> </div> </div> @@ -682,13 +660,13 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToEdit(structureFormStep.structureConsent)" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToEdit(structureFormStep.structureConsent)" - ></app-button> + /> </div> <div class="content"> <p>{{ structure.dataShareConsentDate ? 'Oui' : 'Non' }}</p> @@ -704,13 +682,13 @@ [style]="buttonTypeEnum.Secondary" [extraClass]="'editButton'" (action)="goToManageMembers()" - ></app-button> + /> <app-button class="hide-on-desktop" [iconBtn]="'edit'" [style]="buttonTypeEnum.SecondaryOnlyIcon" (action)="goToManageMembers()" - ></app-button> + /> </div> <div class="content" *ngIf="members"> <div [ngPlural]="members.length"> @@ -728,19 +706,19 @@ Vous pourrez valider après avoir renseigné l’intégralité des champs obligatoires. </p> <div class="buttons"> - <app-button [text]="'Retour'" [iconBtn]="'close'" (click)="goBack()"></app-button> + <app-button [text]="'Retour'" [iconBtn]="'close'" (click)="goBack()" /> <app-button [text]="'Valider'" [iconBtn]="'check'" [style]="buttonTypeEnum.Primary" [disabled]="!isFormValid()" (click)="updateStructureUpdateDate()" - ></app-button> + /> </div> </ng-container> <ng-container *ngIf="!isUpdateStructure"> <div class="buttons"> - <app-button [text]="'Retour'" (click)="goBack()"></app-button> + <app-button [text]="'Retour'" (click)="goBack()" /> </div> </ng-container> </div> diff --git a/src/app/profile/structure-members-management/structure-members-management.component.html b/src/app/profile/structure-members-management/structure-members-management.component.html index c9014ff39..aa8a51f33 100644 --- a/src/app/profile/structure-members-management/structure-members-management.component.html +++ b/src/app/profile/structure-members-management/structure-members-management.component.html @@ -9,7 +9,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <h1> Gérer les membres de <span>{{ structure.structureName }}</span> </h1> @@ -19,7 +19,7 @@ [text]="'Ajouter un membre'" (click)="addMemberModalOpenned = true" tabindex="0" - ></app-button> + /> </div> <div *ngIf="isLoading" class="loader"> @@ -33,7 +33,7 @@ [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" - ></app-svg-icon> + /> <div class="info-member"> <a routerLink="/profile/{{ member._id }}" class="member">{{ member.name }} {{ member.surname }}</a> <p class="job" *ngIf="displayJobEmployer(member)">{{ displayJobEmployer(member) }}</p> @@ -45,7 +45,7 @@ [text]="'Exclure ce membre'" (click)="memberToExclude = member; excludeModalOpenned = true" tabindex="0" - ></app-button> + /> </div> <div *ngFor="let member of tempUsers" class="member-card"> <div class="user"> @@ -54,22 +54,22 @@ [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" - ></app-svg-icon> + /> <div class="info-member"> <p class="member">{{ member.email }}</p> </div> </div> <div fxLayout="row" fxLayoutAlign="start center" class="pendingContainer"> <div class="info-pendingStructure"> - <app-svg-icon class="check-icon" [type]="'ico'" [icon]="'check'"></app-svg-icon> - <p class="text">Demande de rattachement envoyée le {{ member.updatedAt | date: 'dd/MM/YYYY' }}</p> + <app-svg-icon class="check-icon" [type]="'ico'" [icon]="'check'" /> + <p class="text">Demande de rattachement envoyée le {{ member.updatedAt | date : 'dd/MM/YYYY' }}</p> </div> <app-button [style]="buttonTypeEnum.Secondary" [text]="'Annuler la demande'" (click)="tempUserToCancel = member; cancelAddTempUserModalOpenned = true" tabindex="0" - ></app-button> + /> </div> </div> <div *ngIf="!tempUsers.length && !structureWithOwners.owners.length"> @@ -83,7 +83,7 @@ [openned]="addMemberModalOpenned" [structure]="structureWithOwners" (closed)="closeAddMemberModal($event)" -></app-structure-add-member-modal> +/> <app-custom-modal *ngIf="excludeModalOpenned" [openned]="excludeModalOpenned" @@ -91,7 +91,7 @@ [hideTitle]="true" [customValidationButton]="'Oui'" (closed)="excludeMember(memberToExclude, $event)" -></app-custom-modal> +/> <app-custom-modal *ngIf="cancelAddTempUserModalOpenned" [openned]="cancelAddTempUserModalOpenned" @@ -99,4 +99,4 @@ [hideTitle]="true" [customValidationButton]="'Oui'" (closed)="cancelAddTempUser(tempUserToCancel, $event)" -></app-custom-modal> +/> diff --git a/src/app/profile/structures-management/structures-management.component.html b/src/app/profile/structures-management/structures-management.component.html index 5c3cb1e31..038c830d7 100644 --- a/src/app/profile/structures-management/structures-management.component.html +++ b/src/app/profile/structures-management/structures-management.component.html @@ -10,7 +10,7 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <h1 [ngPlural]="structures.length"> <ng-template ngPluralCase="1">Gestion des structures</ng-template> <ng-template ngPluralCase="other">Gérer mes structures</ng-template> @@ -22,7 +22,7 @@ [text]="'Ajouter une structure'" routerLink="/form/structure" tabindex="0" - ></app-button> + /> </div> </div> <div *ngIf="structures" class="structuresList"> @@ -32,22 +32,22 @@ <p class="structureLocation">{{ elt.structure.address.commune }}</p> </div> <div *ngIf="isBeingDeleted(elt.structure)" class="deleteInProgress"> - <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'"></app-svg-icon> - <span>Suppression le {{ elt.structure.toBeDeletedAt | date: 'shortDate' }}</span> + <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" /> + <span>Suppression le {{ elt.structure.toBeDeletedAt | date : 'shortDate' }}</span> </div> <div class="buttons" fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="12px"> <app-button [text]="'Quitter la structure'" [style]="buttonTypeEnum.SecondaryWide" (click)="selectedStructure = elt.structure; leaveModalOpenned = true" - ></app-button> + /> <app-button *ngIf="!isBeingDeleted(elt.structure)" class="deleteAction" [text]="'Supprimer la structure'" [style]="buttonTypeEnum.SecondaryWide" (click)="selectedStructure = elt.structure; deleteModalOpenned = true" - ></app-button> + /> <app-button *ngIf="isBeingDeleted(elt.structure)" @@ -55,7 +55,7 @@ [text]="'Annuler la suppression'" [style]="buttonTypeEnum.SecondaryWide" (click)="selectedStructure = elt.structure; cancelDeleteModalOpenned = true" - ></app-button> + /> </div> </div> </div> @@ -67,7 +67,7 @@ [customValidationButton]="'Oui'" [customCancelButton]="'Non'" (closed)="leaveStructure(selectedStructure, $event)" - ></app-custom-modal> + /> <app-custom-modal *ngIf="deleteModalOpenned" [openned]="deleteModalOpenned" @@ -79,7 +79,7 @@ [customValidationButton]="'Oui'" [customCancelButton]="'Non'" (closed)="deleteStructure(selectedStructure, $event)" - ></app-custom-modal> + /> <app-custom-modal *ngIf="cancelDeleteModalOpenned" [openned]="cancelDeleteModalOpenned" @@ -88,6 +88,6 @@ [customValidationButton]="'Oui'" [customCancelButton]="'Non'" (closed)="cancelDelete(selectedStructure, $event)" - ></app-custom-modal> + /> </div> </div> diff --git a/src/app/reset-password/reset-password.component.html b/src/app/reset-password/reset-password.component.html index e83eede22..c294cf12a 100644 --- a/src/app/reset-password/reset-password.component.html +++ b/src/app/reset-password/reset-password.component.html @@ -28,20 +28,18 @@ [text]="'Annuler'" [style]="buttonTypeEnum.Secondary" [extraClass]="'fullButton'" - > - </app-button> + /> <app-button [type]="'submit'" [disabled]="loading" [text]="'Envoyer'" [style]="buttonTypeEnum.Primary" [extraClass]="'fullWidth'" - > - </app-button> + /> </div> </form> </div> </div> </div> - <app-password-form *ngIf="token"></app-password-form> + <app-password-form *ngIf="token" /> </div> diff --git a/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.html b/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.html index 3f11eca7a..ecccd88a8 100644 --- a/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.html +++ b/src/app/shared/components/accompaniment-picker/accompaniment-picker.component.html @@ -6,5 +6,5 @@ [style]="buttonTypeEnum.CheckButton" [text]="module.name" (action)="toogleResult(module)" - ></app-button> + /> </div> diff --git a/src/app/shared/components/button/button.component.html b/src/app/shared/components/button/button.component.html index 84d4ac76b..9796377f5 100644 --- a/src/app/shared/components/button/button.component.html +++ b/src/app/shared/components/button/button.component.html @@ -7,7 +7,7 @@ class="text withIcon left" fxLayoutAlign="space-around center" > - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> <span>{{ text }}</span> </div> <div @@ -17,7 +17,7 @@ fxLayoutAlign="space-around center" > <span>{{ text }}</span> - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> </div> </button> </ng-container> @@ -25,7 +25,7 @@ <ng-container *ngIf="style === buttonTypeEnum.searchIcon"> <button class="searchIcon" type="{{ type }}" (click)="doAction()"> <div fxLayout="row center" class="searchIcon withIcon" fxLayoutAlign="space-between center"> - <app-svg-icon [type]="'ico'" [icon]="iconBtn" [iconColor]="'currentColor'" [iconClass]="'icon-30'"></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="iconBtn" [iconColor]="'currentColor'" [iconClass]="'icon-30'" /> </div> </button> </ng-container> @@ -45,7 +45,7 @@ class="text withIcon left" fxLayoutAlign="space-around center" > - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> <span [ngClass]="extraClass">{{ text }}</span> </div> <div @@ -55,7 +55,7 @@ fxLayoutAlign="space-around center" > <span [ngClass]="extraClass">{{ text }}</span> - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> </div> </button> </ng-container> @@ -64,12 +64,12 @@ <button class="btn-regular modal-primary" type="{{ type }}" (click)="doAction()" [disabled]="disabled"> <div *ngIf="!iconBtn" class="text">{{ text }}</div> <div *ngIf="iconBtn && iconPos === 'left'" fxLayout="row center" class="text" fxLayoutAlign="space-around center"> - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> <span>{{ text }}</span> </div> <div *ngIf="iconBtn && iconPos === 'right'" fxLayout="row center" class="text" fxLayoutAlign="space-around center"> <span>{{ text }}</span> - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> </div> </button> </ng-container> @@ -84,12 +84,12 @@ > <div *ngIf="!iconBtn" class="text">{{ text }}</div> <div *ngIf="iconBtn && iconPos === 'left'" fxLayout="row center" class="text" fxLayoutAlign="space-around center"> - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> <span>{{ text }}</span> </div> <div *ngIf="iconBtn && iconPos === 'right'" fxLayout="row center" class="text" fxLayoutAlign="space-around center"> <span>{{ text }}</span> - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> </div> </button> </ng-container> @@ -111,7 +111,7 @@ class="text withIcon left" fxLayoutAlign="space-around center" > - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> <span>{{ text }}</span> </div> <div @@ -121,7 +121,7 @@ fxLayoutAlign="space-around center" > <span>{{ text }}</span> - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> </div> </button> </ng-container> @@ -135,7 +135,7 @@ class="text withIcon left" fxLayoutAlign="center center" > - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> <span>{{ text }}</span> </div> <div @@ -145,7 +145,7 @@ fxLayoutAlign="center center" > <span>{{ text }}</span> - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> </div> </button> </ng-container> @@ -153,7 +153,7 @@ <ng-container *ngIf="style === buttonTypeEnum.SecondaryOnlyIcon"> <button class="btn-regular secondary" type="{{ type }}" (click)="doAction()" [disabled]="disabled"> <div *ngIf="iconBtn" fxLayout="row center" class="text withIcon center" fxLayoutAlign="space-around center"> - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> </div> </button> </ng-container> @@ -168,7 +168,7 @@ [iconClass]="'icon-32'" [icon]="iconBtn" [iconColor]="'currentColor'" - ></app-svg-icon> + /> {{ text }} </div> </button> @@ -190,7 +190,7 @@ fxLayoutAlign="space-around center" fxLayoutGap="13px" > - <app-svg-icon [type]="'ico'" [iconClass]="'icon-32'" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="'ico'" [iconClass]="'icon-32'" [icon]="iconBtn" [iconColor]="'currentColor'" /> {{ text }} </div> </button> @@ -236,7 +236,7 @@ [icon]="'validate'" [iconClass]="'icon-28'" [iconColor]="'currentColor'" - ></app-svg-icon> + /> {{ text }} </div> </button> @@ -258,19 +258,14 @@ [iconColor]="" [iconClass]="'icon-28'" [iconColor]="active ? 'green' : 'currentColor'" - ></app-svg-icon> + /> </div> </button> </ng-container> <ng-container *ngIf="style === buttonTypeEnum.TagCloudButton"> <button type="button" class="btn-tags-cloud" fxLayout="row" (click)="doAction()"> <span>{{ text }}</span> - <app-svg-icon - [type]="'ico'" - [iconClass]="'icon-centered'" - [icon]="'tagDelete'" - [iconColor]="'white'" - ></app-svg-icon> + <app-svg-icon [type]="'ico'" [iconClass]="'icon-centered'" [icon]="'tagDelete'" [iconColor]="'white'" /> </button> </ng-container> @@ -283,7 +278,7 @@ class="text withIcon left" fxLayoutAlign="space-around center" > - <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'"></app-svg-icon> + <app-svg-icon [type]="iconType" [icon]="iconBtn" [iconColor]="'currentColor'" /> <span [ngClass]="extraClass">{{ text }}</span> </div> </button> @@ -291,6 +286,6 @@ <ng-container *ngIf="style === buttonTypeEnum.TagCloudResetButton"> <button type="button" class="flex row btn-tags-cloud reset" (click)="doAction()"> <span>Supprimer les filtres</span> - <app-svg-icon [type]="'ico'" [icon]="'tagReset'" [iconClass]="'icon-16'" [iconColor]="'black'"></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="'tagReset'" [iconClass]="'icon-16'" [iconColor]="'black'" /> </button> </ng-container> diff --git a/src/app/shared/components/custom-modal/custom-modal.component.html b/src/app/shared/components/custom-modal/custom-modal.component.html index d2afe6490..7eddafe13 100644 --- a/src/app/shared/components/custom-modal/custom-modal.component.html +++ b/src/app/shared/components/custom-modal/custom-modal.component.html @@ -17,12 +17,12 @@ (action)="closeModal(false)" [text]="customCancelButton || 'Annuler'" [style]="buttonTypeEnum.modalSecondary" - ></app-button> + /> <app-button (action)="closeModal(true)" [text]="customValidationButton || 'Valider'" [style]="buttonTypeEnum.modalPrimary" - ></app-button> + /> </div> </div> </div> diff --git a/src/app/shared/components/data-share-consent/data-share-consent.component.html b/src/app/shared/components/data-share-consent/data-share-consent.component.html index c13632f51..107fd484d 100644 --- a/src/app/shared/components/data-share-consent/data-share-consent.component.html +++ b/src/app/shared/components/data-share-consent/data-share-consent.component.html @@ -17,7 +17,7 @@ [events]="eventsSubject.asObservable()" layoutGap="8px" class="firstLine" - ></app-radio-form> + /> <div *ngFor="let structure of dataConsentPendingStructures"> <app-radio-form @@ -32,7 +32,7 @@ " (selectedEvent)="onRadioBtnChangeStructure(structure._id, $event)" layoutGap="8px" - ></app-radio-form> + /> </div> <p class="informationEndForm"> diff --git a/src/app/shared/components/hour-picker/hour-picker.component.html b/src/app/shared/components/hour-picker/hour-picker.component.html index 546d6f180..cb2acbeca 100644 --- a/src/app/shared/components/hour-picker/hour-picker.component.html +++ b/src/app/shared/components/hour-picker/hour-picker.component.html @@ -48,10 +48,10 @@ <div> <div *ngIf="hour.error === 'wrong' || hour.error === 'incomplete'" class="error-message"> - <app-svg-icon [iconClass]="'icon-32'" [type]="'ico'" [icon]="'nok'"></app-svg-icon> + <app-svg-icon [iconClass]="'icon-32'" [type]="'ico'" [icon]="'nok'" /> </div> <div *ngIf="hour.error === null" class="error-message"> - <app-svg-icon [iconClass]="'icon-32'" [type]="'ico'" [icon]="'ok'"></app-svg-icon> + <app-svg-icon [iconClass]="'icon-32'" [type]="'ico'" [icon]="'ok'" /> </div> </div> </div> @@ -62,7 +62,7 @@ [iconType]="'form'" [iconBtn]="'show'" [style]="buttonTypeEnum.Secondary" - ></app-button> + /> </div> <div class="extraAction" *ngIf="day.hours.length === 2"> <a (click)="this.removeHours(day, 1)" (keyup.enter)="this.removeHours(day, 1)">Supprimer</a> diff --git a/src/app/shared/components/modal-confirmation/modal-confirmation.component.html b/src/app/shared/components/modal-confirmation/modal-confirmation.component.html index 6f6b7b991..866471b74 100644 --- a/src/app/shared/components/modal-confirmation/modal-confirmation.component.html +++ b/src/app/shared/components/modal-confirmation/modal-confirmation.component.html @@ -15,13 +15,13 @@ (action)="closeModal(false)" [text]="'Annuler'" [style]="buttonTypeEnum.modalSecondary" - ></app-button> + /> <app-button (action)="closeModal(true)" [text]="customConfirmationText ? customConfirmationText : 'Confirmer'" [style]="buttonTypeEnum.modalPrimary" [extraClass]="singleButton && 'fullWidth'" - ></app-button> + /> </div> </div> </div> diff --git a/src/app/shared/components/modal-join-confirmation/modal-join-confirmation.component.html b/src/app/shared/components/modal-join-confirmation/modal-join-confirmation.component.html index 9b6638d6c..e4d1e789d 100644 --- a/src/app/shared/components/modal-join-confirmation/modal-join-confirmation.component.html +++ b/src/app/shared/components/modal-join-confirmation/modal-join-confirmation.component.html @@ -16,12 +16,12 @@ (action)="closeModal(false)" [text]="'Annuler'" [style]="buttonTypeEnum.modalSecondary" - ></app-button> + /> <app-button (action)="closeModal(true)" [text]="customConfirmationText ? customConfirmationText : 'Confirmer'" [style]="buttonTypeEnum.modalPrimary" - ></app-button> + /> </div> </div> </div> diff --git a/src/app/shared/components/password-form/password-form.component.html b/src/app/shared/components/password-form/password-form.component.html index 619dc1b37..321ad6bb4 100644 --- a/src/app/shared/components/password-form/password-form.component.html +++ b/src/app/shared/components/password-form/password-form.component.html @@ -18,12 +18,12 @@ tabindex="0" (click)="showOldPassword()" (keyup.enter)="showOldPassword()" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!checkOldPassword(accountForm.value.oldPassword)" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> <p *ngIf="passwordError" class="special invalid">Votre ancien mot de passe est incorrect.</p> </div> @@ -42,13 +42,13 @@ [iconClass]="'validation-small'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('password').value.length < 8" [iconClass]="'validation-small'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> <p>8 caractères</p> </li> <li @@ -62,13 +62,13 @@ [iconClass]="'validation-small'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!checkIfPasswordHasSpecialChar(accountForm.get('password').value)" [iconClass]="'validation-small'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> <p>un caractère spécial</p> </li> <li @@ -82,13 +82,13 @@ [iconClass]="'validation-small'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!checkIfPasswordHasLowerCase(accountForm.get('password').value); s" [iconClass]="'validation-small'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> <p>un caractère en minuscule</p> </li> <li @@ -102,13 +102,13 @@ [iconClass]="'validation-small'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!checkIfPasswordHasUpperCase(accountForm.get('password').value); s" [iconClass]="'validation-small'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> <p>un caractère en majuscule</p> </li> <li @@ -122,13 +122,13 @@ [iconClass]="'validation-small'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="!checkIfPasswordHasDigit(accountForm.get('password').value)" [iconClass]="'validation-small'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> <p>un chiffre</p> </li> </ul> @@ -146,20 +146,20 @@ tabindex="0" (click)="showPassword()" (keyup.enter)="showPassword()" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('password').valid" [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('password').invalid && accountForm.get('password').value" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="column"> @@ -178,19 +178,19 @@ tabindex="0" (click)="showConfirmPassword()" (keyup.enter)="showConfirmPassword()" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('confirmPassword').valid && accountForm.get('confirmPassword').value" [iconClass]="'validation'" [type]="'form'" [icon]="'validate'" - ></app-svg-icon> + /> <app-svg-icon *ngIf="accountForm.get('confirmPassword').invalid && accountForm.get('confirmPassword').value" [iconClass]="'validation'" [type]="'form'" [icon]="'notValidate'" - ></app-svg-icon> + /> </div> </div> <div class="form-group" fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="20px"> @@ -199,8 +199,7 @@ [text]="'Annuler'" [style]="buttonTypeEnum.Secondary" [extraClass]="'fullButton'" - > - </app-button> + /> <app-button [type]="'submit'" [disabled]=" @@ -211,8 +210,7 @@ [text]="'Envoyer'" [style]="buttonTypeEnum.Primary" [extraClass]="'fullButton'" - > - </app-button> + /> </div> </form> </div> 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 index d5b08144c..537acb42e 100644 --- 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 @@ -8,7 +8,7 @@ <div class="mobile-column"> <div fxLayout="column" fxFlex="100%"> <div *ngIf="structure.address" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px"> - <app-svg-icon [type]="'ico'" [icon]="'adress'" [title]="'Adresse'" [iconClass]="'icon-22'"></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="'adress'" [title]="'Adresse'" [iconClass]="'icon-22'" /> <p>{{ structure.address.numero }} {{ structure.address.street }}, {{ structure.address.commune }}</p> </div> <div @@ -18,7 +18,7 @@ [iconClass]="'icon-22'" fxLayoutGap="13px" > - <app-svg-icon [type]="'ico'" [icon]="'tel'" [title]="'Téléphone'" [iconClass]="'icon-22'"></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="'tel'" [title]="'Téléphone'" [iconClass]="'icon-22'" /> <p>{{ structure.contactPhone | phone }}</p> </div> <div @@ -27,12 +27,7 @@ fxLayoutAlign="none center" fxLayoutGap="13px" > - <app-svg-icon - [type]="'ico'" - [iconClass]="'grey-1 icon-22'" - [icon]="'email'" - [title]="'Email'" - ></app-svg-icon> + <app-svg-icon [type]="'ico'" [iconClass]="'grey-1 icon-22'" [icon]="'email'" [title]="'Email'" /> <p>{{ structure.contactMail }}</p> </div> </div> @@ -48,7 +43,7 @@ <div class="w-100 mobile-column flex row mb20"> <div *ngIf="structure.hours.hasData()" class="timeContainer"> <h3 class="subtitle">HORAIRES</h3> - <div *ngFor="let day of structure.hours | keyvalue: keepOriginalOrder"> + <div *ngFor="let day of structure.hours | keyvalue : keepOriginalOrder"> <div *ngIf="day.value.open" class="mb4"> <h4>{{ day.key | day }}</h4> <div class="opening-time w100"> @@ -63,7 +58,7 @@ <div *ngIf="tclStopPoints.length"> <h3 class="subtitle">ACCÈS</h3> <div class="flex column container"> - <div *ngFor="let tclStop of tclStopPoints | slice: 0:3" class="flex column tclStop"> + <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> diff --git a/src/app/shared/components/structure-list-print/structure-list-print.component.html b/src/app/shared/components/structure-list-print/structure-list-print.component.html index 419f1422e..fcecf741b 100644 --- a/src/app/shared/components/structure-list-print/structure-list-print.component.html +++ b/src/app/shared/components/structure-list-print/structure-list-print.component.html @@ -1,5 +1,5 @@ <div class="multi-print" *ngFor="let structure of structures"> - <app-structure-detail-print [structure]="structure"></app-structure-detail-print> + <app-structure-detail-print [structure]="structure" /> </div> <div class="loader"> <img class="loader-gif" src="/assets/gif/loader_circle_grey.gif" alt /> diff --git a/src/app/shared/components/structure-pmr/structure-pmr.component.html b/src/app/shared/components/structure-pmr/structure-pmr.component.html index b97c86fb5..8faabb203 100644 --- a/src/app/shared/components/structure-pmr/structure-pmr.component.html +++ b/src/app/shared/components/structure-pmr/structure-pmr.component.html @@ -8,13 +8,13 @@ tabindex="0" (click)="goBack()" (keyup.enter)="goBack()" - ></app-svg-icon> + /> <div class="titleContent"> <h3>{{ title ? title : 'La structure doit-elle être accessible pour les personnes à mobilité réduite ?' }}</h3> </div> </div> <p class="missing-information" *ngIf="isEditMode && !structureForm.get('pmrAccess').valid"> - <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon"></app-svg-icon> + <app-svg-icon [iconClass]="'icon-26'" [type]="'form'" [icon]="'notValidate'" class="validationIcon" /> <span>Il faut renseigner un champ</span> </p> <app-radio-form diff --git a/src/app/shared/components/structure-type-picker/structure-type-picker.component.html b/src/app/shared/components/structure-type-picker/structure-type-picker.component.html index 043cb1449..9328dfc16 100644 --- a/src/app/shared/components/structure-type-picker/structure-type-picker.component.html +++ b/src/app/shared/components/structure-type-picker/structure-type-picker.component.html @@ -1,7 +1,7 @@ <div class="typeContainer"> <div class="collapse" [ngClass]="{ notCollapsed: !showPublic }"> <div class="collapseHeader" (click)="togglePublic()" (keyup.enter)="togglePublic()" tabindex="0"> - <app-svg-icon [iconClass]="'icon-52'" [type]="'ico'" [icon]="structureTypeIconEnum.public"></app-svg-icon> + <app-svg-icon [iconClass]="'icon-52'" [type]="'ico'" [icon]="structureTypeIconEnum.public" /> <div class="titleCollapse"> {{ structureTypeCategoryEnum.public }} </div> @@ -21,13 +21,13 @@ [style]="buttonTypeEnum.CheckButton" [text]="getStructureTypeLabel(type.value)" (action)="pickStructureType(type._id)" - ></app-button> + /> </span> </div> </div> <div class="collapse" [ngClass]="{ notCollapsed: !showPrivate }"> <div class="collapseHeader" (click)="togglePrivate()" (keyup.enter)="togglePrivate()" tabindex="0"> - <app-svg-icon [iconClass]="'icon-52'" [type]="'ico'" [icon]="structureTypeIconEnum.private"></app-svg-icon> + <app-svg-icon [iconClass]="'icon-52'" [type]="'ico'" [icon]="structureTypeIconEnum.private" /> <div class="titleCollapse"> {{ structureTypeCategoryEnum.private }} </div> @@ -47,7 +47,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="getStructureTypeLabel(type.value)" (action)="pickStructureType(type._id)" - ></app-button> + /> </span> </div> </div> @@ -58,11 +58,7 @@ (click)="togglePrivateLucrative()" (keyup.enter)="togglePrivateLucrative()" > - <app-svg-icon - [iconClass]="'icon-52'" - [type]="'ico'" - [icon]="structureTypeIconEnum.privateLucrative" - ></app-svg-icon> + <app-svg-icon [iconClass]="'icon-52'" [type]="'ico'" [icon]="structureTypeIconEnum.privateLucrative" /> <div class="titleCollapse"> {{ structureTypeCategoryEnum.privateLucrative }} </div> @@ -82,7 +78,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="getStructureTypeLabel(type.value)" (action)="pickStructureType(type._id)" - ></app-button> + /> </span> </div> </div> diff --git a/src/app/shared/components/text-input-modal/text-input-modal.component.html b/src/app/shared/components/text-input-modal/text-input-modal.component.html index af04b154e..6b253ab7d 100644 --- a/src/app/shared/components/text-input-modal/text-input-modal.component.html +++ b/src/app/shared/components/text-input-modal/text-input-modal.component.html @@ -9,12 +9,12 @@ [text]="'Annuler'" [style]="buttonTypeEnum.modalSecondary" (action)="closeModal(false, myText.value)" - ></app-button> + /> <app-button [text]="'Confirmer'" [style]="buttonTypeEnum.modalPrimary" (action)="closeModal(true, myText.value)" - ></app-button> + /> </div> </div> </div> diff --git a/src/app/shared/components/training-type-picker/training-type-picker.component.html b/src/app/shared/components/training-type-picker/training-type-picker.component.html index 7a03b45ec..4a403fe97 100644 --- a/src/app/shared/components/training-type-picker/training-type-picker.component.html +++ b/src/app/shared/components/training-type-picker/training-type-picker.component.html @@ -41,7 +41,7 @@ [style]="buttonTypeEnum.CheckButton" [text]="module.name" (action)="pickChoice(categorie, module)" - ></app-button> + /> </ng-container> </div> </div> diff --git a/src/app/structure-list/components/card/card.component.html b/src/app/structure-list/components/card/card.component.html index 80fd2a70c..cc423517d 100644 --- a/src/app/structure-list/components/card/card.component.html +++ b/src/app/structure-list/components/card/card.component.html @@ -8,7 +8,7 @@ <div class="left"> <div fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="16px"> <div fxLayout="row" fxLayoutAlign="center center" fxLayoutGap="8px"> - <app-svg-icon [type]="'ico'" [icon]="structure?.getTypeStructureIcon()" [iconClass]="'icon-52'"></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="structure?.getTypeStructureIcon()" [iconClass]="'icon-52'" /> <div fxLayout="column" fxLayoutAlign="end"> <div fxLayout="row" class="structure-name-container"> <span class="structure-name" [ngClass]="{ notClaimed: !isClaimed }">{{ structure.structureName }}</span> @@ -44,7 +44,7 @@ (keyup.enter)="cardAddToList(); $event.stopPropagation()" tabindex="0" > - <app-svg-icon class="add-icon" [type]="'ico'" [icon]="'add'"></app-svg-icon> + <app-svg-icon class="add-icon" [type]="'ico'" [icon]="'add'" /> <span>Ajouter</span> </div> <div @@ -56,7 +56,7 @@ (click)="cardAddToList(); $event.stopPropagation()" (keyup.enter)="cardAddToList(); $event.stopPropagation()" > - <app-svg-icon class="add-icon" [type]="'ico'" [icon]="'validate-big'" [iconColor]="'white'"></app-svg-icon> + <app-svg-icon class="add-icon" [type]="'ico'" [icon]="'validate-big'" [iconColor]="'white'" /> <span>Ajouté</span> </div> </div> diff --git a/src/app/structure-list/components/more-filters/more-filters.component.html b/src/app/structure-list/components/more-filters/more-filters.component.html index a37e29f22..bfe0d1f86 100644 --- a/src/app/structure-list/components/more-filters/more-filters.component.html +++ b/src/app/structure-list/components/more-filters/more-filters.component.html @@ -42,7 +42,7 @@ [iconColor]="'grey-1'" [icon]="'closeModal'" [type]="'ico'" - ></app-svg-icon> + /> </div> </div> <div class="scroll-container"> diff --git a/src/app/structure-list/components/structure-details/structure-details.component.html b/src/app/structure-list/components/structure-details/structure-details.component.html index 178cda282..d202d064b 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.html +++ b/src/app/structure-list/components/structure-details/structure-details.component.html @@ -2,7 +2,7 @@ <div class="structure-details-container"> <!-- Header info --> <div class="structure-details-title" fxLayout="row" fxLayoutGap="8px" fxLayoutAlign="space-evenly center"> - <app-svg-icon [type]="'ico'" [icon]="structure?.getTypeStructureIcon()" [iconClass]="'icon-52'"></app-svg-icon> + <app-svg-icon [type]="'ico'" [icon]="structure?.getTypeStructureIcon()" [iconClass]="'icon-52'" /> <h1 class="bold">{{ structure.structureName }}</h1> <div class="ico-close"> <div class="ico-close-details" (click)="close()" (keyup.enter)="close()" tabindex="0"></div> @@ -28,7 +28,7 @@ [icon]="'advisor'" [iconClass]="'icon-32'" fxLayoutAlign="space-evenly" - ></app-svg-icon> + /> <div class="iconTitle">Voir le conseiller numérique</div> </div--> <!-- Prendre rdv - Hidden until RDVS functionnality is developed --> @@ -52,17 +52,17 @@ (click)="goToWebsite()" (keyup.enter)="goToWebsite()" > - <app-svg-icon class="icon" [type]="'ico'" [icon]="'web'" [iconClass]="'icon-32'"></app-svg-icon> + <app-svg-icon class="icon" [type]="'ico'" [icon]="'web'" [iconClass]="'icon-32'" /> <div class="iconTitle">Site internet</div> </div> <!-- Voir la plaquette - Hidden until functionnality is developed --> <!--div class="clickableDiv" role="button" tabindex="0"> - <app-svg-icon class="icon" [type]="'ico'" [icon]="'docs'" [iconClass]="'icon-32'"></app-svg-icon> + <app-svg-icon class="icon" [type]="'ico'" [icon]="'docs'" [iconClass]="'icon-32'"/> <div class="iconTitle">Voir la plaquette</div> </div--> <!-- Imprimer --> <div role="button" class="printButton clickableDiv" (click)="print()" (keyup.enter)="print()" tabindex="0"> - <app-svg-icon class="icon" [type]="'ico'" [icon]="'printStructure'" [iconClass]="'icon-32'"></app-svg-icon> + <app-svg-icon class="icon" [type]="'ico'" [icon]="'printStructure'" [iconClass]="'icon-32'" /> <div class="iconTitle">Imprimer</div> </div> <!-- Signaler une erreur --> @@ -73,7 +73,7 @@ (click)="displayModalError()" (keyup.enter)="displayModalError()" > - <app-svg-icon class="icon" [type]="'ico'" [icon]="'watch'" [iconClass]="'icon-32'"></app-svg-icon> + <app-svg-icon class="icon" [type]="'ico'" [icon]="'watch'" [iconClass]="'icon-32'" /> <div class="iconTitle">Une erreur ?</div> </div> <!-- Je travaille ici --> @@ -88,7 +88,7 @@ (click)="handleJoin()" (keyup.enter)="handleJoin()" > - <app-svg-icon class="icon" [type]="'ico'" [icon]="'workhere'" [iconClass]="'icon-32'"></app-svg-icon> + <app-svg-icon class="icon" [type]="'ico'" [icon]="'workhere'" [iconClass]="'icon-32'" /> <div class="iconTitle">Je travaille ici</div> </div> <!-- Modifier la structure --> @@ -100,7 +100,7 @@ (click)="handleModify()" (keyup.enter)="handleModify()" > - <app-svg-icon class="icon" [type]="'ico'" [icon]="'modifyStructure'" [iconClass]="'icon-32'"></app-svg-icon> + <app-svg-icon class="icon" [type]="'ico'" [icon]="'modifyStructure'" [iconClass]="'icon-32'" /> <div class="iconTitle">Modifier</div> </div> </div> @@ -147,13 +147,8 @@ rel="noopener noreferrer" [href]="'http://' + structure.facebook" > - <app-svg-icon - [type]="'ico'" - [icon]="'facebook'" - [title]="'Facebook'" - [iconClass]="'icon-30'" - ></app-svg-icon - ></a> + <app-svg-icon [type]="'ico'" [icon]="'facebook'" [title]="'Facebook'" [iconClass]="'icon-30'" /> + </a> <a *ngIf="structure.twitter" target="_blank" @@ -161,13 +156,8 @@ rel="noopener noreferrer" [href]="'http://' + structure.twitter" > - <app-svg-icon - [type]="'ico'" - [icon]="'twitter'" - [title]="'Twitter'" - [iconClass]="'icon-30'" - ></app-svg-icon - ></a> + <app-svg-icon [type]="'ico'" [icon]="'twitter'" [title]="'Twitter'" [iconClass]="'icon-30'" /> + </a> <a *ngIf="structure.instagram" target="_blank" @@ -175,13 +165,8 @@ rel="noopener noreferrer" [href]="'http://' + structure.instagram" > - <app-svg-icon - [type]="'ico'" - [icon]="'instagram'" - [title]="'Instagram'" - [iconClass]="'icon-30'" - ></app-svg-icon - ></a> + <app-svg-icon [type]="'ico'" [icon]="'instagram'" [title]="'Instagram'" [iconClass]="'icon-30'" /> + </a> <a *ngIf="structure.linkedin" target="_blank" @@ -189,13 +174,8 @@ rel="noopener noreferrer" [href]="'http://' + structure.linkedin" > - <app-svg-icon - [type]="'ico'" - [icon]="'linkedin'" - [title]="'Linkedin'" - [iconClass]="'icon-30'" - ></app-svg-icon - ></a> + <app-svg-icon [type]="'ico'" [icon]="'linkedin'" [title]="'Linkedin'" [iconClass]="'icon-30'" /> + </a> </div> </div> </div> @@ -217,7 +197,7 @@ <div fxLayout="column" *ngIf="structure.hours.hasData()"> <h2>Horaires</h2> <div fxLayout="column" class="opening-hours"> - <div *ngFor="let day of structure.hours | keyvalue: keepOriginalOrder"> + <div *ngFor="let day of structure.hours | keyvalue : keepOriginalOrder"> <div *ngIf="day.value.open" class="opening-hour" fxLayout="row" fxLayoutAlign="flex-start flex-start"> <h4 class="day">{{ day.key | day }}</h4> <div class="opening-time" fxLayout="column" fxLayoutAlign="none flex-start"> @@ -322,61 +302,54 @@ <h2>Labellisations</h2> <div class="wrapper"> <div *ngFor="let label of structure.categories.labelsQualifications.sort()"> - <app-logo-card [name]="label"></app-logo-card> + <app-logo-card [name]="label" />> </div> </div> - </div> - <!-- Members --> - <div - *ngIf="userIsLoggedIn() && structureAdmins.length" - fxLayout="column" - class="structure-details-block" - fxLayoutAlign="baseline baseline" - fxLayoutGap="8px" - > - <h2>Membres</h2> - <div fxLayout="column" fxLayoutGap="8px" fxLayoutAlign="baseline baseline"> - <div *ngFor="let member of structureAdmins" class="member-card"> - <app-svg-icon - class="avatar" - [type]="'avatar'" - [icon]="'defaultAvatar'" - [iconClass]="'icon-40'" - ></app-svg-icon> - <div class="info-member"> - <a routerLink="/profile/{{ member._id }}" class="member" - >{{ member.name | userName }} {{ member.surname | uppercase }}</a - > - <p class="job" *ngIf="member.job?.name">{{ member.job?.name }}</p> + <!-- Members --> + <div + *ngIf="userIsLoggedIn() && structureAdmins.length" + fxLayout="column" + class="structure-details-block" + fxLayoutAlign="baseline baseline" + fxLayoutGap="8px" + > + <h2>Membres</h2> + <div fxLayout="column" fxLayoutGap="8px" fxLayoutAlign="baseline baseline"> + <div *ngFor="let member of structureAdmins" class="member-card"> + <app-svg-icon class="avatar" [type]="'avatar'" [icon]="'defaultAvatar'" [iconClass]="'icon-40'" /> + <div class="info-member"> + <a routerLink="/profile/{{ member._id }}" class="member" + >{{ member.name | userName }} {{ member.surname | uppercase }}</a + > + <p class="job" *ngIf="member.job?.name">{{ member.job?.name }}</p> + </div> </div> </div> </div> - </div> - <!-- Démarches en lignes --> - <div - *ngIf=" - (structure.categories.onlineProcedures && structure.categories.onlineProcedures.length) || - structure.otherDescription - " - fxLayout="column" - class="structure-details-block" - fxLayoutAlign="baseline baseline" - fxLayoutGap="12px" - > - <h2>Démarches en ligne</h2> - <div fxLayout="column"> - <div class="wrapper"> - <div *ngFor="let accompagnement of structure.categoriesDisplay.onlineProcedures.sort()"> - <app-logo-card [name]="accompagnement"></app-logo-card> + <!-- Démarches en lignes --> + <div + *ngIf=" + (structure.categories.onlineProcedures && structure.categories.onlineProcedures.length) || + structure.otherDescription + " + fxLayout="column" + class="structure-details-block" + fxLayoutAlign="baseline baseline" + fxLayoutGap="12px" + > + <h2>Démarches en ligne</h2> + <div fxLayout="column"> + <div class="wrapper"> + <div *ngFor="let accompagnement of structure.categoriesDisplay.onlineProcedures.sort()"> + <app-logo-card [name]="accompagnement" />iv> + </div> + <p *ngIf="structure.otherDescription" fxLayout="column"> + {{ structure.otherDescription }} + </p> </div> </div> - <p *ngIf="structure.otherDescription" fxLayout="column"> - {{ structure.otherDescription }} - </p> - </div> - </div> <!-- Formation --> <div @@ -423,126 +396,107 @@ </div> </div> - <!-- Matériel et wifi --> - <div - *ngIf="structure.hasEquipments()" - fxLayout="column" - class="structure-details-block" - fxLayoutAlign="baseline baseline" - > - <h2>Matériel et wifi</h2> - <div fxLayout="column"> - <div *ngIf="structure.categories.selfServiceMaterial.includes('wifiEnAccesLibre')"> - {{ getEquipmentsLabel('wifiEnAccesLibre') }} + <!-- Matériel et wifi --> + <div + *ngIf="structure.hasEquipments()" + fxLayout="column" + class="structure-details-block" + fxLayoutAlign="baseline baseline" + > + <h2>Matériel et wifi</h2> + <div fxLayout="column"> + <div *ngIf="structure.categories.selfServiceMaterial.includes('wifiEnAccesLibre')"> + {{ getEquipmentsLabel('wifiEnAccesLibre') }} + </div> + <p *ngFor="let equipement of structure.categories.selfServiceMaterial" class="no-margin-bottom"> + <span *ngIf="equipement === 'computer' && structure.nbComputers" + >{{ getEquipmentsLabel(equipement) }} : {{ structure.nbComputers }}</span + > + <span *ngIf="equipement === 'printer' && structure.nbPrinters" + >{{ getEquipmentsLabel(equipement) }} : {{ structure.nbPrinters }}</span + > + <span *ngIf="equipement === 'scanner' && structure.nbScanners" + >{{ getEquipmentsLabel(equipement) }} : {{ structure.nbScanners }}</span + > + </p> + </div> </div> - <p *ngFor="let equipement of structure.categories.selfServiceMaterial" class="no-margin-bottom"> - <span *ngIf="equipement === 'computer' && structure.nbComputers" - >{{ getEquipmentsLabel(equipement) }} : {{ structure.nbComputers }}</span - > - <span *ngIf="equipement === 'printer' && structure.nbPrinters" - >{{ getEquipmentsLabel(equipement) }} : {{ structure.nbPrinters }}</span - > - <span *ngIf="equipement === 'scanner' && structure.nbScanners" - >{{ getEquipmentsLabel(equipement) }} : {{ structure.nbScanners }}</span - > - </p> - </div> - </div> - - <!-- Vente de matériel --> - <div - *ngIf="structure.categories.solidarityMaterial && structure.categories.solidarityMaterial.length" - fxLayout="column" - class="structure-details-block" - fxLayoutAlign="baseline baseline" - > - <h2>Vente de matériel a prix solidaire</h2> - <div fxLayout="column"> - <p *ngFor="let equipement of structure.categoriesDisplay.solidarityMaterial" class="no-margin-bottom"> - <span>{{ equipement }}</span> - </p> - </div> - </div> - <!-- Transport --> - <div - *ngIf="tclStopPoints.length" - fxLayout="column" - class="structure-details-block noSeparator" - fxLayoutAlign="baseline baseline" - > - <h2>Accès</h2> - <div fxLayout="column wrap" fxLayoutGap="24px"> - <div *ngFor="let tclStop of tclStopPoints | slice: 0:3"> - {{ tclStop.name }} - <div fxLayout="row wrap" fxLayoutGap="16px"> - <p *ngFor="let sub of tclStop.subLines"> - <app-svg-icon [type]="'tcl'" [icon]="sub" [iconClass]="'acces-icon'"></app-svg-icon> - </p> - <p *ngFor="let tram of tclStop.tramLines"> - <app-svg-icon [type]="'tcl'" [icon]="tram" [iconClass]="'acces-icon'"></app-svg-icon> - </p> - <p *ngFor="let bus of tclStop.busLines"> - <app-svg-icon [type]="'tcl'" [icon]="bus" [iconClass]="'acces-icon'"></app-svg-icon> + <!-- Vente de matériel --> + <div + *ngIf="structure.categories.solidarityMaterial && structure.categories.solidarityMaterial.length" + fxLayout="column" + class="structure-details-block" + fxLayoutAlign="baseline baseline" + > + <h2>Vente de matériel a prix solidaire</h2> + <div fxLayout="column"> + <p *ngFor="let equipement of structure.categoriesDisplay.solidarityMaterial" class="no-margin-bottom"> + <span>{{ equipement }}</span> </p> </div> </div> - </div> - </div> - <!-- Mise à jour --> - <div fxLayout="column" class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px"> - <div fxLayout="row" fxLayoutAlign="none flex-start" fxLayoutGap="13px"> - <p class="updated">Mise à jour le {{ structure.updatedAt | date: 'mediumDate' }}</p> - </div> - </div> - </div> - <app-modal-confirmation - [openned]="deleteModalOpenned" - [content]="'Voulez-vous vraiment supprimer cette structure ?'" - (closed)="deleteStructure($event)" - ></app-modal-confirmation> - - <app-join-modal-confirmation - [openned]="claimModalOpenned" - [title]="'Travaillez-vous ici ?'" - [primaryContent]=" - 'Un message sera envoyé aux administrateurs Rés\'IN pour valider l\'affectation de votre compte à la structure' - " - [secondaryContent]="structure.structureName" - [customConfirmationText]="'Rejoindre la structure'" - (closed)="claimStructure($event)" - ></app-join-modal-confirmation> - - <app-join-modal-confirmation - [openned]="joinModalOpenned" - [title]="'Travaillez-vous ici ?'" - [primaryContent]="'Un message sera envoyé à un administrateur de la structure'" - [secondaryContent]="structure.structureName" - [customConfirmationText]="'Rejoindre la structure'" - (closed)="joinStructure($event)" - ></app-join-modal-confirmation> + <!-- Transport --> + <div + *ngIf="tclStopPoints.length" + fxLayout="column" + class="structure-details-block noSeparator" + fxLayoutAlign="baseline baseline" + > + <h2>Accès</h2> + <div fxLayout="column wrap" fxLayoutGap="24px"> + <div *ngFor="let tclStop of tclStopPoints | slice : 0 : 3"> + {{ tclStop.name }} + <div fxLayout="row wrap" fxLayoutGap="16px"> + <p *ngFor="let sub of tclStop.subLines"> + <app-svg-icon [type]="'tcl'" [icon]="sub" [iconClass]="'acces-icon'" /> + </p> + <p *ngFor="let tram of tclStop.tramLines"> + <app-svg-icon [type]="'tcl'" [icon]="tram" [iconClass]="'acces-icon'" /> + </p> + <p *ngFor="let bus of tclStop.busLines"> + <app-svg-icon [type]="'tcl'" [icon]="bus" [iconClass]="'acces-icon'" /> + </p> + </div> + </div> + </div> + </div> + <!-- Mise à jour --> + <div fxLayout="column" class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px"> + <div fxLayout="row" fxLayoutAlign="none flex-start" fxLayoutGap="13px"> + <p class="updated">Mise à jour le {{ structure.updatedAt | date : 'mediumDate' }}</p> + </div> + </div> + </div> - <app-join-modal-confirmation - [openned]="pendingModalOpenned" - [title]="'Travaillez-vous ici ?'" - [primaryContent]=" - 'Un message a déjà été envoyé aux administrateurs Rés\'IN pour validation, vous recevrez un email quand votre compte sera rattaché à la structure' - " - [secondaryContent]="structure.structureName" - [customConfirmationText]="'OK'" - [displayCancelButton]="false" - (closed)="togglePendingModal()" - ></app-join-modal-confirmation> + <app-modal-confirmation + [openned]="deleteModalOpenned" + [content]="'Voulez-vous vraiment supprimer cette structure ?'" + (closed)="deleteStructure($event)" + /> - <app-text-input-modal - [openned]="structureErrorModalOpenned" - [placeholder]="'Décrivez l\'erreur ici. Ex: Horaires faux...'" - [content]=" - 'Voulez-vous notifier res\'in d\'une erreur sur la fiche de cet acteur ? Votre commentaire sera envoyé à l\'acteur en question ainsi qu\'aux administrateurs.' - " - (closed)="sendErrorEmail($event)" - (newContent)="sendErrorEmail($event)" - ></app-text-input-modal> + <app-join-modal-confirmation + [openned]="claimModalOpenned" + [title]="'Travaillez-vous ici ?'" + [primaryContent]=" + 'Un message sera envoyé aux administrateurs Rés\'IN pour valider l\'affectation de votre compte à la structure' + " + [secondaryContent]="structure.structureName" + [customConfirmationText]="'Rejoindre la structure'" + (closed)="claimStructure($event)" + />modal-confirmation [openned]="joinModalOpenned" [title]="'Travaillez-vous ici ?'" [primaryContent]="'Un + message sera envoyé à un administrateur de la structure'" [secondaryContent]="structure.structureName" + [customConfirmationText]="'Rejoindre la structure'" (closed)="joinStructure($event)" />modal-confirmation + [openned]="pendingModalOpenned" [title]="'Travaillez-vous ici ?'" [primaryContent]=" 'Un message a déjà été + envoyé aux administrateurs Rés\'IN pour validation, vous recevrez un email quand votre compte sera rattaché à la + structure' " [secondaryContent]="structure.structureName" [customConfirmationText]="'OK'" + [displayCancelButton]="false" (closed)="togglePendingModal()" />input-modal + [openned]="structureErrorModalOpenned" [placeholder]="'Décrivez l\'erreur ici. Ex: Horaires faux...'" + [content]=" 'Voulez-vous notifier res\'in d\'une erreur sur la fiche de cet acteur ? Votre commentaire + sera envoyé à l\'acteur en question ainsi qu\'aux administrateurs.' " (closed)="sendErrorEmail($event)" + (newContent)="sendErrorEmail($event)" /> + </div> + </div> </div> </div> diff --git a/src/app/structure-list/components/structure-list-search/structure-list-search.component.html b/src/app/structure-list/components/structure-list-search/structure-list-search.component.html index 841bc148d..c6b74fff3 100644 --- a/src/app/structure-list/components/structure-list-search/structure-list-search.component.html +++ b/src/app/structure-list/components/structure-list-search/structure-list-search.component.html @@ -11,7 +11,7 @@ <div class="ico-close-search"></div> </button> <span *ngIf="this.searchForm.get('searchTerm').value?.length > 0" class="separation"></span> - <app-button [style]="buttonTypeEnum.searchIcon" [iconBtn]="'search'" [type]="'submit'"></app-button> + <app-button [style]="buttonTypeEnum.searchIcon" [iconBtn]="'search'" [type]="'submit'" /> </form> <div (appClickOutside)="closeModal()" class="btnSection"> <button @@ -118,7 +118,7 @@ [style]="buttonTypeEnum.TertiaryRounded" [text]="'Plus de filtres'" (action)="openModal(TypeModal.moreFilters)" - ></app-button> + /> <div *ngIf="modalTypeOpened"> <app-more-filters [modalType]="modalTypeOpened" @@ -126,7 +126,7 @@ [modules]="checkedModulesFilter" (searchEvent)="fetchResults($event)" (closeEvent)="closeModal()" - ></app-more-filters> + /> </div> </div> </div> @@ -138,7 +138,7 @@ [style]="buttonTypeEnum.TagCloudButton" [text]="filter.displayText ? filter.displayText : filter.id" (action)="removeFilter(filter)" - ></app-button> - <app-button [style]="buttonTypeEnum.TagCloudResetButton" (action)="resetFilters()"></app-button> + /> + <app-button [style]="buttonTypeEnum.TagCloudResetButton" (action)="resetFilters()" /> </div> </div> diff --git a/src/app/structure-list/structure-list.component.html b/src/app/structure-list/structure-list.component.html index 32574a729..f97e62775 100644 --- a/src/app/structure-list/structure-list.component.html +++ b/src/app/structure-list/structure-list.component.html @@ -11,13 +11,13 @@ [text]="'Imprimer la liste'" [style]="buttonTypeEnum.Secondary" [extraClass]="'small-text'" - ></app-button> + /> <app-button (action)="addStructure()" [text]="'Ajouter une structure'" [style]="buttonTypeEnum.Secondary" [extraClass]="'small-text'" - ></app-button> + /> </ng-container> </div> @@ -34,7 +34,7 @@ class="structure-card" role="listitem" tabindex="0" - ></app-card> + /> <p *ngIf="structureList && structureList.length <= 0 && !isLoading"> Il n'y a aucune réponse correspondant à votre recherche </p> diff --git a/src/app/structure/structure-exclude/structure-exclude.component.html b/src/app/structure/structure-exclude/structure-exclude.component.html index 9c5ca3999..87257d948 100644 --- a/src/app/structure/structure-exclude/structure-exclude.component.html +++ b/src/app/structure/structure-exclude/structure-exclude.component.html @@ -1,5 +1,5 @@ -<app-structure-details [structure]="structure" (closeDetails)="close()"></app-structure-details> -<app-carto></app-carto> +<app-structure-details [structure]="structure" (closeDetails)="close()" /> +<app-carto /> <div class="modalBackground" *ngIf="structure"> <div class="modal"> @@ -20,19 +20,14 @@ (action)="close()" [text]="'Non'" [style]="buttonTypeEnum.modalSecondary" - ></app-button> + /> <app-button *ngIf="!alreadyExcluded" (action)="exclude()" [text]="'Exclure'" [style]="buttonTypeEnum.modalPrimary" - ></app-button> - <app-button - *ngIf="alreadyExcluded" - (action)="close()" - [text]="'OK'" - [style]="buttonTypeEnum.modalPrimary" - ></app-button> + /> + <app-button *ngIf="alreadyExcluded" (action)="close()" [text]="'OK'" [style]="buttonTypeEnum.modalPrimary" /> </div> </div> </div> diff --git a/src/app/structure/structure-join/structure-join.component.html b/src/app/structure/structure-join/structure-join.component.html index e0dd990ca..7224efceb 100644 --- a/src/app/structure/structure-join/structure-join.component.html +++ b/src/app/structure/structure-join/structure-join.component.html @@ -7,10 +7,10 @@ [formType]="formTypeEnum.structure" [structureName]="structureName" [isClaimed]="isClaimed" - ></app-information-step> + /> </div> <div class="button"> - <app-button [style]="buttonTypeEnum.Primary" [text]="'Ok'" (action)="handleFinish()"> </app-button> + <app-button [style]="buttonTypeEnum.Primary" [text]="'Ok'" (action)="handleFinish()" /> </div> </div> </ng-container> @@ -53,7 +53,7 @@ </div> </div> <div class="button"> - <app-button [style]="buttonTypeEnum.Primary" [text]="'Ok'" (action)="handleCallback()"> </app-button> + <app-button [style]="buttonTypeEnum.Primary" [text]="'Ok'" (action)="handleCallback()" /> </div> </div> </ng-container> diff --git a/src/index.html b/src/index.html index 8707eb098..742fa66bc 100644 --- a/src/index.html +++ b/src/index.html @@ -68,7 +68,7 @@ <meta name="theme-color" content="#333333" /> </head> <body> - <app-root></app-root> + <app-root /> <noscript>Please enable JavaScript to continue using this application.</noscript> </body> </html> -- GitLab