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.

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

Add activity #10

Open
wants to merge 130 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
2764b73
Update README.md
andalusm Jan 15, 2024
5626c5f
Added logo file
andalusm Jan 15, 2024
d6045d7
Update README.md
andalusm Jan 15, 2024
0420951
Update package-lock.json to add bootstrap package
reemodo Jan 15, 2024
f5a9a51
Update and rename DataModel.js to ActivityModel.js
nadeen-maree Jan 15, 2024
70870da
changing names
SujoodEldda Jan 15, 2024
fe9cd7a
Update index.html
nadeen-maree Jan 15, 2024
b1aa972
Merge branch 'main' of https://github.com/reemodo/Amani
SujoodEldda Jan 15, 2024
f076ba2
Rename api.js to activitiesApi.js
reemodo Jan 15, 2024
caf6af9
Create ActivityController.js
nadeen-maree Jan 15, 2024
5b24bb3
Update main.js
nadeen-maree Jan 15, 2024
44c07c8
Update main.js
nadeen-maree Jan 15, 2024
13036e0
Update ActivityController.js
nadeen-maree Jan 15, 2024
d8ce657
removing things
SujoodEldda Jan 15, 2024
6c6bb3e
Merge branch 'main' of https://github.com/reemodo/Amani
SujoodEldda Jan 15, 2024
5a3ffc1
Add files via upload
SujoodEldda Jan 15, 2024
6175cc3
Delete user.JSON
SujoodEldda Jan 15, 2024
c783fe1
Add files via upload
SujoodEldda Jan 15, 2024
a68db23
Update package.json
reemodo Jan 15, 2024
0312294
Update .gitignore to ignore any edition in package and package-lock.json
reemodo Jan 15, 2024
c0872b4
edit package-lock and package to meet our requirements
reemodo Jan 15, 2024
77f668f
add dist/models dir
reemodo Jan 15, 2024
ef88dcc
add server changes
reemodo Jan 16, 2024
24a8833
change api route
reemodo Jan 16, 2024
65c2bd5
adding DBMangaer.js
SujoodEldda Jan 16, 2024
c479d91
adding the connectToDB function
SujoodEldda Jan 16, 2024
471cd95
Added main html page with correct styles
andalusm Jan 16, 2024
91194bf
Merge pull request #1 from reemodo/DB-Branch
reemodo Jan 16, 2024
d63f8f2
Merge branch 'main' of https://github.com/reemodo/Amani
andalusm Jan 16, 2024
7f59a8b
Merge branch 'main' into serverFile
reemodo Jan 16, 2024
fa7670a
Merge pull request #2 from reemodo/CreateHTMLHome
andalusm Jan 16, 2024
e24c541
server and DB set up
reemodo Jan 16, 2024
e25ad15
addActivity method added to class ActivityController class
nadeen-maree Jan 16, 2024
46304cb
Merge pull request #3 from reemodo/serverFile
reemodo Jan 16, 2024
a0ae5b1
generate API
Noor-n204 Jan 16, 2024
6786dd2
Merge pull request #4 from reemodo/server-generate-data
Noor-n204 Jan 16, 2024
6c0f9fe
adding the user and university and activity schemas and adding the ge…
SujoodEldda Jan 16, 2024
b86d338
Revert "adding the user and university and activity schemas and addin…
SujoodEldda Jan 16, 2024
6c83707
Revert "Revert "adding the user and university and activity schemas a…
SujoodEldda Jan 16, 2024
a9ba397
Revert "adding the user and university and activity schemas and addin…
SujoodEldda Jan 16, 2024
ad827fd
Merge branch 'main' into DB-Branch
SujoodEldda Jan 16, 2024
96da49f
adding the schemas and the generate functioins
SujoodEldda Jan 16, 2024
8903c39
Merge pull request #5 from reemodo/DB-Branch
reemodo Jan 16, 2024
1ece3d6
Added handlebar and renderer for activity
andalusm Jan 16, 2024
e377c18
add activity button handling added
nadeen-maree Jan 16, 2024
ce74b4c
Merge pull request #7 from reemodo/addActivity
reemodo Jan 16, 2024
ac1e16a
Merge branch 'main' into CreateHandlebarActivities
reemodo Jan 16, 2024
1dd44c2
Merge pull request #6 from reemodo/CreateHandlebarActivities
reemodo Jan 16, 2024
7eaa98f
adding collections controllers
SujoodEldda Jan 16, 2024
1956ea2
Fixed bugs
andalusm Jan 16, 2024
a5a330d
Revert "adding collections controllers"
SujoodEldda Jan 16, 2024
04eaa8f
Revert "Revert "adding collections controllers""
SujoodEldda Jan 16, 2024
138aa03
adding
SujoodEldda Jan 16, 2024
5380981
Fixed bugs
andalusm Jan 16, 2024
d7af681
Merge pull request #8 from reemodo/fixBugs
SujoodEldda Jan 16, 2024
291bdcd
Merge branch 'main' into DB-Branch
SujoodEldda Jan 16, 2024
2ab62bc
adding dbCollection classes
SujoodEldda Jan 16, 2024
beef6ac
add activity
Noor-n204 Jan 16, 2024
aefe65e
Merge pull request #9 from reemodo/DB-Branch
andalusm Jan 16, 2024
d65db2c
Revert "Db branch"
andalusm Jan 16, 2024
0c31be3
Merge pull request #10 from reemodo/revert-9-DB-Branch
andalusm Jan 16, 2024
d5001ce
Merge branch 'main' into server-adding-activity
reemodo Jan 16, 2024
d680ee4
Merge pull request #11 from reemodo/server-adding-activity
SujoodEldda Jan 16, 2024
d9b05a2
filter activity and get all activities functionalities added
nadeen-maree Jan 16, 2024
4665cb4
Merge branch 'main' into filterActivities
andalusm Jan 16, 2024
426c1b4
Merge pull request #12 from reemodo/filterActivities
nadeen-maree Jan 16, 2024
edf3fe5
showMyActivities functionality added
nadeen-maree Jan 16, 2024
fe161df
adding collections manager class
SujoodEldda Jan 16, 2024
4b72fd3
Merge pull request #13 from reemodo/showMyActivities
nadeen-maree Jan 16, 2024
0d615be
Merge pull request #14 from reemodo/collection
SujoodEldda Jan 16, 2024
fa5cc11
add get my activities route
reemodo Jan 16, 2024
589d444
Merge branch 'main' into AddGetActivites
reemodo Jan 16, 2024
b896c22
add get all activities
reemodo Jan 16, 2024
0989dd3
add changes
reemodo Jan 16, 2024
6f212f3
adding findbyid function and delete activity
SujoodEldda Jan 16, 2024
7de85d7
Merge branch 'main' into collection
SujoodEldda Jan 16, 2024
732f107
Merge pull request #15 from reemodo/AddGetActivites
reemodo Jan 16, 2024
0fd3ea8
Merge pull request #16 from reemodo/collection
SujoodEldda Jan 16, 2024
28ac8f7
added delete activity route
Noor-n204 Jan 16, 2024
c9944c2
Merge pull request #17 from reemodo/serverAddActivity
SujoodEldda Jan 16, 2024
6d1b234
adding the delete funciton and update function
SujoodEldda Jan 16, 2024
c7eea0f
Merge branch 'main' into collection
SujoodEldda Jan 16, 2024
a3e34f2
Merge branch 'main' into collection
SujoodEldda Jan 16, 2024
eab50bc
Merge pull request #18 from reemodo/collection
reemodo Jan 16, 2024
ee32594
delete activity functionality added and modified other functions
nadeen-maree Jan 16, 2024
0afc68b
Merge pull request #19 from reemodo/deleteMyActivity
reemodo Jan 16, 2024
71cde58
transportations API
Noor-n204 Jan 16, 2024
9d5c384
Merge pull request #20 from reemodo/getTransportations-branch
Noor-n204 Jan 16, 2024
3488835
Added handlebars for add Activity
andalusm Jan 16, 2024
6e6eb77
adding the filterField function
SujoodEldda Jan 16, 2024
9be5633
Revert "adding the filterField function"
SujoodEldda Jan 16, 2024
f78dee2
Revert "Revert "adding the filterField function""
SujoodEldda Jan 16, 2024
0308791
Merge branch 'main' into collection
SujoodEldda Jan 16, 2024
8e8d17d
Fixed merge conflicts
andalusm Jan 16, 2024
0277ce0
Merge pull request #21 from reemodo/collection
SujoodEldda Jan 16, 2024
d43e8cb
Merge pull request #22 from reemodo/addActivityHandlebars
andalusm Jan 16, 2024
afd19cb
edit capacity functionality added
nadeen-maree Jan 16, 2024
eb9f020
Edit capacity server API
Noor-n204 Jan 16, 2024
f63194b
fix bugs
nadeen-maree Jan 16, 2024
57a9dea
Merge pull request #23 from reemodo/edit-capacityAPI
SujoodEldda Jan 16, 2024
7e705db
updating the routes
SujoodEldda Jan 16, 2024
c84f06d
Merge branch 'main' into check-server
SujoodEldda Jan 16, 2024
16cae5f
Merge pull request #25 from reemodo/check-server
SujoodEldda Jan 16, 2024
7e24b95
fix bug
nadeen-maree Jan 16, 2024
6b09133
Merge pull request #26 from reemodo/editCapacity
reemodo Jan 16, 2024
449b3a0
Added search for filtering
andalusm Jan 16, 2024
3563ad2
changing to db
SujoodEldda Jan 16, 2024
022e6da
Fixed merge conflicts
andalusm Jan 16, 2024
e0e2fc9
Merge branch 'main' into filterActivity
andalusm Jan 16, 2024
caedb3c
Merge pull request #27 from reemodo/filterActivity
andalusm Jan 16, 2024
65ddfd2
editing the put route
SujoodEldda Jan 16, 2024
57253f2
Merge pull request #28 from reemodo/check-route
SujoodEldda Jan 16, 2024
048e5b4
add activities view feat
reemodo Jan 16, 2024
af6f316
Merge branch 'main' into handlingActivitesViewFeat
reemodo Jan 16, 2024
0549bad
Merge pull request #29 from reemodo/handlingActivitesViewFeat
reemodo Jan 16, 2024
6b0b475
Added My activities page
andalusm Jan 16, 2024
a713bfd
Merge branch 'main' into myActivities
andalusm Jan 16, 2024
96ac77b
Merge pull request #30 from reemodo/myActivities
Noor-n204 Jan 16, 2024
4c399c2
Fixed generater error
andalusm Jan 16, 2024
24eda60
Merge branch 'main' into FixedGeneraterData
andalusm Jan 16, 2024
2a860e2
Merge pull request #31 from reemodo/FixedGeneraterData
andalusm Jan 16, 2024
9ebd260
add activity feat
reemodo Jan 16, 2024
748f0ec
Merge pull request #32 from reemodo/handlingActivitesViewFeat
reemodo Jan 16, 2024
541507e
Fixed filter button
andalusm Jan 16, 2024
b869c9e
Merge pull request #33 from reemodo/Buttonfix
Noor-n204 Jan 16, 2024
a5a012c
Revert "Fixed filter button"
reemodo Jan 16, 2024
919cd6f
Merge pull request #34 from reemodo/revert-33-Buttonfix
reemodo Jan 16, 2024
9e94b8e
fix add activity
Noor-n204 Jan 16, 2024
342d399
debug the project
reemodo Jan 16, 2024
efd14de
debug
reemodo Jan 16, 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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.DS_Store
.vscode/
node_modules
node_modules
package.json
package-lock.json
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# full-stack-project-template
A Basic jQuery, NodeJS & MongoDB project template
# <img src="https://github.com/reemodo/Amani/blob/main/dist/logo.png" alt="GitHub Logo" width="50"/> Amani
The project is a comprehensive mobile application that enables university students to connect, organize activities, and facilitate meet-ups through a user-friendly interface, integrating both frontend and backend technologies for a seamless user experience.

# Setup
```
Expand All @@ -9,4 +9,4 @@ $ npm install
# Run the Project
```
$ node server.js
```
```
35 changes: 35 additions & 0 deletions activity.JSON
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[
{
"userId":"0",
"universityName":"Sami shamoon",
"date": "2024-4-12",
"location":"Rahat",
"transportationType":"Car",
"capacity":3,
"activityType":"fromSchool",
"preferredGender":"f",
"participants":[]
},
{
"userId":"0",
"universityName":"Ben gurion",
"date": "2024-2-08",
"location":"Arad",
"transportationType":"Bus",
"capacity":4,
"activityType":"toSchool",
"preferredGender":"f",
"participants":[]
},
{
"userId":"2",
"universityName":"Sami shamoon",
"date": "2024-3-10",
"location":"Arad",
"transportationType":"Car",
"capacity":3,
"activityType":"toSchool",
"preferredGender":"un",
"participants":[]
}
]
3 changes: 3 additions & 0 deletions config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
const transportations = ["Car","Bus"]
const currentDate = new Date()
module.exports ={transportations, currentDate}
4 changes: 0 additions & 4 deletions dist/DataModel.js

This file was deleted.

8 changes: 0 additions & 8 deletions dist/Renderer.js

This file was deleted.

Loading