Unverified Commit f0a69b49 authored by Florent Chehab's avatar Florent Chehab
Browse files

fix(front): repaired datepickers

We now have a new docker image
parent cf3a2669
...@@ -35,7 +35,7 @@ check_back: ...@@ -35,7 +35,7 @@ check_back:
check_front: check_front:
<<: *only-default <<: *only-default
stage: check_and_lint stage: check_and_lint
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.1.0 image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.1.1
before_script: before_script:
- cd frontend && mkdir -p node_modules && mv -f /usr/src/deps/node_modules/* /usr/src/deps/node_modules/.bin ./node_modules/ - cd frontend && mkdir -p node_modules && mv -f /usr/src/deps/node_modules/* /usr/src/deps/node_modules/.bin ./node_modules/
script: script:
...@@ -53,7 +53,7 @@ lint_backend: ...@@ -53,7 +53,7 @@ lint_backend:
image: registry.gitlab.utc.fr/rex-dri/rex-dri/backend:v0.2.1 image: registry.gitlab.utc.fr/rex-dri/rex-dri/backend:v0.2.1
script: script:
- cd backend - cd backend
- black --check . - black --check .
- flake8 - flake8
tags: tags:
- docker - docker
...@@ -61,7 +61,7 @@ lint_backend: ...@@ -61,7 +61,7 @@ lint_backend:
lint_frontend_and_documentation: lint_frontend_and_documentation:
<<: *only-default <<: *only-default
stage: check_and_lint stage: check_and_lint
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.1.0 image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.1.1
before_script: before_script:
- cd frontend && mkdir -p node_modules && mv -f /usr/src/deps/node_modules/* /usr/src/deps/node_modules/.bin ./node_modules/ - cd frontend && mkdir -p node_modules && mv -f /usr/src/deps/node_modules/* /usr/src/deps/node_modules/.bin ./node_modules/
script: script:
...@@ -100,7 +100,7 @@ test_back: ...@@ -100,7 +100,7 @@ test_back:
test_frontend: test_frontend:
<<: *only-default <<: *only-default
stage: test stage: test
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.1.0 image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.1.1
before_script: before_script:
- cd frontend && mkdir -p node_modules && mv -f /usr/src/deps/node_modules/* /usr/src/deps/node_modules/.bin ./node_modules/ - cd frontend && mkdir -p node_modules && mv -f /usr/src/deps/node_modules/* /usr/src/deps/node_modules/.bin ./node_modules/
script: script:
......
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
## Next ## Next
- [feat] ci: run black and prettier in ci - [feat] ci: run black and prettier in ci
- [feat] backend: add feedback type to make differences between course and exchange feedback - [feat] backend: add feedback type to make differences between course and exchange feedback
###### _TBD_ ###### _TBD_
- [chore] front: updated wording and information regarding previous exchanges and offers - [chore] front: updated wording and information regarding previous exchanges and offers
- [refacto] front: use Material-ui pagination component - [refacto] front: use Material-ui pagination component
- [fix] front: datepickers were broken => new frontend image to prevent the crash (downgraded a dependency)
## v2.7.0 ## v2.7.0
......
...@@ -68,7 +68,7 @@ services: ...@@ -68,7 +68,7 @@ services:
# Service to handle frontend live developpments and building # Service to handle frontend live developpments and building
frontend: frontend:
# Get the image from the registry # Get the image from the registry
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.1.0 image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.1.1
# To use a locally built one, comment above, uncomment bellow. # To use a locally built one, comment above, uncomment bellow.
# build: ./frontend # build: ./frontend
# On startup, we retrieve the dependencies from the image and start the developpement server # On startup, we retrieve the dependencies from the image and start the developpement server
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
"defaults" "defaults"
], ],
"dependencies": { "dependencies": {
"@date-io/date-fns": "^2.6.1", "@date-io/date-fns": "1.x",
"@material-ui/core": "^4.9.14", "@material-ui/core": "^4.9.14",
"@material-ui/icons": "^4.2.1", "@material-ui/icons": "^4.2.1",
"@material-ui/lab": "^4.0.0-alpha.53", "@material-ui/lab": "^4.0.0-alpha.53",
......
...@@ -883,22 +883,17 @@ ...@@ -883,22 +883,17 @@
exec-sh "^0.3.2" exec-sh "^0.3.2"
minimist "^1.2.0" minimist "^1.2.0"
"@date-io/core@1.x": "@date-io/core@1.x", "@date-io/core@^1.3.13":
version "1.3.13" version "1.3.13"
resolved "https://registry.yarnpkg.com/@date-io/core/-/core-1.3.13.tgz#90c71da493f20204b7a972929cc5c482d078b3fa" resolved "https://registry.yarnpkg.com/@date-io/core/-/core-1.3.13.tgz#90c71da493f20204b7a972929cc5c482d078b3fa"
integrity sha512-AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA== integrity sha512-AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA==
"@date-io/core@^2.6.0": "@date-io/date-fns@1.x":
version "2.6.0" version "1.3.13"
resolved "https://registry.yarnpkg.com/@date-io/core/-/core-2.6.0.tgz#01efa47b225d1a94d3138583588b919442149ee8" resolved "https://registry.yarnpkg.com/@date-io/date-fns/-/date-fns-1.3.13.tgz#7798844041640ab393f7e21a7769a65d672f4735"
integrity sha512-GkM3jTlh9r3MfZEuFKV4g1JSbxz1G0Or1CBKkhPcw7UCJRjjsk5mLVYZYtUQEsOY8rCSFUTdCOm63ulWzAC/pw== integrity sha512-yXxGzcRUPcogiMj58wVgFjc9qUYrCnnU9eLcyNbsQCmae4jPuZCDoIBR21j8ZURsM7GRtU62VOw5yNd4dDHunA==
"@date-io/date-fns@^2.6.1":
version "2.6.1"
resolved "https://registry.yarnpkg.com/@date-io/date-fns/-/date-fns-2.6.1.tgz#f0879f161203804ae5314401fcf0bc7133596eca"
integrity sha512-N8NwnUB9cs794aCmEW+TZv8uFFAPii/AzyEKJ6K2v+eZ4QbLuOuDcyX0BIQ98XH0YsBbZcTHggnFKHSX2bNaEw==
dependencies: dependencies:
"@date-io/core" "^2.6.0" "@date-io/core" "^1.3.13"
"@emotion/hash@^0.8.0": "@emotion/hash@^0.8.0":
version "0.8.0" version "0.8.0"
......
...@@ -39,7 +39,7 @@ services: ...@@ -39,7 +39,7 @@ services:
volumes: ["postgres_data_prod:/var/lib/postgresql/data/"] volumes: ["postgres_data_prod:/var/lib/postgresql/data/"]
frontend: # Will be killed as soon as the front is generated frontend: # Will be killed as soon as the front is generated
image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.1.0 image: registry.gitlab.utc.fr/rex-dri/rex-dri/frontend:v2.1.1
command: /bin/sh -c "cd frontend && mv -f /usr/src/deps/node_modules/* /usr/src/deps/node_modules/.bin ./node_modules/ && yarn build" command: /bin/sh -c "cd frontend && mv -f /usr/src/deps/node_modules/* /usr/src/deps/node_modules/.bin ./node_modules/ && yarn build"
networks: [] networks: []
volumes: volumes:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment