Skip to content

Commit

Permalink
Merge branch 'master' into CI-CD
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/package-lock.json
  • Loading branch information
zylee348 committed Nov 13, 2023
2 parents f905cdb + aa02d7b commit 0276577
Show file tree
Hide file tree
Showing 32 changed files with 3,171 additions and 17,058 deletions.
Binary file modified .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules/
src/backend/question_backend/.env
.env
docker-compose.yml
3 changes: 3 additions & 0 deletions .vite/deps_temp_fb7caec9/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"type": "module"
}
5 changes: 5 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ import Logout from "./pages/Logout";
import { ModalsProvider } from "@mantine/modals";
import { Notifications } from '@mantine/notifications';
import '@mantine/notifications/styles.css';
import '@mantine/code-highlight/styles.css';
import TagQuestions from "./pages/TagQuestions";
import QuestionNavbar from "./components/question_crud/questionNavbar";
import AttemptHistory from "./pages/AttemptHistory";
import AttemptMenu from "./pages/AttemptMenu";

function App() {

Expand All @@ -38,6 +41,8 @@ function App() {
<Route path="/room/:roomID" element={<Room/>}/>
<Route path="/logout" element={<Logout/>} />
<Route path="/chatbox" element={<ChatboxPage/>} />
<Route path="/attemptHistory" element={<AttemptHistory/>} />
<Route path="/attemptHistory/:id" element={<AttemptMenu/>} />
</Routes>
</Router>
<Notifications/>
Expand Down
Binary file modified src/backend/.DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions src/backend/code_execution_backend/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
npm-debug.log
13 changes: 13 additions & 0 deletions src/backend/code_execution_backend/dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM node:16

WORKDIR /usr/src/code

COPY package*.json ./

RUN npm install

COPY . .

EXPOSE 6969

CMD [ "node", "index.js" ]
Loading

0 comments on commit 0276577

Please sign in to comment.