Skip to content
Snippets Groups Projects
Commit 594a395e authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

Merge branch 'chore/remove-fxlayout' into 'dev'

chore: remove @angular/flex-layout

See merge request !772
parents 72254085 4413503b
Branches
Tags
2 merge requests!783V3.0.0,!772chore: remove @angular/flex-layout
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
"@angular/common": "^17.0.7", "@angular/common": "^17.0.7",
"@angular/compiler": "^17.0.7", "@angular/compiler": "^17.0.7",
"@angular/core": "^17.0.7", "@angular/core": "^17.0.7",
"@angular/flex-layout": "^15.0.0-beta.42",
"@angular/forms": "^17.0.7", "@angular/forms": "^17.0.7",
"@angular/platform-browser": "^17.0.7", "@angular/platform-browser": "^17.0.7",
"@angular/platform-browser-dynamic": "^17.0.7", "@angular/platform-browser-dynamic": "^17.0.7",
...@@ -475,23 +474,6 @@ ...@@ -475,23 +474,6 @@
"@angular/core": "17.0.8" "@angular/core": "17.0.8"
} }
}, },
"node_modules/@angular/cdk": {
"version": "17.0.4",
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-17.0.4.tgz",
"integrity": "sha512-mh/EuIR0NPfpNqAXBSZWuJeBMXUvUDYdKhiFWZet5NLO1bDgFe1MGLBjtW4us95k4BZsMLbCKNxJgc+4JqwUvg==",
"peer": true,
"dependencies": {
"tslib": "^2.3.0"
},
"optionalDependencies": {
"parse5": "^7.1.2"
},
"peerDependencies": {
"@angular/common": "^17.0.0 || ^18.0.0",
"@angular/core": "^17.0.0 || ^18.0.0",
"rxjs": "^6.5.3 || ^7.4.0"
}
},
"node_modules/@angular/cli": { "node_modules/@angular/cli": {
"version": "17.0.8", "version": "17.0.8",
"resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.0.8.tgz", "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.0.8.tgz",
...@@ -648,22 +630,6 @@ ...@@ -648,22 +630,6 @@
"zone.js": "~0.14.0" "zone.js": "~0.14.0"
} }
}, },
"node_modules/@angular/flex-layout": {
"version": "15.0.0-beta.42",
"resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-15.0.0-beta.42.tgz",
"integrity": "sha512-cTAPVMMxnyIFwpZwdq0PL5mdP9Qh+R8MB7ZBezVaN3Rz2fRrkagzKpLvPX3TFzepXrvHBdpKsU4b8u+NxEC/6g==",
"deprecated": "This package has been deprecated. Please see https://blog.angular.io/modern-css-in-angular-layouts-4a259dca9127",
"dependencies": {
"tslib": "^2.3.0"
},
"peerDependencies": {
"@angular/cdk": ">=15.0.0",
"@angular/common": ">=15.0.2",
"@angular/core": ">=15.0.2",
"@angular/platform-browser": ">=15.0.2",
"rxjs": "^6.5.3 || ^7.4.0"
}
},
"node_modules/@angular/forms": { "node_modules/@angular/forms": {
"version": "17.0.8", "version": "17.0.8",
"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.0.8.tgz", "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.0.8.tgz",
...@@ -13883,7 +13849,7 @@ ...@@ -13883,7 +13849,7 @@
"version": "4.5.0", "version": "4.5.0",
"resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
"integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
"devOptional": true, "dev": true,
"engines": { "engines": {
"node": ">=0.12" "node": ">=0.12"
}, },
...@@ -21036,7 +21002,7 @@ ...@@ -21036,7 +21002,7 @@
"version": "7.1.2", "version": "7.1.2",
"resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
"integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
"devOptional": true, "dev": true,
"dependencies": { "dependencies": {
"entities": "^4.4.0" "entities": "^4.4.0"
}, },
......
import { BREAKPOINT } from '@angular/flex-layout';
const PRINT_BREAKPOINTS = [ const PRINT_BREAKPOINTS = [
{ {
alias: 'xs', alias: 'xs',
...@@ -52,7 +50,7 @@ const PRINT_BREAKPOINTS = [ ...@@ -52,7 +50,7 @@ const PRINT_BREAKPOINTS = [
]; ];
export const CustomBreakPointsProvider = { export const CustomBreakPointsProvider = {
provide: BREAKPOINT, provide: [],
useValue: PRINT_BREAKPOINTS, useValue: PRINT_BREAKPOINTS,
multi: true, multi: true,
}; };
...@@ -159,12 +159,12 @@ ...@@ -159,12 +159,12 @@
(action)="selectJob(job)" (action)="selectJob(job)"
/> />
</div> </div>
<app-input
*ngIf="isUnexistingJob()"
label="Quelle fonction occupez-vous ?"
(valueChange)="updateNewJob($event)"
/>
</div> </div>
<app-input
*ngIf="isUnexistingJob()"
label="Quelle fonction occupez-vous ?"
(valueChange)="updateNewJob($event)"
/>
<app-appointment-choice <app-appointment-choice
*ngIf="hasPersonalOffer" *ngIf="hasPersonalOffer"
......
...@@ -118,9 +118,6 @@ ...@@ -118,9 +118,6 @@
@include font-bold-16; @include font-bold-16;
} }
} }
.tagList {
margin-bottom: 1em;
}
.descriptionTab { .descriptionTab {
p.descriptionLength { p.descriptionLength {
......
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { SharedComponents } from './components'; import { SharedComponents } from './components';
...@@ -15,7 +14,7 @@ import { YesNoComponent } from './components/yes-no/yes-no.component'; ...@@ -15,7 +14,7 @@ import { YesNoComponent } from './components/yes-no/yes-no.component';
import { SharedDirectives } from './directives'; import { SharedDirectives } from './directives';
import { SharedPipes } from './pipes'; import { SharedPipes } from './pipes';
@NgModule({ @NgModule({
imports: [CommonModule, FormsModule, RouterModule, FlexLayoutModule, ReactiveFormsModule], imports: [CommonModule, FormsModule, RouterModule, ReactiveFormsModule],
declarations: [ declarations: [
...SharedPipes, ...SharedPipes,
...SharedComponents, ...SharedComponents,
...@@ -35,7 +34,6 @@ import { SharedPipes } from './pipes'; ...@@ -35,7 +34,6 @@ import { SharedPipes } from './pipes';
...SharedDirectives, ...SharedDirectives,
CommonModule, CommonModule,
RouterModule, RouterModule,
FlexLayoutModule,
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment