Merge pull request #36 from jabbate19/main

Update to Rust API

Author: jabbate19

.gitignore

@@ -3,4 +3,5 @@ envs.py
 .venv
 venv/
 users.sqlite3
-launch.json
+launch.json
+.env

Dockerfile

@@ -2,7 +2,7 @@ FROM docker.io/python:3.8-buster
 LABEL maintainer="Andrew Simonson <[email protected]>"
 
 WORKDIR /app
-ADD ./src /app
+#ADD ./src /app
 COPY ./requirements.txt requirements.txt
 RUN apt-get -yq update && \
     pip install --no-cache-dir -r requirements.txt

src/app.py

@@ -14,7 +14,7 @@ def homepage():
 
 @app.route('/catalog')
 def catalogpage():
-    games = requests.get(app.config["DEVCADE_API_URI"] + "games/gamelist").json()
+    games = requests.get(app.config["DEVCADE_API_URI"] + "games/").json()
     return flask.render_template('catalog.html', gamelist=games)
 
 @app.route('/user')
@@ -26,13 +26,10 @@ def user():
 
 @app.route('/game/<id>')
 def getgame(id):
-    games = requests.get(app.config["DEVCADE_API_URI"] + "games/gamelist").json()
-    for i in range(len(games)):
-        if games[i]['id'] == id:
-            break
-    else:
+    game_req = requests.get(app.config["DEVCADE_API_URI"] + f"games/{id}")
+    if game_req.status_code == 404:
         flask.render_template('404.html')
-    return flask.render_template('game.html', game=games[i])
+    return flask.render_template('game.html', game=game_req.json())
 
 @app.route('/upload_game', methods = ['POST'])
 @login_required
@@ -44,7 +41,7 @@ def uploadgame():
         author = current_user.id
         file = {'file': ("game.zip", f.stream, "application/zip")}
         fields = {'title': title, 'description': description, 'author':author}
-        r = requests.post(app.config["DEVCADE_API_URI"] + "games/upload", files=file, data=fields)
+        r = requests.post(app.config["DEVCADE_API_URI"] + "games/", files=file, data=fields, headers={"frontend_api_key":app.config["FRONTEND_API_KEY"]})
         if r.status_code == 200:
             return flask.redirect('/catalog')
         return "<p>" + r.text + "</p>"
@@ -54,7 +51,7 @@ def uploadgame():
 def uploadpage():
     usergames = []
     try:
-        games = requests.get(app.config["DEVCADE_API_URI"] + "games/gamelist").json()
+        games = requests.get(app.config["DEVCADE_API_URI"] + "games/").json()
         for i in games:
             if i['author'] == current_user.id:
                 usergames.append(i)
@@ -64,21 +61,18 @@ def uploadpage():
 
 @app.route('/download/<id>')
 def download(id):
-    r = requests.get(app.config["DEVCADE_API_URI"] + "games/download/" + id, stream=True)
+    r = requests.get(app.config["DEVCADE_API_URI"] + f"games/{id}/game", stream=True)
     b = BytesIO(r.content)
     game = FileWrapper(b)
     return flask.Response(game, mimetype="application/zip", direct_passthrough=True)
 
 @app.route('/admin/delete/<id>')
 @login_required
 def deleteGame(id):
-    games = requests.get(app.config['DEVCADE_API_URI'] + "games/gamelist").json()
-    author = ""
-    for i in games:
-        if i['id'] == id:
-            author = i['author']
+    game = requests.get(app.config['DEVCADE_API_URI'] + "games/" + id).json()
+    author = game['author']
     if(current_user.admin or current_user.id == author):
-        r = requests.post(app.config["DEVCADE_API_URI"] + "games/delete/" + id)
+        r = requests.delete(app.config["DEVCADE_API_URI"] + "games/" + id, headers={"frontend_api_key":app.config["FRONTEND_API_KEY"]})
         if r.status_code != 200:
             return r.text
     else:

src/config.py

@@ -31,5 +31,6 @@
 OIDC_CLIENT_SECRET = env.get('OIDC_CLIENT_SECRET', 'NOT-A-SECRET')
 
 DEVCADE_API_URI = env.get('DEVCADE_API_URI')
+FRONTEND_API_KEY = env.get('FRONTEND_API_KEY')
 
 DEVCADE_IS_DEV = env.get('DEVCADE_IS_DEV')

src/contributors.py

@@ -78,5 +78,11 @@
         "link" : "",
         "email" : hashlib.md5(b"[email protected]").hexdigest(),
         "desc" : "Hardware Team, First Year GDD"
+    },
+    {
+        "name" : "Joe Abbate",
+        "link" : "https://joeabbate.me",
+        "email" : hashlib.md5(b"[email protected]").hexdigest(),
+        "desc" : "Lead Security Engineer, Third Year Cyber Security"
     }
-]
+]

src/templates/header.html

@@ -1,7 +1,7 @@
 {% macro gamecard(game) %}
-<a href="/game/{{ game.id }}">
-  <div class="game-card" style="background-image: url({{ game.bannerLink }})">
-    <img class="game-icon" src="{{ game.iconLink }}" />
+<a href="/game/{{ game.game_id }}">
+	<div class="game-card" style="background-image: url({{ config['DEVCADE_API_URI'] }}games/{{ game.game_id }}/banner)">
+		<img class="game-icon" src="{{ config['DEVCADE_API_URI'] }}games/{{ game.game_id }}/icon" />
     <div class="game-name">
       <div>
         <h2>{{ game.name }}</h2>