Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
616 commits
Select commit Hold shift + click to select a range
b800a5e
add updated front end components
Nov 11, 2023
67539ff
Increase Timeout For History Service
Jai2501 Nov 11, 2023
f08ee62
Merge branch 'merge-question-service-with-all-services' of https://gi…
Jai2501 Nov 11, 2023
f1c5caa
fix question controller export syntax error
Nov 11, 2023
de77a35
add missing assets
Nov 11, 2023
e548a75
add api call to history
Nov 11, 2023
c8f5085
add link for forgot password
Nov 11, 2023
0269fb8
Add search
Nov 11, 2023
f178084
Merge remote-tracking branch 'origin/match-collab-resolve' into merge…
Jai2501 Nov 11, 2023
5ff0fa7
Merge remote-tracking branch 'origin/test-updated-merge' into merge-s…
Jai2501 Nov 11, 2023
ecff248
Update CollaborationWindow.jsx
Jai2501 Nov 11, 2023
fd5faef
Update AIChat.jsx
Jai2501 Nov 11, 2023
09e5990
Update HistoryServiceController.js
Jai2501 Nov 11, 2023
619a7d2
Update App.js
Jai2501 Nov 11, 2023
5d85277
Update History Service
Jai2501 Nov 11, 2023
382ff36
Update CollaborationWindow.jsx
Jai2501 Nov 11, 2023
5eb303e
Update config.js
Jai2501 Nov 11, 2023
8490387
Update CollaborationWindow.jsx
Jai2501 Nov 11, 2023
ef1f713
Create .gitignore
Jai2501 Nov 11, 2023
1ab4ddd
Update config.js
Jai2501 Nov 11, 2023
094030c
Update Docker-compose.yml
Jai2501 Nov 11, 2023
3bbac85
Fix controller param issues.
laihuiqi Nov 12, 2023
7eeca48
add loading feature for AI chat, reposition chat and AI button
Nanxi-Huang Nov 12, 2023
0cb083f
Fix errors with filter
Nov 12, 2023
63f782e
resolve issues with socket
Nanxi-Huang Nov 12, 2023
a1f964c
Create build_master_docker_services.yaml
Jai2501 Nov 12, 2023
937307d
fix issue where other user is not navigated collab window
Nanxi-Huang Nov 12, 2023
0782b65
Update build_master_docker_services.yaml
Jai2501 Nov 12, 2023
f5e0050
Update build_master_docker_services.yaml
Jai2501 Nov 12, 2023
e28b7b2
Update build_master_docker_services.yaml
Jai2501 Nov 12, 2023
04888ea
Update build_master_docker_services.yaml
Jai2501 Nov 12, 2023
f4f335e
Update build_master_docker_services.yaml
Jai2501 Nov 12, 2023
400ffe8
fix socket bugs
Nov 12, 2023
eb067b4
Create build__and_test_master_user_service.yaml
Jai2501 Nov 12, 2023
f2b0522
Add JEST in User Service
Jai2501 Nov 12, 2023
ceefae9
Update build_and_test_master_user_service.yaml
Jai2501 Nov 12, 2023
8598e3d
Add Sample Test Case File
Jai2501 Nov 12, 2023
db943f9
add bug fix for single user session initialisation
Nov 12, 2023
60bb821
Update Workflow File
Jai2501 Nov 12, 2023
a299877
Update build_and_test_master_user_service.yaml
Jai2501 Nov 12, 2023
a6b99e9
Update Sample Test Case
Jai2501 Nov 12, 2023
494186f
Update Workflow File
Jai2501 Nov 12, 2023
f823c60
Update build_and_test_master_user_service.yaml
Jai2501 Nov 12, 2023
753311f
Update build_and_test_master_user_service.yaml
Jai2501 Nov 12, 2023
8fb2715
Update package.json
Jai2501 Nov 12, 2023
2229e0c
Merge branch 'add-ci-cd' of https://github.com/CS3219-AY2324S1/ay2324…
Jai2501 Nov 12, 2023
860cf35
Update package.json
Jai2501 Nov 12, 2023
d1de819
Update Users.js
Jai2501 Nov 12, 2023
c39937a
Merge branch 'merge-services' into add-ci-cd
Jai2501 Nov 12, 2023
2bad6f2
Update build_and_test_master_user_service.yaml
Jai2501 Nov 12, 2023
18ec726
Update build_and_test_master_user_service.yaml
Jai2501 Nov 12, 2023
c767245
Update build_and_test_master_user_service.yaml
Jai2501 Nov 12, 2023
992095d
Update Dockerfile
Jai2501 Nov 12, 2023
92e3fd9
Merge branch 'add-ci-cd' of https://github.com/CS3219-AY2324S1/ay2324…
Jai2501 Nov 12, 2023
a81cdfa
Update docker-compose.yml
Jai2501 Nov 12, 2023
5110e6d
Update UserDatabaseController.test.js
Jai2501 Nov 12, 2023
f6a5f86
Revert File State
Jai2501 Nov 12, 2023
f89a751
add updates to collab service sockets for code editor
Nov 12, 2023
cbfd57e
Add Artifact Upload
Jai2501 Nov 12, 2023
d7a7cdd
Update build_and_test_master_user_service.yaml
Jai2501 Nov 12, 2023
9113b20
Update build_and_test_master_user_service.yaml
Jai2501 Nov 12, 2023
c58cd09
Update package.json
Jai2501 Nov 12, 2023
7abf744
Add Matching Service CI/CD Setup
Jai2501 Nov 12, 2023
d06e365
Remove slash
Nov 12, 2023
39548aa
Backup script to run questions
Nov 12, 2023
0137b0a
add import fixes from collaborativeInputDb and minor code editor change
Nov 13, 2023
b303b76
Update build_and_test_master_matching_service.yaml
Jai2501 Nov 13, 2023
873fb88
Add CI/CD for Question Service
Jai2501 Nov 13, 2023
35d9dc5
Add CI/CD for Collaboration Service
Jai2501 Nov 13, 2023
7f8a513
Add Comments
Jai2501 Nov 13, 2023
cab8cae
Update build_and_test_master_collaboration_service.yaml
Jai2501 Nov 13, 2023
eb3a919
Update build_and_test_master_matching_service.yaml
Jai2501 Nov 13, 2023
cfce70d
Update build_and_test_master_matching_service.yaml
Jai2501 Nov 13, 2023
0ba4869
Update build_and_test_master_matching_service.yaml
Jai2501 Nov 13, 2023
1460b26
Update README.md
Jai2501 Nov 13, 2023
de5cd0a
Add CI/CD for Communication Service
Jai2501 Nov 13, 2023
94025d0
Add Jest Dependency in Collaboration Service
Jai2501 Nov 13, 2023
f78a6b6
Update README.md
Jai2501 Nov 13, 2023
5f8c765
Add CI/CD For GPT Service
Jai2501 Nov 13, 2023
b8dd580
Add CI/CD For GPT Service
Jai2501 Nov 13, 2023
d858c8d
align AIService with the updated AI backend
Nanxi-Huang Nov 13, 2023
3ee8c6d
Merge remote-tracking branch 'origin/merge-services' into collab-fix
Nanxi-Huang Nov 13, 2023
1dd4324
Merge remote-tracking branch 'origin/test-updated-merge' into collab-fix
Nanxi-Huang Nov 13, 2023
3559fb7
Update UserAuthenticationController.test.js
Jai2501 Nov 13, 2023
e443c0e
Revert "Merge remote-tracking branch 'origin/merge-services' into col…
Nanxi-Huang Nov 13, 2023
15e2aff
Revert "Merge remote-tracking branch 'origin/test-updated-merge' into…
Nanxi-Huang Nov 13, 2023
51b6966
Add User Service Unit + Integration Tests
Jai2501 Nov 13, 2023
cd0cd59
Update Test Directory of User Service
Jai2501 Nov 13, 2023
2039169
Fix tests
Nov 13, 2023
9ca6e5c
Add merge changes
Nov 13, 2023
b307ccb
Merge branch 'merge-services' into test-updated-merge
Nov 13, 2023
db7a714
remove proxy in package.json file
Nov 13, 2023
7799ebb
Add change
Nov 13, 2023
662d3e6
edit config files
Nov 13, 2023
71ae41e
Update History Service
Jai2501 Nov 13, 2023
aa2d6d6
Add Tests for History Service
Jai2501 Nov 13, 2023
6c5e1da
Add CI/CD for History Service
Jai2501 Nov 13, 2023
0dcbe58
Add Anonymous Volume for History Service
Jai2501 Nov 13, 2023
fa95b17
Update Dockerfile
Jai2501 Nov 13, 2023
a1d1237
Remove user tags
Nov 13, 2023
d448088
Fix History Service Database Connection Issue
Jai2501 Nov 13, 2023
3cf9192
Update build_and_test_master_history_service.yaml
Jai2501 Nov 13, 2023
ca155a6
Update HistoryDatabaseController.js
Jai2501 Nov 13, 2023
e0f30e6
Add Longer Timeouts
Jai2501 Nov 13, 2023
5f2dd27
Add health check routes.
laihuiqi Nov 13, 2023
2b460f7
Add CI/CD for Frontend
Jai2501 Nov 13, 2023
9023ea4
Add Anonymous Volume (Frontend)
Jai2501 Nov 13, 2023
c9abcab
Merge branch 'merge-question-service-with-all-services' into add-ci-cd
Jai2501 Nov 13, 2023
32f3f56
change reconnection state in collaboration window
Nov 13, 2023
cfb4cef
resolve timer extension issue
Nanxi-Huang Nov 13, 2023
c575154
edit session terminate params
Nov 13, 2023
c14ae75
comment out timer disconnect
Nov 13, 2023
6eeef4f
fix for collab session termination sync bug and add delay before land…
Nov 13, 2023
ef9acf9
fix code editor default code issue and syntax highlighting bug
Nov 13, 2023
19bb6a6
rename init code lang param and remove code editor on change
Nov 13, 2023
f04fc1e
add client socket for code editor
Nov 13, 2023
80887f3
add and sync lang dropdown for collab session and modify match pop va…
Nov 13, 2023
183820f
Merge branch 'merge-services' into test-updated-merge
Nov 14, 2023
8fcfaf6
Merge remote-tracking branch 'origin/collab-fix' into test-updated-merge
Nov 14, 2023
be7767c
save files
Nov 14, 2023
12aad40
fix default code not appearing bug
Nov 14, 2023
45ee407
separate log in and sign up forms
Nov 14, 2023
dc7cad8
remove setAction redeclaration
Nov 14, 2023
c40164c
add cosmetic changes to log in sign up
Nov 14, 2023
3cad0c5
fix css for log in sign up
Nov 14, 2023
f844166
Add question view (will fix small issues with it soon)
Nov 14, 2023
e7005ed
add error handling for user login and sign up and css animations
Nov 14, 2023
4802cd3
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Nov 14, 2023
970b82f
push updated version
Nov 14, 2023
8c85c2b
updated user service api
Nov 14, 2023
fce8580
Resolve issue with question view
Nov 14, 2023
2009832
Update test-updated-merge changes
Nov 14, 2023
87e6bc7
fix issue with language selection
Nov 14, 2023
a697b01
fix lang use state typo
Nov 14, 2023
bfcc1eb
fix lang dropdown selection in sign up
Nov 14, 2023
a6af6de
support audio call feature
Nanxi-Huang Nov 14, 2023
11d7ec0
fix user edit profile function call bug
Nov 14, 2023
8b6ca2e
Update .env
Jai2501 Nov 14, 2023
ecdf5d0
Add changes for population and fields
Nov 14, 2023
bc23c89
Update CollaborationWindow.jsx
Linda124 Nov 14, 2023
96669d4
Update .env
Jai2501 Nov 14, 2023
06bf8bb
Add change from file
Nov 14, 2023
a839f8d
Add Dynamic Key Fetch
Jai2501 Nov 14, 2023
0cb3c37
Create .env
Jai2501 Nov 14, 2023
c77a0ed
Update time check.
laihuiqi Nov 14, 2023
453f6d5
Update collab service test
laihuiqi Nov 14, 2023
f3a9b70
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Jai2501 Nov 14, 2023
661061a
Update docker-compose.yml
Jai2501 Nov 14, 2023
c358edf
Merge branch 'test-updated-merge' into collab-fix
Nanxi-Huang Nov 14, 2023
f61c757
Merge pull request #95 from CS3219-AY2324S1/collab-fix
aishh12 Nov 14, 2023
75a6501
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Jai2501 Nov 14, 2023
eec22c2
Merge branch 'add-ci-cd' into test-updated-merge
Jai2501 Nov 14, 2023
3f6fd5e
Remove Parse Int
Jai2501 Nov 14, 2023
410254c
Update Users.js
Jai2501 Nov 14, 2023
de9bb57
Update CI/CD For Collab Service
Jai2501 Nov 14, 2023
00936b5
Update .gitignore
Jai2501 Nov 14, 2023
f53317a
Update build_and_test_master_collaboration_service.yaml
Jai2501 Nov 14, 2023
1554b66
Update .gitignore
Jai2501 Nov 14, 2023
a93a984
Update build_and_test_master_gpt_service.yaml
Jai2501 Nov 14, 2023
e76b469
Update build_and_test_master_gpt_service.yaml
Jai2501 Nov 14, 2023
6b40e5e
Update build_and_test_master_gpt_service.yaml
Jai2501 Nov 14, 2023
d6f5acd
Update build_and_test_master_gpt_service.yaml
Jai2501 Nov 14, 2023
c870039
Add/Update Test Cases
Jai2501 Nov 14, 2023
c24cdca
Resolve merge conflict.
laihuiqi Nov 14, 2023
2cae650
Update matching test case to mock post request to question service.
laihuiqi Nov 14, 2023
0b5926f
Update README.md for Collaboration Service
laihuiqi Nov 14, 2023
a81faf1
Update README.md
laihuiqi Nov 14, 2023
fa761d5
Fix typo issue
laihuiqi Nov 14, 2023
8880698
Update README.md
laihuiqi Nov 15, 2023
617a563
Update README.md
laihuiqi Nov 15, 2023
cdea2a1
add SQL to list of language for sign up, profile, match and code editor
Nov 15, 2023
d060104
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Nov 15, 2023
8938a16
Update README.md
laihuiqi Nov 15, 2023
8cd5a2b
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Nov 15, 2023
3127480
Update README.md
Jai2501 Nov 15, 2023
185e23a
Update README.md
laihuiqi Nov 15, 2023
86b9390
Update README.md
laihuiqi Nov 15, 2023
e3cc23c
Update README.md
laihuiqi Nov 15, 2023
01a5b6a
Update README.md
Jai2501 Nov 15, 2023
e18fd78
Update README.md
Jai2501 Nov 15, 2023
d1381a6
Fix Admin Route Bug
Jai2501 Nov 15, 2023
673fc6b
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Jai2501 Nov 15, 2023
53b2e98
fix rabbitmq url in matching config
Nov 15, 2023
07ae864
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Nov 15, 2023
6f0ce5c
remove unwanted comment from user profile and adjust lang drop down w…
Nov 15, 2023
e582756
Update controller text output for error message.
laihuiqi Nov 15, 2023
d6d91ff
Update RabbitMQ url.
laihuiqi Nov 15, 2023
d220843
add collab submission to user attempt db
Nov 15, 2023
1e76297
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Nov 15, 2023
a428b90
add fix for history service
Nov 15, 2023
a3e903d
fix merge conflict
Nov 15, 2023
478b66d
edit attempt.jsx
Nov 15, 2023
8f28948
match not success output
Nanxi-Huang Nov 15, 2023
3b29015
Merge pull request #96 from CS3219-AY2324S1/match-popup-notsuccess
aishh12 Nov 15, 2023
6050621
Add History Service To Support Questions
Jai2501 Nov 15, 2023
39106ce
Update HistoryRoutesController.js
Jai2501 Nov 15, 2023
50f69cb
Update Test Cases
Jai2501 Nov 15, 2023
1c464ef
Update build_and_test_master_history_service.yaml
Jai2501 Nov 15, 2023
831215c
Fix Question Not Being Updated Bug
Jai2501 Nov 15, 2023
2b40d14
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Jai2501 Nov 15, 2023
e057955
Update HistoryDatabaseController.js
Jai2501 Nov 15, 2023
b0c418f
Update HistoryDatabaseController.js
Jai2501 Nov 15, 2023
b47a285
Update HistoryDatabaseController.js
Jai2501 Nov 15, 2023
a1184ac
Recover GPT Service.
laihuiqi Nov 15, 2023
81b2bba
Merge branch 'updated-history-service' into test-updated-merge
Jai2501 Nov 15, 2023
00ed80c
Recover collaboration service.
laihuiqi Nov 15, 2023
f44748c
Add Script to Add Users on Startup
Jai2501 Nov 15, 2023
fd582d9
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Jai2501 Nov 15, 2023
21f8222
Update UserDatabaseController.test.js
Jai2501 Nov 15, 2023
6e53a53
Update UserDatabaseController.test.js
Jai2501 Nov 15, 2023
72fd1cd
link history service front and back end
Nov 15, 2023
af8a964
Merge branch 'test-updated-merge' of https://github.com/CS3219-AY2324…
Nov 15, 2023
a0eaa3a
Update AttemptView.jsx
Jai2501 Nov 15, 2023
bdf6fdc
Update CollaborationWindow.jsx
Jai2501 Nov 15, 2023
89d60cb
Update AttemptHistory.jsx
Jai2501 Nov 15, 2023
452b413
Update Attempt.jsx
Jai2501 Nov 15, 2023
6e21697
fix history service bug with code fetching
Nov 16, 2023
49d0238
edit matchingController.js
Nov 16, 2023
5bb4e24
add cancel match request
Nanxi-Huang Nov 16, 2023
9d95347
Remove Database From History Service
Jai2501 Nov 16, 2023
81c7e8d
Update MatchPopup.jsx
Jai2501 Nov 16, 2023
4a0b8f6
Update LoadPopup.jsx
Jai2501 Nov 16, 2023
3ac198a
Merge pull request #97 from CS3219-AY2324S1/matching-cancel
Jai2501 Nov 16, 2023
e6e5af7
Update config.js
Jai2501 Nov 16, 2023
a19655c
Merge branch 'fix-question-edit-bug' into test-updated-merge
Jai2501 Nov 16, 2023
b465a66
Merge pull request #98 from CS3219-AY2324S1/test-updated-merge
Jai2501 Nov 16, 2023
3e619f7
Update App.js
Jai2501 Nov 17, 2023
f24a67e
Add Logout + Delete Button
Jai2501 Nov 17, 2023
1ea6a1a
Update Login.jsx
Jai2501 Nov 17, 2023
95a6419
Delete CollaborationService Directory
Jai2501 Nov 17, 2023
91d2352
Delete CommunicationService directory
Jai2501 Nov 17, 2023
8a2a033
Delete GptService directory
Jai2501 Nov 17, 2023
55ae44c
Delete HistoryService directory
Jai2501 Nov 17, 2023
06523d6
Delete MatchingService directory
Jai2501 Nov 17, 2023
0064372
Update docker-compose.yml
Jai2501 Nov 17, 2023
32a0679
Delete .github/workflows/build_and_test_master_collaboration_service.…
Jai2501 Nov 17, 2023
aef22e9
Delete .github/workflows/build_and_test_master_communication_service.…
Jai2501 Nov 17, 2023
281c326
Delete .github/workflows/build_and_test_master_gpt_service.yaml
Jai2501 Nov 17, 2023
70e815c
Delete .github/workflows/build_and_test_master_history_service.yaml
Jai2501 Nov 17, 2023
607f2a4
Delete .github/workflows/build_and_test_master_matching_service.yaml
Jai2501 Nov 17, 2023
ca36c46
Update App.js
Jai2501 Nov 17, 2023
05f3c3f
remove comment from docker-compose.yml
Nanxi-Huang Nov 17, 2023
3d59f14
Update README.md
Jai2501 Nov 17, 2023
b19ef62
Update UserProfile.jsx
Jai2501 Nov 18, 2023
ca11b2c
Merge pull request #100 from CS3219-AY2324S1/assignment-2-final
Jai2501 Nov 18, 2023
1c46097
resolve merge conflict with master
Nov 18, 2023
661f68f
Merge pull request #99 from CS3219-AY2324S1/assignment1
Jai2501 Nov 18, 2023
c131758
Merge pull request #101 from CS3219-AY2324S1/assignment-3-final
Jai2501 Nov 18, 2023
bfb6b0f
Merge pull request #102 from CS3219-AY2324S1/assignment-4-final
Jai2501 Nov 18, 2023
a764ea5
add deadline
github-classroom[bot] Nov 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
56 changes: 56 additions & 0 deletions .github/workflows/build_and_test_master_frontend_client.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Build And Test Frontend Client

on:
push:
paths:
- "Frontend/**"
- ".github/workflows/build_and_test_master_frontend_client.yaml"

pull_request:
paths:
- "Frontend/**"
- ".github/workflows/build_and_test_master_frontend_client.yaml"

jobs:
build-and-test-frontend-service:
runs-on: ubuntu-latest

env:
CONTAINER_NAME: "ay2324s1-course-assessment-g16_frontend_1" # Here _ is being used after file directory and service name vs -

steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up Docker Environment
uses: docker/setup-buildx-action@v3

- name: Build Frontend Client with Docker Compose
run: docker-compose build --no-cache frontend

- name: Run Frontend Client with Docker Compose
run: docker-compose up -d frontend

# - name: Wait For Startup
# run: sleep 30

- name: List Docker Containers
run: docker ps

- name: Logs [For Checking Status Only]
run: docker-compose logs

# - name: Run Test Cases in Frontend Client
# run: docker exec $CONTAINER_NAME npm test

# - name: Retrieve Artifacts [JEST Test Reports]
# run: docker cp $CONTAINER_NAME:/app/coverage ./frontend-client-test-jest-reports

# - name: Upload Artifacts
# uses: actions/upload-artifact@v3
# with:
# name: frontend-client-test-jest-report-artifacts
# path: ./frontend-client-test-jest-reports/*

- name: Shut Down Containers
run: docker-compose down
56 changes: 56 additions & 0 deletions .github/workflows/build_and_test_master_question_service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Build And Test Question Service

on:
push:
paths:
- "QuestionService/**"
- ".github/workflows/build_and_test_master_question_service.yaml"

pull_request:
paths:
- "QuestionService/**"
- ".github/workflows/build_and_test_master_question_service.yaml"

jobs:
build-and-test-question-service:
runs-on: ubuntu-latest

env:
CONTAINER_NAME: "ay2324s1-course-assessment-g16_question-service_1" # Here _ is being used after file directory and service name vs -

steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up Docker Environment
uses: docker/setup-buildx-action@v3

- name: Build Question Service and Question Service Database with Docker Compose
run: docker-compose build --no-cache question-service question-service-database

- name: Run Question Service and Question Service Database with Docker Compose
run: docker-compose up -d question-service question-service-database

# - name: Wait For Startup
# run: sleep 30

- name: List Docker Containers
run: docker ps

- name: Logs [For Checking Status Only]
run: docker-compose logs

- name: Run Test Cases in Question Service
run: docker exec $CONTAINER_NAME npm test

- name: Retrieve Artifacts [JEST Test Reports]
run: docker cp $CONTAINER_NAME:/app/coverage ./question-service-test-jest-reports

- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: question-service-test-jest-report-artifacts
path: ./question-service-test-jest-reports/*

- name: Shut Down Containers
run: docker-compose down
56 changes: 56 additions & 0 deletions .github/workflows/build_and_test_master_user_service.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Build And Test User Service

on:
push:
paths:
- "UserService/**"
- ".github/workflows/build_and_test_master_user_service.yaml"

pull_request:
paths:
- "UserService/**"
- ".github/workflows/build_and_test_master_user_service.yaml"

jobs:
build-and-test-user-service:
runs-on: ubuntu-latest

env:
CONTAINER_NAME: "ay2324s1-course-assessment-g16_user-service_1" # Here _ is being used after file directory and service name vs -

steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up Docker Environment
uses: docker/setup-buildx-action@v3

- name: Build User Service and User Service Database with Docker Compose
run: docker-compose build --no-cache user-service user-service-database

- name: Run User Service and User Service Database with Docker Compose
run: docker-compose up -d user-service user-service-database

# - name: Wait For Startup
# run: sleep 30

- name: List Docker Containers
run: docker ps

- name: Logs [For Checking Status Only]
run: docker-compose logs

- name: Run Test Cases in User Service
run: docker exec $CONTAINER_NAME npm test

- name: Retrieve Artifacts [JEST Test Reports]
run: docker cp $CONTAINER_NAME:/app/coverage ./user-service-test-jest-reports

- name: Upload Artifacts
uses: actions/upload-artifact@v3
with:
name: user-service-test-jest-report-artifacts
path: ./user-service-test-jest-reports/*

- name: Shut Down Containers
run: docker-compose down
17 changes: 17 additions & 0 deletions .github/workflows/build_master_docker_services.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Build All Docker Containers

on: [push, pull_request]

jobs:
build-all-services:
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Set up Docker Environment
uses: docker/setup-buildx-action@v3

- name: Build with Docker Compose
run: docker-compose build --no-cache
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"git.ignoreLimitWarning": true
}
1 change: 1 addition & 0 deletions Frontend/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
1 change: 1 addition & 0 deletions Frontend/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PORT=3001
23 changes: 23 additions & 0 deletions Frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
10 changes: 10 additions & 0 deletions Frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM node:18-alpine

WORKDIR /app
COPY package.json .
RUN npm install
COPY . .

EXPOSE 3001

CMD ["npm", "start"]
23 changes: 23 additions & 0 deletions Frontend/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Frontend Setup Guide

# Quick Start

1. Navigate to the `Frontend` Directory in Terminal or Powershell

2. Build the Container.

Command:

```
docker-compose build frontend
```

3. Start the Container.

Command:

```
docker-compose up frontend
```

4. Using your preferred Browser, you can go to the following URL `http://localhost:3001/` to see the frontend running.
Loading