Skip to content

Local to development #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ehabyousef wants to merge 41 commits into
base: development
Choose a base branch
from
Open

Local to development #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
b29cbfb
community style
mahmoudkhairy402 Jun 8, 2024
d43caa2
start localization
ehabyousef Jun 11, 2024
632a3cd
localization
ehabyousef Jun 13, 2024
8ca04ec
last of community , except post view handling, like , comment and sha…
mahmoudkhairy402 Jun 18, 2024
04faabf
Merge branch 'chatting' of https://github.com/Graduation-Project-MRS/…
ehabyousef Jun 18, 2024
573cd0d
restore
ehabyousef Jun 18, 2024
dc8cf30
add community lcaoizatyion
ehabyousef Jun 19, 2024
596b16d
add dash work
ehabyousef Jun 30, 2024
a54fb6e
عشان البوب يرن من عنده
mahmoudkhairy402 Jul 1, 2024
dfc1b0e
finish dashboard
ehabyousef Jul 4, 2024
c60267c
finish
ehabyousef Jul 4, 2024
f8f0554
last commit
mahmoudkhairy402 Jul 4, 2024
55f0f1b
Merge branch 'chatting' of https://github.com/Graduation-Project-MRS/…
ehabyousef Jul 4, 2024
5dc3a65
auth&recipe details
ehabyousef Jul 4, 2024
d27433f
community finish
mahmoudkhairy402 Jul 5, 2024
b2febd9
Merge branch 'local' of https://github.com/Graduation-Project-MRS/Fro…
mahmoudkhairy402 Jul 5, 2024
a10bbab
تعديل ف الميرج
mahmoudkhairy402 Jul 5, 2024
3e0a986
last
mahmoudkhairy402 Jul 6, 2024
ff5d170
dash color
ehabyousef Jul 6, 2024
b70ea81
Merge branch 'local' of https://github.com/Graduation-Project-MRS/Fro…
ehabyousef Jul 6, 2024
a4e0fbc
Merge branch 'local' of https://github.com/Graduation-Project-MRS/Fro…
mahmoudkhairy402 Jul 6, 2024
4d761a9
recomendation is working ..!
mahmoudkhairy402 Jul 6, 2024
bd63274
شوية حنكشه كدا
mahmoudkhairy402 Jul 6, 2024
50e687f
dash && localization
ehabyousef Jul 6, 2024
973e2f8
localization end
mahmoudkhairy402 Jul 6, 2024
b4bb7e8
com update
mahmoudkhairy402 Jul 6, 2024
fa2999d
add
ehabyousef Jul 6, 2024
eb8c4c9
Merge branch 'local' of https://github.com/Graduation-Project-MRS/Fro…
ehabyousef Jul 6, 2024
2e502bf
edit
ehabyousef Jul 6, 2024
99d28d6
del
ehabyousef Jul 6, 2024
1f37853
fix recommendation
mahmoudkhairy402 Jul 6, 2024
7bb80c4
Merge branch 'lastBranch' of https://github.com/Graduation-Project-MR…
mahmoudkhairy402 Jul 6, 2024
95493a8
Merge branch 'local' of https://github.com/Graduation-Project-MRS/Fro…
ehabyousef Jul 6, 2024
716de09
Merge pull request #2 from Graduation-Project-MRS/lastBranch
ehabyousef Jul 6, 2024
df557ec
apply react-helmet
mahmoudkhairy402 Jul 6, 2024
46a5802
helmet
mahmoudkhairy402 Jul 6, 2024
8936d62
Merge branch 'local' of https://github.com/Graduation-Project-MRS/Fro…
ehabyousef Jul 6, 2024
3046ea5
last changes
mahmoudkhairy402 Jul 6, 2024
aead5fc
edit addRecipe
ehabyousef Jul 6, 2024
7584f2b
Merge branch 'lastBranch' of https://github.com/Graduation-Project-MR…
ehabyousef Jul 6, 2024
48e72ae
Merge pull request #3 from Graduation-Project-MRS/lastBranch
ehabyousef Jul 6, 2024
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
6 changes: 6 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

223 changes: 223 additions & 0 deletions wannameal/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions wannameal/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,16 @@
"axios": "^1.6.8",
"bootstrap": "^5.3.3",
"framer-motion": "^11.1.7",
"i18next": "^23.11.5",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-http-backend": "^2.5.2",
"jwt-decode": "^4.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-helmet": "^6.1.0",
"react-i18next": "^14.1.2",
"react-icons": "^5.1.0",
"react-input-emoji": "^5.9.0",
"react-redux": "^9.1.1",
"react-router-dom": "^6.22.3",
"react-scripts": "5.0.1",
Expand Down
4 changes: 2 additions & 2 deletions wannameal/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>WannaMeal</title>
</head>
<body>
<body >
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
Expand Down
Loading