Skip to content
This repository has been archived by the owner on Nov 15, 2024. It is now read-only.

build(deps): bump terser from 4.8.0 to 4.8.1 in /front-admin #3

Open
wants to merge 359 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
359 commits
Select commit Hold shift + click to select a range
65d8f63
Improve cicd
tyjak Apr 12, 2021
a1698f8
remove not referer
fxmontigny Apr 12, 2021
2f9e0c2
fix code rome
fxmontigny Apr 12, 2021
adbf2e5
change cities desktop
fxmontigny Apr 12, 2021
683bdf1
add test log
fxmontigny Apr 12, 2021
16d7e0b
Fix glob pattern
tyjak Apr 12, 2021
c7b53e6
Feature/432 1 ptsprint 6 vérifier lancre arrivée en haut de la page
fxmontigny Apr 12, 2021
24b5578
remove no referrer
fxmontigny Apr 12, 2021
187eb41
hide desktop
fxmontigny Apr 12, 2021
4f44f35
Refacto production deploy
tyjak Apr 12, 2021
3fdf3b2
Add dependencies
tyjak Apr 12, 2021
f7c204e
typo
tyjak Apr 12, 2021
e83efde
Add step to deliver front-admin in prod
tyjak Apr 12, 2021
db276e2
back on city page
fxmontigny Apr 13, 2021
d520e06
no translate
fxmontigny Apr 13, 2021
01afba8
fix back bt on search
fxmontigny Apr 13, 2021
0165a19
Add install step and a deploy more light deploy step
tyjak Apr 13, 2021
26aaf36
change search bar
fxmontigny Apr 13, 2021
219b190
Add a nginx reload on release produciton
tyjak Apr 13, 2021
40dfcbb
Fix
tyjak Apr 13, 2021
6994b40
Fix for TTY issue
tyjak Apr 13, 2021
1ffe19b
Fix 500 error with restart container...
tyjak Apr 13, 2021
f7c293b
Fix remove bad operand
tyjak Apr 13, 2021
04c183b
Add restart nginx for release front-admin in gitlab-ci
tyjak Apr 13, 2021
42da98f
change wording
fxmontigny Apr 13, 2021
83416d6
fix house rent
fxmontigny Apr 14, 2021
f4ac697
update average house rent
fxmontigny Apr 14, 2021
3c74c68
remove test
fxmontigny Apr 14, 2021
1178aa1
Ajout du conteneur de backup
tyjak Apr 16, 2021
d476006
add faq page
fxmontigny Apr 14, 2021
9078db6
change help datas
fxmontigny Apr 20, 2021
c8d498a
fix menu icon
fxmontigny Apr 19, 2021
8a4504c
fix link
fxmontigny Apr 20, 2021
47f312b
add pdf
fxmontigny Apr 20, 2021
1554a94
less and more 26 years
fxmontigny Apr 22, 2021
c2929e5
quick design review
fxmontigny Apr 22, 2021
024a983
hide from city
fxmontigny Apr 22, 2021
a7b1d0d
add criterions
fxmontigny May 3, 2021
b88636b
Refactoring CI/CD
tyjak Apr 26, 2021
4a86f40
fix
tyjak Apr 30, 2021
a7918eb
fix criterions
fxmontigny May 3, 2021
f461363
complete read me
fxmontigny May 5, 2021
79e03b0
add campaign link
fxmontigny May 5, 2021
ff7f8e6
align word to menu mobile
fxmontigny May 5, 2021
c015397
add tag navigation
fxmontigny May 11, 2021
6c3c70c
add name to url
fxmontigny May 11, 2021
56650cf
Feature/560 performance du moteur de recherche
fxmontigny May 10, 2021
81bf426
Update CI/CD
tyjak May 10, 2021
0a255f2
change tag to exit
fxmontigny May 11, 2021
4cf8019
control city format
fxmontigny May 11, 2021
eade8ea
Fix some file path to trigge coorectly configuration publish job
tyjak May 11, 2021
1650933
add sort by match
fxmontigny May 11, 2021
06f9b58
kill cache
fxmontigny May 12, 2021
97e0a92
disable cache
fxmontigny May 12, 2021
b5c4d2b
Add production delivery description in README
tyjak May 11, 2021
0ec95ac
fix "Rendered more hooks than during the previous render." error
codeheroics May 25, 2021
9eaa43c
Feature/573 moteur de recherche laffichage des résultats pour les vil…
fxmontigny May 20, 2021
e5e51d8
add missing searchable cities instead of districts
fxmontigny May 27, 2021
61651a0
Fix add absolute path to targe only the deploy package.json
tyjak May 28, 2021
7acabaf
Optimize test step cicd
tyjak May 31, 2021
30ffbfc
sync code rome fap and pcs
fxmontigny May 31, 2021
7bd7ac5
Fix for ip recette / prod gitlab-cicd
tyjak May 31, 2021
5eb94af
tweak search page to avoid suggesting countryside when user wants city
codeheroics May 27, 2021
6bb8596
fix style for buttons in list of jobs
codeheroics May 27, 2021
0314770
Add the front-end ability to search for a job type
codeheroics May 31, 2021
321a65d
change default language from english to french
codeheroics Jun 2, 2021
9bb28b3
Better "no city found" page
codeheroics Jun 2, 2021
9eeaf0e
add pdf with stats, accessible via /stats
codeheroics Jun 7, 2021
05d5a71
fix regions tensions: avoid loading bad data in cache, having non upd…
codeheroics Jun 9, 2021
97ddbcf
temp fix - remove duplicated cities from qa (before adding unique key)
codeheroics Jun 9, 2021
208d008
Add link to stats page in footer
codeheroics Jun 10, 2021
adb0bc3
Resolve "Fix deploy ssl files"
tyjak Jun 14, 2021
50ea433
remove admin route
codeheroics Jun 14, 2021
2ae4055
add console scripts for sync of regions, cities, professions in tension
codeheroics Jun 15, 2021
9780c5a
add a script to sync amenities, plus amenities data (30mo)
codeheroics Jun 15, 2021
5a78af6
disable by default SQL console logging
codeheroics Jun 15, 2021
fadd9dc
remove RouteSync file & routes (\o/)
codeheroics Jun 15, 2021
2071e27
restrict database port access
tyjak Jun 18, 2021
ad85ef1
fix the syncs that are happening on loading
codeheroics Jun 21, 2021
e59664e
Fix nginx path conf for env dev to run
tyjak Jun 21, 2021
984f30f
fix - front-end countryside search used a wrong criterion
codeheroics Jun 22, 2021
029ad36
manually add Paris, Lyon & Marseille to our data
codeheroics Jun 22, 2021
1d487ae
use master wording about tension
codeheroics Jun 10, 2021
67088df
feat: add autocompletion for job search
codeheroics Jun 21, 2021
cdd37f5
display matching job title or skill
codeheroics Jun 22, 2021
53b9f04
disable skill search & fix matchings for jobs
codeheroics Jun 23, 2021
e1f7be1
add stats page for prod
codeheroics Jun 17, 2021
1799b8b
update stats.pdf
codeheroics Jun 23, 2021
63bba24
Create Mobility Guide page
codeheroics Jun 23, 2021
4ae6565
link mobility guide page to city page
codeheroics Jun 24, 2021
3f163ea
fix display of population
codeheroics Jun 28, 2021
6bdd1ca
improve two wordings from cities list & search
codeheroics Jun 28, 2021
31df1db
remove info icon from cities list
codeheroics Jun 28, 2021
865d0c9
rewrite help page filter logic to be able to target a category from url
codeheroics Jun 28, 2021
dfa39c2
tweak mobility guide link to help page
codeheroics Jun 28, 2021
d9fab3b
remove back arrow from help page
codeheroics Jun 28, 2021
e996497
tweak UI for visible autocomplete on mobile
codeheroics Jun 29, 2021
33754b6
second round of tweaks to show autocomplete on mobile
codeheroics Jun 29, 2021
7dd6334
ui mobile tweak: autocomplete on top of screen when focused
codeheroics Jun 29, 2021
281188b
revert part of the style tweaks previously made now that mobile searc…
codeheroics Jun 29, 2021
c5ed505
add education section (only mobile)
codeheroics Jul 1, 2021
45ccd5b
rewrite panel-city-life component for mobile & desktop
codeheroics Jul 1, 2021
ad29ef1
remove ability to change rome code from cities screen
codeheroics Jul 5, 2021
c1f63d9
update stats page
codeheroics Jul 6, 2021
5bcc130
add missing labels to desktop search selects
codeheroics Jul 5, 2021
dba2f26
refactoringmaterial-ui all selects style
codeheroics Jul 6, 2021
dfe5361
tweak education panel position for desktop
codeheroics Jul 6, 2021
f9442c6
tweak infotext position on search regions
codeheroics Jul 6, 2021
e31b7fd
tweak mobility guide wording
codeheroics Jul 6, 2021
126f9cd
truncate job description if needed
codeheroics Jul 6, 2021
e47452a
add filter base functionality
codeheroics Jul 6, 2021
af0023a
add filter functionality with multiple selection
codeheroics Jul 7, 2021
cb5cc5a
Update README.md
tyjak Jul 9, 2021
540eaab
job filters: add "others" choice for duration, contracts
codeheroics Jul 8, 2021
90ac501
offer live calculation of offers number in filters
codeheroics Jul 12, 2021
b0f3229
more margin before filters
codeheroics Jul 12, 2021
bd7070a
migration to remove a specific help from db
codeheroics Jul 12, 2021
47966ee
job filters : remove white color from select
codeheroics Jul 12, 2021
8a9616c
Update README.md
tyjak Jul 12, 2021
a7ed203
Update README.md
tyjak Jul 12, 2021
db12680
fix: changing criterions on /cities reset the rome code by mistake
codeheroics Jul 16, 2021
4b3a592
remove duplicate values from mobile criterions panel
codeheroics Jul 12, 2021
c3088c9
refactor cities component code style
codeheroics Jul 15, 2021
701c368
refactoring of cities page & panels
codeheroics Jul 15, 2021
1589818
Build mobile criterions selection while refactoring some code
codeheroics Jul 15, 2021
cada85d
fix linting errors
codeheroics Jul 20, 2021
64b3681
add more button on job items
codeheroics Jul 20, 2021
601563d
add seeder data to add new helps
codeheroics Jul 21, 2021
6fefa6b
fix links from mobility guide to help
codeheroics Jul 22, 2021
ac8fe75
Better filters display
codeheroics Jul 22, 2021
8c63d68
fix absent mobile-selection-panel-tags
codeheroics Jul 22, 2021
af4d005
Integrate a list of jobs page to Mobiville
codeheroics Jul 20, 2021
cc66dba
shorten city description max length
codeheroics Jul 22, 2021
1c0c083
create romecode table, ogr route
codeheroics Jul 26, 2021
7f9101d
Move & refactor "rome-list" to "ogr-list"
codeheroics Jul 26, 2021
4273f7a
tweak jobs filters display
codeheroics Jul 27, 2021
7245d47
refactor & update faq
codeheroics Jul 27, 2021
d366e36
add missing data for rome codes
codeheroics Jul 27, 2021
3425f67
Fix add absolute path to targe only the deploy package.json
tyjak May 28, 2021
a9a9d6f
Resolve "Fix deploy ssl files"
tyjak Jun 14, 2021
75bd3ef
only show ogrs for rome codes in tension
codeheroics Jul 27, 2021
740dc13
prevent crash when no description for job
codeheroics Jul 27, 2021
ae0d186
ogr list is now a rome list
codeheroics Jul 28, 2021
0706520
rename ogr-list to rome-list
codeheroics Jul 28, 2021
ff3ecd5
fix infinite scroll for cities, which was hampered by loading hiding …
codeheroics Jul 30, 2021
3723542
allow ignoring city size search step
codeheroics Aug 2, 2021
4826d24
bamenities for lyon, paris and marseille
codeheroics Aug 3, 2021
f657df6
improve help categories filter
codeheroics Aug 4, 2021
45e9a3c
improve rome search autocomplete using full text index.
codeheroics Jul 29, 2021
ace70d4
Fix conflict nginx conf in dev mode deploy
tyjak Aug 6, 2021
7833757
update social housing data when using sync Regions
codeheroics Aug 5, 2021
cb9d322
add tension information to the jobs panel
codeheroics Aug 5, 2021
89eb9e1
fix active states for mobile nav
codeheroics Aug 10, 2021
d5603c7
handle errors in search
codeheroics Aug 9, 2021
a093c0b
remove react rewired, use CRA
codeheroics Aug 10, 2021
5433d25
remove react rewired, use CRA
codeheroics Aug 10, 2021
9d6b2f6
setup prettier, husky, lint-staged, apply to front-end
codeheroics Aug 10, 2021
f592a6f
prettier-ify, eslint fix back-end code
codeheroics Aug 12, 2021
90b77eb
bigger job descriptions
codeheroics Sep 14, 2021
5568742
prevent showing negative salaries
codeheroics Sep 14, 2021
ca56848
fix city case
codeheroics Aug 12, 2021
1ca8781
disable eslint warnings which crash CI builds
codeheroics Sep 15, 2021
9e92011
Implement a front-end search into job results
codeheroics Sep 15, 2021
705b429
migration: add slugs data to helps
codeheroics Sep 16, 2021
865eea1
use slugs instead of id + title for helps urls
codeheroics Sep 16, 2021
f335728
add google search console id
codeheroics Sep 20, 2021
df6975c
do not allow eslint warnings in code
codeheroics Sep 20, 2021
1cb0dcf
h1 tag for helps page
codeheroics Sep 20, 2021
9f4e31f
use h1, small css cleanup for help-details
codeheroics Sep 20, 2021
b462946
h1 for page city-details
codeheroics Sep 20, 2021
8bdeb3a
fix tension ratio not sent if no salary
codeheroics Sep 20, 2021
eb37239
api professions: small refactoring to parallelize requests
codeheroics Sep 20, 2021
c3635a7
add code for google analytics & optimize
codeheroics Sep 21, 2021
a5d2c60
fix help links from mobility page
codeheroics Sep 22, 2021
a7e77c0
update stats page for september
codeheroics Sep 22, 2021
df2886c
autocomplete search fix
codeheroics Sep 22, 2021
79a35bd
minor wording tweak
codeheroics Sep 22, 2021
9d8c8e1
use bassin info for job tension
codeheroics Sep 23, 2021
59da4e8
Fix long time secret detection job
tyjak Sep 23, 2021
9760d9e
small accessibility tweaks
codeheroics Sep 23, 2021
ee1f02a
add go to main content link
codeheroics Sep 23, 2021
288a5df
rename amenities to equipments
codeheroics Sep 21, 2021
7436be8
add script used to build a lighter equipments file
codeheroics Sep 21, 2021
717f264
add new equipments file
codeheroics Sep 21, 2021
0743e38
add remarkable gardens
codeheroics Sep 23, 2021
e69e6c5
update stats pdf
codeheroics Sep 27, 2021
8ecf6fd
fix csv parsing utils file
codeheroics Sep 28, 2021
7a53d62
remove reg column from equipments in migration
codeheroics Sep 27, 2021
1bbff31
add remarkable gardens icons, quick panel-city-life refactoring
codeheroics Sep 28, 2021
7526d56
Button Info for remarkable gardens
codeheroics Sep 29, 2021
f17b951
refactoring to stop using custom query-string parsing, which results …
codeheroics Sep 29, 2021
7a24d51
refactor lots of lower_case url parameters to camelCase
codeheroics Sep 29, 2021
40114ac
api: fix broken profession route
codeheroics Oct 4, 2021
d225bdc
Allow the selection of multiple situations
codeheroics Oct 1, 2021
06e4d75
front: partial refactoring / simplification of helps page
codeheroics Oct 4, 2021
1296ab0
Implement bassinsJobs table & sync functionalities
codeheroics Oct 5, 2021
57714c5
api: Load data from datalake pe for bassinsjobs
codeheroics Oct 6, 2021
60bee94
use /mnt/datalakepe for datalake data in qa env
codeheroics Oct 7, 2021
a3ded19
jobs: search tension by department and bassin and display the most pr…
codeheroics Oct 6, 2021
8dcdf82
front: add accessibility page
codeheroics Oct 7, 2021
c1372e8
front: override background color of MUI css baseline
codeheroics Oct 7, 2021
d93f829
front: hide the number of available job offers in cities
codeheroics Oct 11, 2021
b5fb924
front: fix social housing wording
codeheroics Oct 11, 2021
2a6cad8
front: add react-helmet, new meta & titles everywhere
codeheroics Oct 7, 2021
f0993c4
front: refactor a bit of panel-city-jobs to city
codeheroics Oct 12, 2021
6a47e10
api: refactoring - remove useless sync on each app startup
codeheroics Oct 12, 2021
227c8cf
api: add regions_tensions_criterions table, use it instead of complic…
codeheroics Oct 13, 2021
e0402db
api: add sync command for new regionsTensionsCriterions
codeheroics Oct 14, 2021
57f2cba
front fix: housing delay is in months, not days
codeheroics Oct 18, 2021
0bf4f41
front fix: helps page display
codeheroics Oct 18, 2021
2d9449e
front fix: fix selection display for helps
codeheroics Oct 18, 2021
d4d328f
db/api: remove useless tables
codeheroics Oct 13, 2021
fa994b4
front: implement new panel-city-jobs page
codeheroics Oct 14, 2021
b40f1e3
front refactor: panel-city-jobs css sanitization
codeheroics Oct 19, 2021
7eb27a1
front feat: rename filters label in panel-city-jobs
codeheroics Oct 19, 2021
d403900
front: rename city files
codeheroics Oct 19, 2021
e63759c
front jobs: fix filters labels visible through z-index block
codeheroics Oct 19, 2021
9c63615
front: implement new helps page design
codeheroics Oct 20, 2021
170e944
front: implement help details new design
codeheroics Oct 20, 2021
8fc1069
api/db: new, renamed columns for helps table
codeheroics Oct 25, 2021
e9f1911
api: cleanup old help csv, seeder files
codeheroics Oct 25, 2021
cdcac26
front: add help logos
codeheroics Oct 25, 2021
8f3607c
front: add help type info
codeheroics Oct 25, 2021
e686869
front: add partner info
codeheroics Oct 25, 2021
2cc867d
front: design tweak for job offers panel
codeheroics Oct 26, 2021
571021b
front: migrate to material-ui 5
codeheroics Oct 28, 2021
1eb7686
front fix: material-ui 5 import fixes
codeheroics Oct 28, 2021
8e63f0e
front: fix ApplyToJobLink style
codeheroics Oct 28, 2021
9996fbf
nginx/api: express nginx/api dependency in docker-compose
codeheroics Oct 26, 2021
4ea4b29
data: update helps
codeheroics Oct 27, 2021
f6aa7cd
front: update icons from helps
codeheroics Oct 27, 2021
c21e3a1
chore: rename help components
codeheroics Oct 27, 2021
62146f1
front: update stats pdf page
codeheroics Nov 2, 2021
a09a34e
front: fix helps page wrong style on hover
codeheroics Nov 2, 2021
e3aa25e
data: fix helps labels, which had \n visible in them
codeheroics Nov 3, 2021
01690cf
front: add new header
codeheroics Oct 28, 2021
716e056
front: add new menu icons
codeheroics Nov 2, 2021
d00cf0b
Write new home page (desktop version)
codeheroics Nov 2, 2021
62b6aa8
front: new home page for mobile
codeheroics Nov 3, 2021
d39fa97
front: rename files related to Home
codeheroics Nov 4, 2021
50c6f06
front: fix /aides link in homepage
codeheroics Nov 8, 2021
e6fd369
front: add ability to style main layout
codeheroics Nov 8, 2021
e78501a
front: fix style issue for homepage
codeheroics Nov 8, 2021
c01431d
front: change action-logement logo
codeheroics Nov 8, 2021
e7d94ec
front: tweak home wording
codeheroics Nov 10, 2021
3a0983b
front: rewrite faq page
codeheroics Nov 8, 2021
97bce5b
front: move common nav, backarrow to subheader component
codeheroics Nov 10, 2021
f88d94f
front: tweak faq & new subheader styles
codeheroics Nov 15, 2021
1625422
front: tweak help-details style for more consistency with new designs
codeheroics Nov 15, 2021
b9e2023
build(deps): bump terser from 4.8.0 to 4.8.1 in /front-admin
dependabot[bot] Jul 20, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions front/package.json
Original file line number Diff line number Diff line change
@@ -6,9 +6,12 @@
"@devexpress/dx-react-core": "^2.7.3",
"@devexpress/dx-react-scheduler": "^2.7.3",
"@devexpress/dx-react-scheduler-material-ui": "^2.7.3",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.56",
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
"@mui/icons-material": "^5.0.5",
"@mui/material": "^5.0.6",
"@mui/styled-engine-sc": "^5.0.4",
"@mui/styles": "^5.0.2",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
@@ -31,7 +34,7 @@
"react-scripts": "4.0.3",
"react-toastify": "^6.1.0",
"slug": "^5.0.1",
"styled-components": "^5.2.1",
"styled-components": "^5.3.3",
"web-vitals": "^0.2.4",
"yarn": "^1.22.15"
},
2 changes: 1 addition & 1 deletion front/src/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import CssBaseline from '@material-ui/core/CssBaseline'
import CssBaseline from '@mui/material/CssBaseline'
import { Routes } from './routes/routes'

function App() {
2 changes: 1 addition & 1 deletion front/src/components/button.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import styled from 'styled-components'
import PropTypes from 'prop-types'
import { Button as ButtonUI } from '@material-ui/core'
import { Button as ButtonUI } from '@mui/material'
import {
COLOR_GRAY,
COLOR_PRIMARY,
2 changes: 1 addition & 1 deletion front/src/components/menu-desktop.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react'
import { Link, useLocation } from 'react-router-dom'
import styled from 'styled-components'
import { Typography } from '@material-ui/core'
import { Typography } from '@mui/material'
import { COLOR_PRIMARY, COLOR_TEXT_SECONDARY } from '../constants/colors'
import LOGO from '../assets/images/LogoMobiville_gros.svg'
import LOGO_AL from '../assets/images/logo-action-logement.png'
2 changes: 1 addition & 1 deletion front/src/components/menu-mobile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react'
import { Link, useLocation } from 'react-router-dom'
import styled from 'styled-components'
import { Typography } from '@material-ui/core'
import { Typography } from '@mui/material'
import { COLOR_PRIMARY, COLOR_TEXT_SECONDARY } from '../constants/colors'

const Nav = styled.nav`
2 changes: 1 addition & 1 deletion front/src/components/menu.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ import React from 'react'
import { Link } from 'react-router-dom'
import styled from 'styled-components'
import PropTypes from 'prop-types'
import { Typography } from '@material-ui/core'
import { Typography } from '@mui/material'
import LOGO from '../assets/images/LogoMobiville_gros.svg'

const MainSpace = styled.div``
2 changes: 1 addition & 1 deletion front/src/components/top-mobile-menu.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import styled from 'styled-components'
import { Link } from 'react-router-dom'
import { Typography } from '@material-ui/core'
import { Typography } from '@mui/material'
import LOGO from '../assets/images/LogoMobiville_gros.svg'
import LOGO_AL from '../assets/images/logo-action-logement.png'
import LOGO_PE from '../assets/images/logo-pole-emploi.png'
2 changes: 1 addition & 1 deletion front/src/index.js
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import './assets/styles/main.scss'
import {
MuiThemeProvider,
unstable_createMuiStrictModeTheme as createMuiTheme,
} from '@material-ui/core/styles'
} from '@mui/material/styles'
import App from './App'
import reportWebVitals from './reportWebVitals'
import Providers from './common/contexts'
9 changes: 4 additions & 5 deletions front/src/routes/cities/cities-filter-list.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
import React, { useEffect } from 'react'
import styled from 'styled-components'
import { MenuItem, Select } from '@material-ui/core'
import FilterListIcon from '@material-ui/icons/FilterList'
import { MenuItem, Select } from '@mui/material'
import FilterListIcon from '@mui/icons-material/FilterList'
import { useCities } from '../../common/contexts/citiesContext'

const Wrapper = styled.div`
display: flex;
align-items: center;
`

const SelectBlock = styled(Select)`
const SelectBlock = styled(Select).attrs({ variant: 'standard' })`
&& {
margin-right: 11px;

&.MuiInput-underline:before {
border-bottom: none !important;
}

.MuiSelect-select {
background-color: transparent !important;
padding-right: 0 !important;
}

.MuiSelect-icon {
4 changes: 2 additions & 2 deletions front/src/routes/cities/city-item.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import PropTypes from 'prop-types'
import styled from 'styled-components'
import { Typography } from '@material-ui/core'
import ArrowForwardIcon from '@material-ui/icons/ArrowForward'
import { Typography } from '@mui/material'
import ArrowForwardIcon from '@mui/icons-material/ArrowForward'

import { ucFirst } from '../../utils/utils'
import {
2 changes: 1 addition & 1 deletion front/src/routes/cities/desktop-criterions-panel.js
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import {
InputLabel,
Select,
Typography,
} from '@material-ui/core'
} from '@mui/material'
import { Controller, useForm } from 'react-hook-form'
import { useCities } from '../../common/contexts/citiesContext'
import {
4 changes: 2 additions & 2 deletions front/src/routes/cities/mobile-criterions-panel.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react'
import PropTypes from 'prop-types'
import styled from 'styled-components'
import { Typography } from '@material-ui/core'
import TuneIcon from '@material-ui/icons/Tune'
import { Typography } from '@mui/material'
import TuneIcon from '@mui/icons-material/Tune'

import { useCities } from '../../common/contexts/citiesContext'
import { ucFirst } from '../../utils/utils'
4 changes: 2 additions & 2 deletions front/src/routes/cities/mobile-criterions-selection.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { useState } from 'react'
import PropTypes from 'prop-types'
import styled from 'styled-components'
import { FormControl, InputLabel, MenuItem, Select } from '@material-ui/core'
import ArrowBackOutlinedIcon from '@material-ui/icons/ArrowBackOutlined'
import { FormControl, InputLabel, MenuItem, Select } from '@mui/material'
import ArrowBackOutlinedIcon from '@mui/icons-material/ArrowBackOutlined'

import { Button } from '../../components/button'

4 changes: 2 additions & 2 deletions front/src/routes/city/CityHeader.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react'
import styled from 'styled-components'
import PropTypes from 'prop-types'
import PersonIcon from '@material-ui/icons/Person'
import PersonIcon from '@mui/icons-material/Person'
import { Link, useHistory } from 'react-router-dom'
import ArrowBackOutlinedIcon from '@material-ui/icons/ArrowBackOutlined'
import ArrowBackOutlinedIcon from '@mui/icons-material/ArrowBackOutlined'
import { useCities } from '../../common/contexts/citiesContext'
import {
COLOR_PRIMARY,
75 changes: 40 additions & 35 deletions front/src/routes/city/PanelCityJobs.js
Original file line number Diff line number Diff line change
@@ -11,13 +11,13 @@ import {
ListItemText,
TextField,
InputAdornment,
} from '@material-ui/core'
import SearchIcon from '@material-ui/icons/Search'
import ArrowUpwardIcon from '@material-ui/icons/ArrowUpward'
import ArrowDownwardIcon from '@material-ui/icons/ArrowDownward'
import EuroIcon from '@material-ui/icons/Euro'
import DescriptionIcon from '@material-ui/icons/Description'
import ScheduleIcon from '@material-ui/icons/Schedule'
} from '@mui/material'
import SearchIcon from '@mui/icons-material/Search'
import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward'
import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward'
import EuroIcon from '@mui/icons-material/Euro'
import DescriptionIcon from '@mui/icons-material/Description'
import ScheduleIcon from '@mui/icons-material/Schedule'

import { useProfessions } from '../../common/contexts/professionsContext'
import {
@@ -95,11 +95,13 @@ const JobContentLayout = styled.div`
`

const JobSearchFormControl = styled(FormControl)`
padding: 16px;
margin-bottom: 8px;
background: #ffffff;
border: 1px solid ${COLOR_GRAY};
border-radius: 8px;
&& {
padding: 16px;
margin-bottom: 8px;
background: #ffffff;
border: 1px solid ${COLOR_GRAY};
border-radius: 8px;
}
`

const JobTitleLayout = styled.div`
@@ -161,31 +163,33 @@ const JobItemAdditionalInfo = styled.li`
const StyledFormControl = styled(FormControl).attrs({
variant: 'filled',
})`
width: 100px;
margin-left: 16px;
margin-bottom: 8px;

.MuiInputBase-root {
border-radius: 8px;
overflow: hidden;
}
&& {
width: 100px;
margin-left: 16px;
margin-bottom: 8px;

.MuiInputBase-root {
border-radius: 8px;
overflow: hidden;
}

.MuiFilledInput-underline::before {
border-bottom: none;
}
.MuiFilledInput-underline::before {
border-bottom: none;
}

// The two styles below are to allow ellipsis, because the labels
// of the filter fields are too long.
// These can be removed once the fields are reworked to be bigger
.MuiInputLabel-root {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: 75%;
height: 100%;
}
.MuiInputLabel-shrink {
max-width: 109%;
// The two styles below are to allow ellipsis, because the labels
// of the filter fields are too long.
// These can be removed once the fields are reworked to be bigger
.MuiInputLabel-root {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: 75%;
height: 100%;
}
.MuiInputLabel-shrink {
max-width: 109%;
}
}
`

@@ -402,6 +406,7 @@ const PanelCityJobs = ({
<JobSearchFormControl fullWidth>
<TextField
label="Rechercher dans les offres"
variant="standard"
value={searchValue}
onChange={(event) => setSearchValue(event.target.value)}
InputProps={{
8 changes: 4 additions & 4 deletions front/src/routes/city/PanelCityLife.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { useEffect, useState } from 'react'
import PropTypes from 'prop-types'
import styled from 'styled-components'
import ArrowForwardIcon from '@material-ui/icons/ArrowForward'
import { IconButton, Tooltip } from '@material-ui/core'
import InfoIcon from '@material-ui/icons/Info'
import ArrowForwardIcon from '@mui/icons-material/ArrowForward'
import { IconButton, Tooltip } from '@mui/material'
import InfoIcon from '@mui/icons-material/Info'
import { useWindowSize } from '../../common/hooks/window-size'
import { isMobileView } from '../../constants/mobile'
import {
@@ -239,7 +239,7 @@ const PanelCityLife = ({ city }) => {
<p className="title">
<span>Jardins remarquables</span>
<Tooltip title="Ce label désigne les parcs et jardins d'exceptions">
<IconButton>
<IconButton size="large">
<InfoIcon />
</IconButton>
</Tooltip>
2 changes: 1 addition & 1 deletion front/src/routes/help-details/help-details.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import styled from 'styled-components'
import { useParams } from 'react-router-dom'
import { Helmet } from 'react-helmet'
import { Link } from 'react-router-dom'
import ArrowBackIcon from '@material-ui/icons/ArrowBack'
import ArrowBackIcon from '@mui/icons-material/ArrowBack'

import { useHelps } from '../../common/contexts/helpsContext'
import { useWindowSize } from '../../common/hooks/window-size'
4 changes: 2 additions & 2 deletions front/src/routes/helps/helps.js
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@ import { orderBy } from 'lodash'
import { Link } from 'react-router-dom'
import queryString from 'query-string'
import { Helmet } from 'react-helmet'
import ArrowForwardIcon from '@material-ui/icons/ArrowForward'
import EuroIcon from '@material-ui/icons/Euro'
import ArrowForwardIcon from '@mui/icons-material/ArrowForward'
import EuroIcon from '@mui/icons-material/Euro'

import { useHelps } from '../../common/contexts/helpsContext'
import { useWindowSize } from '../../common/hooks/window-size'
2 changes: 1 addition & 1 deletion front/src/routes/mobility-guide/MobilityGuide.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import styled from 'styled-components'
import { Link as _Link } from 'react-router-dom'
import _ArrowForward from '@material-ui/icons/ArrowForward'
import _ArrowForward from '@mui/icons-material/ArrowForward'

import { MainLayout } from '../../components/main-layout'
import { useWindowSize } from '../../common/hooks/window-size'
2 changes: 1 addition & 1 deletion front/src/routes/rome-list/RomeList.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import { Link as _Link } from 'react-router-dom'
import styled from 'styled-components'
import axios from 'axios'
import { deburr, sortBy } from 'lodash'
import ArrowBackOutlinedIcon from '@material-ui/icons/ArrowBackOutlined'
import ArrowBackOutlinedIcon from '@mui/icons-material/ArrowBackOutlined'

import { MainLayout } from '../../components/main-layout'
import { isMobileView } from '../../constants/mobile'
4 changes: 2 additions & 2 deletions front/src/routes/search/search.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React, { lazy, memo } from 'react'
import styled from 'styled-components'
import { Typography } from '@material-ui/core'
import { Typography } from '@mui/material'
import { isEmpty } from 'lodash'
import queryString from 'query-string'

import ArrowBackOutlinedIcon from '@material-ui/icons/ArrowBackOutlined'
import ArrowBackOutlinedIcon from '@mui/icons-material/ArrowBackOutlined'
import { useHistory, useLocation, useParams } from 'react-router-dom'
import { useCities } from '../../common/contexts/citiesContext'
import { MainLayout } from '../../components/main-layout'
6 changes: 3 additions & 3 deletions front/src/routes/search/step1.js
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@ import {
FormControl,
TextField,
Typography,
} from '@material-ui/core'
} from '@mui/material'
import { toast } from 'react-toastify'
import React, { useEffect, useState } from 'react'
import PropTypes from 'prop-types'
import styled from 'styled-components'
import Autocomplete from '@material-ui/lab/Autocomplete'
import Autocomplete from '@mui/material/Autocomplete'
import { Button } from '../../components/button'
import { getPosition } from '../../utils/navigator'
import { useCities } from '../../common/contexts/citiesContext'
@@ -127,7 +127,7 @@ const Step1Component = ({ onNext, values }) => {
onInputChange={(event, newInputValue) => {
setInputValue(newInputValue)
}}
getOptionSelected={(option, value) => option.id === value.id}
isOptionEqualToValue={(option, value) => option.id === value.id}
getOptionLabel={formatedCity}
options={searchCities.filter((s) => s.id !== null)}
loading={isLoadingLocation}
Loading