CLeanup.

Author: toddbirchard

Pipfile.lock

@@ -10,31 +10,34 @@
 
 ![Flask Assets Tutorial](https://github.com/hackersandslackers/flask-assets-tutorial/.github/[email protected])
 
-Structure your Flask apps in a scalable and intelligent way using Blueprints. This repository contains source code for the accompanying tutorial on Hackers and Slackers: https://hackersandslackers.com/flask-blueprints/
+Build and code-split your frontend assets across Blueprints using Flask-Assets. Accompanying tutorial on Hackers and Slackers here: https://hackersandslackers.com/flask-assets/
 
-## Getting Started
+## Installation
 
-Installation is recommended with Pipenv:
+**Installation via `requirements.txt`**:
 
 ```shell
-$ git clone https://github.com/hackersandslackers/flask-assets-tutorial.git
+$ git clone https://github.com/hackersandslackers/fflask-assets-tutorial.git
 $ cd flask-assets-tutorial
-$ pipenv shell
-$ pipenv update
-$ pip install lesscpy cssmin jsmin
-$ python3 main.py
+$ python3 -m venv myenv
+$ source myenv/bin/activate
+$ pip3 install -r requirements.txt
+$ flask run
 ```
 
-Alternatively, try installing via **setup.py**:
+**Installation via [Pipenv](https://pipenv-fork.readthedocs.io/en/latest/)**:
 
 ```shell
 $ git clone https://github.com/hackersandslackers/flask-assets-tutorial.git
 $ cd flask-assets-tutorial
-$ python3 setup.py install
-$ pip install lesscpy cssmin jsmin
-$ python3 main.py
+$ pipenv shell
+$ pipenv update
+$ flask run
 ```
 -----
 
 **Hackers and Slackers** tutorials are free of charge. If you found this tutorial helpful, a [small donation](https://www.buymeacoffee.com/hackersslackers) would be greatly appreciated to keep us in business. All proceeds go towards coffee, and all coffee goes towards more content.
+-----
+
+**Hackers and Slackers** tutorials are free of charge. If you found this tutorial helpful, a [small donation](https://www.buymeacoffee.com/hackersslackers) would be greatly appreciated to keep us in business. All proceeds go towards coffee, and all coffee goes towards more content.
 

README.md

@@ -1,25 +1,29 @@
 """Initialize app."""
 from flask import Flask
 from flask_assets import Environment
-from .assets import compile_assets
-
-assets = Environment()
 
 
 def create_app():
-    """Construct the core flask_assets_tutorial."""
+    """Construct the core application."""
     app = Flask(__name__, instance_relative_config=False)
     app.config.from_object('config.Config')
+    assets = Environment()
+    assets.init_app(app)
 
     # Initialize plugins
     assets.init_app(app)
 
     with app.app_context():
-        # Import parts of our flask_assets_tutorial
+        # Import parts of our application
         from .admin import admin_routes
         from .main import main_routes
+        from .assets import compile_static_assets
+
+        # Register Blueprints
         app.register_blueprint(admin_routes.admin_bp)
         app.register_blueprint(main_routes.main_bp)
-        compile_assets(assets)
+
+        # Compile static assets
+        compile_static_assets(assets)
 
         return app

flask_assets_tutorial/__init__.py renamed to application/__init__.py

@@ -2,7 +2,12 @@
 from flask import Blueprint, render_template
 
 
-admin_bp = Blueprint('admin_bp', __name__, template_folder='templates', static_folder='static')  # Blueprint Configuration
+admin_bp = Blueprint(
+    'admin_bp',
+    __name__,
+    template_folder='templates',
+    static_folder='static'
+)  # Blueprint Configuration
 
 
 @admin_bp.route('/dashboard', methods=['GET'])

flask_assets_tutorial/admin/admin_routes.py renamed to application/admin/admin_routes.py

@@ -1,8 +1,9 @@
 """Compile static assets."""
+from flask import current_app as app
 from flask_assets import Bundle
 
 
-def compile_assets(assets):
+def compile_static_assets(assets):
     """Configure and build asset bundles."""
     main_style_bundle = Bundle('src/less/*.less',
                                'main_bp/homepage.less',
@@ -20,6 +21,8 @@ def compile_assets(assets):
     assets.register('main_styles', main_style_bundle)
     assets.register('main_js', main_js_bundle)
     assets.register('admin_styles', admin_style_bundle)
-    main_style_bundle.build()
-    main_js_bundle.build()
-    admin_style_bundle.build()
+    if app.config['FLASK_ENV'] == 'development':  # Only rebuild bundles in development
+        main_style_bundle.build()
+        main_js_bundle.build()
+        admin_style_bundle.build()
+    return assets

flask_assets_tutorial/admin/static/admin.less renamed to application/admin/static/admin.less

@@ -1,9 +1,9 @@
 """Flask configuration variables."""
-from os import environ
+from os import environ, path
 from dotenv import load_dotenv
 
-
-load_dotenv()
+basedir = path.abspath(path.dirname(__file__))
+load_dotenv(path.join(basedir, '.env'))
 
 
 class Config:

flask_assets_tutorial/admin/templates/dashboard.jinja2 renamed to application/admin/templates/dashboard.jinja2

@@ -0,0 +1,38 @@
+[tool.poetry]
+name = "Flask Assets Tutorial"
+version = "0.1.0"
+description = "Flask application which compiles ands serves frontend assets with Flask-Assets."
+authors = ["Todd Birchard <[email protected]>"]
+maintainers = ["Todd Birchard <[email protected]>"]
+license = "MIT"
+readme = "README.md"
+homepage = "https://hackersandslackers.com/flask-assets/"
+repository = "https://github.com/hackersandslackers/flask-assets-tutorial/"
+documentation = "https://hackersandslackers.com/flask-assets/"
+keywords = ["Flask",
+            "Flask-Assets",
+            "Bundles",
+            "MVC",
+            "Tutorial"]
+
+[tool.poetry.dependencies]
+python = "^3.8"
+flask = "*"
+flask-assets = "*"
+python-dotenv = "*"
+
+[tool.poetry.dev-dependencies]
+lesscpy = "*"
+cssmin = "*"
+jsmin = "*"
+pytest = "*"
+
+[build-system]
+requires = ["poetry>=0.12"]
+build-backend = "poetry.masonry.api"
+
+[tool.poetry.scripts]
+run = "wsgi:app"
+
+[tool.poetry.urls]
+issues = "https://github.com/hackersandslackers/fflask-assets-tutorial/issues"

flask_assets_tutorial/assets.py renamed to application/assets.py

@@ -1,14 +1,14 @@
-click==7.1.1
+click==7.1.2
 cssmin==0.2.0
-Flask==1.1.1
+Flask==1.1.2
 Flask-Assets==2.0
 itsdangerous==1.1.0
-Jinja2==2.11.1
+Jinja2==2.11.2
 jsmin==2.2.2
 lesscpy==0.14.0
 MarkupSafe==1.1.1
 ply==3.11
-python-dotenv==0.12.0
+python-dotenv==0.13.0
 six==1.14.0
 webassets==2.0
-Werkzeug==1.0.0
+Werkzeug==1.0.1

flask_assets_tutorial/main/main_routes.py renamed to application/main/main_routes.py

@@ -1,5 +1,5 @@
 """Application entry point."""
-from flask_assets_tutorial import create_app
+from application import create_app
 
 app = create_app()