Skip to content

Commit d19f1c9

Browse files
Asam237Asam237
authored
Merge pull request #152 from mouafus/ui_ux_update
UI ux update
2 parents 88590fd + 107a5ca commit d19f1c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+49986
-47653
lines changed

‎frontend/package-lock.json

+46,899-46,717
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json

+76-68
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,78 @@
11
{
2-
"name": "frontend",
3-
"version": "0.1.0",
4-
"private": true,
5-
"dependencies": {
6-
"@emotion/react": "^11.10.4",
7-
"@emotion/styled": "^11.10.4",
8-
"@types/react-paginate": "^7.1.1",
9-
"axios": "^0.22.0",
10-
"eslint": "^7.11.0",
11-
"i18next": "^21.9.0",
12-
"i18next-browser-languagedetector": "^6.1.5",
13-
"i18next-http-backend": "^1.4.1",
14-
"install": "^0.13.0",
15-
"leaflet": "^1.7.1",
16-
"npm": "^8.19.2",
17-
"rc-drawer": "^4.4.2",
18-
"react": "^17.0.2",
19-
"react-dom": "^17.0.2",
20-
"react-hooks-use-modal": "^2.1.0",
21-
"react-i18next": "^11.18.3",
22-
"react-leaflet": "^3.2.2",
23-
"react-modern-drawer": "^0.1.1",
24-
"react-paginate": "^8.1.3",
25-
"react-router-dom": "^5.3.0",
26-
"react-search-field": "^2.0.1",
27-
"react-search-input": "^0.11.3",
28-
"recoil": "^0.7.2",
29-
"recoil-persist": "^4.2.0"
30-
},
31-
"scripts": {
32-
"start": "craco start",
33-
"build": "craco build",
34-
"test": "craco test",
35-
"eject": "react-scripts eject",
36-
"lint": "eslint --fix --ext .js,.ts ."
37-
},
38-
"eslintConfig": {
39-
"extends": [
40-
"react-app",
41-
"react-app/jest"
42-
]
43-
},
44-
"browserslist": [
45-
">0.2%",
46-
"not dead",
47-
"not op_mini all"
48-
],
49-
"devDependencies": {
50-
"@craco/craco": "^6.4.0",
51-
"@mui/material": "^5.1.0",
52-
"@testing-library/jest-dom": "^5.11.4",
53-
"@testing-library/react": "^11.1.0",
54-
"@testing-library/user-event": "^12.1.10",
55-
"@types/jest": "^26.0.15",
56-
"@types/leaflet": "^1.7.6",
57-
"@types/node": "^12.0.0",
58-
"@types/react": "^17.0.0",
59-
"@types/react-dom": "^17.0.0",
60-
"@types/react-router-dom": "^5.3.2",
61-
"@typescript-eslint/eslint-plugin": "^5.8.0",
62-
"@typescript-eslint/parser": "^5.8.0",
63-
"autoprefixer": "^9.8.8",
64-
"postcss": "^7.0.39",
65-
"react-scripts": "4.0.3",
66-
"tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.17",
67-
"typescript": "^4.1.2",
68-
"web-vitals": "^1.0.1"
69-
}
2+
"name": "frontend",
3+
"version": "0.1.0",
4+
"private": true,
5+
"dependencies": {
6+
"@emotion/react": "^11.10.4",
7+
"@emotion/styled": "^11.10.4",
8+
"@types/nprogress": "^0.2.0",
9+
"@types/react-helmet": "^6.1.5",
10+
"@types/react-paginate": "^7.1.1",
11+
"@types/react-router-config": "^5.0.6",
12+
"axios": "^0.22.0",
13+
"eslint": "^7.11.0",
14+
"i18next": "^21.9.0",
15+
"i18next-browser-languagedetector": "^6.1.5",
16+
"i18next-http-backend": "^1.4.1",
17+
"install": "^0.13.0",
18+
"leaflet": "^1.7.1",
19+
"notistack": "^2.0.8",
20+
"npm": "^8.19.2",
21+
"nprogress": "^0.2.0",
22+
"rc-drawer": "^4.4.2",
23+
"react": "^17.0.2",
24+
"react-dom": "^17.0.2",
25+
"react-feather": "^2.0.10",
26+
"react-helmet": "^6.1.0",
27+
"react-hooks-use-modal": "^2.1.0",
28+
"react-i18next": "^11.18.3",
29+
"react-leaflet": "^3.2.2",
30+
"react-modern-drawer": "^0.1.1",
31+
"react-paginate": "^8.1.3",
32+
"react-router-config": "^5.1.1",
33+
"react-router-dom": "^5.3.0",
34+
"react-search-field": "^2.0.1",
35+
"react-search-input": "^0.11.3",
36+
"recoil": "^0.7.2",
37+
"recoil-persist": "^4.2.0"
38+
},
39+
"scripts": {
40+
"start": "craco start",
41+
"build": "craco build",
42+
"test": "craco test",
43+
"eject": "react-scripts eject",
44+
"lint": "eslint --fix --ext .js,.ts ."
45+
},
46+
"eslintConfig": {
47+
"extends": [
48+
"react-app",
49+
"react-app/jest"
50+
]
51+
},
52+
"browserslist": [
53+
">0.2%",
54+
"not dead",
55+
"not op_mini all"
56+
],
57+
"devDependencies": {
58+
"@craco/craco": "^6.4.0",
59+
"@mui/material": "^5.1.0",
60+
"@testing-library/jest-dom": "^5.11.4",
61+
"@testing-library/react": "^11.1.0",
62+
"@testing-library/user-event": "^12.1.10",
63+
"@types/jest": "^26.0.15",
64+
"@types/leaflet": "^1.7.6",
65+
"@types/node": "^12.0.0",
66+
"@types/react": "^17.0.0",
67+
"@types/react-dom": "^17.0.0",
68+
"@types/react-router-dom": "^5.3.2",
69+
"@typescript-eslint/eslint-plugin": "^5.8.0",
70+
"@typescript-eslint/parser": "^5.8.0",
71+
"autoprefixer": "^9.8.8",
72+
"postcss": "^7.0.39",
73+
"react-scripts": "4.0.3",
74+
"tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.17",
75+
"typescript": "^4.1.2",
76+
"web-vitals": "^1.0.1"
77+
}
7078
}

‎frontend/src/App.tsx

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import React from 'react'
2+
import Routes from "./routes";
3+
import {RecoilRoot} from "recoil";
4+
import "./index.css";
5+
import "translations";
6+
import ThemeProvider from "./theme";
7+
import {SnackbarProvider} from 'notistack';
8+
9+
const App = () => {
10+
return (
11+
<React.Fragment>
12+
<RecoilRoot>
13+
<SnackbarProvider maxSnack={3} anchorOrigin={{horizontal: "right", vertical: "top"}}>
14+
<ThemeProvider>
15+
<Routes/>
16+
</ThemeProvider>
17+
</SnackbarProvider>
18+
</RecoilRoot>
19+
</React.Fragment>
20+
);
21+
}
22+
23+
24+
export default App;

‎frontend/src/assets/data/Items.data.ts

-29
This file was deleted.

‎frontend/src/assets/data/Links.data.ts

+19-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
import i18n from "../../i18n";
2-
31
export const LINKS = [
4-
{
5-
title: i18n.t("adviceTitle2"),
6-
content: [
7-
i18n.t("adviceContent"),
8-
]
9-
},
10-
{
11-
title:i18n.t( "adviceTitle3"),
12-
content: [
13-
i18n.t("adviceContent1"),
14-
]
15-
},
16-
{
17-
title: i18n.t("adviceTitle4"),
18-
content: [
19-
i18n.t("adviceContent2"),
20-
]
21-
}
22-
]
2+
{
3+
title: "adviceTitle2",
4+
content: [
5+
"adviceContent",
6+
]
7+
},
8+
{
9+
title: "adviceTitle3",
10+
content: [
11+
"adviceContent1",
12+
]
13+
},
14+
{
15+
title: "adviceTitle4",
16+
content: [
17+
"adviceContent2",
18+
]
19+
}
20+
]

‎frontend/src/assets/translation/en/en.json

-46
This file was deleted.

‎frontend/src/assets/translation/fr/fr.json

-46
This file was deleted.

‎frontend/src/atoms/accept.ts

-6
This file was deleted.

‎frontend/src/atoms/alerts.ts

-23
This file was deleted.

‎frontend/src/atoms/cities.ts

-25
This file was deleted.

0 commit comments

Comments
 (0)