Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
b31cb0e
GitHub Classroom Feedback
github-classroom[bot] Sep 15, 2024
f561a59
Setting up GitHub Classroom Feedback
github-classroom[bot] Sep 15, 2024
6edac9b
add deadline
github-classroom[bot] Sep 15, 2024
279fe38
Initialise frontend
ldinghan Sep 19, 2024
6aa7419
Add navbar
ldinghan Sep 19, 2024
2b73faf
Update navbar
ldinghan Sep 19, 2024
830322d
Link navbar to pages
ldinghan Sep 19, 2024
6181c1b
Realign hero buttons
ldinghan Sep 20, 2024
c4a2582
Merge pull request #2 from CS3219-AY2425S1/frontend-branch
wesho1107 Sep 20, 2024
5d0d15c
Configure prettier
tjch-o Sep 20, 2024
8343ada
Merge pull request #3 from CS3219-AY2425S1/format
tjch-o Sep 20, 2024
4499e0f
Initialise backend of user service
tjch-o Sep 20, 2024
367ef60
Merge pull request #4 from tjch-o/initialise-backend
tjch-o Sep 22, 2024
14458b0
Initialise question service
tjch-o Sep 23, 2024
97a8812
Update outdated configuration files
tjch-o Sep 23, 2024
ab1b49d
Implement adding of questions
tjch-o Sep 24, 2024
f62f8c1
Improve error handling
tjch-o Sep 24, 2024
9a3eb04
Implement deleting of questions
tjch-o Sep 25, 2024
5f80910
Merge pull request #5 from CS3219-AY2425S1/question-service
lunaroddity Sep 25, 2024
4732a7a
Implement getting of questions
lunaroddity Sep 25, 2024
a9f57ac
Fix getQuestionRoute
lunaroddity Sep 25, 2024
ee70992
Refactor filter to use only one endpoint
tjch-o Sep 26, 2024
f898014
Merge branch 'PEERPREP-3-Implement-getting-of-questions' of https://g…
tjch-o Sep 26, 2024
ad4d10e
Update package*.json
wesho1107 Sep 26, 2024
17ea595
Downgrade Next and add shadcn
wesho1107 Sep 26, 2024
1bc4838
Add shadcn button
wesho1107 Sep 26, 2024
c8aeefe
Update dimensions for navbar
wesho1107 Sep 26, 2024
b1819ba
Add problems directory
wesho1107 Sep 26, 2024
58a3c62
Add add questions form
ldinghan Sep 26, 2024
8536592
Change Metadata
wesho1107 Sep 26, 2024
0b3716a
Update port number
ldinghan Sep 26, 2024
0a3f294
Add problems with shadcn table and badges
wesho1107 Sep 26, 2024
a574fa2
Add variant colors to Badges
wesho1107 Sep 26, 2024
bfc99dc
Add status icon with tooltip for problems
wesho1107 Sep 26, 2024
e0e4385
Style badges
wesho1107 Sep 26, 2024
20dbf8d
Merge pull request #6 from CS3219-AY2425S1/PEERPREP-3-Implement-getti…
ldinghan Sep 26, 2024
bd6f531
Add Id and Description columns
wesho1107 Sep 26, 2024
213c91d
Merge branch 'main' into PEERPREP-7-QuestionForm
wesho1107 Sep 26, 2024
08ce5b5
Implement await function to get questions
wesho1107 Sep 26, 2024
f585753
Display fetched JSON questions
wesho1107 Sep 26, 2024
cfe18c9
Comment out question status (for nice to haves)
wesho1107 Sep 26, 2024
5cd203f
Merge pull request #8 from CS3219-AY2425S1/PEERPREP-7-QuestionForm
tjch-o Sep 26, 2024
6e6ad8f
Implement editing of questions
tjch-o Sep 27, 2024
a02b3e5
Merge pull request #9 from CS3219-AY2425S1/PEERPREP-9-Edit-Questions-…
wesho1107 Sep 27, 2024
373b970
Implement running of frontend and backend concurrently
tjch-o Sep 27, 2024
d812cfd
Merge branch 'main' into run-both
tjch-o Sep 27, 2024
20c2f15
Add package.json for backend
tjch-o Sep 27, 2024
0b4485b
Fix navbar styling
wesho1107 Sep 27, 2024
8973c1b
Merge pull request #10 from CS3219-AY2425S1/run-both
oeggy03 Sep 27, 2024
11e6531
Implement popup dialog for question
wesho1107 Sep 27, 2024
c79da58
Change global primary button color
wesho1107 Sep 27, 2024
d337142
Modify script for installing dependencies
tjch-o Sep 27, 2024
da5f562
Update script for installing dependencies
tjch-o Sep 27, 2024
de7f4a7
Create types and interfaces for props in index.d.ts
wesho1107 Sep 27, 2024
b981df0
Implement util function to convert string to difficulty type
wesho1107 Sep 27, 2024
e2c387a
Add margin bottom to DialogHeader
wesho1107 Sep 27, 2024
8ff98b8
Update add question form categories input
ldinghan Sep 27, 2024
273af67
Merge conflicts
ldinghan Sep 27, 2024
125c211
Merge conflicts
ldinghan Sep 27, 2024
13044a3
Integrate add question form into problems page
ldinghan Sep 27, 2024
e9f008f
Merge pull request #7 from CS3219-AY2425S1/frontend-branch
oeggy03 Sep 28, 2024
88d1c2e
Merge pull request #11 from CS3219-AY2425S1/run-both
oeggy03 Sep 28, 2024
d9d6bf8
Implement basic template for a sample profile page
oeggy03 Sep 28, 2024
86900eb
Fix peerprep icon
wesho1107 Sep 28, 2024
a297479
Fix button styling for homepage in global.css
wesho1107 Sep 28, 2024
b666f3e
Fix badge border to transparent
wesho1107 Sep 28, 2024
8eec82f
Fix border css styling for separator and table
wesho1107 Sep 28, 2024
d0a0f6d
Fix styling of outline button to primary outline
wesho1107 Sep 28, 2024
1916678
Use secondary button for question form
wesho1107 Sep 28, 2024
1e21e6b
Implement refetch when question is created
wesho1107 Sep 28, 2024
0a88f1c
Merge pull request #13 from CS3219-AY2425S1/PEERPREP-11-FixFrontendBugs
oeggy03 Sep 28, 2024
8edeca4
Add backend support and REST API for user sign up
oeggy03 Sep 28, 2024
04e0e7c
Add support for login, protected pages, log out
oeggy03 Sep 28, 2024
03d39b2
Update code to use envConfig file to improve abstraction and security
oeggy03 Sep 28, 2024
64d4839
Delete debugging statement in envConfig
oeggy03 Sep 28, 2024
7fcdff1
Add another API endpoint to help check if user is authenticated.
oeggy03 Sep 28, 2024
828615a
Implement logic where navbar changes based on auth status
oeggy03 Sep 28, 2024
4186857
Add logger msg to auth status checking
oeggy03 Sep 28, 2024
92352dd
Add login page and basic login logic.
oeggy03 Sep 28, 2024
d108d0c
Add log out logic on profile page.
oeggy03 Sep 28, 2024
d9bbb7f
Fix log out redirect to redirect to home page instead.
oeggy03 Sep 28, 2024
d0cc7ed
Implement logic for sign up.
oeggy03 Sep 28, 2024
990628d
Improve abstraction by moving jwt token logic into jwtUtils
oeggy03 Sep 28, 2024
05689c2
Implement profile, finish up login logic.
oeggy03 Sep 28, 2024
7c8c84d
Edit package.json to run npm install on all relevant folders
oeggy03 Sep 28, 2024
afc9288
Change sign up button color
oeggy03 Sep 28, 2024
397485b
Merge branch 'main' into user-service
oeggy03 Sep 28, 2024
22c9bae
Add edit question button and form
lunaroddity Sep 28, 2024
51a8678
Merge pull request #14 from CS3219-AY2425S1/user-service
tjch-o Sep 28, 2024
81d634e
Add support for 2 types of users - regular and admin
oeggy03 Sep 29, 2024
0a9cdaa
Merge branch 'user-service' of https://github.com/CS3219-AY2425S1/cs3…
oeggy03 Sep 29, 2024
a85c5ba
Add API to check whether user is admin.
oeggy03 Sep 29, 2024
7372644
Update authcontext to reflect isAdmin correctly
oeggy03 Sep 29, 2024
491f750
Merge pull request #15 from CS3219-AY2425S1/user-service
tjch-o Sep 29, 2024
8ddc1ae
Merge branch 'main' into PEERPREP-8-Edit-Questions-Frontend
lunaroddity Sep 29, 2024
a2f2465
Protect the frontend of add quesitons - to be seen by admins only
oeggy03 Sep 29, 2024
b21844c
Merge pull request #17 from CS3219-AY2425S1/protectAdd
lunaroddity Sep 29, 2024
8cdf8bd
Merge branch 'main' of https://github.com/CS3219-AY2425S1/cs3219-ay24…
lunaroddity Sep 29, 2024
9b83b11
Fix bug where token verification would fail when server is first started
oeggy03 Sep 29, 2024
5a45fa0
Restrict edit access and implement refetch for edit question
lunaroddity Sep 29, 2024
99cf4c1
Add error message when no field is modified
tjch-o Sep 29, 2024
9b33ccb
Merge pull request #20 from CS3219-AY2425S1/PEERPREP-8-Edit-Questions…
oeggy03 Sep 29, 2024
ac75c64
Merge pull request #19 from CS3219-AY2425S1/edit-question-fix
oeggy03 Sep 29, 2024
f7fbd9c
Merge pull request #18 from CS3219-AY2425S1/protectAdd
lunaroddity Sep 29, 2024
cfdada2
Implement duplicate checks when editing questions
tjch-o Sep 29, 2024
0f8bfa4
Merge pull request #21 from CS3219-AY2425S1/edit-question-fix
lunaroddity Sep 29, 2024
423c3e0
Add delete dialog
ldinghan Sep 29, 2024
1ebc7a6
Merge pull request #22 from CS3219-AY2425S1/delete-question-branch
tjch-o Sep 29, 2024
9ac8513
Optimise API call
ldinghan Sep 29, 2024
13d25c2
Update file reference
ldinghan Sep 29, 2024
4b6ce26
Update delete dialog box UI
ldinghan Sep 29, 2024
22b27b1
Merge pull request #23 from CS3219-AY2425S1/frontend-branch
tjch-o Sep 29, 2024
241b6d7
fix bson bug
oeggy03 Sep 29, 2024
640e23a
Fix bson bug again
oeggy03 Sep 29, 2024
4ec3e43
Initialise Docker
tjch-o Oct 5, 2024
d2ac9a7
Fix bcrypt not working on Docker issue
tjch-o Oct 5, 2024
b80b36c
Update name of network bridge
tjch-o Oct 5, 2024
41794c4
Update docker-compose.ymp to use named volumes to fix npm install iss…
oeggy03 Oct 6, 2024
96926db
Update README.md
tjch-o Oct 6, 2024
c462f6a
Merge pull request #24 from CS3219-AY2425S1/containerisation
wesho1107 Oct 6, 2024
6d8548c
Add logging to question service
tjch-o Oct 7, 2024
5901348
Modify backend of edit questions to fit new duplicate checks
tjch-o Oct 7, 2024
0027065
Merge pull request #25 from CS3219-AY2425S1/question-service
lunaroddity Oct 12, 2024
0878c5a
Pre-populate existing question data in Edit Form
lunaroddity Oct 13, 2024
f2b27d9
Fix edit difficulty bug
tjch-o Oct 14, 2024
c14d0f0
Fix edit form error message
lunaroddity Oct 14, 2024
c7aa5f1
Submit only values of dirty fields for edit
lunaroddity Oct 15, 2024
451cd36
Fix categories not sending request even when edited bug
tjch-o Oct 15, 2024
7442d58
Simplify backend duplicate checks
tjch-o Oct 15, 2024
f9dac18
Merge branch 'PEERPREP-8-Edit-Questions-Frontend' of https://github.c…
lunaroddity Oct 16, 2024
a35cc7c
Add error message for duplicate error for edit question form
lunaroddity Oct 16, 2024
16b5c04
Remove unnecessary log
tjch-o Oct 16, 2024
52cc5d6
Clean up code
lunaroddity Oct 16, 2024
22ab272
Merge branch 'PEERPREP-8-Edit-Questions-Frontend' of https://github.c…
lunaroddity Oct 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
Empty file added .github/.keep
Empty file.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
node_modules
dist

.github

.env
backend/*/combined.log
backend/*/error.log
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"semi": false,
"singleQuote": true,
"tabWidth": 4,
"printWidth": 80
}
19 changes: 14 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
[![Review Assignment Due Date](https://classroom.github.com/assets/deadline-readme-button-22041afd0340ce965d47ae6ef1cefeee28c7c493a6346c4f15d667ab976d596c.svg)](https://classroom.github.com/a/bzPrOe11)

# CS3219 Project (PeerPrep) - AY2425S1
## Group: Gxx

### Note:
- You can choose to develop individual microservices within separate folders within this repository **OR** use individual repositories (all public) for each microservice.
- In the latter scenario, you should enable sub-modules on this GitHub classroom repository to manage the development/deployment **AND** add your mentor to the individual repositories as a collaborator.
- The teaching team should be given access to the repositories as we may require viewing the history of the repository in case of any disputes or disagreements.
## Group: G18

Ensure Docker has been installed before running the following commands:
```
docker-compose up --build
```

### Note:

- You can choose to develop individual microservices within separate folders within this repository **OR** use individual repositories (all public) for each microservice.
- In the latter scenario, you should enable sub-modules on this GitHub classroom repository to manage the development/deployment **AND** add your mentor to the individual repositories as a collaborator.
- The teaching team should be given access to the repositories as we may require viewing the history of the repository in case of any disputes or disagreements.
Loading