diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 66f5c4d3c..d1c2fd3cc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,7 +10,7 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: - + # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages permissions: pages: write @@ -44,7 +44,7 @@ jobs: - name: Upload artifact uses: actions/upload-pages-artifact@v1 with: - path: 'dist' + path: "dist" - name: Deploy to github pages 🚀 if: github.ref == 'refs/heads/master' diff --git a/package.json b/package.json index 92e576773..9e6e6e660 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@types/react-dom": "^18.0.6", "@vitejs/plugin-react": "^4.0.2", "husky": "^8.0.2", - "prettier": "3.0.0", + "prettier": "^2.8.8", "pretty-quick": "^3.1.3", "typescript": "^4.9.5", "vite": "^4.4.2" diff --git a/src/components/QuestionFilter/useFilterSearch.js b/src/components/QuestionFilter/useFilterSearch.js index 5723310fa..4213cc411 100644 --- a/src/components/QuestionFilter/useFilterSearch.js +++ b/src/components/QuestionFilter/useFilterSearch.js @@ -35,7 +35,9 @@ export function useFilterSearch() { const [urlSearchParams, setUrlSearchParams] = useUrlParams( DEFAULT_FILTER_URL_PARAMS, - { valueTag: ["value_tag", "value"] } + { + valueTag: ["value_tag", "value"], + } ); const exposedParameters = React.useMemo( () => convertUrlToParams(urlSearchParams), diff --git a/src/components/welcome/Welcome.jsx b/src/components/welcome/Welcome.jsx index a2d3b35c8..d86786fb6 100644 --- a/src/components/welcome/Welcome.jsx +++ b/src/components/welcome/Welcome.jsx @@ -6,6 +6,9 @@ import { useTheme } from "@mui/material/styles"; import useControlled from "@mui/utils/useControlled"; import useMediaQuery from "@mui/material/useMediaQuery"; import logo from "../../assets/logo.png"; +import logosGame from "../../assets/logosGame.png"; +import questionsGame from "../../assets/questionsGame.png"; +import ecoScoreGame from "../../assets/ecoScoreGame.png"; import Tour from "reactour"; import { @@ -76,7 +79,7 @@ export const getSteps = ({ t, withSelector, theme }) => [ height: "auto", flex: "20%", }} - src={require("../../assets/logo.png")} + src={logo} /> [ height: "auto", justifyContent: "center", }} - src={require("../../assets/questionsGame.png")} + src={questionsGame} /> @@ -144,7 +147,7 @@ export const getSteps = ({ t, withSelector, theme }) => [ height: "auto", flex: "20%", }} - src={require("../../assets/logo.png")} + src={logo} /> [ height: "auto", justifyContent: "center", }} - src={require("../../assets/logosGame.png")} + src={logosGame} /> @@ -197,7 +200,7 @@ export const getSteps = ({ t, withSelector, theme }) => [ height: "auto", flex: "20%", }} - src={require("../../assets/logo.png")} + src={logo} /> [ height: "auto", justifyContent: "center", }} - src={require("../../assets/ecoScoreGame.png")} + src={ecoScoreGame} /> @@ -253,7 +256,7 @@ export const getSteps = ({ t, withSelector, theme }) => [ height: "auto", flex: "20%", }} - src={require("../../assets/logo.png")} + src={logo} /> {t("helper.welcome.page5.title")} @@ -283,7 +286,7 @@ export const getSteps = ({ t, withSelector, theme }) => [ height: "auto", flex: "20%", }} - src={require("../../assets/logo.png")} + src={logo} /> {t("helper.welcome.page6.title")} @@ -334,6 +337,8 @@ const Welcome = (props) => { [t, isDesktop, theme] ); + console.log({ steps }); + return ( <> ({ bgcolor: theme.palette.paper, height: "100vh" })} justifyContent="center" alignItems="center" > diff --git a/yarn.lock b/yarn.lock index 58881e53f..628263d58 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2044,7 +2044,7 @@ __metadata: husky: ^8.0.2 i18next: ^22.4.9 lodash.isequal: ^4.5.0 - prettier: 3.0.0 + prettier: ^2.8.8 pretty-quick: ^3.1.3 react: ^18.2.0 react-dom: ^18.2.0 @@ -2757,12 +2757,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.0.0": - version: 3.0.0 - resolution: "prettier@npm:3.0.0" +"prettier@npm:^2.8.8": + version: 2.8.8 + resolution: "prettier@npm:2.8.8" bin: - prettier: bin/prettier.cjs - checksum: 6a832876a1552dc58330d2467874e5a0b46b9ccbfc5d3531eb69d15684743e7f83dc9fbd202db6270446deba9c82b79d24383d09924c462b457136a759425e33 + prettier: bin-prettier.js + checksum: b49e409431bf129dd89238d64299ba80717b57ff5a6d1c1a8b1a28b590d998a34e083fa13573bc732bb8d2305becb4c9a4407f8486c81fa7d55100eb08263cf8 languageName: node linkType: hard