-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
Full Review #165
Open
nada-abuzaid
wants to merge
482
commits into
initial-commit
Choose a base branch
from
main
base: initial-commit
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Full Review #165
Changes from all commits
Commits
Show all changes
482 commits
Select commit
Hold shift + click to select a range
5505e5b
Merge pull request #96 from GSG-G13/88-create-react-router
HamdyPs 8287653
edit user setting page
heleena-fadi ee61ac1
Merge pull request #100 from GSG-G13/84-user-setting-page
abeerAyad 750418d
fix home conflict
HamdyPs 3b0a804
Merge pull request #82 from GSG-G13/80-home-page
HamdyPs 4b93006
router
abeerAyad 05c4f37
navigation router and layout for classPage
abeerAyad 91a95a2
make buttons useable to navigate
abeerAyad 5ac489f
Merge pull request #110 from GSG-G13/106-navigation-router
HamdyPs 3685f4b
styling store page
HamdyPs 2516e39
fix conflict, layout class page
HamdyPs fb12b05
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 109-…
heleena-fadi 869b4c4
styling for class page and edit related components
heleena-fadi 12f5979
Merge pull request #111 from GSG-G13/108-styling-store-page
HamdyPs 97cd985
stylesignup
abeerAyad 74e6f66
home dashboard
abeerAyad b46dffa
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 114-…
abeerAyad 7c85b5c
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 109-…
heleena-fadi 2fc5243
home dashboard style
abeerAyad a4c648a
home dashboard style
abeerAyad 77c4344
nav and product style
abeerAyad 56de00a
Merge pull request #113 from GSG-G13/112-styling-signup-page
HamdyPs 76b09e8
Merge pull request #116 from GSG-G13/114-styling-home-dashboard-page
HamdyPs 2290b7e
Merge pull request #118 from GSG-G13/117-styling-user-pages
HamdyPs 6a56d33
fix padding on class page
heleena-fadi e56c7d3
fix conflict after pull main
heleena-fadi 0ed55f7
fix profile page style
AhmedMughessib 55459ac
edit class page style and related component for this page
heleena-fadi 029f6c9
styling home page
HamdyPs 2bbff94
add route for class page
heleena-fadi 0b098de
Merge pull request #122 from GSG-G13/109-styling-class-page
AdhamHaisami e862cab
Merge pull request #121 from GSG-G13/119-edit-profile-style
AdhamHaisami b7bc226
move swiper to its own file
HamdyPs 2c28ba5
Merge pull request #123 from GSG-G13/115-styling-home-page
HamdyPs 24c0112
connection between front and back
HamdyPs 0effa69
Merge pull request #126 from GSG-G13/125-connect-front-with-back
AdhamHaisami 52a3e87
class functionality
abeerAyad 2b9f0b7
fix react-hooks eslint rules
abeerAyad 64297e4
add sign in functionality
HamdyPs b85b825
isActive condition when click class
abeerAyad 8eb01f7
category
abeerAyad 008bed0
get all products
HamdyPs d39018c
get all categories
abeerAyad e360fe6
sign up functionality with validation and edit alert component and fi…
heleena-fadi 7608128
delete dummy data
abeerAyad 0dd9696
Merge pull request #137 from GSG-G13/128-sign-up-functionality
HamdyPs 24bdbe7
usereducer instead of usestate
HamdyPs e992f59
fix dublicated on change function
HamdyPs 4815eab
Merge pull request #135 from GSG-G13/127-sign-in-functionality
HamdyPs 51bdfaa
Merge pull request #133 from GSG-G13/131-get-all-products
HamdyPs 6c9034d
Merge pull request #134 from GSG-G13/132-get-all-categories
HamdyPs b82a222
get product by categories
HamdyPs bdc9ff8
product details
abeerAyad 7f9b8a0
filtered product by category
HamdyPs 6021e39
get product details
abeerAyad dc74bd1
get announcement
abeerAyad f8a15b6
annnouncment add
AhmedMughessib 3b78d39
updata pr
AhmedMughessib e47d089
send data to server successfuly
AhmedMughessib 2b8198a
finalize add announcement
AhmedMughessib ae7c49b
remove console log and change name prop
AhmedMughessib 6f5ae84
remove unnecessary lines from app js file
AhmedMughessib 5e6ab9a
edit link and function
AhmedMughessib b4a3bc2
get product table details dashboard
abeerAyad a7aecb0
remove comp from app
abeerAyad e5fe088
profile page functionality and change table
HamdyPs b526152
rename state
abeerAyad dc55393
Merge pull request #147 from GSG-G13/140-add-announcement
AdhamHaisami a97d35a
Merge pull request #141 from GSG-G13/139-get-product-by-categories
AdhamHaisami dc3cfa9
resolve conflict
abeerAyad 385e383
Merge pull request #149 from GSG-G13/148-get-product-table-details-da…
AdhamHaisami c136e31
change stic data to read DB data in the announcment table
AhmedMughessib fe0c661
Merge pull request #146 from GSG-G13/143-get-announcements
AdhamHaisami f59e6ef
Merge pull request #154 from GSG-G13/151-dashboard-get-announcement
AdhamHaisami 9acf077
get user setting
heleena-fadi 695dfcf
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 145-…
heleena-fadi 316f466
add product dashboard
abeerAyad 06519ba
resolve conflict
abeerAyad c540b8f
resolve conflict
abeerAyad a2829a2
Merge pull request #130 from GSG-G13/129-class-functionality
heleena-fadi ace008d
add subscription onclick join class button
abeerAyad 4415840
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 145-…
heleena-fadi a4d3ac6
setting page
heleena-fadi 42fa98b
get subscription
abeerAyad c8e80ea
resolve conflict
abeerAyad 0b26e64
Merge pull request #158 from GSG-G13/153-add-product
heleena-fadi a3c5d10
get subscription dashboard
abeerAyad 8cecb6e
get orders dashboard
abeerAyad e5bcce9
Merge pull request #142 from GSG-G13/138-get-product-details
HamdyPs 6c301ce
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 159-…
abeerAyad 18afbc1
add check status for subscription
abeerAyad 1b76798
delete announcement
AhmedMughessib 96ffe69
user setting data
heleena-fadi 2cfc586
Merge pull request #170 from GSG-G13/169-delete-announcement
AdhamHaisami 16bd641
add static class comp
abeerAyad 547e2d2
edit function on user setting page
heleena-fadi aba01c7
edit function on user setting page
heleena-fadi 1e39d5a
update get order functionality ,and use alert msg
abeerAyad 5b114e1
Merge pull request #166 from GSG-G13/164-get-orders-dashboard
HamdyPs a6b13e0
get check subscription
abeerAyad 0dc8f48
resolve conflict
abeerAyad 073223a
Merge pull request #163 from GSG-G13/162-get-subscription-dashboard
HamdyPs ecfa692
Merge pull request #161 from GSG-G13/159-add-subscription-client
HamdyPs a6a9276
user add order
HamdyPs 3e705ad
fix conflict profile page file
HamdyPs fec14e4
Merge pull request #150 from GSG-G13/144-profile-page-functionality
HamdyPs 08b28db
change the way to add data from dashboard
HamdyPs 3225467
change the way to send data from dashboard to use req.body instead of…
HamdyPs aafb1d5
add chat and sockit clint package, still need to use chat component
HamdyPs e3b4db2
Merge pull request #173 from GSG-G13/167-user-add-order
HamdyPs f0457f4
get class
abeerAyad 753ac29
resolve conflict
abeerAyad b4355b2
add and get class
abeerAyad 0f0cfb2
add and get class
abeerAyad c14f6a2
Merge pull request #177 from GSG-G13/138-add-and-get-classes-dashboard
HamdyPs a0ed700
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 172-…
abeerAyad 58f6eee
add static class main
abeerAyad babef0a
Merge pull request #178 from GSG-G13/172-add-static-class-main-page
HamdyPs af72846
refactor styling
heleena-fadi 3801858
Merge branch 'main' of https://github.com/GSG-G13/gym-react into styl…
heleena-fadi c3ec8ad
Merge pull request #179 from GSG-G13/styling-design
abeerAyad 81fee75
styling class page
abeerAyad 1773a18
add eddit and delete functionality
HamdyPs c5bb859
handle logout
AhmedMughessib a8fcc98
styleing store page
heleena-fadi 2531703
fix conflict
HamdyPs 3495b97
Merge pull request #71 from GSG-G13/70-message-comp
HamdyPs 04d56a4
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 174-…
HamdyPs 9144307
Merge pull request #182 from GSG-G13/181-class-page-styling
HamdyPs ede4049
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 174-…
HamdyPs 3b34d2f
Merge pull request #185 from GSG-G13/styling-design
HamdyPs 17d5956
style chat page
HamdyPs f24f07e
fix conflict
HamdyPs 356bc32
Merge pull request #183 from GSG-G13/180-add-edit-and-delete-function…
HamdyPs 405147f
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 145-…
HamdyPs 7e53a55
announcement styling
abeerAyad cfa23c0
fix usersetting page to get data and update data
HamdyPs b73d6ff
Merge pull request #168 from GSG-G13/145-user-setting-functionality
HamdyPs 97a03f8
fix input deleted value attri
HamdyPs 865a758
sign out finctionality and fix conflict
HamdyPs e018ded
Merge pull request #184 from GSG-G13/handle-logout
HamdyPs e12b295
styling profile page and logic
HamdyPs 8fe84c4
Merge pull request #187 from GSG-G13/145-user-setting-functionality
HamdyPs 62223af
Merge pull request #189 from GSG-G13/188-styling-profile-page-and-fix…
HamdyPs dd75249
fix conflict
HamdyPs 9622527
Merge pull request #175 from GSG-G13/174-add-chat
HamdyPs 70d430b
add userdata to navbar and get the cookie
HamdyPs ae11625
Merge pull request #191 from GSG-G13/190-add-userdata-to-navbar-and-g…
HamdyPs 506896c
et statistic section data home dashboard
HamdyPs cffd770
Merge pull request #193 from GSG-G13/192-get-statistic-section-data-h…
HamdyPs 682d8e1
announcement styling
abeerAyad ca7fb94
Merge pull request #194 from GSG-G13/186-announcement-styling
HamdyPs f9c95c2
styling store page
HamdyPs 3cc87a3
get statistic order and rating chart
abeerAyad fc1d00c
Merge pull request #198 from GSG-G13/197-get-statistic-order-data-and…
HamdyPs 5c08bca
Merge pull request #196 from GSG-G13/195-styling-store-page
HamdyPs b63d76b
delete user
abeerAyad 8aedf45
delete user info
abeerAyad 58d635e
delete user info
HamdyPs d235100
navigate user to home
HamdyPs 76c1f3b
fix navigate error
HamdyPs a809158
Merge pull request #200 from GSG-G13/delete-user-info
HamdyPs 51c65aa
edit-functionality-dashboard
HamdyPs dfe9075
edit some issue on pages
heleena-fadi 7fa6a4b
Merge pull request #201 from GSG-G13/199-edit-functionality-dashboard
HamdyPs 41df3fc
Merge pull request #202 from GSG-G13/fixing-issues
HamdyPs 68d7db1
add, get, and delete comment
abeerAyad d36c754
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 204-…
HamdyPs 6c13472
styling product deyailes page
heleena-fadi 5e48035
Merge pull request #206 from GSG-G13/203-styling-product-details
HamdyPs 7a8d8d7
add structure comment box and add comment data
HamdyPs 28b4b54
get data after delete
HamdyPs 4b7a58c
fix conflict
HamdyPs 1e9e878
Merge pull request #205 from GSG-G13/204-add-get-and-delete-comment-f…
heleena-fadi 29e634f
style comments on announcement page
heleena-fadi 1e9fe91
restyling comment box
HamdyPs b0b04e9
edit annoucement comments and add router with role check between clie…
HamdyPs 273175a
Merge pull request #207 from GSG-G13/edit
HamdyPs 05b7187
fix-dashboard-router-and-background-color
HamdyPs c43678f
remove white color from index css
HamdyPs 73b64c5
fix-dashboard-router-and-background-color
HamdyPs 91465b2
Merge pull request #210 from GSG-G13/209-fix-dashboard-router-and-bac…
HamdyPs 75eddf4
logout admin
abeerAyad 7184789
get trainers home page
HamdyPs 9a8cbdf
fix styling background based on user role
HamdyPs f3fcb9d
get trainers data
HamdyPs cd4c8d5
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 211-…
abeerAyad b78a63a
Merge pull request #213 from GSG-G13/212-get-trainers-home-page
HamdyPs e73c462
edit path logout to home
abeerAyad fd89586
Merge pull request #214 from GSG-G13/211-logout-admin
AdhamHaisami 9f6c9ca
user reset his account password
HamdyPs bb8c921
Merge pull request #217 from GSG-G13/216-change-password-comp
HamdyPs 1536290
admin profile and edit data
abeerAyad d65ebdc
add icon and link
abeerAyad d9a8fb2
Merge pull request #219 from GSG-G13/218-admin-profile-and-edit-data
HamdyPs b4b4f3e
edit-class-page-and-show-user-in-chat-and-add-check-token
HamdyPs 7259d3d
fix
HamdyPs 01e97d0
fix conflict
HamdyPs 79367f6
fix conflict in navbar
HamdyPs da6715c
Merge pull request #222 from GSG-G13/221-edit-class-page-and-show-use…
HamdyPs ceed8d1
order-subscription alert
abeerAyad 6c2777a
change dashboard
HamdyPs a6a5544
Merge pull request #224 from GSG-G13/221-edit-class-page-and-show-use…
HamdyPs 948c1bd
subscription and order alert
abeerAyad 4af21c6
add and get and update and delete functionailty dashboard
HamdyPs 2c28c79
Merge pull request #225 from GSG-G13/156-announcement-add-and-get-das…
HamdyPs 84467f0
add-get-class-subscription-product
abeerAyad 374f1fd
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 157-…
abeerAyad 009a044
delete subscription, product,classes
abeerAyad 99c8cf5
add,get,update and delete classes ,subscriptions and products
abeerAyad 3361e1b
Merge pull request #227 from GSG-G13/157-product-classes-subscription…
HamdyPs 3a5184d
dashboard home functionality
HamdyPs a2765da
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 226-…
HamdyPs 0a3cfde
home functionality and prfile admin
HamdyPs 9c25dc8
Merge branch 'main' of https://github.com/GSG-G13/gym-react into 223-…
abeerAyad 18d4180
check user while ordering and subscription and user delete-subs an or…
abeerAyad 45321e0
Merge pull request #228 from GSG-G13/226-dashboard-home-functionality
HamdyPs 09bfd73
Merge pull request #229 from GSG-G13/223-alert-msg-functionality
HamdyPs 2ace491
fix conflict
HamdyPs 0e58a80
Merge pull request #231 from GSG-G13/230-check-user-while-ordering-an…
HamdyPs b91d654
fix announcement page
HamdyPs 1467e4e
fix get orders dashboard bug
HamdyPs d735637
fix get orders dashboard bug
HamdyPs 8fc258a
Merge pull request #232 from GSG-G13/fix-announcement-page
HamdyPs aeaaf04
style rest password,get class,trainer,subscription count for class page
abeerAyad dda7c75
fix edit functionality
HamdyPs 13209f1
Merge pull request #234 from GSG-G13/233-style-rest-passwordget-class…
HamdyPs c44e8fe
fix conflict in class files
HamdyPs 38d7e59
fix addForm and EditForm title
abeerAyad bcb2ecb
Merge pull request #235 from GSG-G13/fix-announcement-page
HamdyPs 2147136
resolve cofilct
abeerAyad ccdedac
Merge pull request #237 from GSG-G13/236-fix-addform-and-editform-title
HamdyPs f9a21d9
edit codition subscription req
abeerAyad 331aace
Merge pull request #238 from GSG-G13/edit-subscription-condition
HamdyPs 5ae1f3b
update order status in dashboard and client side
HamdyPs 4610dec
Merge pull request #240 from GSG-G13/239-update-order-status-in-dashb…
HamdyPs f9ce30e
handle search users dashboard with style it
heleena-fadi 3ad3543
show image instead of url in dashboard
HamdyPs c5c9d2f
Merge pull request #241 from GSG-G13/show-photo-insteadof-url
HamdyPs fac6d72
search dashboard functinality
heleena-fadi d03680b
filtered data in dashboard table
HamdyPs 6c425e5
Merge pull request #243 from GSG-G13/search-dashboard
HamdyPs eb9efb4
add-get calendar for classes
abeerAyad 825cfa6
fix get method error when move from month to day and click more
HamdyPs 2babfeb
add moment for local and add time with date
HamdyPs da0fb44
Merge pull request #244 from GSG-G13/242-add-calendar-functionality
HamdyPs 36538dc
show calendar for class
abeerAyad cc8f078
delete one calendar data
HamdyPs 1fe8459
Merge pull request #247 from GSG-G13/delete-one-calendar-data
HamdyPs 982a2a0
Merge pull request #246 from GSG-G13/245-calendar-for-client
HamdyPs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
module.exports = { | ||
env: { browser: true, es2020: true }, | ||
extends: [ | ||
'plugin:react/jsx-runtime', | ||
'airbnb', | ||
'airbnb/hooks', | ||
], | ||
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' }, | ||
settings: { react: { version: '18.2' } }, | ||
plugins: ['react-refresh'], | ||
rules: { | ||
'react-refresh/only-export-components': 'warn', | ||
'import/extensions': 'off', | ||
'react/jsx-filename-extension': [1, { extensions: ['.jsx'] }], | ||
'react/react-in-jsx-scope': 'off', | ||
'react/function-component-definition': [2, { namedComponents: 'arrow-function' }], | ||
'react/prop-types': 'off', | ||
'linebreak-style': 'off', | ||
'react-hooks/exhaustive-deps': 0, | ||
'import/no-extraneous-dependencies': 0, | ||
|
||
}, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# Logs | ||
logs | ||
*.log | ||
npm-debug.log* | ||
yarn-debug.log* | ||
yarn-error.log* | ||
pnpm-debug.log* | ||
lerna-debug.log* | ||
|
||
node_modules | ||
dist | ||
dist-ssr | ||
*.local | ||
|
||
# Editor directories and files | ||
|
||
!.vscode/extensions.json | ||
.idea | ||
.DS_Store | ||
*.suo | ||
*.ntvs* | ||
*.njsproj | ||
*.sln | ||
*.sw? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"editor.codeActionsOnSave": { | ||
"source.fixAll.eslint": true | ||
}, | ||
"cSpell.words": [ | ||
"adipisicing", | ||
"Edituser", | ||
"goalweight", | ||
"Hamdy", | ||
"linebreak", | ||
"Redwan" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,13 @@ | ||||||
<!DOCTYPE html> | ||||||
<html lang="en"> | ||||||
<head> | ||||||
<meta charset="UTF-8" /> | ||||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> | ||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||||||
<title>Vite + React</title> | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
</head> | ||||||
<body> | ||||||
<div id="root"></div> | ||||||
<script type="module" src="/src/main.jsx"></script> | ||||||
</body> | ||||||
</html> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
set your icon here, and delete the vite.svg file