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

Merge the dev into the main for 1st prototype #146

Merged
merged 378 commits into from
Dec 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
378 commits
Select commit Hold shift + click to select a range
4f14868
fixed carousel arrow
mufidat3250 Oct 20, 2022
1a7e158
feat: set up eslint
JulianaSau Oct 20, 2022
0386234
fix: fix linting errors by running eslint --fix
JulianaSau Oct 20, 2022
97cb61e
feat: setup pre-commit and pre-push hooks
JulianaSau Oct 20, 2022
c09debc
fix: reduce tab width in prettier rules file
JulianaSau Oct 20, 2022
41343b9
:lipstick: Update Style file
Meekunn Oct 21, 2022
c91f719
fixed style error
mufidat3250 Oct 21, 2022
7b61ac5
Merge pull request #69 from JulianaSau/dev_team2
BatoolMM Oct 21, 2022
54ff398
update dependencies
RealRichi3 Oct 21, 2022
e1ee25d
add authentication tests - auth.test.js
RealRichi3 Oct 21, 2022
b91e968
Merge remote-tracking branch 'origin/dev_team2' into feat/unit-tests
RealRichi3 Oct 21, 2022
70c5ce2
Merge branch 'dev_team2' into Meekun-patch-1
Meekunn Oct 21, 2022
7e7c03f
removed passwordConfirm from res object in signup controller - auth.c…
RealRichi3 Oct 21, 2022
1e1c042
add: test for /signup route - auth.test.js
RealRichi3 Oct 21, 2022
835b149
add: condition for morgan('dev') middlware - app.js
RealRichi3 Oct 21, 2022
1057e82
code formatting - /models/
RealRichi3 Oct 21, 2022
14c2800
update dependencies
RealRichi3 Oct 21, 2022
c4b9b55
Merge branch 'Open-Science-Community-Saudi-Arabia:main' into delete-g…
Amidsts Oct 22, 2022
3d7c765
add: unit test for /login route - auth.test.js
RealRichi3 Oct 22, 2022
506553a
update: hid passwordConfirm field from returned request object - user…
RealRichi3 Oct 22, 2022
0fc2735
Merge pull request #62 from ORIYOMI289/delete-getcourses
RealRichi3 Oct 22, 2022
4232a45
before merging dev_team2
RealRichi3 Oct 22, 2022
54c5243
update dependencies - package.json
RealRichi3 Oct 22, 2022
1c7ec4e
fix merge conflicts
RealRichi3 Oct 22, 2022
66a3f7f
fix adminId ref in videoSchema model - course.models.js
RealRichi3 Oct 22, 2022
7a34061
fix: basicAuth middleware call syntax - course.routes.js
RealRichi3 Oct 22, 2022
96bde4b
Merge pull request #71 from RealRichi3/feat/unit-tests
RealRichi3 Oct 22, 2022
4217ddb
Revert "[21/10/2022] : Backend API [feat] - Unit tests "
RealRichi3 Oct 22, 2022
0aea08e
Merge pull request #78 from Open-Science-Community-Saudi-Arabia/rever…
RealRichi3 Oct 22, 2022
dd43f2c
Revert "Revert "[21/10/2022] : Backend API [feat] - Unit tests ""
RealRichi3 Oct 22, 2022
63b05b7
Merge pull request #79 from Open-Science-Community-Saudi-Arabia/rever…
RealRichi3 Oct 22, 2022
038fcec
fix: failed login due double hashing password - user.model.js
RealRichi3 Oct 22, 2022
1aa0125
complete login test - auth.test.js
RealRichi3 Oct 22, 2022
b6a154a
update /forgetpassword route - auth.routes.js
RealRichi3 Oct 22, 2022
0f22b0c
add: env variables for email and Oauth2 client - config.js
RealRichi3 Oct 22, 2022
de33dbc
changed nodemailer config from 'less secure gmail apps' to 'Oauth2 cl…
RealRichi3 Oct 22, 2022
ee39b59
add: test for /forgotpassword route - auth.test.js
RealRichi3 Oct 22, 2022
98112a1
Set up color variables and types to ensure color consistency
Tammy-Ajoko Oct 23, 2022
6142837
add: /passwordreset test - auth.test.js
RealRichi3 Oct 23, 2022
3a95f69
add: course schema model - course.models.js
RealRichi3 Oct 23, 2022
f5b1c81
removed unused password model - password.model.js
RealRichi3 Oct 23, 2022
f9c60f1
removed unused password model - password.model.js
RealRichi3 Oct 23, 2022
a3ad71b
fixed: responsive screen
mufidat3250 Oct 23, 2022
72ce564
fix: /googlesignin 500 error code - auth.controleller.js
RealRichi3 Oct 23, 2022
2f12252
add: GOOGLE_SIGNIN_CLIENT_ID env variable - config.js
RealRichi3 Oct 23, 2022
b1c7d74
Admin_Only_create_course
oEbuka Oct 24, 2022
c239723
Revert "Admin_Only_create_course"
oEbuka Oct 24, 2022
3201591
code refractoring
mufidat3250 Oct 24, 2022
e506a1c
fixed: image path
mufidat3250 Oct 24, 2022
6cc41c6
fixes
mufidat3250 Oct 24, 2022
2d73aa5
marge-conflict resolved
mufidat3250 Oct 24, 2022
b2f0323
add: implemented test_token schema model - auth.controller.js
RealRichi3 Oct 24, 2022
055bd1b
add: implemented test_token schema model - auth.controller.js
RealRichi3 Oct 24, 2022
d85bf7d
add: test for existence of unhashed password reset token - auth.test.js
RealRichi3 Oct 24, 2022
24f4719
add: changePassword shcema mode - user.models.js
RealRichi3 Oct 24, 2022
95faf83
add: implement changepassword user_schema model - auth.controller.js
RealRichi3 Oct 24, 2022
61fabf0
add: test for /forgotpassword and /resetpassword - auth.test.js
RealRichi3 Oct 24, 2022
32a19dd
add: test for BasicAuth authentication middleware - auth.test.js
RealRichi3 Oct 25, 2022
f452c72
add: response message for failed auth in basicAuth middleware - auth.…
RealRichi3 Oct 25, 2022
9dae3e9
Merge pull request #81 from RealRichi3/feat/unit_test
RealRichi3 Oct 25, 2022
62d31bc
Merge branch 'Open-Science-Community-Saudi-Arabia:dev_team2' into dev…
Tammy-Ajoko Oct 25, 2022
aca8ab3
Refactored login and signup into a single CSS file
Tammy-Ajoko Oct 25, 2022
eb4e790
updated color variables
Tammy-Ajoko Oct 25, 2022
098d6a6
Merge branch 'Open-Science-Community-Saudi-Arabia:dev_team2' into dev…
oEbuka Oct 25, 2022
5c7e2fe
Admin create course
oEbuka Oct 25, 2022
ae3e075
Merge branch 'dev_team2' of https://github.com/oEbuka/MOOCs into dev_…
oEbuka Oct 25, 2022
42fb3a1
feat: update README.md to include important information
JulianaSau Oct 25, 2022
ed01d73
fix: add deleted content
JulianaSau Oct 25, 2022
2f763d4
fix: remove duplicated content
JulianaSau Oct 25, 2022
3df1365
Merge pull request #89 from oEbuka/dev_team2
RealRichi3 Oct 25, 2022
ef31f94
add: email verificaiton token to user_schema - user.model.js
RealRichi3 Oct 26, 2022
5bae117
update: set user field to unique - test_token.model.js
RealRichi3 Oct 26, 2022
f3084ca
add: email verification - auth.controller.js
RealRichi3 Oct 26, 2022
c2d3ae6
update: select passwordResetToken field in query - auth.test.js
RealRichi3 Oct 26, 2022
cdc2153
fix: fix errors in README content
JulianaSau Oct 26, 2022
1b5acc7
fix: fix typo in readme file
JulianaSau Oct 26, 2022
0511fe1
fix: failed email verification - auth.controller.js
RealRichi3 Oct 26, 2022
247e7f0
add: route for email verification - auth.routes.js
RealRichi3 Oct 26, 2022
b30e0f7
add: check for unverified user account in auth Middleware - auth.js
RealRichi3 Oct 26, 2022
f362513
Merge pull request #92 from RealRichi3/feat/verify_email
RealRichi3 Oct 26, 2022
0d98d09
add: exercise shcema model - course.models.js
RealRichi3 Oct 26, 2022
e6b3d40
add: questions schema, add relation to exercises - course.model.js
RealRichi3 Oct 26, 2022
7d9a5a4
Merge pull request #94 from RealRichi3/feat/course_exercises
RealRichi3 Oct 27, 2022
fa22f87
add: Update courses - auth.controller.js
RealRichi3 Oct 27, 2022
e041e73
update: exports to include Question and Exercise model - course.model…
RealRichi3 Oct 27, 2022
d626a6c
add: update course route - course.routes.js
RealRichi3 Oct 27, 2022
a65763d
Merge pull request #97 from RealRichi3/dev_team2
RealRichi3 Oct 27, 2022
69541c4
add: author to videoschema - course.models.js
RealRichi3 Oct 27, 2022
605637f
feat: upload course - courses.controller.js
RealRichi3 Oct 27, 2022
b22cc0d
fix: emailVerificationToken showing in returned response for signup -…
RealRichi3 Oct 27, 2022
b98b53e
add: upload video route - course.routes.js
RealRichi3 Oct 27, 2022
9e4fec1
update: email sender Alias to MOOCs - email.js
RealRichi3 Oct 27, 2022
3fe8f01
feat: get vidoes for a particular course - courses.controller.js
RealRichi3 Oct 27, 2022
973fe57
renamed courses.controller.js to course.controller.js
RealRichi3 Oct 27, 2022
551478d
add: GET /course/videos route - course.routes.js
RealRichi3 Oct 27, 2022
f0d0090
feat: handle all GET queries for vides - course.controller.js, course…
RealRichi3 Oct 27, 2022
0ee9a35
feat: update video data - course.controllers.js, course.routes.js
RealRichi3 Oct 27, 2022
487db66
feat: delete video - course.controllers.js, course.routes.js
RealRichi3 Oct 27, 2022
e9a2301
Merge pull request #100 from RealRichi3/dev_team2
RealRichi3 Oct 27, 2022
a2119fa
update: get courses to include different query format - course.contro…
RealRichi3 Oct 27, 2022
20352ff
Merge branch 'dev_team2' of https://github.com/RealRichi3/MOOCs into …
RealRichi3 Oct 27, 2022
ac1446f
Merge pull request #103 from RealRichi3/dev_team2
RealRichi3 Oct 27, 2022
37bbf97
add: CRUD operations for Exercises - exercise_question.controllers.js
RealRichi3 Oct 28, 2022
4939887
renamed exercise_question.controllers.js to exercise.controllers.js
RealRichi3 Oct 28, 2022
b214802
add: exercise feature - exercise.controllers.js, exercise.routes.js
RealRichi3 Oct 28, 2022
16a0602
update: function doc string - course.controllers.js
RealRichi3 Oct 28, 2022
1812a81
include exercise route handler in imports - routes_handler.js
RealRichi3 Oct 28, 2022
d7cb58c
Merge pull request #104 from RealRichi3/feat/CRUD_exercises
RealRichi3 Oct 28, 2022
25c6659
update: question schema to include correct_answer field - course.mode…
RealRichi3 Oct 29, 2022
bd327c2
corrected router import syntax
RealRichi3 Oct 29, 2022
1b80ca5
corrected router import syntax - exercise.routes.js
RealRichi3 Oct 29, 2022
ab91a1f
add: routes for CRUD operations for questions - question.routes.js
RealRichi3 Oct 29, 2022
8bc3bc4
feat: CRUD operations for questions - question.controllers.js
RealRichi3 Oct 29, 2022
ba3f3d7
add: missing imports - exercise.controllers.js
RealRichi3 Oct 29, 2022
ef754c1
update import/exports to include question routes - routes_handler.js,…
RealRichi3 Oct 29, 2022
2d4890a
Merge pull request #106 from RealRichi3/feat/CRUD_questions
RealRichi3 Oct 29, 2022
e371615
Merge branch 'dev_team2' of https://github.com/RealRichi3/MOOCs into …
RealRichi3 Oct 31, 2022
e7be562
update improrts - course.controller.js
RealRichi3 Oct 31, 2022
9d0a57b
update improrts - questions.controller.js
RealRichi3 Oct 31, 2022
071e25c
remove debug console.log - auth.controllers.js
RealRichi3 Oct 31, 2022
975e1ed
update permission handler import - course.routes.js
RealRichi3 Oct 31, 2022
4113649
update imports - exercise.routes.js
RealRichi3 Oct 31, 2022
1acd734
update imprts - permission_handler.js
RealRichi3 Oct 31, 2022
4df783d
increase test timer - auth.test.js
RealRichi3 Oct 31, 2022
1192eac
increase test timer - package.json
RealRichi3 Oct 31, 2022
3916ee9
corrected typo - course.controllers.js
RealRichi3 Oct 31, 2022
8a8f47e
Merge pull request #109 from RealRichi3/dev_team2
RealRichi3 Oct 31, 2022
b4e74df
add: enrolled courses to user schema model - user.models.js
RealRichi3 Nov 1, 2022
7b570ed
add: enrolled users to course schema model - course.model.js
RealRichi3 Nov 1, 2022
830c8a2
feat: enroll course - course.controllers.js
RealRichi3 Nov 1, 2022
e281e24
feat: cancel course enrollment - course.controllers.js
RealRichi3 Nov 1, 2022
4ff5d21
add: /enroll /cancelenrollment routes - course.routes.js
RealRichi3 Nov 1, 2022
e2d8402
add: basicAuth middleware - course.routes.js
RealRichi3 Nov 1, 2022
8f56c3c
feat: GET enrolled courses - course.controllers.js
RealRichi3 Nov 1, 2022
eb26de0
feat: GET enrolled users - course.controllers.js
RealRichi3 Nov 1, 2022
683278c
add: GET /enrolledusers and /enrolledcourses - course.routes.js
RealRichi3 Nov 1, 2022
8a96f1c
Merge pull request #110 from RealRichi3/feat/enroll_course
RealRichi3 Nov 1, 2022
6370025
add: initial postman documentation for AUTH API
RealRichi3 Nov 1, 2022
429d56f
Merge branch 'Open-Science-Community-Saudi-Arabia:dev_team2' into dev…
RealRichi3 Nov 1, 2022
86b1945
Merge pull request #111 from RealRichi3/dev_team2
RealRichi3 Nov 1, 2022
1433ec2
fixed the button
mufidat3250 Nov 5, 2022
197c39b
add: cloudinary to dependencies - package.json
RealRichi3 Nov 7, 2022
9f3a5b9
Merge pull request #115 from RealRichi3/dev_team2
RealRichi3 Nov 7, 2022
fafdd3c
Merge pull request #90 from JulianaSau/feat/update-ReadMe
BatoolMM Nov 9, 2022
86db226
Merge branch 'dev_team2' of https://github.com/Open-Science-Community…
sandygudie Nov 10, 2022
ccc7fb8
added changes to header and footer
sandygudie Nov 10, 2022
c094db8
Merge pull request #37 from Meekunn/Meekun-patch-1
sandygudie Nov 10, 2022
560c294
Update README.md
sandygudie Nov 10, 2022
0c12df7
Merge branch 'dev_team2' of https://github.com/Open-Science-Community…
sandygudie Nov 10, 2022
c628836
reposition login and signup files
sandygudie Nov 10, 2022
d36367b
Merge pull request #83 from Tammy-Ajoko/dev_team2
sandygudie Nov 10, 2022
b3bb725
add: contribution guide and detailed project description - CONTRIBUTI…
RealRichi3 Nov 12, 2022
ee87bb6
add: conditional PORT - config.js
RealRichi3 Nov 12, 2022
e787c06
update formatting, add file naming guide - CONTRIBUTING.md
RealRichi3 Nov 12, 2022
6446b56
Merge branch 'Open-Science-Community-Saudi-Arabia:dev_team2' into dev…
RealRichi3 Nov 12, 2022
54f22b2
moved updated CONTRIBUTING.md to /backend_API folder
RealRichi3 Nov 12, 2022
47e4c79
revert changes to exclude backend API contribution guide - CONTRIBUTI…
RealRichi3 Nov 12, 2022
c2ac5cf
Merge branch 'dev_team2' of https://github.com/RealRichi3/MOOCs into …
RealRichi3 Nov 12, 2022
489f488
fixed conflicts
sandygudie Nov 15, 2022
d5f8923
updated landing page
sandygudie Nov 15, 2022
936296e
added header and footer to landing page
sandygudie Nov 15, 2022
90c5cd4
update comit message format - CONTRIBUTING.md
RealRichi3 Nov 16, 2022
899bcda
changed commit message format to branch name format
RealRichi3 Nov 16, 2022
e5ce1a4
Merge pull request #43 from mufidat3250/mufidat3250
sandygudie Nov 18, 2022
a9ae0e4
added authentication for sign-up page
sandygudie Nov 21, 2022
0d72dbb
added required for confirm password
sandygudie Nov 21, 2022
3e764ea
Merge branch 'Open-Science-Community-Saudi-Arabia:dev_team2' into dev…
RealRichi3 Nov 21, 2022
c4aedc5
Update backend_API/CONTRIBUTING.md
RealRichi3 Nov 21, 2022
93331cb
Update backend_API/CONTRIBUTING.md
RealRichi3 Nov 21, 2022
9ac5ff0
change API DOCUMENTATION heading level - CONTRIBUTING.md
RealRichi3 Nov 21, 2022
8cedcdd
moved contribution workflow to before note section - CONTRIBUTING.md
RealRichi3 Nov 21, 2022
8f0a47e
change upstream branch from master to mian - CONTRIBUTING.md
RealRichi3 Nov 21, 2022
746dddf
Merge branch 'dev_team2' of https://github.com/RealRichi3/MOOCs into …
RealRichi3 Nov 21, 2022
f64bba7
fixed page routing
sandygudie Nov 21, 2022
b91df2b
Merge pull request #123 from Open-Science-Community-Saudi-Arabia/fix/…
sandygudie Nov 21, 2022
3bf7adf
corrected repository name - CONTRIBUTING.md
RealRichi3 Nov 21, 2022
d540a7f
add: links to for technologies used - CONTRIBUTING.md
RealRichi3 Nov 21, 2022
750ae62
fix: non matching repository link - CONTRIBUTING.md
RealRichi3 Nov 21, 2022
a7ba986
Merge branch 'dev_team2' of https://github.com/Open-Science-Community…
sandygudie Nov 21, 2022
e9b0a8f
reduced toast timing
sandygudie Nov 21, 2022
bdd5fab
reduced toast-success timing
sandygudie Nov 21, 2022
d7f0f6c
Merge pull request #121 from Open-Science-Community-Saudi-Arabia/feat…
sandygudie Nov 21, 2022
822f23d
fix branch naming guide - CONTRIBUTING.md
RealRichi3 Nov 21, 2022
c76824e
fix type - CONTRIBUTING.md
RealRichi3 Nov 21, 2022
6ef936c
added authentication for login page
sandygudie Nov 22, 2022
d62b21e
added updates
sandygudie Nov 22, 2022
38b6e62
Merge pull request #125 from Open-Science-Community-Saudi-Arabia/auth…
sandygudie Nov 22, 2022
fbb54b1
added forgot password page
sandygudie Nov 28, 2022
8418272
Merge branch 'dev_team2' of https://github.com/Open-Science-Community…
sandygudie Nov 28, 2022
d20041e
remove reduntant file
sandygudie Nov 28, 2022
ef6a3ce
added reset password feature
sandygudie Nov 28, 2022
c255201
Merge pull request #127 from Open-Science-Community-Saudi-Arabia/forg…
sandygudie Nov 28, 2022
265e21f
fixed conflicts
sandygudie Nov 28, 2022
2d6f6cf
rename CSS files to scss
sandygudie Nov 28, 2022
04ed836
Merge pull request #131 from Open-Science-Community-Saudi-Arabia/fixs…
sandygudie Nov 28, 2022
7b14494
Merge pull request #119 from RealRichi3/dev_team2
RealRichi3 Nov 28, 2022
64e8679
refactor css to scss
sandygudie Nov 29, 2022
99e52a0
reposition name in sign up page
sandygudie Nov 29, 2022
c666f72
fix ui
sandygudie Nov 29, 2022
a408735
Merge pull request #132 from Open-Science-Community-Saudi-Arabia/fix/…
sandygudie Nov 29, 2022
488cb3a
add: authCodes model - authCodes.models.js
RealRichi3 Nov 29, 2022
ffba245
add: auth_codes util to get auth codes - auth_codes.js
RealRichi3 Nov 29, 2022
47a95e7
add: auth_codes util to get auth codes - auth_codes.js
RealRichi3 Nov 29, 2022
60439bd
update: forgetPassword to include password reset code - auth.controll…
RealRichi3 Nov 29, 2022
1e98812
add: password reset and refresh token env variables - config.js
RealRichi3 Nov 29, 2022
7d6606b
add: auth_codes to user db schema - user.models.js
RealRichi3 Nov 29, 2022
25d732b
update: forgetpassword to implement new authcode flow - auth.controll…
RealRichi3 Nov 29, 2022
eb42403
update user model default value to Authcode instance - user.models.js
RealRichi3 Nov 29, 2022
8076e99
add: custom secret for decodeJWT util - jwt_handler.js
RealRichi3 Nov 29, 2022
bb09ac6
add: error logging - jwt_handler.js
RealRichi3 Nov 29, 2022
dbeabd5
add: error logging - jwt_handler.js
RealRichi3 Nov 29, 2022
6ed18e2
add: implement custom jwtSecret for signtoken util - auth.controller.js
RealRichi3 Nov 29, 2022
3f255d0
added google signin feature
sandygudie Nov 30, 2022
99d6169
added update
sandygudie Nov 30, 2022
23b2a43
Merge pull request #136 from Open-Science-Community-Saudi-Arabia/feat…
sandygudie Nov 30, 2022
f1a6fd8
fix: auth_codes field not populating in users model - auth.controller.js
RealRichi3 Nov 30, 2022
3db598f
complete reset password - auth.controllers.js
RealRichi3 Nov 30, 2022
a3b8056
change attribute field name in authcode schema - authcode.model.js
RealRichi3 Nov 30, 2022
a589f47
add: authcode one to one relation to user shcema - user.models.js'
RealRichi3 Nov 30, 2022
26e0861
convert auth code to string - ..../utils/auth_code.js
RealRichi3 Nov 30, 2022
cc82ec7
update npm script command - package.json
RealRichi3 Nov 30, 2022
fb08d60
add: catch for email util - email.js
RealRichi3 Nov 30, 2022
bfdaacf
change response message - auth.controllers.js'
RealRichi3 Nov 30, 2022
2568e51
update reset password route - auth.routes.js
RealRichi3 Nov 30, 2022
ed73cf3
add: getloggedinuser - auth.cotroller.js, auth.routes.js
RealRichi3 Nov 30, 2022
807397e
Merge pull request #134 from RealRichi3/refactor/password-reset
RealRichi3 Nov 30, 2022
94cd887
fixed comflict
sandygudie Dec 1, 2022
ec6b9ca
fix: undefied password reset code in users email
RealRichi3 Dec 1, 2022
0587ae9
Merge pull request #138 from RealRichi3/refactor/password-reset
RealRichi3 Dec 1, 2022
a8d98ac
updated foorgot/reset password feature
sandygudie Dec 2, 2022
5c89834
Merge branch 'dev_team2' of https://github.com/Open-Science-Community…
sandygudie Dec 2, 2022
dae2c7d
add: Blacklisted token schema - token.models.js
RealRichi3 Dec 2, 2022
9bc683e
update changepassword schema method to delete auth code - user.models.js
RealRichi3 Dec 2, 2022
f5a12de
fix: new password not logging in - auth.controller.js
RealRichi3 Dec 2, 2022
3c492de
update imports - auth_codes.js
RealRichi3 Dec 2, 2022
659b37a
implement blacklisted tokens - auth.controllers.js
RealRichi3 Dec 2, 2022
8003931
implement blacklisted tokens - auth.js
RealRichi3 Dec 2, 2022
ce42e1a
add: new custom API errors - custom_errors.js
RealRichi3 Dec 2, 2022
b1ed2bf
add: catch for Not Found url - app.js
RealRichi3 Dec 2, 2022
f1c0581
Merge pull request #140 from RealRichi3/fix/password-reset
RealRichi3 Dec 2, 2022
87b0a4e
Merge pull request #129 from Open-Science-Community-Saudi-Arabia/feat…
sandygudie Dec 2, 2022
cabc57f
Create CHANGELOG.md
RealRichi3 Dec 19, 2022
7fd3edc
add: documentation for auth controllers - auth.controllers.js
RealRichi3 Dec 23, 2022
cdb66c2
add: documentation for course controllers - course.controllers.js
RealRichi3 Dec 23, 2022
c13e65a
add: documentation for question controllers - question.controllers.js
RealRichi3 Dec 23, 2022
10a3088
add: documentation for exercise controllers - exercise.controllers.js
RealRichi3 Dec 23, 2022
e9f34e9
add: documentation for utils - /src/utils
RealRichi3 Dec 23, 2022
750d25e
Merge pull request #144 from RealRichi3/code_documentation
RealRichi3 Dec 23, 2022
52e1615
Merge pull request #145 from Open-Science-Community-Saudi-Arabia/dev_…
RealRichi3 Dec 23, 2022
fd1fdca
Merge branch 'main' into dev
BatoolMM Dec 24, 2022
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
74 changes: 74 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,77 @@ vignettes/*.pdf

# R Environment Variables
.Renviron

# Backend API sensitive files
/backend_API/src/.env*
*node_modules/

# History files
.Rhistory
.Rapp.history

# Session Data files
.RData

# User-specific files
.Ruserdata

# Example code in package build process
*-Ex.R

# Output files from R CMD build
/*.tar.gz

# Output files from R CMD check
/*.Rcheck/

# RStudio files
.Rproj.user/

# produced vignettes
vignettes/*.html
vignettes/*.pdf

# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
.httr-oauth

# knitr and R markdown default cache directories
*_cache/
/cache/

# Temporary files created by R markdown
*.utf8.md
*.knit.md

# R Environment Variables
.Renviron

# Backend API sensitive files
/backend_API/src/*.env
*node_modules/

# Frontend
# 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/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

<!-- Change log file should contain history of all changes or contributions made and a reference to the PR or issue created -->

# Changelog

All notable changes to this project will be documented in this file.
Expand All @@ -16,3 +19,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### `Deprecated`

### `Security`

7 changes: 7 additions & 0 deletions Frontend/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# node node_modules
/node_modules/*

#build artefacts
dist/*
build/*
coverage/*
33 changes: 33 additions & 0 deletions Frontend/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
module.exports = {
env: {
browser: true,
es2021: true,
node: true,
},
extends: ["plugin:react/recommended", "airbnb", "prettier"],
overrides: [],
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
},
plugins: ["react", "prettier"],
rules: {
"prettier/prettier": ["error"],
"no-unused-vars": "warn",
"react/no-unescaped-entities": 0,
"jsx-a11y/anchor-is-valid": 0,
"react/button-has-type": 0,
"react/self-closing-comp": "warn",
"import/newline-after-import": "warn",
"import/order": "warn",
"no-console": "warn",
"camelcase":"off",
'react/jsx-props-no-spreading': 'off',
'react/no-array-index-key':'off',
'import/prefer-default-export':'off',
'jsx-a11y/click-events-have-key-events':'off',
'jsx-a11y/no-static-element-interactions':'off',
'react/prop-types': ['off'],
'react/jsx-no-constructed-context-values': 'off'
}
}
6 changes: 6 additions & 0 deletions Frontend/.husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

cd Frontend
yarn lint-staged

4 changes: 4 additions & 0 deletions Frontend/.husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

# include other rules here eg. unit tests
5 changes: 5 additions & 0 deletions Frontend/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!include:../.gitignore
node_modules/

# html files
*.html
25 changes: 25 additions & 0 deletions Frontend/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"printWidth": 100,
"trailingComma": "all",
"tabWidth": 2,
"semi": false,
"singleQuote": false,
"arrowParens": "always",
"requirePragma": true,
"endOfLine": "lf",
"overrides": [
{
"files": "*.json",
"options": {
"singleQuote": false
}
},
{
"files": ".*rc",
"options": {
"singleQuote": false,
"parser": "json"
}
}
]
}
20 changes: 20 additions & 0 deletions Frontend/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Lato&display=swap" rel="stylesheet" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<!-- Google Signup/signin script -->
<script src="https://accounts.google.com/gsi/client" async defer></script>

<title>Vite + React</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
4 changes: 4 additions & 0 deletions Frontend/lint-staged.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module.exports = {
'*.{js,jsx}': ['yarn lint'],
'*.{js,json,css,jsx}': ['yarn format'],
}
49 changes: 49 additions & 0 deletions Frontend/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"name": "oscsa",
"private": true,
"version": "0.0.0",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview",
"lint": "eslint --fix",
"lint:fix": "eslint --fix */**/*.{jsx,js,tsx} --color",
"lint:check": "eslint */**/*.{jsx,js,tsx} --color",
"prettier": "prettier .",
"format": "prettier --write",
"format:fix": "yarn prettier -- --write",
"format:check": "yarn prettier -- --check",
"prepare": "cd .. && husky install Frontend/.husky",
"lint-staged": "lint-staged --config lint-staged.config.js"
},
"dependencies": {
"@vitejs/plugin-react": "^2.1.0",
"axios": "^1.1.3",
"gapi-script": "^1.2.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-google-login": "^5.2.2",
"react-icons": "^4.6.0",
"react-router-dom": "^6.4.2",
"react-slick": "^0.29.0",
"react-toastify": "^9.1.1",
"slick-carousel": "^1.8.1",
"vite": "^3.1.0"
},
"devDependencies": {
"@types/react": "^18.0.17",
"@types/react-dom": "^18.0.6",
"eslint": "^7.32.0 || ^8.2.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.28.0",
"eslint-plugin-react-hooks": "^4.3.0",
"husky": "^8.0.1",
"lint-staged": "^13.0.3",
"prettier": "^2.7.1",
"sass": "^1.56.1"
}
}
1 change: 1 addition & 0 deletions Frontend/public/_redirects
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* /index.html 200
Binary file added Frontend/public/images/Mask Group.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Frontend/public/images/course1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Frontend/public/images/course2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Frontend/public/images/course3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Frontend/public/images/hero-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Frontend/public/images/ring1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Frontend/public/images/ring2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Frontend/public/images/testimonial1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Frontend/public/vectors/certificate.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions Frontend/public/vectors/training.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions Frontend/public/vectors/user.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Frontend/public/vite.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions Frontend/src/App.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React from "react"
import "./styles/GlobalStyles.scss"
import { Routes, Route } from "react-router-dom"
import LandingPage from "./pages/landing-page/LandingPage"
import Login from "./pages/auth/login"
import Signup from "./pages/auth/signup"
import Dashboard from "./pages/Dashboard"
import {AppProvider} from "./context";
import ResetPassword from "./pages/auth/password/reset-password";
import ForgotPassword from "./pages/auth/password/forgotpassword";

function App() {

return (

<Routes>
<Route path="/" element={<LandingPage />} />
<Route path="/login" element={<Login />} />
<Route path="/signup" element={<Signup />} />
<Route path="/resetpassword" element={<ResetPassword />} />
<Route path="/forgotpassword" element={<ForgotPassword />} />
<Route path="/dashboard"
element={ <AppProvider><Dashboard /></AppProvider>}
/>

</Routes>)
}

export default App

1 change: 1 addition & 0 deletions Frontend/src/assets/react.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
80 changes: 80 additions & 0 deletions Frontend/src/components/Carousel/Carousel.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import React from "react";
import './Carousel.scss'
import Slider from 'react-slick'
import "slick-carousel/slick/slick.css";
import "slick-carousel/slick/slick-theme.css";
import LeftArrow from '../vectors/LeftArrow'
import RightArrow from '../vectors/RightArrow'

function Carousel({children}) {
const settings = {
infinite:true,
speed: 500,
slidesToShow: 4,
slidesToScroll: 1,
initialSlide: 0,
nextArrow: <SampleNextArrow />,
prevArrow: <SamplePreviousArrow />,
responsive: [
{
breakpoint: 1024,
settings: {
slidesToShow: 3,
slidesToScroll: 3,
infinite: true,
dots: true
}
},
{
breakpoint: 768,
settings: {
slidesToShow: 2,
slidesToScroll: 2,
initialSlide: 2
}
},
{
breakpoint: 425,
settings: {
slidesToShow: 1,
slidesToScroll: 1
}
}
]
}
return (
<Slider {...settings} className='carosel'>
{children}
</Slider>
)
}

export default Carousel

function SampleNextArrow({
onClick,
}) {
return (
<div
className=" next "
onClick={onClick}
>

<RightArrow/>
</div>
);
}

function SamplePreviousArrow({
onClick,
}) {
return (
<div
className="prev"
onClick={onClick}
>
<LeftArrow/>
</div>
);
}

7 changes: 7 additions & 0 deletions Frontend/src/components/Carousel/Carousel.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.slick-list {
margin: 0 -10px;
}

.slick-slide>div {
margin: 0 15px;
}
Loading