Skip to content
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

Jump to bottom

Add activity #10

Open
wants to merge 130 commits into
base: main
Choose a base branch
from
Open

Add activity #10

wants to merge 130 commits into from

Conversation

nadeen-maree
Copy link

No description provided.

andalusm and others added 30 commits January 15, 2024 14:29
@andalusm
Update README.md
2764b73
@andalusm
Added logo file
5626c5f
@andalusm
Update README.md
d6045d7
@reemodo
Update package-lock.json to add bootstrap package
0420951
@nadeen-maree
Update and rename DataModel.js to ActivityModel.js
f5a9a51
@SujoodEldda
changing names
70870da
@nadeen-maree
Update index.html
fe9cd7a
@SujoodEldda
Merge branch 'main' of https://github.com/reemodo/Amani
b1aa972
@reemodo
Rename api.js to activitiesApi.js
f076ba2
@nadeen-maree
Create ActivityController.js
caf6af9
@nadeen-maree
Update main.js
5b24bb3
@nadeen-maree
Update main.js
44c07c8
@nadeen-maree
Update ActivityController.js
13036e0
@SujoodEldda
removing things
d8ce657
@SujoodEldda
Merge branch 'main' of https://github.com/reemodo/Amani
6c6bb3e
@SujoodEldda
Add files via upload
5a3ffc1
@SujoodEldda
Delete user.JSON
6175cc3
@SujoodEldda
Add files via upload
c783fe1
@reemodo
Update package.json
a68db23
@reemodo
Update .gitignore to ignore any edition in package and package-lock.json
0312294
@reemodo
edit package-lock and package to meet our requirements
c0872b4
@reemodo
add dist/models dir
77f668f
@reemodo
add server changes
ef88dcc
@reemodo
change api route
24a8833
@SujoodEldda
adding DBMangaer.js
65c2bd5
@SujoodEldda
adding the connectToDB function
c479d91
@andalusm
Added main html page with correct styles
471cd95
@reemodo
Merge pull request #1 from reemodo/DB-Branch
91194bf 
Db branch
@andalusm
Merge branch 'main' of https://github.com/reemodo/Amani
d63f8f2
@reemodo
Merge branch 'main' into serverFile
7f59a8b
SujoodEldda and others added 22 commits January 16, 2024 17:53
@SujoodEldda
Merge branch 'main' into check-server
c84f06d
@SujoodEldda
Merge pull request #25 from reemodo/check-server
16cae5f 
updating the routes
@nadeen-maree
fix bug
7e24b95
@reemodo
Merge pull request #26 from reemodo/editCapacity
6b09133 
Edit capacity
@andalusm
Added search for filtering
449b3a0
@SujoodEldda
changing to db
3563ad2
@andalusm
Fixed merge conflicts
022e6da
@andalusm
Merge branch 'main' into filterActivity
e0e2fc9
@andalusm
Merge pull request #27 from reemodo/filterActivity
caedb3c 
Added search for filtering
@SujoodEldda
editing the put route
65ddfd2
@SujoodEldda
Merge pull request #28 from reemodo/check-route
57253f2 
Check route
@reemodo
add activities view feat
048e5b4
@reemodo
Merge branch 'main' into handlingActivitesViewFeat
af6f316
@reemodo
Merge pull request #29 from reemodo/handlingActivitesViewFeat
0549bad 
add activities view feat
@andalusm
Added My activities page
6b0b475
@andalusm
Merge branch 'main' into myActivities
a713bfd
@Noor-n204
Merge pull request #30 from reemodo/myActivities
96ac77b 
Added My activities handlebar
@andalusm
Fixed generater error
4c399c2
@andalusm
Merge branch 'main' into FixedGeneraterData
24eda60
@andalusm
Merge pull request #31 from reemodo/FixedGeneraterData
2a860e2 
Fixed generater error
@reemodo
add activity feat
9ebd260
@reemodo
Merge pull request #32 from reemodo/handlingActivitesViewFeat
748f0ec 
add activity feat
@Noor-n204 Noor-n204 deleted the addActivity branch January 16, 2024 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nadeen-maree @andalusm @reemodo @SujoodEldda @Noor-n204