Merge branch 'main' into gamejam-info

Author: wilsonmcdade

README.md

@@ -38,15 +38,19 @@ If you would like to run this project using your local machine, first create a `
 ```
 import os
 
+os.environ['IP'] = ''
+os.environ['PORT'] = ''
 os.environ['SERVER_NAME'] = ''
 os.environ['PREFERRED_URL_SCHEME'] = ''
+os.environ["OIDC_ISSUER"] = ""
+os.environ["OIDC_CLIENT_ID"] = ""
 os.environ["OIDC_CLIENT_SECRET"] = ""
-os.environ["DEVCADE_DB_PORT"] = ""
-os.environ["DEVCADE_DB_NAME"] = ""
-os.environ["DEVCADE_DB_USER"] = ""
-os.environ["DEVCADE_DB_PASS"] = ""
-os.environ["DEVCADE_DB_URI"] = ""
+os.environ["GOOGLE_OIDC_ISSUER"] = ""
+os.environ["GOOGLE_OIDC_CLIENT_ID"] = ""
+os.environ["GOOGLE_OIDC_CLIENT_SECRET"] = ""
 os.environ["DEVCADE_API_URI"] = ""
+os.environ["FRONTEND_API_KEY"] = ""
+os.environ["DEVCADE_IS_DEV"] = ""
 ```
 
-Note that this is just a template for the `envs.py` file. You will need to get these secrets from an RTP or Devcade developer.
+Note that this is just a template for the `envs.py` file. You will need to get these secrets from an RTP or Devcade developer.

requirements.txt

@@ -1,17 +1,17 @@
 alembic==1.8.1
 Beaker==1.11.0
-certifi==2022.9.24
+certifi==2022.12.7
 cffi==1.15.1
 charset-normalizer==2.1.1
 click==8.1.3
-cryptography==38.0.1
+cryptography==39.0.1
 defusedxml==0.7.1
 Flask==2.2.2
 Flask-Login==0.6.2
 Flask-Migrate==3.1.0
 Flask-pyoidc==3.11.0
 Flask-SQLAlchemy==3.0.2
-future==0.18.2
+future==0.18.3
 greenlet==1.1.3.post0
 gunicorn==20.1.0
 idna==3.4
@@ -30,5 +30,5 @@ six==1.16.0
 SQLAlchemy==1.4.42
 typing_extensions==4.4.0
 urllib3==1.26.12
-Werkzeug==2.2.2
+Werkzeug==2.2.3
 psycopg2-binary==2.9.3

src/app.py

@@ -108,6 +108,11 @@ def gamejam():
 def preseed():
     return flask.redirect('https://raw.githubusercontent.com/ComputerScienceHouse/Devcade-onboard/main/idiot/preseed.txt')
 
+@app.route('/docs')
+def docs():
+    return flask.redirect('https://devcade-docs.csh.rit.edu')
+
+
 @app.errorhandler(Exception)
 def page404(e):
     eCode = 500

src/templates/header.html

@@ -69,7 +69,7 @@ <h1>Devcade</h1>
         <div id="nav" class="dropped hidden">
           <div class="item"><a href="/">Home</a></div>
           <div class="item"><a href="/catalog">Games</a></div>
-          <div class="item"><a href="https://computersciencehouse.github.io/devcade-website/">Docs</a></div>
+          <div class="item"><a href="/docs">Docs</a></div>
           {% if current_user.is_authenticated %}
           <div class="item"><a href="/upload">Upload</a></div>
           <div class="item" id="account">