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

Feedback #1

Open
wants to merge 235 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
235 commits
Select commit Hold shift + click to select a range
d9d92de
Setting up GitHub Classroom Feedback
github-classroom[bot] Sep 8, 2023
dcad260
Add assignment deadline url
github-classroom[bot] Sep 8, 2023
d02acb9
initial commit
ngjiayuan Sep 11, 2023
7586bc2
add navbar
ngjiayuan Sep 11, 2023
d78a9a9
add question list
KJunWei Sep 15, 2023
f833989
homepage
charltonator Sep 15, 2023
c7c168c
homepage
charltonator Sep 15, 2023
f513645
Add basic question form
szelongq Sep 15, 2023
613615e
Merge pull request #7 from CS3219-AY2324S1/6-add-question-list
charltonator Sep 16, 2023
b18878e
Merge branch 'master' into homepage
charltonator Sep 16, 2023
7e4d538
Merge pull request #13 from CS3219-AY2324S1/homepage
charltonator Sep 16, 2023
7b311c8
move home above titlebar
charltonator Sep 16, 2023
1cce8be
add authentication feature
ngjiayuan Sep 16, 2023
23e5768
Merge branch 'master' of https://github.com/CS3219-AY2324S1/ay2324s1-…
ngjiayuan Sep 16, 2023
1def5e0
remove imports
ngjiayuan Sep 16, 2023
1cbcd20
add github workflow
ngjiayuan Sep 16, 2023
5f2f2a7
fix build
ngjiayuan Sep 16, 2023
13cc09f
Merge pull request #18 from CS3219-AY2324S1/auth
wilburrito Sep 17, 2023
4f13395
Add functionality to pull questions from Firestore
wilburrito Sep 19, 2023
ac0e42d
Add functionality but still buggy
wilburrito Sep 19, 2023
a82465b
Create ProblemSolver page
charltonator Sep 21, 2023
10d7109
Fix bugs
wilburrito Sep 22, 2023
e9875a5
Pass checks
wilburrito Sep 22, 2023
a6662fa
Fix infinite recursion
wilburrito Sep 22, 2023
cf2237f
Fix infinite recursion
wilburrito Sep 22, 2023
66437c7
Merge pull request #23 from CS3219-AY2324S1/pull-questions-from-fires…
wilburrito Sep 22, 2023
a55cb5b
Add landing page if not logged in or not signed up
wilburrito Sep 22, 2023
b3942df
Fix styling for linter
wilburrito Sep 22, 2023
0a40199
Merge pull request #25 from CS3219-AY2324S1/landing-page
wilburrito Sep 22, 2023
3204190
use database(untested), create question not found page and separate c…
charltonator Sep 22, 2023
dd4e933
add matching service button
KJunWei Sep 24, 2023
bf5d2ae
Merge branch 'master' into 22-create-button-for-matching-service
KJunWei Sep 24, 2023
3e32a6a
Merge pull request #26 from CS3219-AY2324S1/22-create-button-for-matc…
KJunWei Sep 25, 2023
8467aed
Merge branch 'master' into add-question-form
szelongq Sep 27, 2023
36e7047
dynamic routing
charltonator Sep 28, 2023
e81e9bd
dynamic routing and example creation
charltonator Sep 28, 2023
8dc3466
add monaco code editor with dynamic syntax highlighting by language
charltonator Sep 28, 2023
82c5de1
Merge branch 'master' into question-solving-page
charltonator Sep 28, 2023
359985c
Update .env_20230928213149
charltonator Sep 29, 2023
56d73b6
re enable es lint
charltonator Sep 29, 2023
89ffa70
Merge branch 'question-solving-page' of https://github.com/CS3219-AY2…
charltonator Sep 29, 2023
0279b5c
Update package.json
charltonator Sep 29, 2023
c1e1f7a
add profile page
ngjiayuan Sep 29, 2023
fe68241
re install
charltonator Sep 29, 2023
0ccf9a7
Merge branch 'question-solving-page' of https://github.com/CS3219-AY2…
charltonator Sep 29, 2023
8321cb5
re installl again
charltonator Sep 29, 2023
1eb7b8e
Merge branch 'master' of https://github.com/CS3219-AY2324S1/ay2324s1-…
ngjiayuan Sep 29, 2023
b78a803
fix eslint
charltonator Sep 29, 2023
6e4d7d9
eslinter
charltonator Sep 29, 2023
c527f12
Merge pull request #33 from CS3219-AY2324S1/auth
ngjiayuan Sep 29, 2023
c6a22f8
es lint
charltonator Sep 29, 2023
02044dc
eslint
charltonator Sep 29, 2023
1ebb118
Merge branch 'master' into question-solving-page
charltonator Sep 29, 2023
ec8f4ab
fix shit
charltonator Sep 29, 2023
17ed498
fix
charltonator Sep 29, 2023
153ebba
for real this time
charltonator Sep 29, 2023
e24b193
Merge pull request #31 from CS3219-AY2324S1/question-solving-page
charltonator Sep 29, 2023
3f3453f
refactor backend
ngjiayuan Sep 29, 2023
56700d7
refactored backend
ngjiayuan Sep 29, 2023
075445c
Merge branch 'master' into add-question-form
szelongq Oct 4, 2023
8904c4b
Merge branch 'refactor-backend' into add-question-form
szelongq Oct 4, 2023
eb2a7cf
Add addQuestionTab
szelongq Oct 4, 2023
93575e8
Add question categories in form
szelongq Oct 4, 2023
ae318fc
Add EditQuestionsTab
szelongq Oct 4, 2023
3789d82
refactor frontend auth and add user service
ngjiayuan Oct 6, 2023
6e02723
Merge branch 'refactor-backend' into add-question-form
szelongq Oct 7, 2023
80ca034
add dependency in package.json
ngjiayuan Oct 9, 2023
62f5cd9
edit user service to update profile
KJunWei Oct 11, 2023
77062de
Matching service
wilburrito Oct 11, 2023
c2031d1
refactor question to use API
charltonator Oct 11, 2023
80e27f2
create new QuestionService folder with own instance of express
charltonator Oct 11, 2023
23ef804
Update .gitignore
charltonator Oct 11, 2023
718cdd6
Delete QuestionService/node_modules directory
charltonator Oct 11, 2023
136fb1f
Update .gitignore
charltonator Oct 11, 2023
844fcb3
Merge branch 'refactor-question' of https://github.com/CS3219-AY2324S…
charltonator Oct 11, 2023
a1e7803
Merge branch 'refactor-backend' into matching-service
wilburrito Oct 11, 2023
564229e
Merge pull request #45 from CS3219-AY2324S1/matching-service
charltonator Oct 12, 2023
57643cb
Merge branch 'refactor-question' into refactor-backend
charltonator Oct 12, 2023
f2a09ae
Merge pull request #46 from CS3219-AY2324S1/refactor-backend
charltonator Oct 12, 2023
8b5b017
separate backend into 4 services.
charltonator Oct 12, 2023
1f0fed4
Fix socket on frontend
wilburrito Oct 12, 2023
e56c0b9
Merge pull request #48 from CS3219-AY2324S1/refactor-question
wilburrito Oct 12, 2023
90d42e2
Adjust UI visibility based on log in
szelongq Oct 12, 2023
4f2e03b
Merge branch 'adjust-login-visible-ui' into add-question-form
szelongq Oct 12, 2023
6166232
Hide login buttons when already logged in
szelongq Oct 12, 2023
2a4f413
Fix Navbar link when small page view
szelongq Oct 12, 2023
61b9678
Merge branch 'adjust-login-visible-ui' into add-question-form
szelongq Oct 12, 2023
77ee49a
Merge pull request #49 from CS3219-AY2324S1/adjust-login-visible-ui
szelongq Oct 13, 2023
1fb804f
Merge branch 'master' into add-question-form
szelongq Oct 13, 2023
d565a4b
Update addQuestion api on QuestionService
szelongq Oct 13, 2023
10f7be4
Add pages for view or manage questions
szelongq Oct 13, 2023
8eed18c
Link frontend add question form to backend
szelongq Oct 13, 2023
31ae571
Link frontend delete question to backend
szelongq Oct 13, 2023
3d6a9ac
Add API Gateway Service
wilburrito Oct 13, 2023
12aef0a
Dockerise services and frontend
wilburrito Oct 13, 2023
586f006
Merge branch 'master' into api-gateway-service-and-dockerize
wilburrito Oct 13, 2023
cf3e643
add delete function for userservice, remove account for authservice
KJunWei Oct 15, 2023
4ebffb7
Add image naming to docker-compose.yml
wilburrito Oct 17, 2023
547663f
Merge branch 'api-gateway-service-and-dockerize' of https://github.co…
wilburrito Oct 17, 2023
d68ba36
Merge pull request #56 from CS3219-AY2324S1/api-gateway-service-and-d…
wilburrito Oct 17, 2023
45f668a
add basic collab and chat functionality
charltonator Oct 17, 2023
9a4419c
Add K8s deployment config files
wilburrito Oct 18, 2023
93ae165
Add Auth and UserService service config yaml
szelongq Oct 18, 2023
3ece618
collab and chat works (without docker)
charltonator Oct 19, 2023
97af3e6
fix collab
charltonator Oct 19, 2023
1383951
add page to create admin user
KJunWei Oct 19, 2023
522af84
Merge branch 'master' into add-question-form
szelongq Oct 19, 2023
af54f15
Add dynamic constraints/examples to QuestionForm
szelongq Oct 19, 2023
0e40193
Add update question API in QuestionService
szelongq Oct 19, 2023
bbd9022
Edit header titles for question pages
szelongq Oct 19, 2023
e708b89
Change reference to question id
szelongq Oct 19, 2023
61499b0
Merge pull request #57 from CS3219-AY2324S1/53-create-delete-button-f…
KJunWei Oct 22, 2023
3ced66d
Merge pull request #65 from CS3219-AY2324S1/add-question-form
szelongq Oct 22, 2023
35cff02
add admin table
KJunWei Oct 22, 2023
f39b522
Merge pull request #67 from CS3219-AY2324S1/collabService
charltonator Oct 22, 2023
066a5c2
Merge branch 'master' into 62-add-functionality-for-maintainer
KJunWei Oct 22, 2023
a863a63
Merge pull request #68 from CS3219-AY2324S1/62-add-functionality-for-…
KJunWei Oct 22, 2023
1e9ac22
Fix merge conflict
szelongq Oct 22, 2023
2b5a082
Remove decscription from Question Table
wilburrito Oct 23, 2023
be8c8d4
Remove some other columns
wilburrito Oct 23, 2023
88dcc9e
Merge pull request #69 from CS3219-AY2324S1/remove-question-desc
wilburrito Oct 23, 2023
a905e6e
Add new dropdown table
wilburrito Oct 23, 2023
b09c008
logic for matching works, but state not being updated
charltonator Oct 23, 2023
e4a6b1a
make clickable questions and larger title
charltonator Oct 24, 2023
7ce5f73
Fix matching form
wilburrito Oct 24, 2023
295f58c
alert if no such question, and increase text size
charltonator Oct 24, 2023
4824422
remove firebase in FE
ngjiayuan Oct 24, 2023
fa72ea0
Merge pull request #75 from CS3219-AY2324S1/charltonNew
charltonator Oct 24, 2023
f11e916
add gh workflow for FE
ngjiayuan Oct 24, 2023
80460b0
Merge branch 'master' of https://github.com/CS3219-AY2324S1/ay2324s1-…
ngjiayuan Oct 24, 2023
12272db
fix wrong folder
ngjiayuan Oct 24, 2023
3710f87
fix workflow
ngjiayuan Oct 24, 2023
075d396
fix workflow
ngjiayuan Oct 24, 2023
db60db5
add dep to dep array
ngjiayuan Oct 24, 2023
71e81ae
fix eslint
ngjiayuan Oct 24, 2023
b4f9609
fix matching link by sorting
charltonator Oct 24, 2023
ef201e6
Merge branch 'master' of https://github.com/CS3219-AY2324S1/ay2324s1-…
charltonator Oct 24, 2023
eed61ff
Merge branch 'master' into k8s-setup
szelongq Oct 24, 2023
b77c741
fix matching by sorting again
charltonator Oct 24, 2023
b57594a
Merge branch 'master' into k8s-setup
szelongq Oct 24, 2023
943e421
fix docker
ngjiayuan Oct 25, 2023
876ed61
Update kubernetes manifests
szelongq Oct 25, 2023
1301cf1
Add timeout snackbar for matching service
wilburrito Oct 30, 2023
7e7dc5e
Remove start_services.sh
wilburrito Oct 30, 2023
a3763a6
Merge pull request #80 from CS3219-AY2324S1/add-timeout-matching-service
wilburrito Oct 30, 2023
c8b51f8
Add frontend deployment and service
szelongq Nov 1, 2023
4b08262
Allow Maintainer role to manage questions too
szelongq Nov 1, 2023
78b86c7
Rename maintainer role to master
szelongq Nov 4, 2023
050ff29
Merge branch 'master' of https://github.com/CS3219-AY2324S1/ay2324s1-…
ngjiayuan Nov 4, 2023
6f84d76
Fix managing questions table and fix questions table for normal users
wilburrito Nov 4, 2023
442647c
Merge pull request #82 from CS3219-AY2324S1/fix-questions-table
szelongq Nov 4, 2023
5566184
add checks and check for duplicate for question form
charltonator Nov 5, 2023
6c48897
Merge pull request #85 from CS3219-AY2324S1/question_form_update_char…
charltonator Nov 5, 2023
23ba7d9
add hpa.yaml
KJunWei Nov 6, 2023
896cddb
Update autoscaler names and target names
szelongq Nov 6, 2023
a09176d
Merge branch 'master' of https://github.com/CS3219-AY2324S1/ay2324s1-…
ngjiayuan Nov 6, 2023
fe13740
add alert when accessing pages before authentication
ngjiayuan Nov 6, 2023
f873589
fix pagination
KJunWei Nov 7, 2023
f759fe5
add normal users table
KJunWei Nov 7, 2023
c539fb6
add placeholder
KJunWei Nov 8, 2023
d1b14c2
Merge branch 'master' into k8s-setup
szelongq Nov 8, 2023
34deb6b
Add ConfigMap YAML for env variables
szelongq Nov 8, 2023
37d6d04
Change frontend exposed port to 80 for http
szelongq Nov 8, 2023
c90d3fa
Fix HPA configs for frontend
szelongq Nov 8, 2023
2b84914
Merge pull request #87 from CS3219-AY2324S1/86-page-issue
szelongq Nov 8, 2023
2d2b67b
fix newline bug
KJunWei Nov 8, 2023
34127b4
backend auth
ngjiayuan Nov 8, 2023
c5f5250
Merge branch 'master' of https://github.com/CS3219-AY2324S1/ay2324s1-…
ngjiayuan Nov 8, 2023
b4374bc
fix lint
ngjiayuan Nov 9, 2023
5014312
modal for question table and auto refresh when edit question
charltonator Nov 9, 2023
cad5ba5
Merge pull request #94 from CS3219-AY2324S1/newestCharlton
charltonator Nov 9, 2023
bd61053
Add timer
wilburrito Nov 9, 2023
7111e13
Merge pull request #99 from CS3219-AY2324S1/add-timer-to-matching-form
wilburrito Nov 9, 2023
8145fc0
Merge pull request #93 from CS3219-AY2324S1/92-fix-newline-character-bug
szelongq Nov 10, 2023
25f6e2b
Merge pull request #91 from CS3219-AY2324S1/90-add-placeholder-to-fil…
szelongq Nov 10, 2023
f931a5b
Merge pull request #81 from CS3219-AY2324S1/fix-admin-privileges
szelongq Nov 10, 2023
d3ad357
Fix eslint issues in frontend
szelongq Nov 10, 2023
286444d
Clean up api-gateway index and docker-compose yml
szelongq Nov 10, 2023
d91d7d5
Fix comments in Dockerfiles
szelongq Nov 10, 2023
49e0c89
Try using slimmer build for backend services
szelongq Nov 10, 2023
6a3a2b3
reAdd question Tab for SPA
charltonator Nov 10, 2023
121c019
Merge pull request #102 from CS3219-AY2324S1/fixforSPA
charltonator Nov 10, 2023
09b44ba
remove question tab on app
charltonator Nov 10, 2023
2065ec3
Merge pull request #103 from CS3219-AY2324S1/fixforSPA
charltonator Nov 10, 2023
509911f
Merge branch 'master' of https://github.com/CS3219-AY2324S1/ay2324s1-…
ngjiayuan Nov 10, 2023
cbd609d
fix lint
ngjiayuan Nov 10, 2023
9eb74d5
Merge pull request #77 from CS3219-AY2324S1/cicd
ngjiayuan Nov 10, 2023
b5f6f31
Merge branch 'master' into clean-up-docker-files
szelongq Nov 10, 2023
bf953ab
Switch back to node:14
szelongq Nov 11, 2023
44f2724
Remove non-assignment 4 code
szelongq Nov 11, 2023
f2fdcea
Update token in profile
szelongq Nov 11, 2023
cd80e8c
Add README.md for Assignment 4
szelongq Nov 11, 2023
ebf1248
Revert "Remove non-assignment 4 code"
szelongq Nov 11, 2023
3801480
Merge pull request #101 from CS3219-AY2324S1/clean-up-docker-files
szelongq Nov 11, 2023
60bacb6
ensure auth.currentUser is being maintained
KJunWei Nov 12, 2023
f665cf3
fix eslint
KJunWei Nov 12, 2023
8a603dd
Merge branch 'master' into 88-allow-master-to-view-normal-users
KJunWei Nov 13, 2023
b69031b
resolve conflicts
KJunWei Nov 13, 2023
334ab18
edit eslint
KJunWei Nov 13, 2023
1bdf54a
Merge branch 'master' into k8s-setup
szelongq Nov 13, 2023
e515301
Update docker-compose.yml
szelongq Nov 13, 2023
598c8ce
Update docker-compose.yml
szelongq Nov 13, 2023
c327a0a
Reorganize k8s files into folders
szelongq Nov 13, 2023
072b3a2
Update HPA files
szelongq Nov 13, 2023
03b03a4
Create README.md for GKE deployment
szelongq Nov 13, 2023
7e6d713
Create a separate docker-compose for deployment
szelongq Nov 13, 2023
5dd8cea
Merge pull request #89 from CS3219-AY2324S1/88-allow-master-to-view-n…
szelongq Nov 13, 2023
525d4ed
Merge pull request #104 from CS3219-AY2324S1/edit-auth
szelongq Nov 14, 2023
201c213
Fix formatting for QuestionTable
szelongq Nov 14, 2023
14fd0e0
Add parsing of html question descriptions
szelongq Nov 14, 2023
e3f6e22
Remove unused import
szelongq Nov 14, 2023
893db09
Remove unused imports
szelongq Nov 14, 2023
dffd5b6
Update formatting of profile and user tables
szelongq Nov 14, 2023
5187a08
Add html sanitization
szelongq Nov 14, 2023
482570c
Merge pull request #107 from CS3219-AY2324S1/add-html-parsing
szelongq Nov 14, 2023
98d777f
Merge pull request #105 from CS3219-AY2324S1/k8s-setup
szelongq Nov 14, 2023
8b0c8ac
Update Typography to use span instead of p
szelongq Nov 14, 2023
aec7c75
Remove unused buttons in Navbar
szelongq Nov 14, 2023
bbf9036
Merge pull request #108 from CS3219-AY2324S1/add-html-sanitization
szelongq Nov 14, 2023
2ae0019
add parse without examples function
charltonator Nov 14, 2023
0e9b69c
Update utils.tsx
charltonator Nov 14, 2023
9a027cf
Update QuestionForm.tsx
charltonator Nov 14, 2023
9d55d18
Update QuestionForm.tsx
charltonator Nov 14, 2023
cdf3599
Check for same question when checking similarity
szelongq Nov 14, 2023
7528c53
Update parseHtml to return raw when error
szelongq Nov 14, 2023
0051f3a
Merge pull request #112 from CS3219-AY2324S1/parseWithoutExamples
charltonator Nov 14, 2023
963ade0
Update README.md
wilburrito Nov 15, 2023
0a768db
Merge pull request #113 from CS3219-AY2324S1/wilburrito-patch-1
wilburrito Nov 15, 2023
cf45fbb
Update README.md
szelongq Nov 15, 2023
c8f7c63
Merge pull request #114 from CS3219-AY2324S1/update-readme-with-deplo…
szelongq Nov 15, 2023
96248a8
Update homepage
szelongq Nov 15, 2023
85cfa39
Merge pull request #115 from CS3219-AY2324S1/update-homepage
szelongq Nov 15, 2023
eb0262d
Fix eslint
szelongq Nov 15, 2023
b57ab2e
Merge pull request #116 from CS3219-AY2324S1/fix-eslint-from-homepage
szelongq Nov 15, 2023
56eeda5
add deadline
github-classroom[bot] Nov 18, 2023
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 removed .github/.keep
Empty file.
29 changes: 29 additions & 0 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Build on Pull Request

on:
pull_request:
branches:
- "*"

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: "18" # You can specify the Node.js version you need

- name: Install dependencies
run: |
cd frontend
npm install

- name: Build and lint
run: |
cd frontend
npm run build
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
node_modules
javascript
/.pnp
.pnp.js

/.history
# testing
/coverage

# production
build

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

npm-debug.log*
yarn-debug.log*
yarn-error.log*

# IDE metadata
/*/.idea/
20 changes: 20 additions & 0 deletions ApiGatewayService/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Use an official Node.js runtime as a parent image
FROM node:14

# Set the working directory in the container
WORKDIR /usr/src/api-gateway

# Copy package.json and package-lock.json to the working directory
COPY package.json ./

# Install app dependencies
RUN npm install

# Bundle your app source code into the container
COPY . .

# Expose the port on which your API gateway will run
EXPOSE 3001

# Define the command to start your API gateway
CMD [ "npm", "run", "dev" ]
Loading
Loading