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

Quest challenge rework #85

Merged
merged 29 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
274f5d3
Bring back basic qr socket implementation
JacobWrenn Sep 4, 2024
854d155
Modify schema
JacobWrenn Sep 7, 2024
ed21c0e
Modify schema
JacobWrenn Sep 8, 2024
6d61c29
Make start and end time optional
JacobWrenn Sep 10, 2024
66be89a
Add category to challenges
JacobWrenn Sep 10, 2024
d7443db
Switch to durhack-dev.com
JacobWrenn Oct 13, 2024
6ff0b8d
Merge remote-tracking branch 'origin/joe/speedrunning' into quest-cha…
JacobWrenn Oct 13, 2024
fb095a2
Allow adding points to arbitrary keycloak user
JacobWrenn Oct 13, 2024
97c4dd7
Update redemption logic
JacobWrenn Oct 18, 2024
986aadd
Merge branch 'quest-challenge-rework' of github.com:ducompsoc/durhack…
JacobWrenn Oct 18, 2024
2100eef
Start redoing routes
JacobWrenn Oct 19, 2024
c3bc49c
QR handlers upgraded
JacobWrenn Oct 20, 2024
39af987
Start quest routes
JacobWrenn Oct 20, 2024
30e0e22
Add quest completion and finish quest routes
JacobWrenn Oct 23, 2024
ef6f60b
Lots of frontend
JacobWrenn Oct 23, 2024
22f09f4
Quest list hacker, start preset changes
JacobWrenn Oct 24, 2024
43dbd1f
Volunteer challenge list
JacobWrenn Oct 25, 2024
405ffc4
Strip out broken functionality
JacobWrenn Oct 25, 2024
5fa40c9
Quest admin
JacobWrenn Oct 25, 2024
9f0a9b0
Check for completions when new quest added
JacobWrenn Oct 25, 2024
f37b4ce
Merge branch 'main' into quest-challenge-rework
JacobWrenn Oct 26, 2024
3269976
Resolve the more egregious issues
JacobWrenn Oct 26, 2024
c26f7de
Update client/src/app/page.tsx
Lordfirespeed Oct 28, 2024
f06d005
Update client/src/components/tabbed-page.tsx
Lordfirespeed Oct 28, 2024
342f2b0
More PR fixes
JacobWrenn Oct 28, 2024
a2b8711
Merge branch 'main' into quest-challenge-rework
JacobWrenn Oct 29, 2024
af6f60c
Merge branch 'main' into quest-challenge-rework
JacobWrenn Oct 29, 2024
be83000
Finish PR comments, add interop
JacobWrenn Oct 30, 2024
afc13df
Merge branch 'main' into quest-challenge-rework
JacobWrenn Oct 30, 2024
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
25 changes: 1 addition & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ DurHack's 'Guilds' platform, built in-house by the DurHack team (2023-present).
## Nginx Configuration
```
server {
server_name megateams.durhack.com www.megateams.durhack.com;
server_name guilds.durhack.com www.guilds.durhack.com;

location /api {
proxy_pass http://127.0.0.1:3101$request_uri;
Expand Down Expand Up @@ -58,26 +58,3 @@ server {
listen 80;
}
```

## mysql server

Make sure you are running a [mysql server](https://dev.mysql.com/doc/refman/8.1/en/installing.html)
on your machine before trying to run the project otherwise you will get connection refused errors etc.
as the javascript can't find a server to connect to on your localhost 🥲.

If your computer's `hosts` file contains `::1 localhost` (IPv6 local loopback) then you will need to use
`127.0.0.1` as the database host, as the IPv6 spec clashes with the port spec (`::1:3306` is recognised as an IPv6 address,
not an address followed by a port).

This server should also have an appropriate user with permissions to manage the database, e.g.
```sql
CREATE USER 'durhack'@'localhost' IDENTIFIED BY 'durhack';
GRANT ALL PRIVILEGES ON durhack2023megateams.* TO 'durhack'@'localhost'
```
_This follows the naming used in the `.env.local` file given above_


## environment options
- `MEGATEAMS_SKIP_EMAIL_VERIFICATION`: set to `true` to allow users to set their password without verifying email
- `MEGATEAMS_NO_MITIGATE_CSRF`: set to `true` to allow `POST/PATCH/DELETE` (etc.) requests
_without_ a CSRF hash cookie and token header.
3 changes: 2 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
"chart.js": "^4.3.0",
"chartjs-plugin-annotation": "^3.0.1",
"chartjs-plugin-datalabels": "^2.2.0",
"clsx": "^2.1.1",
"dateformat": "^5.0.3",
"eslint-config-next": "13.4.5",
"next": "^14.2.7",
"postcss": "^8.4.41",
"qrcode-scanner-react": "^0.2.3",
"react": "18.2.0",
"react-chartjs-2": "^5.2.0",
"react-component-export-image": "^1.0.6",
"react-dom": "18.2.0",
"react-hooks-use-form-state": "^0.0.1",
"react-paginate": "^8.2.0",
Expand All @@ -55,6 +55,7 @@
"sass": "^1.63.4",
"socket.io-client": "^4.7.5",
"swr": "^2.2.2",
"tailwind-merge": "^2.5.4",
"tailwindcss": "3.3.2",
"typescript": "5.1.3"
},
Expand Down
Binary file added client/public/Atlantis/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions client/public/Atlantis/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/Centre of the Earth/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions client/public/Centre of the Earth/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 0 additions & 17 deletions client/public/Cygnus/constellation.svg

This file was deleted.

Binary file removed client/public/Cygnus/icon.png
Binary file not shown.
Loading
Loading