Merge branch 'main' into resumes

.env.template

@@ -20,6 +20,17 @@ GITHUB_CALLBACK_URL="/api/auth/github/callback"
 GITHUB_CLIENT_ID=test
 GITHUB_CLIENT_SECRET=test
 
+# Discord OAuth config
+DISCORD_CALLBACK_URL="/api/auth/discordcallback"
+DISCORD_CLIENT_ID=foo
+DISCORD_CLIENT_SECRET=foo
+DISCORD_BOT_TOKEN=foo
+DISCORD_SERVER_ID=foo
+DISCORD_VANDERBILT_ROLE=foo
+DISCORD_HACKER_ROLE=foo
+DISCORD_MENTOR_ROLE=foo
+DISCORD_SPONSOR_ROLE=foo
+
 BUCKET_NAME=foo
 # As per README, remove spaces in the below, i.e GCP_STORAGE_SERVICE_ACCOUNT='{"type":"service_account","project_id":"foo"...}'
 GCP_STORAGE_SERVICE_ACCOUNT='{ \

.eslintrc.js

@@ -60,6 +60,10 @@ module.exports = {
 		'no-use-before-define': [0],
 		'@typescript-eslint/no-use-before-define': ['error'],
 		'@typescript-eslint/explicit-module-boundary-types': [0],
+		'promise/catch-or-return': [
+			2,
+			{ allowFinally: true }
+		]
 	},
 	root: true,
 	overrides: [

.github/CONTRIBUTING.md

@@ -10,7 +10,7 @@ If you choose not to use `nvm`, you'll have to manually make sure that your `nod
 
 If you choose to use `nvm`, you can just run `nvm use`.
 
-Run `./scripts/install.sh` from the top level of the Vaken repository. Note that the variables in
+Run `./scripts/devEnv.sh` from the top level of the Vaken repository. Note that the variables in
 the new `.env` file will need to be changed to valid values.
 
 **Installing MongoDB:**

.github/workflows/push.yml

@@ -16,4 +16,4 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: '14'
-      - run: npm audit --audit-level=high --only=prod
+      - run: npm audit --audit-level=high --production

.vscode/settings.json

@@ -24,5 +24,8 @@
 	"[jsonc]": {
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
 	},
-	"deepscan.enable": true
+	"deepscan.enable": true,
+	"[typescript]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode"
+	}
 }

README.md

@@ -71,7 +71,7 @@ A next-gen hackathon registration system.
 
 ## Contributing
 
-All contributions are welcome. Please read [CONTRIBUTING.md](./CONTRIBUTING.md) for setup and development instructions.
+All contributions are welcome. Please read [CONTRIBUTING.md](.github/CONTRIBUTING.md) for setup and development instructions.
 
 ## Customizing for your event
 - constants: [./src/common/constants.json](./src/common/constants.json)