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 58 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
6ea2da2
Setting up GitHub Classroom Feedback
github-classroom[bot] Aug 24, 2022
1a46b98
Initial commit
9teMare Sep 28, 2022
6d9a4c1
Update README
9teMare Sep 28, 2022
8c0659f
Merge pull request #2 from 9teMare/main
9teMare Sep 28, 2022
6434280
select difficulty, find match button
pnutzz-0207 Oct 6, 2022
ec0744d
Merge pull request #3 from pnutzz-0207/main
pnutzz-0207 Oct 15, 2022
890b4d5
Countdown modal when finding match
pnutzz-0207 Oct 15, 2022
497e095
add FoundMatchModal
pnutzz-0207 Oct 15, 2022
c1f1671
Merge pull request #4 from pnutzz-0207/countdown-modal
pnutzz-0207 Oct 15, 2022
beb1cf8
Merge branch 'main' into main
pnutzz-0207 Oct 15, 2022
c30e884
Merge pull request #5 from pnutzz-0207/main
pnutzz-0207 Oct 15, 2022
858f33e
Update dashboard.tsx
pnutzz-0207 Oct 15, 2022
8dd4d29
Merge pull request #6 from pnutzz-0207/main
pnutzz-0207 Oct 15, 2022
94451b5
Add basic matching service workflow
Oct 15, 2022
834af6e
Add basic text collaboration
Oct 16, 2022
9ea4dee
Add code editor
Oct 16, 2022
cb9ef6c
matching and popup
pnutzz-0207 Oct 16, 2022
ea34464
Merge branch 'main' into main
pnutzz-0207 Oct 16, 2022
e256f77
Merge pull request #7 from ddx-510/main
pnutzz-0207 Oct 16, 2022
aaf9610
Merge branch 'main' into matching_merge
pnutzz-0207 Oct 16, 2022
a57472c
Merge pull request #8 from pnutzz-0207/matching_merge
pnutzz-0207 Oct 16, 2022
1b336d9
bug fixes
pnutzz-0207 Oct 16, 2022
25db1aa
Merge pull request #9 from pnutzz-0207/matching_merge
pnutzz-0207 Oct 16, 2022
e5cd2e3
Change UI colour scheme, minor refactors
9teMare Oct 16, 2022
891cf73
Update UI
9teMare Oct 16, 2022
3dc9688
Update tailwind.config.js
9teMare Oct 16, 2022
ab61669
Merge branch 'main' into styled
9teMare Oct 16, 2022
10a64eb
Merge pull request #1 from 9teMare/styled
9teMare Oct 16, 2022
b538a02
Merge pull request #10 from 9teMare/main
pnutzz-0207 Oct 17, 2022
6df46a7
Add questions into json
GabriellaTeh Oct 17, 2022
6723255
Merge pull request #11 from GabriellaTeh/question-service
GabriellaTeh Oct 17, 2022
597f5e6
chats, fix socket bugs
9teMare Oct 21, 2022
45819c5
Merge pull request #12 from 9teMare/main
Nov 7, 2022
261a6bd
add more questions
GabriellaTeh Nov 7, 2022
f0353b2
Fix login/signup error message
9teMare Nov 7, 2022
d8515da
Add difficulty levels and restructured matching logic
Nov 7, 2022
6b79a1d
Merge branch 'CS3219-AY2223S1:main' into main
Nov 7, 2022
b5344a0
Merge pull request #14 from ddx-510/main
9teMare Nov 7, 2022
6fed09b
Merge pull request #13 from 9teMare/main
9teMare Nov 7, 2022
90e5016
Display question
pnutzz-0207 Nov 7, 2022
2d918ae
Code runner
9teMare Nov 7, 2022
79e7171
Merge pull request #15 from pnutzz-0207/main
9teMare Nov 8, 2022
060eba9
Merge branch 'main' into main
pnutzz-0207 Nov 8, 2022
21dc7c0
Merge pull request #16 from 9teMare/main
pnutzz-0207 Nov 8, 2022
a696638
Display question according to difficulty
pnutzz-0207 Nov 8, 2022
817d34c
Merge pull request #17 from pnutzz-0207/main
9teMare Nov 8, 2022
fdd70c0
Question UI, CSS bug fix
9teMare Nov 8, 2022
d720550
Merge pull request #18 from 9teMare/main
Nov 8, 2022
9cad3a5
heroku
9teMare Nov 8, 2022
0649301
Update package.json
9teMare Nov 8, 2022
39a81fb
Update package.json
9teMare Nov 8, 2022
b69dc8a
Fancy Dashboard UI, minor bug fix
9teMare Nov 9, 2022
dca5ba8
Merge pull request #19 from 9teMare/main
9teMare Nov 9, 2022
f95840b
dockerfile
9teMare Nov 9, 2022
93cf46c
Update Question.tsx
9teMare Nov 9, 2022
7fefdf7
Merge pull request #20 from 9teMare/main
9teMare Nov 10, 2022
99ab4d4
Fix flickering of cursor
Nov 11, 2022
2058e66
Merge pull request #21 from ddx-510/main
9teMare Nov 12, 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
Empty file removed .github/.keep
Empty file.
34 changes: 34 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

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

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
55 changes: 55 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Install dependencies only when needed
FROM node:16 AS deps
WORKDIR /app

# Install dependencies based on the preferred package manager
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
RUN \
if [ -f yarn.lock ]; then yarn --frozen-lockfile; \
elif [ -f package-lock.json ]; then npm ci; \
elif [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i --frozen-lockfile; \
else echo "Lockfile not found." && exit 1; \
fi


# Rebuild the source code only when needed
FROM node:16 AS builder
WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules
COPY . .

# Next.js collects completely anonymous telemetry data about general usage.
# Learn more here: https://nextjs.org/telemetry
# Uncomment the following line in case you want to disable telemetry during the build.
# ENV NEXT_TELEMETRY_DISABLED 1

RUN npm run build

# If using npm comment out above and use below instead
# RUN npm run build

# Production image, copy all the files and run next
FROM node:16 AS runner
WORKDIR /app

ENV NODE_ENV production
# Uncomment the following line in case you want to disable telemetry during runtime.
# ENV NEXT_TELEMETRY_DISABLED 1

RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs

COPY --from=builder /app/public ./public

# Automatically leverage output traces to reduce image size
# https://nextjs.org/docs/advanced-features/output-file-tracing
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static

USER nextjs

EXPOSE 3000

ENV PORT 3000

CMD ["node", "server.js"]
38 changes: 24 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
# CS3219-AY22-23-Project-Skeleton

This is a template repository for CS3219 project.

## User Service
1. Rename `.env.sample` file to `.env`.
2. Create a Cloud DB URL using Mongo Atlas.
3. Enter the DB URL created as `DB_CLOUD_URI` in `.env` file.
4. Install npm packages using `npm i`.
5. Run User Service using `npm run dev`.

## Frontend
1. Install npm packages using `npm i`.
2. Run Frontend using `npm start`.
# PeerPrep - G41

## Getting Started

1. Create `.env.local` file in the root directory

2. Add the following lines:

```markdown
MONGO_URI=mongodb+srv://peerprep:[email protected]/?retryWrites=true&w=majority
MONGO_DB=peerprep
MONGO_COLLECTION=users
MONGO_QN_EASY=question_easy
MONGO_QN_MEDIUM=question_medium
MONGO_QN_HARD=question_hard
NEXTAUTH_SECRET=0jtDHssr83fgtJKroV6DGQ6uD9BXW4+FvPbehI9zUXY=
NEXTAUTH_URL=http://localhost:3000
```

3. In the root directory, run `pnpm install` or `npm install` (`pnpm` is the recommended package manager here, if you do not have `pnpm` installed please try to install it, it is way better than `npm`)

4. Run `pnpm dev`

5. Go to `localhost:3000` and see!
70 changes: 0 additions & 70 deletions frontend/README.md

This file was deleted.

Loading