Cleanup.

toddbirchard · toddbirchard · commit f29599a6fc47 · 2020-05-09T10:28:22.000-04:00
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Hackers and Slackers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Pipfile b/Pipfile
@@ -9,6 +9,7 @@ verify_ssl = true
 Flask = "*"
 Flask-WTF = "*"
 python-dotenv = "*"
+email_validator = "*"
 
 [requires]
 python_version = "3.7"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 
 ![Flask-WTF Tutorial](https://res-1.cloudinary.com/hackers/image/upload/q_auto:best/v1/2019/11/flask-wtforms.jpg)
 
-Source code for the accompanying tutorial found here: https://hackersandslackers.com/guide-to-building-forms-in-flask/
+Source code for the accompanying tutorial found here: https://hackersandslackers.com/flask-wtforms-forms/
 
 
 ## Installation
diff --git a/application/routes.py b/application/routes.py
@@ -5,7 +5,7 @@
 
 @app.route('/')
 def home():
-    return render_template('index.html',
+    return render_template('index.jinja2',
                            template='home-template')
 
 
@@ -14,7 +14,7 @@ def contact():
     form = ContactForm()
     if form.validate_on_submit():
         return redirect(url_for('success'))
-    return render_template('contact.html',
+    return render_template('contact.jinja2',
                            form=form,
                            template='form-template')
 
@@ -24,12 +24,12 @@ def signup():
     form = SignupForm()
     if form.validate_on_submit():
         return redirect(url_for('success'))
-    return render_template('signup.html',
+    return render_template('signup.jinja2',
                            form=form,
                            template='form-template')
 
 
 @app.route('/success', methods=('GET', 'POST'))
 def success():
-    return render_template('success.html',
+    return render_template('success.jinja2',
                            template='success-template')
diff --git a/application/templates/analytics.jinja2 b/application/templates/analytics.jinja2
@@ -0,0 +1,14 @@
+<script type="text/javascript">
+  var _gauges = _gauges || [];
+  (function() {
+    var t   = document.createElement('script');
+    t.type  = 'text/javascript';
+    t.async = true;
+    t.id    = 'gauges-tracker';
+    t.setAttribute('data-site-id', '5eb6bab25292fb79acffe181');
+    t.setAttribute('data-track-path', 'https://track.gaug.es/track.gif');
+    t.src = 'https://d2fuc4clr7gvcn.cloudfront.net/track.js';
+    var s = document.getElementsByTagName('script')[0];
+    s.parentNode.insertBefore(t, s);
+  })();
+</script>
diff --git a/application/templates/contact.jinja2 b/application/templates/contact.jinja2
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'layout.jinja2' %}
 
 {% block styles %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/forms.css') }}" rel="stylesheet" type="text/css">
diff --git a/application/templates/index.jinja2 b/application/templates/index.jinja2
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'layout.jinja2' %}
 
 {% block styles %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/home.css') }}" rel="stylesheet" type="text/css">
diff --git a/application/templates/layout.html b/application/templates/layout.html
diff --git a/application/templates/layout.jinja2 b/application/templates/layout.jinja2
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+
+<html lang="en">
+
+<head>
+  <meta charset="utf-8"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+  <title>{{ title }}</title>
+  <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"/>
+  <link rel="shortcut icon" href="{{ url_for('static', filename='dist/img/favicon.png') }}" type="image/x-icon"/>
+  {% block styles %}{% endblock %}
+  <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" type="text/css">
+  <script src="https://kit.fontawesome.com/e3deaeba31.js" crossorigin="anonymous"></script>
+  <link href="https://fonts.googleapis.com/css?family=Poppins:200,300,500" rel="stylesheet">
+</head>
+
+<body class="{{ template }}">
+<div class="container">
+  {% block content %}{% endblock %}
+</div>
+{% include 'analytics.jinja2' %}
+</body>
+
+</html>
diff --git a/application/templates/meta.html b/application/templates/meta.html
diff --git a/application/templates/signup.jinja2 b/application/templates/signup.jinja2
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'layout.jinja2' %}
 
 {% block styles %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/forms.css') }}" rel="stylesheet" type="text/css">
diff --git a/application/templates/success.jinja2 b/application/templates/success.jinja2
@@ -1,4 +1,4 @@
-{% extends 'layout.html' %}
+{% extends 'layout.jinja2' %}
 
 {% block styles %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/success.css') }}" rel="stylesheet" type="text/css">
diff --git a/config.py b/config.py
@@ -1,9 +1,9 @@
 """App configuration."""
-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:
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,39 @@
+[tool.poetry]
+name = "Flask Blueprint Tutorial"
+version = "0.1.0"
+description = "Tutorial to implement forms in your Flask app."
+authors = ["Todd Birchard <toddbirchard@gmail.com>"]
+maintainers = ["Todd Birchard <toddbirchard@gmail.com>"]
+license = "MIT"
+readme = "README.md"
+homepage = "https://hackersandslackers.com/flask-wtforms-forms/"
+repository = "https://github.com/hackersandslackers/flask-wtform-tutorial/"
+documentation = "https://hackersandslackers.com/flask-wtforms-forms/"
+keywords = ["Flask",
+            "Forms",
+            "Flask-WTF",
+            "MVC",
+            "Tutorial"]
+
+[tool.poetry.dependencies]
+python = "^3.8"
+flask = "*"
+flask-wtf = "*"
+python-dotenv = "*"
+email_validator = "*"
+
+[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/flask-wtform-tutorial/issues"
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,10 @@
 click==7.1.2
+dnspython==1.16.0
+email-validator==1.1.0
 Flask==1.1.2
 Flask-WTF==0.14.3
 Flask-WTF-Tutorial==0.0.1
+idna==2.9
 itsdangerous==1.1.0
 Jinja2==2.11.2
 MarkupSafe==1.1.1
diff --git a/setup.py b/setup.py
diff --git a/wsgi.py b/wsgi.py
@@ -1,4 +1,4 @@
-"""App entry point."""
+"""Application entry point."""
 from application import create_app
 
 app = create_app()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends 'layout.html' %}`
	`1`	`+{% extends 'layout.jinja2' %}`
`2`	`2`
`3`	`3`	`{% block styles %}`
`4`	`4`	`<link rel="stylesheet" href="{{ url_for('static', filename='css/forms.css') }}" rel="stylesheet" type="text/css">`