Fix broken image, minor updates.

Author: toddbirchard

.github/flaskblueprints-3@2x.jpg renamed to .github/flaskblueprints@2x.jpg

@@ -1,58 +1,75 @@
-SRCPATH := $(CURDIR)
-PROJECTNAME := $(shell basename $(CURDIR))
+PROJECT_NAME := $(shell basename $CURDIR)
+VIRTUAL_ENVIRONMENT := $(CURDIR)/.venv
+LOCAL_PYTHON := $(VIRTUAL_ENVIRONMENT)/bin/python3
 
 define HELP
 Manage $(PROJECTNAME). Usage:
 
-make run        - Run $(PROJECTNAME).
-make deploy     - Install requirements and run app for the first time.
-make update     - Update pip dependencies via Python Poetry.
+make run        - Run $(PROJECT_NAME).
+make install    - Create virtual env, & install dependencies.
+make update     - Update pip dependencies via Poetry and output requirements.txt.
 make format     - Format code with Python's `Black` library.
+make lint       - Check code formatting with flake8.
 make clean      - Remove cached files and lock files.
 endef
 export HELP
 
-.PHONY: run deploy update format clean help
+.PHONY: run install update format lint clean help
 
 
-requirements: .requirements.txt
-env: .venv/bin/activate
-
-
-.requirements.txt: requirements.txt
-	$(shell . .venv/bin/activate && pip install -r requirements.txt)
+env: .venv/bin/python3
 
 
 all help:
 	@echo "$$HELP"
 
 
+.PHONY: install
+install:
+	if [ ! -d "./.venv" ]; then python3 -m venv $(VIRTUAL_ENVIRONMENT); fi
+	. .venv/bin/activate
+	$(LOCAL_PYTHON) -m pip install --upgrade pip setuptools wheel
+	$(LOCAL_PYTHON) -m pip install -r requirements.txt
+
+
 .PHONY: run
 run: env
 	$(shell . .venv/bin/activate && flask run)
 
 
-.PHONY: deploy
-deploy:
-	$(shell . ./deploy.sh)
-
-
 .PHONY: update
-update: env
-	.venv/bin/python3 -m pip install -U pip
+update:
+	if [ ! -d "./.venv" ]; then python3 -m venv $(VIRTUAL_ENVIRONMENT); fi
+	.venv/bin/python3 -m pip install --upgrade pip setuptools wheel
 	poetry update
 	poetry export -f requirements.txt --output requirements.txt --without-hashes
 
 
 .PHONY: format
 format: env
-	$(shell . .venv/bin/activate && isort ./)
-	$(shell . .venv/bin/activate && black ./)
+	isort --multi-line=3 .
+	black .
+
+
+.PHONY: lint
+lint:
+	flake8 . --count \
+			--select=E9,F63,F7,F82 \
+			--exclude .git,.github,__pycache__,.pytest_cache,.venv,logs,creds,.venv,docs,logs \
+			--show-source \
+			--statistics
 
 
 .PHONY: clean
 clean:
 	find . -name '*.pyc' -delete
 	find . -name '__pycache__' -delete
 	find . -name 'poetry.lock' -delete
-	find . -name 'Pipefile.lock' -delete
+	find . -name 'Pipefile.lock' -delete
+	find . -name '*.log' -delete
+	find . -wholename 'logs/*.json' -delete
+	find . -wholename '.pytest_cache' -delete
+	find . -wholename '**/.pytest_cache' -delete
+	find . -wholename './logs/*.json' -delete
+	find . -wholename '.webassets-cache/*' -delete
+	find . -wholename './logs' -delete

Makefile

@@ -8,7 +8,7 @@
 [![GitHub Stars](https://img.shields.io/github/stars/hackersandslackers/flask-blueprint-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-blueprint-tutorial/stargazers)
 [![GitHub Forks](https://img.shields.io/github/forks/hackersandslackers/flask-blueprint-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-blueprint-tutorial/network)
 
-![Flask Blueprint Tutorial](https://github.com/hackersandslackers/flask-blueprint-tutorial/blob/master/.github/flaskblueprints-3@2x.jpg?raw=true)
+![Flask Blueprint Tutorial](./.github/flaskblueprints@2x.jpg?raw=true)
 
 Structure your Flask apps in a scalable and intelligent way using Blueprints.
 

README.md

@@ -24,5 +24,8 @@ class Config:
     TEMPLATES_FOLDER = "templates"
     COMPRESSOR_DEBUG = True
 
+    # Datadog
+    DD_SERVICE = environ.get("DD_SERVICE")
+
     # API
     BEST_BUY_API_KEY = environ.get("BEST_BUY_API_KEY")

config.py

@@ -1,10 +1,12 @@
 """Initialize Flask app."""
+from ddtrace import patch_all
 from flask import Flask
 from flask_assets import Environment
-from ddtrace import patch_all
 
+from config import Config
 
-patch_all()
+if Config.FLASK_ENV == "production" and Config.DD_SERVICE:
+    patch_all()
 
 
 def init_app():

flask_blueprint_tutorial/__init__.py

@@ -7,37 +7,37 @@ def compile_static_assets(assets):
     """Create stylesheet bundles."""
     assets.auto_build = True
     assets.debug = False
-    common_less_bundle = Bundle(
+    common_style_bundle = Bundle(
         "src/less/*.less",
         filters="less,cssmin",
         output="dist/css/style.css",
         extra={"rel": "stylesheet/less"},
     )
-    home_less_bundle = Bundle(
+    home_style_bundle = Bundle(
         "home_bp/less/home.less",
         filters="less,cssmin",
         output="dist/css/home.css",
         extra={"rel": "stylesheet/less"},
     )
-    profile_less_bundle = Bundle(
+    profile_style_bundle = Bundle(
         "profile_bp/less/profile.less",
         filters="less,cssmin",
         output="dist/css/profile.css",
         extra={"rel": "stylesheet/less"},
     )
-    product_less_bundle = Bundle(
+    product_style_bundle = Bundle(
         "products_bp/less/products.less",
         filters="less,cssmin",
         output="dist/css/products.css",
         extra={"rel": "stylesheet/less"},
     )
-    assets.register("common_less_bundle", common_less_bundle)
-    assets.register("home_less_bundle", home_less_bundle)
-    assets.register("profile_less_bundle", profile_less_bundle)
-    assets.register("product_less_bundle", product_less_bundle)
+    assets.register("common_style_bundle", common_style_bundle)
+    assets.register("home_style_bundle", home_style_bundle)
+    assets.register("profile_style_bundle", profile_style_bundle)
+    assets.register("product_style_bundle", product_style_bundle)
     if app.config["FLASK_ENV"] == "development":
-        common_less_bundle.build()
-        home_less_bundle.build()
-        profile_less_bundle.build()
-        product_less_bundle.build()
+        common_style_bundle.build()
+        home_style_bundle.build()
+        profile_style_bundle.build()
+        product_style_bundle.build()
     return assets

flask_blueprint_tutorial/assets.py

@@ -21,8 +21,8 @@
   <meta name="twitter:site" content="@hackersslackers"/>
   <meta name="twitter:creator" content="@toddrbirchard"/>
   <meta name="twitter:card" content="summary_large_image"/>
-  <meta name="twitter:image" content="https://hackersandslackers-cdn.storage.googleapis.com/2020/05/flaskblueprints-3@2x.jpg"/>
-  <meta property="og:image" content="https://hackersandslackers-cdn.storage.googleapis.com/2020/05/flaskblueprints-3@2x.jpg"/>
+  <meta name="twitter:image" content="https://cdn.hackersandslackers.com/2021/08/_retina/flaskblueprints.jpg"/>
+  <meta property="og:image" content="https://cdn.hackersandslackers.com/2021/08/_retina/flaskblueprints.jpg"/>
   <meta property="og:image:width" content="1000"/>
   <meta property="og:image:height" content="523"/>
   <link href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,500" rel="stylesheet">