Front-end clean-up

Author: HebaruSan

.gitattributes

@@ -0,0 +1 @@
+templates/*.html linguist-language=html+jinja linguist-detectable=true

KerbalStuff/app.py

@@ -24,7 +24,7 @@
 from .blueprints.anonymous import anonymous
 from .blueprints.api import api
 from .blueprints.blog import blog
-from .blueprints.lists import lists
+from .blueprints.packs import packs
 from .blueprints.login_oauth import list_defined_oauths, login_oauth
 from .blueprints.mods import mods
 from .blueprints.profile import profiles
@@ -86,7 +86,7 @@ def load_user(username: str) -> User:
 app.register_blueprint(blog)
 app.register_blueprint(admin)
 app.register_blueprint(mods)
-app.register_blueprint(lists)
+app.register_blueprint(packs)
 app.register_blueprint(api)
 
 try:

KerbalStuff/blueprints/admin.py

@@ -138,7 +138,7 @@ def users(page: int) -> Union[str, werkzeug.wrappers.Response]:
 @admin.route("/admin/blog")
 @adminrequired
 def blog() -> str:
-    return render_template("admin-blog.html")
+    return render_template("admin-blog_create.html")
 
 
 @admin.route("/admin/publishers/<int:page>")

KerbalStuff/blueprints/api.py

@@ -637,7 +637,7 @@ def create_list() -> Union[Dict[str, Any], Tuple[Dict[str, Any], int]]:
                        game_id=game)
     db.add(mod_list)
     db.commit()
-    return {'url': url_for("lists.edit_list", list_id=mod_list.id, list_name=mod_list.name)}
+    return {'url': url_for("packs.edit_list", list_id=mod_list.id, list_name=mod_list.name)}
 
 
 @api.route('/api/mod/create', methods=['POST'])

KerbalStuff/blueprints/blog.py

@@ -44,7 +44,7 @@ def edit_blog(id: str) -> Union[str, werkzeug.wrappers.Response]:
     if not post:
         abort(404)
     if request.method == 'GET':
-        return render_template("edit_blog.html", post=post)
+        return render_template("blog_edit.html", post=post)
     else:
         post.title = request.form.get('post-title')
         post.text = request.form.get('post-body')

KerbalStuff/blueprints/mods.py

@@ -89,7 +89,7 @@ def update(mod_id: int, mod_name: str) -> str:
     check_mod_editable(mod)
     game_versions = GameVersion.query.filter(
         GameVersion.game_id == mod.game_id).order_by(desc(GameVersion.id)).all()
-    return render_template("update.html", ga=mod.game, mod=mod, game_versions=game_versions)
+    return render_template("mod_update.html", ga=mod.game, mod=mod, game_versions=game_versions)
 
 
 @mods.route("/mod/<int:mod_id>.rss", defaults={'mod_name': None})
@@ -257,7 +257,7 @@ def edit_mod(mod_id: int, mod_name: str) -> Union[str, werkzeug.wrappers.Respons
     check_mod_editable(mod)
     if request.method == 'GET':
         original = current_user == mod.user
-        return render_template("edit_mod.html", mod=mod, original=original,
+        return render_template("mod_edit.html", mod=mod, original=original,
                                background=mod.background_url(_cfg('protocol'), _cfg('cdn-domain')),
                                new=request.args.get('new') is not None and original)
     else:
@@ -287,9 +287,9 @@ def edit_mod(mod_id: int, mod_name: str) -> Union[str, werkzeug.wrappers.Respons
         mod.description = description.replace('\r\n', '\n')
         mod.score = get_mod_score(mod)
         if not mod.license:
-            return render_template("edit_mod.html", mod=mod, error="All mods must have a license.")
+            return render_template("mod_edit.html", mod=mod, error="All mods must have a license.")
         if mod.description == default_description:
-            return render_template("edit_mod.html", mod=mod, stupid_user=True)
+            return render_template("mod_edit.html", mod=mod, stupid_user=True)
         newly_published = False
         if request.form.get('publish', None):
             if not mod.published:
@@ -328,7 +328,7 @@ def edit_mod(mod_id: int, mod_name: str) -> Union[str, werkzeug.wrappers.Respons
 @with_session
 def create_mod() -> str:
     ga = _restore_game_info()
-    return render_template("create.html", games=get_games(), ga=ga)
+    return render_template("mod_create.html", games=get_games(), ga=ga)
 
 
 @mods.route("/mod/<int:mod_id>/stats/downloads", defaults={'mod_name': None})

KerbalStuff/blueprints/lists.py KerbalStuff/blueprints/packs.pyKerbalStuff/blueprints/lists.py renamed to KerbalStuff/blueprints/packs.py

@@ -10,7 +10,7 @@
 from ..database import db
 from ..objects import Mod, ModList, ModListItem, Game
 
-lists = Blueprint('lists', __name__)
+packs = Blueprint('packs', __name__)
 
 
 def _get_mod_list(list_id: str) -> Tuple[ModList, Game, bool]:
@@ -27,9 +27,9 @@ def _get_mod_list(list_id: str) -> Tuple[ModList, Game, bool]:
     return mod_list, ga, editable
 
 
-@lists.route("/packs", defaults={'gameshort': None})
-@lists.route("/packs/<gameshort>")
-def packs(gameshort: Optional[str]) -> str:
+@packs.route("/packs", defaults={'gameshort': None})
+@packs.route("/packs/<gameshort>")
+def packs_list(gameshort: Optional[str]) -> str:
     game = None if not gameshort else get_game_info(short=gameshort)
     query = ModList.query \
         .filter(ModList.mods.any()) \
@@ -40,14 +40,14 @@ def packs(gameshort: Optional[str]) -> str:
     return render_template("packs.html", ga=game, game=game, packs=packs, page=page, total_pages=total_pages)
 
 
-@lists.route("/create/pack")
+@packs.route("/create/pack")
 def create_list() -> str:
     games = Game.query.filter(Game.active == True).order_by(desc(Game.id)).all()
     ga = Game.query.order_by(desc(Game.id)).first()
-    return render_template("create_list.html", games=games, ga=ga)
+    return render_template("pack_create.html", games=games, ga=ga)
 
 
-@lists.route("/pack/<int:list_id>/delete")
+@packs.route("/pack/<int:list_id>/delete")
 @loginrequired
 @with_session
 def delete(list_id: str) -> werkzeug.wrappers.Response:
@@ -67,26 +67,26 @@ def delete(list_id: str) -> werkzeug.wrappers.Response:
     return redirect("/profile/" + current_user.username)
 
 
-@lists.route("/pack/<list_id>/<list_name>")
+@packs.route("/pack/<list_id>/<list_name>")
 def view_list(list_id: str, list_name: str) -> str:
     mod_list, ga, editable = _get_mod_list(list_id)
-    return render_template("mod_list.html",
+    return render_template("pack.html",
                            **{
                                'mod_list': mod_list,
                                'editable': editable,
                                'ga': ga
                            })
 
 
-@lists.route("/pack/<list_id>/<list_name>/edit", methods=['GET', 'POST'])
+@packs.route("/pack/<list_id>/<list_name>/edit", methods=['GET', 'POST'])
 @with_session
 @loginrequired
 def edit_list(list_id: str, list_name: str) -> Union[str, werkzeug.wrappers.Response]:
     mod_list, ga, editable = _get_mod_list(list_id)
     if not editable:
         abort(403)
     if request.method == 'GET':
-        return render_template("edit_list.html",
+        return render_template("pack_edit.html",
                                **{
                                    'mod_list': mod_list,
                                    'mod_ids': [m.mod.id for m in mod_list.mods],
@@ -129,4 +129,4 @@ def edit_list(list_id: str, list_name: str) -> Union[str, werkzeug.wrappers.Resp
             db.commit()
         for mod in mod_list.mods:
             mod.sort_index = mods.index(mod.mod.id)
-        return redirect(url_for("lists.view_list", list_id=mod_list.id, list_name=mod_list.name))
+        return redirect(url_for("packs.view_list", list_id=mod_list.id, list_name=mod_list.name))

KerbalStuff/blueprints/profile.py

@@ -48,7 +48,7 @@ def view_profile(username: str) -> str:
                                            key=lambda m: m.game.name),
                                     lambda m: m.game.name)))
     mods_followed = sorted(profile.following, key=lambda mod: mod.created, reverse=True)
-    return render_template("view_profile.html",
+    return render_template("profile.html",
                            profile=profile, forum_url=forum_url, forum_url_username=forum_url_username,
                            background=profile.background_url(_cfg('protocol'), _cfg('cdn-domain')),
                            mods_created=mods_created, mods_followed=mods_followed)
@@ -100,7 +100,7 @@ def profile(username: str) -> Union[str, werkzeug.wrappers.Response]:
             'following': following,
             'background': profile.background_url(_cfg('protocol'), _cfg('cdn-domain')),
         }
-        return render_template("profile.html", **parameters)
+        return render_template("profile_edit.html", **parameters)
     else:
         profile = User.query.filter(User.username == username).first()
         if not profile:

KerbalStuff/ckan.py

@@ -29,7 +29,7 @@ def send_to_ckan(mod: Mod) -> None:
             'description': mod.description,
             'external_link': mod.external_link,
             'source_link': mod.source_link,
-            'user_url': site_base_url + url_for("profile.view_profile", username=mod.user.username),
+            'user_url': site_base_url + url_for("profile.profile", username=mod.user.username),
             'mod_url': site_base_url + url_for('mods.mod', mod_name=mod.name, mod_id=mod.id),
             'site_name': site_name,
         })

frontend/build.js

@@ -4,6 +4,7 @@ const sass = require('node-sass');
 const browserify = require('browserify');
 const coffeeify = require('coffeeify');
 const babelify = require('babelify');
+const uglifyify = require('uglifyify');
 const tildeImporter = require('node-sass-tilde-importer');
 
 const paths = {
@@ -13,19 +14,35 @@ const paths = {
     },
     output: {
         styles: 'build',
-        scripts: 'build'
+        scripts: 'build',
+        fonts: 'build'
     }
 };
 
-function walkDir(dir, callback) {
-    fs.readdirSync(dir).forEach(f => {
-        let dirPath = path.join(dir, f);
-        let isDirectory = fs.statSync(dirPath).isDirectory();
-        isDirectory
-            ? walkDir(dirPath, callback)
-            : callback(path.join(dir, f));
-    });
-}
+const staticDeps = [
+    [ 'node_modules/bootstrap-table/dist/bootstrap-table.min.css',paths.output.styles ],
+    [ 'node_modules/chosen-js/chosen.min.css', paths.output.styles ],
+    [ 'node_modules/@devhau/md-editor/dist/md-editor.min.css', paths.output.styles ],
+
+    [ 'node_modules/jquery/dist/jquery.min.js', paths.output.scripts ],
+    [ 'node_modules/bootstrap-sass/assets/javascripts/bootstrap.min.js', paths.output.scripts ],
+    [ 'node_modules/bootstrap-table/dist/bootstrap-table.min.js', paths.output.scripts ],
+    [ 'node_modules/bootstrap-table/dist/extensions/editable/bootstrap-table-editable.min.js', paths.output.scripts ],
+    [ 'node_modules/bootstrap-table/dist/locale/bootstrap-table-en-US.min.js', paths.output.scripts ],
+    [ 'node_modules/underscore/underscore-min.js', paths.output.scripts ],
+    [ 'node_modules/jscroll/dist/jquery.jscroll.min.js', paths.output.scripts ],
+    [ 'node_modules/chosen-js/chosen.jquery.min.js', paths.output.scripts ],
+    [ 'node_modules/@devhau/md-editor/dist/md-editor.min.js', paths.output.scripts ],
+    [ 'node_modules/typeahead.js/dist/typeahead.bundle.min.js', paths.output.scripts ],
+
+    [ 'node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot', paths.output.fonts ],
+    [ 'node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.svg', paths.output.fonts ],
+    [ 'node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf', paths.output.fonts ],
+    [ 'node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff', paths.output.fonts ],
+    [ 'node_modules/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2', paths.output.fonts ],
+    [ 'node_modules/font-awesome/fonts/fontawesome-webfont.ttf', paths.output.fonts ],
+    [ 'node_modules/font-awesome/fonts/fontawesome-webfont.woff2', paths.output.fonts ]
+];
 
 for (let path in paths.output) {
     if (paths.output.hasOwnProperty(path)) {
@@ -37,6 +54,24 @@ for (let path in paths.output) {
     }
 }
 
+for (const [fromFile, toDir] of staticDeps) {
+    const toFile = fs.statSync(toDir).isDirectory()
+        ? path.join(toDir, path.basename(fromFile))
+        : toDir;
+    fs.copyFileSync(fromFile, toFile);
+    console.log(`Copied ${fromFile} to ${toFile}`);
+}
+
+function walkDir(dir, callback) {
+    fs.readdirSync(dir).forEach(f => {
+        let dirPath = path.join(dir, f);
+        let isDirectory = fs.statSync(dirPath).isDirectory();
+        isDirectory
+            ? walkDir(dirPath, callback)
+            : callback(path.join(dir, f));
+    });
+}
+
 walkDir(paths.input.styles, inputFile => {
     if (!inputFile.endsWith('.scss'))
         return;
@@ -46,19 +81,20 @@ walkDir(paths.input.styles, inputFile => {
     sass.render({
         file: inputFile,
         outfile: outFile,
+        outputStyle: 'compressed',
         importer: tildeImporter,
     }, (err, result) => {
-        if (err)
+        if (err) {
             console.log(err);
-        else fs.writeFile(outFile,
-            result.css,
-            'utf8',
-            err => {
-                if (err)
+        } else {
+            fs.writeFile(outFile, result.css, 'utf8', err => {
+                if (err) {
                     console.log(err);
-                else
+                } else {
                     console.log(`Rendered ${inputFile} to ${outFile}`);
+                }
             });
+        }
     });
 });
 
@@ -70,7 +106,7 @@ walkDir(paths.input.scripts, inputFile => {
     const outFile = path.join(paths.output.scripts, `${basename}.js`);
     browserify([inputFile], {
         extensions: [ '.js', '.coffee' ],
-        transform: [ coffeeify, babelify ],
+        transform: [ coffeeify, babelify, [uglifyify, {global:true}] ],
     }).bundle((err, result) => {
         if (err) {
             console.log(err);