Merge pull request #46 from ComputerScienceHouse/dev

Dev gamejam

Author: jabbate19

src/app.py

@@ -14,7 +14,10 @@ def homepage():
 
 @app.route('/catalog')
 def catalogpage():
+    tag = flask.request.args.get("tag")
     games = requests.get(app.config["DEVCADE_API_URI"] + "games/").json()
+    if tag:
+        games = list(filter(lambda g: tag in map(lambda t: t['name'], g['tags']), games))
     return flask.render_template('catalog.html', gamelist=games)
 
 @app.route('/user')
@@ -40,13 +43,14 @@ def uploadgame():
         icon = flask.request.files['icon']
         title = flask.request.form['title']
         description = flask.request.form['description']
+        tags = flask.request.form['tags']
         author = current_user.id
         file = {
             'game': ("game.zip", game.stream, "application/zip"),
             'banner': ("banner", banner.stream, banner.mimetype),
             'icon': ("icon", icon.stream, icon.mimetype)
         }
-        fields = {'title': title, 'description': description, 'author':author}
+        fields = {'title': title, 'description': description, 'author': author, 'tags': tags}
         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 == 201:
             return flask.redirect('/catalog')
@@ -58,12 +62,13 @@ def uploadpage():
     usergames = []
     try:
         games = requests.get(app.config["DEVCADE_API_URI"] + "games/").json()
+        tags = requests.get(app.config["DEVCADE_API_URI"] + "tags/").json()
         for i in games:
             if i['author'] == current_user.id:
                 usergames.append(i)
     except(Exception):
         print("api offline")
-    return flask.render_template('upload.html', title='Devcade - Upload', gamelist=usergames)
+    return flask.render_template('upload.html', title='Devcade - Upload', gamelist=usergames, tags=tags)
 
 @app.route('/download/<id>')
 def download(id):

src/init.py

@@ -5,9 +5,11 @@
 from flask_sqlalchemy import SQLAlchemy
 from flask_pyoidc.flask_pyoidc import OIDCAuthentication
 from flask_pyoidc.provider_configuration import ProviderConfiguration, ClientMetadata
+from urllib.parse import quote_plus
 
 
 app = flask.Flask(__name__)
+app.jinja_env.filters['quote_plus'] = lambda u: quote_plus(u)
 try:
     app.config.from_pyfile(os.path.join(os.getcwd(), "config.py"))
 except:

src/static/css/devcade.css

@@ -479,3 +479,53 @@ a:hover {
     width: unset;
   }
 }
+
+multi-checkbox {
+  /* Element */
+  --mc-border: 1px solid #000000;
+  --mc-border-radius: 2px;
+  --mc-display: inline-block;
+  --mc-font: 400 0.9em Arial;
+  --mc-vertical-align: middle;
+  /* Dropdown */
+  --mc-dropdown-background: #efefef;
+  --mc-dropdown-box-shadow: 3px 3px 5px 1px rgba(0,0,0,0.35);
+  --mc-dropdown-width: 209px;
+  /* Input */
+  --mc-target-background: #efefef;
+  --mc-target-color: #000000;
+  --mc-target-cursor: default;
+  --mc-target-height: 28px;
+  --mc-target-margin: 0;
+  --mc-target-max-height: default;
+  --mc-target-min-height: default;
+  --mc-target-max-width: default;
+  --mc-target-min-width: default;
+  --mc-target-padding: 0px 0px 0px 3px;
+  --mc-target-outline: none;
+  --mc-target-width: 175px;
+  /* Dropdown Line Items */
+  --mc-dropdown-color: #000000;
+  --mc-dropdown-line-height: 2em;
+  --mc-ul-margin: 5px;
+  --mc-ul-padding: 0;
+  /* Toggle Button */
+  --mc-toggle-button-background: #ffffff;
+  --mc-toggle-button-color: #000000;
+  --mc-toggle-button-cursor: pointer;
+  --mc-toggle-button-height: 30px;
+  --mc-toggle-button-outline: none;
+  --mc-toggle-button-width: 30px;
+  /* Close Button */
+  --mc-close-button-background: #efefef;
+  --mc-close-button-border: none;
+  --mc-close-button-border-radius: default;
+  --mc-close-button-color: #000000;
+  --mc-close-button-cursor: pointer;
+  --mc-close-button-display: block;
+  --mc-close-button-height: 30px;
+  --mc-close-button-margin: 5px auto;
+  --mc-close-button-outline: none;
+  --mc-close-button-width: 30px;
+  --fg: #000000;
+}