WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Sprint 1 #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.

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
4mr-Nour wants to merge 157 commits into
base: main
Choose a base branch
from
Open

Sprint 1 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
d610a24
Merge pull request #2 from Advanced-computer-lab-2024/main
seifdiea Oct 1, 2024
d1ccdac
package update
OmarNasr67 Oct 1, 2024
bbc10f2
Malak
malak-hesham1 Oct 1, 2024
6f26b30
msh malak
OmarNasr67 Oct 1, 2024
fd168d3
Malak and Marina Push
malak-hesham1 Oct 1, 2024
cb7b24e
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
malak-hesham1 Oct 1, 2024
6f5c54d
marina-seller
Marina-Samir-Fahim Oct 1, 2024
1e4bdf6
task 17
tasneem003 Oct 2, 2024
92c21e1
17 done
tasneem003 Oct 2, 2024
53b5589
Activity model
seifdiea Oct 3, 2024
f81a0e8
without comment 3nd controller updateSeller
malak-hesham1 Oct 3, 2024
f81284a
addedMongoose
malak-hesham1 Oct 3, 2024
77efebc
Requirement 24
OmarNasr67 Oct 3, 2024
7ebcbd6
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
OmarNasr67 Oct 3, 2024
757690d
req 23 p1
tasneem003 Oct 3, 2024
11e9cf1
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
tasneem003 Oct 3, 2024
8e11004
nseet el comma
tasneem003 Oct 3, 2024
2bb5b61
mennnaaaaa req 86
mennaessam1 Oct 3, 2024
95e3159
Requirement 25
OmarNasr67 Oct 3, 2024
8e411fe
menna req 86
mennaessam1 Oct 3, 2024
4b9511e
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
mennaessam1 Oct 3, 2024
768af49
CRUD for Activities
seifdiea Oct 3, 2024
44ce31b
task 23
tasneem003 Oct 3, 2024
b11bb7b
Marie and malak push
malak-hesham1 Oct 3, 2024
6d7dcd6
lesa task 23
tasneem003 Oct 3, 2024
7a536fd
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
tasneem003 Oct 3, 2024
d1b445e
2a5er marra task 23 inshallah
tasneem003 Oct 3, 2024
80205b1
hashing password task 17
tasneem003 Oct 3, 2024
c3689cc
Routing and updating controllers
OmarNasr67 Oct 3, 2024
53a10b9
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
OmarNasr67 Oct 3, 2024
06fe127
8aleban sylvia
sylviafaris Oct 3, 2024
e0b7c32
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
sylviafaris Oct 3, 2024
7c3ba98
Requirement 81
mennaessam1 Oct 3, 2024
90f0de1
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
mennaessam1 Oct 3, 2024
1237785
test
tasneem003 Oct 3, 2024
a63d90d
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
tasneem003 Oct 3, 2024
884a2d3
Finishing up Requirement 85
OmarNasr67 Oct 3, 2024
319172e
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
OmarNasr67 Oct 3, 2024
c2c568d
menna req 81
mennaessam1 Oct 3, 2024
6dc3867
menna req 81
mennaessam1 Oct 3, 2024
e39b146
requirement81
mennaessam1 Oct 3, 2024
a6e8a26
req81
mennaessam1 Oct 3, 2024
fc0eabc
Seller with createProfile
Marina-Samir-Fahim Oct 3, 2024
520f42d
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
Marina-Samir-Fahim Oct 3, 2024
e6da7e1
mereged by malak
malak-hesham1 Oct 3, 2024
9ac5ae2
filterProducts
Marina-Samir-Fahim Oct 3, 2024
3c4b7d6
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
malak-hesham1 Oct 3, 2024
c94fa05
Malak commit
malak-hesham1 Oct 3, 2024
14536c1
updated pic url
mennaessam1 Oct 3, 2024
5adeebb
guest Controller created
malak-hesham1 Oct 3, 2024
708e9fc
Req. 83
MariaEskaros Oct 3, 2024
fb9ecfe
added advertiserID to the activity model
seifdiea Oct 3, 2024
c7b1d2b
filterByTags
malak-hesham1 Oct 3, 2024
0b69706
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
malak-hesham1 Oct 3, 2024
a281b10
First Front End Draft
OmarNasr67 Oct 4, 2024
f36b14f
Front End draft (Incomplete)
OmarNasr67 Oct 4, 2024
218c140
Requirement 24 Done
OmarNasr67 Oct 4, 2024
31459b1
Update touristController.js
OmarNasr67 Oct 4, 2024
7d77b9a
Fixing CORS issues
seifdiea Oct 4, 2024
fa1ed65
Update touristController.js
OmarNasr67 Oct 4, 2024
83c2fb2
Fixed a compile issue
seifdiea Oct 4, 2024
a9da27d
setting up the folders
OmarNasr67 Oct 4, 2024
c7265a1
folder update
OmarNasr67 Oct 4, 2024
6ed0c0c
places CRUD is now tied to the governerID
seifdiea Oct 4, 2024
3be3d94
Update .gitignore
OmarNasr67 Oct 4, 2024
3721778
follow up to the previous commit
seifdiea Oct 4, 2024
397e563
task 46
tasneem003 Oct 4, 2024
ac55d75
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
tasneem003 Oct 4, 2024
a8dc3ed
merged iti and tourguide
sylviafaris Oct 4, 2024
8a370fe
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
OmarNasr67 Oct 4, 2024
4f067e6
Front End
OmarNasr67 Oct 4, 2024
435d8db
Front End
OmarNasr67 Oct 4, 2024
8cb4e51
Pending Users Approving
OmarNasr67 Oct 4, 2024
1614cd4
Pending users declination
OmarNasr67 Oct 4, 2024
f0dc0d2
Update AdminController.js
OmarNasr67 Oct 4, 2024
0258c32
Update AdminDashboard.js
OmarNasr67 Oct 4, 2024
fe8b3d0
advertiser import added
Marina-Samir-Fahim Oct 4, 2024
500dbb2
..
Marina-Samir-Fahim Oct 4, 2024
f565e16
TourGuideController Updated
Marina-Samir-Fahim Oct 4, 2024
8930f15
addProductAsAdmin Front End
OmarNasr67 Oct 4, 2024
3a3f4d9
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
OmarNasr67 Oct 4, 2024
1bd9707
Some Frontend Styling
OmarNasr67 Oct 4, 2024
6e90329
FilterProducts in Frontend
OmarNasr67 Oct 4, 2024
d2dea1b
SearchProducts in FrontEnd
OmarNasr67 Oct 4, 2024
69a524d
CSS Preloader for the website
OmarNasr67 Oct 4, 2024
8d00f9f
About Page FrontEnd
OmarNasr67 Oct 4, 2024
28b94fb
DeleteAccount FrontEnd (Not Done)
OmarNasr67 Oct 4, 2024
08b955c
Update AdminController.js
OmarNasr67 Oct 4, 2024
cb74413
updated delete
mennaessam1 Oct 4, 2024
5316e6e
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
mennaessam1 Oct 4, 2024
b08be86
filter tourist activities and viewing them added
4mr-Nour Oct 4, 2024
8b4e67c
task 37 complete
tasneem003 Oct 5, 2024
50d5d6b
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
tasneem003 Oct 5, 2024
c147652
basala7 error 3ady
tasneem003 Oct 5, 2024
fd1d977
Update App.js
OmarNasr67 Oct 5, 2024
8c8b27b
Updated Admin Dashboard
OmarNasr67 Oct 5, 2024
cf06855
Done with AdminDashboard, Waiting on backend
OmarNasr67 Oct 6, 2024
df9bf48
Update LoginCredentials.js
OmarNasr67 Oct 6, 2024
ebf2b0a
Update AdminController.js
OmarNasr67 Oct 6, 2024
c5c7610
Update AdminController.js
OmarNasr67 Oct 6, 2024
c8b5931
Delete sellerController.js
OmarNasr67 Oct 6, 2024
0448bda
create itinerary frontend
sylviafaris Oct 6, 2024
1de9325
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
sylviafaris Oct 6, 2024
fb5996c
2 APIs done in advertiser
Marina-Samir-Fahim Oct 6, 2024
5c5c0d7
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
Marina-Samir-Fahim Oct 6, 2024
89cdbd0
govornor dashboard
MariaEskaros Oct 6, 2024
92385d7
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
MariaEskaros Oct 6, 2024
c132ae2
Setting up the Project
OmarNasr67 Oct 6, 2024
78c25cc
updatedddddd clone ba3d de
mennaessam1 Oct 6, 2024
2ef7fa5
cru APIs done in Advertiser
Marina-Samir-Fahim Oct 6, 2024
da62bf8
crud iti frontend
sylviafaris Oct 6, 2024
0432de9
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
sylviafaris Oct 6, 2024
5f91bf1
govornor CRUD
MariaEskaros Oct 6, 2024
b6af48b
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
MariaEskaros Oct 6, 2024
d05b268
crud iti 2
sylviafaris Oct 6, 2024
d58e323
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
MariaEskaros Oct 6, 2024
67c0924
update govornor pic
MariaEskaros Oct 6, 2024
e6945dd
seller frontend done
mennaessam1 Oct 7, 2024
e3fd775
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
mennaessam1 Oct 7, 2024
26926d3
Admin getCategories
OmarNasr67 Oct 7, 2024
a593b35
admin createCategory
OmarNasr67 Oct 7, 2024
47e777d
Admin updateCategory
OmarNasr67 Oct 7, 2024
2d012bc
admin deleteCategory
OmarNasr67 Oct 7, 2024
c5a128f
admin getCategory (Admin Dashboard is done)
OmarNasr67 Oct 7, 2024
c0aff10
new iti
sylviafaris Oct 7, 2024
c18e3d9
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
sylviafaris Oct 7, 2024
25f4a5c
task 37
tasneem003 Oct 7, 2024
7d5009e
fixing 37
tasneem003 Oct 7, 2024
8c864d3
last tourguide frontend
sylviafaris Oct 7, 2024
f1cbc04
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
sylviafaris Oct 7, 2024
d3ec83e
Update advertiserController.js
seifdiea Oct 7, 2024
c91127b
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
seifdiea Oct 7, 2024
d9bb105
Govornor updatedd including tag
MariaEskaros Oct 7, 2024
5d6174b
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
MariaEskaros Oct 7, 2024
b0a0aad
updated requirements tourist/guest
malak-hesham1 Oct 7, 2024
c796907
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
malak-hesham1 Oct 7, 2024
7bdddaa
SELLER FRONTEND DONEE
mennaessam1 Oct 7, 2024
2840364
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
mennaessam1 Oct 7, 2024
2140b67
last last tourguide
sylviafaris Oct 7, 2024
92e2f1f
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
sylviafaris Oct 7, 2024
4a14e0b
req 47
alikhalid33 Oct 7, 2024
414ad02
Fixing Ali's code
OmarNasr67 Oct 7, 2024
5c6897e
Updated tags for itineraries not attractions
OmarNasr67 Oct 7, 2024
bc4a82f
Tourist/activities front end is done
seifdiea Oct 7, 2024
3e182a8
after filter itenararies
malak-hesham1 Oct 7, 2024
7983b25
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
malak-hesham1 Oct 7, 2024
4a1fa4a
after removing filter ali
malak-hesham1 Oct 7, 2024
5f52ac0
Register frontend
mennaessam1 Oct 7, 2024
a1703e6
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
mennaessam1 Oct 7, 2024
6be7446
error
tasneem003 Oct 7, 2024
c4252c3
Finished Products, Historical Places front end
seifdiea Oct 7, 2024
9b1669e
sort upcoming adjustment, tourist/guest
tasneem003 Oct 7, 2024
0ccf2c3
Finished itineraries front-end for tourist
seifdiea Oct 7, 2024
dc9c371
after sort updated
malak-hesham1 Oct 7, 2024
a6ae8f4
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
malak-hesham1 Oct 7, 2024
75b0ec8
admin pic
mennaessam1 Oct 7, 2024
6be4b76
Merge branch 'Sprint-1' of https://github.com/Advanced-computer-lab-2…
mennaessam1 Oct 7, 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
12 changes: 11 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# Logs
logs
*.log
Expand Down Expand Up @@ -127,6 +129,14 @@ dist
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
Binary file added BackEnd - Shortcut.lnk
View file
Open in desktop
Binary file not shown.
Loading