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

Containerize question and user services #36

Merged
merged 113 commits into from
Oct 5, 2024
Merged

Containerize question and user services #36

merged 113 commits into from
Oct 5, 2024

Conversation

tsulim
Copy link

@tsulim tsulim commented Oct 4, 2024 •
edited
Loading

Main Changes:

  • Shift firebase.js into individual service folders
  • Add Dockerfile and .dockerignore for question service
  • Add Dockerfile for .dockerignore user service
  • Add docker-compose.yml to package and manage both services at once

Close #30 and #31

Other changes:

tsulim and others added 30 commits September 11, 2024 23:34
@tsulim
Merge branch 'setting-up-react'
e6dced5
@tsulim
Merge remote-tracking branch 'upstream/main'
f9d7b2f
@iynixil
Remove dependency in backend and change command to start backend server
5b57a26
@iynixil
Change port used in backend server
4881518
@iynixil
Solve merge conflict
710c5cf
@AndrewOng2066
Merge pull request #4 from CS3219-AY2425S1/main
cb22648 
Pull request
@tsulim
Merge remote-tracking branch 'upstream/main'
edc57f7
@AndrewOng2066
Merge pull request #5 from CS3219-AY2425S1/main
cb422cf 
Pull latest version
@iynixil
Update package-lock.json to be same as main
9554549
@xuelinglow
Display questions data from database
32422d1
@xuelinglow
Make changes to css files
ac89783
@xuelinglow
Make some changes to css. Implement form to add questions to database
1291721
@xuelinglow
Make some minor changes to css
1a047ab
@xuelinglow
Make changes according to coding standard
0168985
Create register account function
fc5b73d
@AndrewOng2066
Merge pull request #10 from AndrewOng2066/register_user
14d2030 
Create register account feature
@iynixil
Merge remote-tracking branch 'upstream/user_branch_Andrew' into user-…
26b5247 
…login
@iynixil
Add user login API
f87bcf8
@iynixil
Fix login API to get encrypted password from database
a99754e
@iynixil
Fix user login API to retrieve username from database
7f86204
@iynixil
Merge pull request #9 from CS3219-AY2425S1/question_branch_xl
24de94c 
Make changes according to coding standard
@iynixil
Add login route to frontend
7aed41f
@iynixil
Add login page UI and styling
6c07593
@iynixil
Add logout API
500cec1
@iynixil
Update password input field to be hidden
e89e2f9
@whitesnowx
Merge remote-tracking branch 'upstream/question_branch_xl'
a645b65
@iynixil
Add navbar component and its styling
6819c7b
@iynixil
Update login page styling
571bf9e
@iynixil
Merge branch 'user-login' into frontend-navbar
71dd534
@iynixil
Update navbar content
bac17dd
tsulim and others added 21 commits September 30, 2024 02:04
@tsulim
Extract route for get all questions
152b26c
@tsulim
Extract route for create question
30b5daf
@tsulim
Extract route for update question
725b3d4
@tsulim
Extract route for delete question
e7c2e40
@tsulim
Add loading animation for update and delete
50069b6
@tsulim
Remove redundant parameter
9cbfdc5
@iynixil
Merge pull request #27 from CS3219-AY2425S1/question-branch-tsu
321cfa2 
Extract question routes to reduce clutter
@iynixil
Merge pull request #32 from iynixil/user-service
9b205e6 
Push finalized user microservice to shared user-service branch
@iynixil
Merge remote-tracking branch 'upstream/question_branch' into merge-us…
f1037de 
…er-question
@iynixil
Refactor backend directory by separating microservices
2baf086
@iynixil
Update file used to configure database
7035358
@iynixil
Update backend npm cmd to use nodemon
dc5fa5d
@iynixil
Rename frontend directory, refactor pages separated by microservices
cde087b
@iynixil
Merge pull request #33 from iynixil/merge-user-question
18cb036 
Merge user and question microservices
@tsulim
Shift remaining files into both services
fd9fdcd
@tsulim
Merge pull request #35 from tsulim/merged-user-question
33546ea 
Shift remaining files into both services
@tsulim
Update controller files on firebase directory
4194af1
@tsulim
Add Dockerfile for question service
d4cb3ab
@tsulim
Add Dockerfile for user service
77df819
@tsulim
Add docker-compose file
32c0972
@tsulim
Merge branch 'merged-user-question' of https://github.com/CS3219-AY24…
9b2ad21 
…25S1/cs3219-ay2425s1-project-g46 into merged-user-question
@tsulim tsulim added this to the Milestone 3 milestone Oct 4, 2024
@tsulim tsulim linked an issue Oct 4, 2024 that may be closed by this pull request
D3: Containerize Question Service #31
Closed
xuelinglow
xuelinglow approved these changes Oct 4, 2024
View reviewed changes
Copy link

@xuelinglow xuelinglow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, tested and it works on my side as well

iynixil
iynixil approved these changes Oct 5, 2024
View reviewed changes
Copy link

@iynixil iynixil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@iynixil iynixil merged commit 743855a into main Oct 5, 2024
AndrewOng2066 added a commit to AndrewOng2066/cs3219-ay2425s1-project-g46 that referenced this pull request Oct 10, 2024
@AndrewOng2066
Merge pull request #13 from CS3219-AY2425S1/main
03e8cd4 
Merge pull request CS3219-AY2425S1#36 from CS3219-AY2425S1/merged-user-question
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iynixil iynixil iynixil approved these changes

@xuelinglow xuelinglow xuelinglow approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Milestone 3
Development

Successfully merging this pull request may close these issues.

D3: Containerize Question Service D3: Containerize User Service
5 participants
@tsulim @xuelinglow @iynixil @AndrewOng2066 @whitesnowx