Added easy deploy Makefile.

Author: toddbirchard

.gitignore

@@ -128,6 +128,12 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-
+# Cached files
 __pycache__
 .DS_Store
+
+# PyCharm
+.idea
+
+# Virtual environment
+.venv/

Makefile

@@ -0,0 +1,58 @@
+SRCPATH := $(CURDIR)
+PROJECTNAME := $(shell basename $(CURDIR))
+
+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 format     - Format code with Python's `Black` library.
+make clean      - Remove cached files and lock files.
+endef
+export HELP
+
+.PHONY: run restart deploy update clean help
+
+
+requirements: .requirements.txt
+
+
+.requirements.txt: requirements.txt
+	$(shell . .venv/bin/activate && pip install -r requirements.txt)
+
+
+all help:
+	@echo "$$HELP"
+
+
+.PHONY: run
+run:
+	$(shell . .venv/bin/activate && python3 wsgi.py)
+
+
+.PHONY: deploy
+deploy:
+	$(shell . ./deploy.sh)
+
+
+.PHONY: update
+update:
+	poetry shell && poetry update
+	pip freeze > requirements.txt
+	exit
+
+
+.PHONY: format
+format: requirements
+	$(shell . .venv/bin/activate)
+	$(shell isort -rc ./)
+	$(shell black ./)
+
+
+.PHONY: clean
+clean:
+	find . -name '*.pyc' -delete
+	find . -name '__pycache__' -delete
+	find . -name 'poetry.lock' -delete
+	find . -name 'Pipefile.lock' -delete

Pipfile

@@ -4,6 +4,7 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
+black = "*"
 
 [packages]
 flask = "*"

README.md

@@ -1,6 +1,6 @@
 # Flask Jinja Tutorial
 
-![Python](https://img.shields.io/badge/Python-v3.7-blue.svg?logo=python&longCache=true&logoColor=white&colorB=5e81ac&style=flat-square&colorA=4c566a)
+![Python](https://img.shields.io/badge/Python-v3.8-blue.svg?logo=python&longCache=true&logoColor=white&colorB=5e81ac&style=flat-square&colorA=4c566a)
 ![Flask](https://img.shields.io/badge/Flask-v1.1.1-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=5e81ac&colorA=4c566a)
 ![GitHub Last Commit](https://img.shields.io/github/last-commit/google/skia.svg?style=flat-square&colorA=4c566a&colorB=a3be8c&logo=GitHub)
 [![GitHub Issues](https://img.shields.io/github/issues/hackersandslackers/flask-jinja-tutorial.svg?style=flat-square&colorA=4c566a&logo=GitHub&colorB=ebcb8b)](https://github.com/hackersandslackers/flask-jinja-tutorial/issues)
@@ -9,7 +9,7 @@
 
 ![Flask Jinja Tutorial](https://storage.googleapis.com/hackersandslackers-cdn/2019/02/jinja@2x.jpg)
 
-Source code for the accompanying tutorial found here: https://hackersandslackers.com/flask-page-templates-jinja/
+Source code for the accompanying tutorial found here: https://hackersandslackers.com/flask-jinja-templates/
 
 ## Getting Started
 

deploy.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ -d ".venv" ]
+then
+    source .venv/bin/activate
+    pip install -r requirements.txt
+    python3 wsgi.py
+else
+    python3 -m venv .venv
+    source .venv/bin/activate
+    python3 -m pip install --upgrade pip
+    pip install -r requirements.txt
+    python3 wsgi.py
+fi

flask_jinja_tutorial/routes.py

@@ -3,14 +3,17 @@
 from flask import render_template
 
 
-@app.route('/')
+@app.route("/")
 def home():
-    """Landing page."""
-    nav = [{'name': 'Home', 'url': 'https://example.com/1'},
-           {'name': 'About', 'url': 'https://example.com/2'},
-           {'name': 'Pics', 'url': 'https://example.com/3'}]
-    return render_template('home.html',
-                           nav=nav,
-                           title="Jinja Demo Site",
-                           description="Smarter page templates \
-                                with Flask & Jinja.")
+    """Landing page route."""
+    nav = [
+        {"name": "Home", "url": "https://example.com/1"},
+        {"name": "About", "url": "https://example.com/2"},
+        {"name": "Pics", "url": "https://example.com/3"},
+    ]
+    return render_template(
+        "home.html",
+        nav=nav,
+        title="Jinja Demo Site",
+        description="Smarter page templates with Flask & Jinja.",
+    )

flask_jinja_tutorial/static/css/home.css

@@ -13,8 +13,6 @@ nav a {
     margin-right: 30px;
     color: #597a96;
     text-decoration: none;
-
-
 }
 
 .container {

flask_jinja_tutorial/static/img/favicon.png

@@ -1,17 +1,36 @@
 <!doctype html>
 <html>
 
-  <head>
-    <title>{{title}}</title>
+<head>
+    <title>{{ title }}</title>
     <meta charset="utf-8">
-    <meta name="description" content="{{description}}">
-    <link rel="shortcut icon" href="/favicon.ico">
+    <meta name="description" content="{{ description }}">
+    <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}"/>
+    <meta name="HandheldFriendly" content="True"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover"/>
+    <meta name="theme-color" content="#5eb9d7"/>
+
+    <!-- OG & Twitter metadata -->
+    <meta property="og:site_name" content="{{ title }}"/>
+    <meta property="og:type" content="website"/>
+    <meta property="og:title" content="{{ title }}"/>
+    <meta property="og:description" content="{{ description }}"/>
+    <meta property="og:url" content="https://flaskjinja.hackersandslackers.app/"/>
+    <meta property="og:image" content="{{ url_for('static', filename='img/flask-jinja@2x.jpg') }}"/>
+    <meta name="twitter:title" content="{{ title }}"/>
+    <meta name="twitter:description" content="{{ description }}"/>
+    <meta name="twitter:url" content="https://flaskjinja.hackersandslackers.app/"/>
+    <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="{{ url_for('static', filename='img/flask-jinja@2x.jpg') }}"/>
+
     {% block css %}{% endblock %}
-  </head>
+</head>
 
-  <body>
-    {% include 'navigation.html' %}
-    {% block content %}{% endblock %}
-  </body>
+<body>
+{% include 'navigation.html' %}
+{% block content %}{% endblock %}
+</body>
 
 </html>