Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
232 commits
Select commit Hold shift + click to select a range
e4ee650
Setting up GitHub Classroom Feedback
github-classroom[bot] Aug 25, 2022
a9d94fd
Add .gitignore
thikhinab Sep 5, 2022
fe1cfe1
Merge pull request #2 from thikhinab/dev
thikhinab Sep 5, 2022
bd5c1f8
Add select difficulty page
thikhinab Sep 5, 2022
b78e90b
Add matching service skeleton
thikhinab Sep 7, 2022
ce7c349
Change styling
thikhinab Sep 7, 2022
cfba398
feat: Create Header,HomePage, LoginPage, ProfilePage, and MatchPage
lerxcl Sep 14, 2022
7a018f1
Add logic to handle match failure
thikhinab Sep 14, 2022
621c4f7
Improve styling
thikhinab Sep 15, 2022
4774445
Milestone 1 features
Md-Fazil Sep 17, 2022
1f87377
Add unique username check
Md-Fazil Sep 17, 2022
7180e3b
Refactor orm layer
Md-Fazil Sep 17, 2022
0426d61
Merge pull request #6 from thikhinab/add-matching-service
lerxcl Sep 20, 2022
1965efb
Merge pull request #7 from CS3219-AY2223S1/milestone1
lerxcl Sep 20, 2022
fc33fcd
Merge branch 'dev' into chenler/frontend
lerxcl Sep 20, 2022
c3676a0
Link User Service APIs to frontend
lerxcl Sep 23, 2022
872e6d9
enhance UI of select and matching page
lerxcl Oct 2, 2022
632fd76
Fix typo and remove dummy user in Select page
lerxcl Oct 3, 2022
b8ecf75
Fix typo in App.js
lerxcl Oct 3, 2022
63f3e54
implement question service
kumsssss Oct 4, 2022
ff388df
Add Collaboration Page
lerxcl Oct 4, 2022
6e1eabb
Add leave button in Collab page
lerxcl Oct 4, 2022
8fc07ef
add endpoint to get list of topics
kumsssss Oct 5, 2022
f100b6b
Add implementation of chat service
Md-Fazil Oct 11, 2022
3fdcb22
add return for functions
kumsssss Oct 11, 2022
efe86d9
change params attr name
kumsssss Oct 11, 2022
f6ad882
add return for functions
kumsssss Oct 11, 2022
ec02a2d
Merge pull request #12 from CS3219-AY2223S1/chat-service-initial
kumsssss Oct 11, 2022
1df7e21
Merge branch 'dev' into question-service
kumsssss Oct 11, 2022
d3df3ff
Merge pull request #9 from CS3219-AY2223S1/question-service
Md-Fazil Oct 11, 2022
15705a2
Add frontend package-lock to gitignore
lerxcl Oct 11, 2022
d085706
Make collab room route wildcard
lerxcl Oct 11, 2022
3d4409c
Merge branch 'dev' into chenler/frontend
lerxcl Oct 11, 2022
78666c6
remove frontend package-lock
lerxcl Oct 11, 2022
61d311c
remove rest of package-lock
lerxcl Oct 11, 2022
e349264
Merge pull request #8 from CS3219-AY2223S1/chenler/frontend
thikhinab Oct 11, 2022
5bfb7a0
Log match information
thikhinab Oct 12, 2022
e143914
Merge branch 'dev' into add-matching-service
thikhinab Oct 12, 2022
e4cdaf8
Fix bug on match info model
thikhinab Oct 12, 2022
a6e9b24
Integrate chat service into frontend
lerxcl Oct 12, 2022
e07b2ec
implement redis cache
kumsssss Oct 19, 2022
5540ff9
remove redundant methods
kumsssss Oct 19, 2022
053f450
update get methods in controller
kumsssss Oct 19, 2022
b979edd
update package and package-lock.json
kumsssss Oct 19, 2022
9641272
Merge branch 'dev' into question-service
kumsssss Oct 19, 2022
5072014
Merge pull request #16 from CS3219-AY2223S1/question-service
lerxcl Oct 20, 2022
cb4a2b5
Merge branch 'dev' into chenler/frontend
lerxcl Oct 20, 2022
2f75402
Integrate question service into frontend
lerxcl Oct 20, 2022
dfbe4bf
Merge pull request #17 from CS3219-AY2223S1/chenler/frontend
kumsssss Oct 20, 2022
37aee35
update question service API endpoint
kumsssss Oct 20, 2022
a31bd15
Notify other users in room if user leave the page
Md-Fazil Oct 22, 2022
89d0593
Implement localStorage and redirect to login if not logged in
lerxcl Oct 23, 2022
3ea2a1c
SignupPage: Redirect to home if user is logged in
lerxcl Oct 23, 2022
ddb590f
Go to collab page immediately after being matched
lerxcl Oct 23, 2022
b9b50ec
create history service
kumsssss Oct 23, 2022
aa1a8a7
bug fixes
kumsssss Oct 23, 2022
d2eba11
remove duplicated functions
kumsssss Oct 23, 2022
bf3525d
remove unnecessary imports
kumsssss Oct 23, 2022
5f7633a
Add editor
thikhinab Oct 23, 2022
b4d98c8
add return
kumsssss Oct 24, 2022
ca0f521
add README for history service
kumsssss Oct 24, 2022
70135e8
Add evaluation functionality
thikhinab Oct 24, 2022
bb3fd8c
Add redis database
thikhinab Oct 24, 2022
b9128cf
Merge pull request #19 from CS3219-AY2223S1/chenler/frontend
lerxcl Oct 25, 2022
ee62080
Resolve merge conflicts
thikhinab Oct 25, 2022
9e16b5c
Merge pull request #21 from thikhinab/add-editor
thikhinab Oct 25, 2022
be124d0
Merge branch 'dev' into add-matching-service
thikhinab Oct 25, 2022
6649353
Refactor pending match logic
thikhinab Oct 25, 2022
cdde345
merge updated dev branch
kumsssss Oct 26, 2022
68cd722
Merge pull request #18 from CS3219-AY2223S1/question-service
kumsssss Oct 26, 2022
ee69570
implement sort by datetime and add question
kumsssss Oct 26, 2022
700f440
Merge branch 'dev' into history-service
kumsssss Oct 26, 2022
950172e
Add filtering by topic
thikhinab Oct 26, 2022
72fd4c9
Update user on editor mode change
thikhinab Oct 26, 2022
194bd75
Merge pull request #20 from CS3219-AY2223S1/history-service
lerxcl Oct 28, 2022
06dfbc0
Merge pull request #23 from CS3219-AY2223S1/update-editor
lerxcl Oct 28, 2022
76e63e2
Update error messages
thikhinab Oct 28, 2022
cee802c
Merge pull request #15 from thikhinab/add-matching-service
lerxcl Oct 28, 2022
2691f82
Merge pull request #22 from CS3219-AY2223S1/notify-on-disconnect
lerxcl Oct 28, 2022
ca67626
fix frontend not giving proper params to chatservice to quit
lerxcl Oct 28, 2022
941ee31
Fix bug
thikhinab Oct 28, 2022
93a10d5
Remove default select
thikhinab Oct 28, 2022
01f90c0
Update localstorage when user leaves
lerxcl Oct 28, 2022
4f3335f
Add SelectTopicPage and button in Home
lerxcl Oct 28, 2022
830c907
Merge pull request #24 from CS3219-AY2223S1/update-editor
lerxcl Oct 28, 2022
f698324
Merge branch 'dev' into chenler/frontend
lerxcl Oct 28, 2022
3a086c9
Support frontend matching filters
thikhinab Oct 28, 2022
625e30b
Update functions
thikhinab Oct 28, 2022
e42544b
Merge pull request #25 from CS3219-AY2223S1/update-matching-service
lerxcl Oct 28, 2022
aae04f2
Add room param
lerxcl Oct 28, 2022
39fd867
Merge branch 'dev' into chenler/frontend
lerxcl Oct 28, 2022
6f3ac2a
Fix typo in matching
lerxcl Oct 28, 2022
14b7a67
configuration for question-service deployment
kumsssss Oct 29, 2022
4fa2223
configuration for user-service deployment
kumsssss Oct 29, 2022
d45e514
Refactor matching service with filter key
thikhinab Oct 29, 2022
d5e983c
Merge pull request #26 from CS3219-AY2223S1/update-matching-service
lerxcl Oct 29, 2022
16ae6d4
Merge branch 'dev' into chenler/frontend
lerxcl Oct 29, 2022
c4379bf
Integrate by topic to matching and collab room
lerxcl Oct 29, 2022
dc7bf17
add config for collaboration-service deployment
kumsssss Oct 30, 2022
8157b36
Merge branch 'dev' into test-deployment
kumsssss Oct 30, 2022
32b27d9
update redis connection
kumsssss Oct 31, 2022
6f95698
change origin for collaboration-service
kumsssss Oct 31, 2022
54e7f53
update cors for chat-service and matching-service
kumsssss Oct 31, 2022
ad14b65
update port config
kumsssss Oct 31, 2022
53f1e6a
add sample yaml file for github actions
kumsssss Oct 31, 2022
e78e11f
Merge pull request #27 from CS3219-AY2223S1/chenler/frontend
kumsssss Nov 1, 2022
6b029b7
Integrate history service to frontend
lerxcl Nov 1, 2022
b74395d
Make button more verbose
lerxcl Nov 1, 2022
59e8368
Store partner username
thikhinab Nov 1, 2022
6fc3c4a
update connection to db for matching-service
kumsssss Nov 1, 2022
9d66cdc
add / endpoint for user-service
kumsssss Nov 1, 2022
9bc0268
remove yaml file
kumsssss Nov 1, 2022
ab21896
resolve merge conflicts
kumsssss Nov 1, 2022
a7f7552
Update dependencies
thikhinab Nov 1, 2022
0342777
Change welcome message in chat service
Md-Fazil Nov 1, 2022
57a42b9
update chat-service
kumsssss Nov 2, 2022
5a1ea1a
update collab-service
kumsssss Nov 2, 2022
847d389
update history-service
kumsssss Nov 2, 2022
95448c8
update matching-service
kumsssss Nov 2, 2022
cdd8ff9
update question-service
kumsssss Nov 2, 2022
fb437ba
update user-service
kumsssss Nov 2, 2022
e2999e7
remove console.log
kumsssss Nov 2, 2022
40c2024
remove commented lines
kumsssss Nov 2, 2022
fe6319c
update connection to redis and db
kumsssss Nov 2, 2022
0887c38
Merge pull request #28 from CS3219-AY2223S1/test-deployment
Md-Fazil Nov 2, 2022
1089d0c
Merge branch 'dev' into chenler/frontend
lerxcl Nov 2, 2022
d69a23b
add workflows
kumsssss Nov 2, 2022
d8864f2
Merge pull request #29 from CS3219-AY2223S1/chenler/frontend
lerxcl Nov 2, 2022
f9f8641
Merge pull request #32 from CS3219-AY2223S1/notify-partner-name
lerxcl Nov 2, 2022
6bd2512
Merge branch 'dev' into update-matching-service
thikhinab Nov 2, 2022
84625a6
Improve Collab page layout and color
lerxcl Nov 3, 2022
86052b4
Merge pull request #30 from CS3219-AY2223S1/update-matching-service
lerxcl Nov 3, 2022
3b179ac
Color code difficulty in Collab page
lerxcl Nov 3, 2022
1fa0109
Merge branch 'dev' into chenler/frontend
lerxcl Nov 3, 2022
1a53586
More button UI color tweaks
lerxcl Nov 3, 2022
0e074ec
Preventive measures for exiting/re-entering Collab page
lerxcl Nov 3, 2022
211ec65
Merge branch 'dev' into github-actions
kumsssss Nov 3, 2022
50768cd
update workflows for microservices
kumsssss Nov 3, 2022
3b1d500
Fix question controller bug
lerxcl Nov 3, 2022
d9f8060
Fix refresh bug in App.js and clear user room data when finding match
lerxcl Nov 3, 2022
4e91de1
Merge pull request #33 from CS3219-AY2223S1/github-actions
kumsssss Nov 4, 2022
10513ba
Merge pull request #34 from CS3219-AY2223S1/dev
kumsssss Nov 4, 2022
83b9692
update matching-service package.json
kumsssss Nov 4, 2022
a931e77
Merge pull request #35 from CS3219-AY2223S1/main-bugfix
Md-Fazil Nov 4, 2022
57fc048
Throw proper error in frontend
lerxcl Nov 4, 2022
a0962a2
Improve collab page fonts
lerxcl Nov 4, 2022
93f37e1
Merge pull request #36 from CS3219-AY2223S1/chenler/frontend
kumsssss Nov 4, 2022
ade19aa
.env for frontend
lerxcl Nov 4, 2022
e3b2a14
Merge branch 'main' into dev
lerxcl Nov 4, 2022
62fb487
Merge pull request #37 from CS3219-AY2223S1/dev
kumsssss Nov 4, 2022
6714c90
Merge branch 'main' into chenler/frontend
lerxcl Nov 4, 2022
0886aea
Update timer
thikhinab Nov 4, 2022
a30fd29
Merge pull request #38 from CS3219-AY2223S1/update-timer
lerxcl Nov 4, 2022
35ef578
Merge branch 'dev' into chenler/frontend
lerxcl Nov 4, 2022
2eb5b26
remove endpoint from constants
lerxcl Nov 4, 2022
d738223
Merge pull request #39 from CS3219-AY2223S1/chenler/frontend
Md-Fazil Nov 6, 2022
1e9a339
Merge pull request #40 from CS3219-AY2223S1/dev
Md-Fazil Nov 6, 2022
1279d39
Update environment variable format
Md-Fazil Nov 6, 2022
67af801
Remove console log
Md-Fazil Nov 6, 2022
d1962cc
fix env variables
Md-Fazil Nov 7, 2022
8b0a08b
Notify other users when a user joins
Md-Fazil Nov 7, 2022
a9bffb5
Revamp UI + theme
lerxcl Nov 7, 2022
1d70a53
Add custom icon
lerxcl Nov 7, 2022
028860e
Remove buggy close tab logic and improve buttons
lerxcl Nov 7, 2022
0e5274d
Merge pull request #41 from CS3219-AY2223S1/fix-env-variables
Md-Fazil Nov 7, 2022
a629334
Merge pull request #42 from CS3219-AY2223S1/fix-chat-service-notifica…
kumsssss Nov 7, 2022
3134c79
Merge pull request #43 from CS3219-AY2223S1/chenler/frontend
lerxcl Nov 7, 2022
e75d709
Add expiry for qn service
lerxcl Nov 7, 2022
62c10f6
Merge pull request #44 from CS3219-AY2223S1/chenler/frontend
kumsssss Nov 7, 2022
6f0245e
Merge pull request #45 from CS3219-AY2223S1/dev
Md-Fazil Nov 7, 2022
820c524
Update ui message
thikhinab Nov 7, 2022
e7a733f
Update error message
thikhinab Nov 7, 2022
ff9f0ca
update frontend
kumsssss Nov 7, 2022
0f55581
move className option
kumsssss Nov 7, 2022
59be8c8
Update matching service
thikhinab Nov 7, 2022
c007120
Merge pull request #48 from CS3219-AY2223S1/update-matching
Md-Fazil Nov 7, 2022
7ebb696
Merge pull request #47 from CS3219-AY2223S1/dev
kumsssss Nov 7, 2022
7dda607
Update matching service
thikhinab Nov 7, 2022
be05c44
Improve header
lerxcl Nov 8, 2022
cf0dbb3
Use first letter as avatar in header
lerxcl Nov 8, 2022
21a641b
Use #2D2D2D in Collab page
lerxcl Nov 8, 2022
372126c
Add loading circle for pages
lerxcl Nov 8, 2022
b24211b
Add icons in buttons
lerxcl Nov 8, 2022
ac2286f
Add directionality for footer in Chat
lerxcl Nov 8, 2022
c86cecb
Add preventation of logging out in Matching/Collab page
lerxcl Nov 8, 2022
2d838d9
Differentiate color between admin and incoming user in chat
lerxcl Nov 8, 2022
95794c9
Merge pull request #50 from CS3219-AY2223S1/update-matching
Md-Fazil Nov 8, 2022
f1d7668
Merge pull request #46 from CS3219-AY2223S1/update-ui
Md-Fazil Nov 8, 2022
bb6576e
Merge pull request #51 from CS3219-AY2223S1/chenler/frontend
Md-Fazil Nov 8, 2022
0afc1f9
Merge pull request #52 from CS3219-AY2223S1/dev
Md-Fazil Nov 8, 2022
52bc8d1
Swap change pw and delete button in Profile
lerxcl Nov 8, 2022
44a2ff1
Fix refresh in Collab page
lerxcl Nov 8, 2022
8107306
Fix refresh in Select topic and difficulty
lerxcl Nov 8, 2022
5ecebf5
Tweak Header RHS position
lerxcl Nov 8, 2022
fc6ad39
Fix header position for good
lerxcl Nov 8, 2022
04e08e6
Add logging
thikhinab Nov 8, 2022
01ed632
Merge pull request #53 from CS3219-AY2223S1/chenler/frontend
lerxcl Nov 8, 2022
39d804a
Add logging
thikhinab Nov 8, 2022
63afeba
Add logging
thikhinab Nov 8, 2022
79c50ee
Add logging
thikhinab Nov 8, 2022
f7b0776
Merge pull request #54 from CS3219-AY2223S1/update-matching
Md-Fazil Nov 8, 2022
d90ecf5
Merge pull request #55 from CS3219-AY2223S1/dev
Md-Fazil Nov 8, 2022
b54af86
Fix height of elements in collab
lerxcl Nov 8, 2022
363f1ae
Merge pull request #56 from CS3219-AY2223S1/chenler/frontend
lerxcl Nov 8, 2022
9dbec32
Attempt to fix matching logic in frontend
lerxcl Nov 8, 2022
9aad237
Merge pull request #58 from CS3219-AY2223S1/chenler/frontend
lerxcl Nov 8, 2022
5cd1da0
Merge pull request #57 from CS3219-AY2223S1/dev
lerxcl Nov 8, 2022
cf7c67d
Tweak UI
lerxcl Nov 8, 2022
9bc8bf8
Merge pull request #59 from CS3219-AY2223S1/chenler/frontend
Md-Fazil Nov 8, 2022
70c66d3
Merge pull request #60 from CS3219-AY2223S1/dev
lerxcl Nov 8, 2022
bbc6d00
Tweak button in history page
lerxcl Nov 8, 2022
c5ce9bd
Merge pull request #61 from CS3219-AY2223S1/chenler/frontend
lerxcl Nov 9, 2022
29339d0
Remove debug statements
thikhinab Nov 9, 2022
f9e62db
Merge pull request #62 from CS3219-AY2223S1/dev
lerxcl Nov 9, 2022
576afbb
Update README.md
lerxcl Nov 9, 2022
e02449b
Merge pull request #63 from CS3219-AY2223S1/minor-changes
Md-Fazil Nov 9, 2022
4d741b8
Merge pull request #64 from CS3219-AY2223S1/dev
lerxcl Nov 9, 2022
91a90d5
Update README.md
lerxcl Nov 9, 2022
7b54654
Update README.md
lerxcl Nov 9, 2022
e290aed
Update README.md
lerxcl Nov 9, 2022
cd8efe2
Update readme
thikhinab Nov 9, 2022
403290a
Update readme
thikhinab Nov 9, 2022
f983639
Update readme
thikhinab Nov 9, 2022
0d8a20c
Update readme
thikhinab Nov 9, 2022
4b4d878
Update readme
thikhinab Nov 9, 2022
e3c2767
Add readme
thikhinab Nov 9, 2022
422d14b
Update readme
thikhinab Nov 9, 2022
2224c8c
Update readme
thikhinab Nov 9, 2022
d6ca048
Update readme
thikhinab Nov 9, 2022
3e7ffbf
Update README.md
Md-Fazil Nov 9, 2022
caac53d
Update README.md
Md-Fazil Nov 9, 2022
729b11d
Update README.md
Md-Fazil Nov 9, 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
47 changes: 47 additions & 0 deletions .github/workflows/chat-microservice-workflows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Node.js CI

on:
push:
branches: [ main ]
paths:
- 'chat-service/**'

jobs:
build:

runs-on: macos-latest
defaults:
run:
working-directory: ./chat-service

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Build and Test chat microservice
run: |
npm i
npm run test --if-present

- name: Generate deployment package [Chat microservice]
run: zip -r deployment.zip * -x "**node_modules**" ".env" "package-lock.json" ".gitignore"

- uses: hkusu/s3-upload-action@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: 'ap-southeast-1'
aws-bucket: 'chat-service-artifact-source-bucket'
bucket-root: '/'
destination-dir: '/'
file-path: './chat-service/deployment.zip'

- name: Deployed!
run: echo App deployed to EL
57 changes: 57 additions & 0 deletions .github/workflows/collab-microservice-workflows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Node.js CI

on:
push:
branches: [ main ]
paths:
- 'collaboration-service/**'

jobs:
build:

runs-on: macos-latest
defaults:
run:
working-directory: ./collaboration-service

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Create .env file
uses: ozaytsev86/create-env-file@v1
with:
ENV_CLOUD_REDIS_URL: ${{ secrets.COLLAB_SERVICE_REDIS_URL }}
ENV_CLOUD_REDIS_PORT: ${{ secrets.COLLAB_SERVICE_REDIS_PORT }}
ENV_CLOUD_REDIS_USERNAME: ${{ secrets.COLLAB_SERVICE_REDIS_USERNAME }}
ENV_CLOUD_REDIS_PASSWORD: ${{ secrets.COLLAB_SERVICE_REDIS_PASSWORD }}
ENV_PORT: "8080"

- name: Build and Test collaboration microservice
run: |
mv ../.env .
npm i
npm run test --if-present

- name: Generate deployment package [Collaboration microservice]
run: zip -r deployment.zip * -x "**node_modules**" ".env" "package-lock.json"

- uses: hkusu/s3-upload-action@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: 'ap-southeast-1'
aws-bucket: 'collaboration-service-artifact-source-bucket'
bucket-root: '/'
destination-dir: '/'
file-path: './collaboration-service/deployment.zip'

- name: Deployed!
run: echo App deployed to EL
55 changes: 55 additions & 0 deletions .github/workflows/history-microservice-workflows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Node.js CI

on:
push:
branches: [ main ]
paths:
- 'history-service/**'

jobs:
build:

runs-on: macos-latest
defaults:
run:
working-directory: ./history-service

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Create .env file
uses: ozaytsev86/create-env-file@v1
with:
ENV_CLOUD_DB_URL: ${{ secrets.HISTORY_SERVICE_DB_URL }}
ENV_ENV: "PROD"
ENV_PORT: "8080"

- name: Build and Test history microservice
run: |
mv ../.env .
npm i
npm run test --if-present

- name: Generate deployment package [History microservice]
run: zip -r deployment.zip * -x "**node_modules**" ".env" "package-lock.json"

- uses: hkusu/s3-upload-action@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: 'ap-southeast-1'
aws-bucket: 'history-service-artifact-source-bucket'
bucket-root: '/'
destination-dir: '/'
file-path: './history-service/deployment.zip'

- name: Deployed!
run: echo App deployed to EL
57 changes: 57 additions & 0 deletions .github/workflows/matching-microservice-workflows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Node.js CI

on:
push:
branches: [ main ]
paths:
- 'matching-service/**'

jobs:
build:

runs-on: macos-latest
defaults:
run:
working-directory: ./matching-service

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Create .env file
uses: ozaytsev86/create-env-file@v1
with:
ENV_CLOUD_REDIS_URL: ${{ secrets.MATCHING_SERVICE_REDIS_URL }}
ENV_CLOUD_REDIS_PORT: ${{ secrets.MATCHING_SERVICE_REDIS_PORT }}
ENV_CLOUD_REDIS_USERNAME: ${{ secrets.MATCHING_SERVICE_REDIS_USERNAME }}
ENV_CLOUD_REDIS_PASSWORD: ${{ secrets.MATCHING_SERVICE_REDIS_PASSWORD }}
ENV_PORT: "8080"

- name: Build and Test matching microservice
run: |
mv ../.env .
npm i
npm run test --if-present

- name: Generate deployment package [Matching microservice]
run: zip -r deployment.zip * -x "**node_modules**" "dev.sqlite" "package-lock.json" ".env"

- uses: hkusu/s3-upload-action@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: 'ap-southeast-1'
aws-bucket: 'matching-service-artifact-source-bucket '
bucket-root: '/'
destination-dir: '/'
file-path: './matching-service/deployment.zip'

- name: Deployed!
run: echo App deployed to EL
59 changes: 59 additions & 0 deletions .github/workflows/question-microservice-workflows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Node.js CI

on:
push:
branches: [ main ]
paths:
- 'question-service/**'

jobs:
build:

runs-on: macos-latest
defaults:
run:
working-directory: ./question-service

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Create .env file
uses: ozaytsev86/create-env-file@v1
with:
ENV_CLOUD_DB_URL: ${{ secrets.QUESTION_SERVICE_DB_URL }}
ENV_CLOUD_REDIS_URL: ${{ secrets.QUESTION_SERVICE_REDIS_URL }}
ENV_CLOUD_REDIS_PORT: ${{ secrets.QUESTION_SERVICE_REDIS_PORT }}
ENV_CLOUD_REDIS_USERNAME: ${{ secrets.QUESTION_SERVICE_REDIS_USERNAME }}
ENV_CLOUD_REDIS_PASSWORD: ${{ secrets.QUESTION_SERVICE_REDIS_PASSWORD }}
ENV_ENV: "PROD"
ENV_PORT: "8080"

- name: Build and Test question microservice
run: |
mv ../.env .
npm i
npm run test

- name: Generate deployment package [Question microservice]
run: zip -r deployment.zip * -x "**node_modules**" ".env" "package-lock.json"

- uses: hkusu/s3-upload-action@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: 'ap-southeast-1'
aws-bucket: 'question-service-artifact-source-bucket'
bucket-root: '/'
destination-dir: '/'
file-path: './question-service/deployment.zip'

- name: Deployed!
run: echo App deployed to EL
59 changes: 59 additions & 0 deletions .github/workflows/user-microservice-workflows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Node.js CI

on:
push:
branches: [ main ]
paths:
- 'user-service/**'

jobs:
build:

runs-on: macos-latest
defaults:
run:
working-directory: ./user-service

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Create .env file
uses: ozaytsev86/create-env-file@v1
with:
ENV_DB_CLOUD_URI: ${{ secrets.USER_SERVICE_DB_URL }}
ENV_CLOUD_REDIS_URL: ${{ secrets.USER_SERVICE_REDIS_URL }}
ENV_CLOUD_REDIS_PORT: ${{ secrets.USER_SERVICE_REDIS_PORT }}
ENV_CLOUD_REDIS_USERNAME: ${{ secrets.USER_SERVICE_REDIS_USERNAME }}
ENV_CLOUD_REDIS_PASSWORD: ${{ secrets.USER_SERVICE_REDIS_PASSWORD }}
ENV_ENV: "PROD"
ENV_PORT: "8080"

- name: Build and Test user microservice
run: |
mv ../.env .
npm i
npm run test --if-present

- name: Generate deployment package [User microservice]
run: zip -r deployment.zip * -x "**node_modules**" ".env" "package-lock.json"

- uses: hkusu/s3-upload-action@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: 'ap-southeast-1'
aws-bucket: 'user-service-artifact-source-bucket'
bucket-root: '/'
destination-dir: '/'
file-path: './user-service/deployment.zip'

- name: Deployed!
run: echo App deployed to EL
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules
.env
*.sqlite
package-lock.json
Binary file added 11-ProjectReport.pdf
Binary file not shown.
Loading