Skip to content

Fix bug #20

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
Open
nadeen-maree wants to merge 174 commits into
base: main
Choose a base branch
from
Open

Fix bug #20

nadeen-maree wants to merge 174 commits into from

Conversation

@nadeen-maree
Copy link

@nadeen-maree nadeen-maree commented Jan 17, 2024

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
Noor-n204 and others added 29 commits January 17, 2024 10:35
@Noor-n204
Merge pull request #42 from reemodo/universityAPI
6c80316 
added user university API
@SujoodEldda
adding a phone field
1fdf48d
@SujoodEldda
Merge branch 'main' into dummyData
3065c2a
@SujoodEldda
changing dummy data
f2cd5e6
@SujoodEldda
Merge pull request #43 from reemodo/dummyData
536b9a2 
Dummy data
@Noor-n204
authenticate Token
275a182
@Noor-n204
Merge pull request #44 from reemodo/authenticateTokenBranch
703c54a 
authenticate Token
@nadeen-maree
university name fixed
d2b8d8f
@Noor-n204
Merge pull request #45 from reemodo/universityNameFixed
5c176bc 
university name fixed
@reemodo
Revert "authenticate Token"
3e658de
@nadeen-maree
Merge pull request #46 from reemodo/revert-44-authenticateTokenBranch
a3bb9cd 
Revert "authenticate Token"
@SujoodEldda
adding the register file and the register route
b11fe62
@SujoodEldda
changing dummy data
421f0dc
@nadeen-maree
Merge pull request #47 from reemodo/register-api
b8b9046 
Register api
@Noor-n204
added headers
e215cb7
@Noor-n204
Merge branch 'main' into added-headers
d831111
@nadeen-maree
Merge pull request #48 from reemodo/added-headers
c86f180 
added headers
@andalusm
Added login page and function (not connected yet)
2df1991
@andalusm
Revert "Added login page and function (not connected yet)"
101a419 
This reverts commit 2df1991.
@andalusm
Revert "Revert "Added login page and function (not connected yet)""
46ba169 
This reverts commit 101a419.
@andalusm
Merge branch 'main' of https://github.com/reemodo/Amani
d40b4d9
@andalusm
add com
30e55d1
@SujoodEldda
fixing bugs
577af3d
@andalusm
Merge pull request #49 from reemodo/loginHtml
cb80c3e 
Login html
@SujoodEldda
Merge pull request #50 from reemodo/register-api
5067340 
fixing bugs
@nadeen-maree
fixed bug
773df4d
@reemodo
fix
0926807
@reemodo
edit path
645ccf0
@reemodo
bug
4a99741
@andalusm andalusm deleted the fixBug branch January 18, 2024 08:11
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