cleaned up tutorial

toddbirchard · toddbirchard · commit 7fd1a81d1b6b · 2019-04-03T11:23:52.000-04:00
diff --git a/Pipfile b/Pipfile
@@ -5,12 +5,11 @@ verify_ssl = true
 
 [dev-packages]
 python-dotenv="*"
-pylama="*"
 
 [packages]
 Flask="*"
 Flask-SQLAlchemy="*"
-pymysql="*"
+psycopg2-binary="*"
 
 [requires]
 python_version = "3.7"
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Flask-SQLAlchemy Tutorial
 
-![Python](https://img.shields.io/badge/Python-3.7.2-blue.svg?logo=python&longCache=true&logoColor=white&colorB=23a8e2&style=flat-square&colorA=36363e)
-![Flask](https://img.shields.io/badge/Flask-1.0.2-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=23a8e2&colorA=36363e)
-![PyMySQL](https://img.shields.io/badge/PyMySQL-0.9.3-red.svg?longCache=true&style=flat-square&logo=mysql&logoColor=white&colorA=36363e&colorB=4479A1)
+![Python](https://img.shields.io/badge/Python-v3.7.2-blue.svg?logo=python&longCache=true&logoColor=white&colorB=23a8e2&style=flat-square&colorA=36363e)
+![Flask](https://img.shields.io/badge/Flask-v1.0.2-blue.svg?longCache=true&logo=flask&style=flat-square&logoColor=white&colorB=23a8e2&colorA=36363e)
+![Psycopg2-binary](https://img.shields.io/badge/Psycopg2--Binary-v2.7.7-red.svg?longCache=true&style=flat-square&logo=PostgreSQL&logoColor=white&colorA=36363e)
 ![Flask-SQLAlchemy](https://img.shields.io/badge/Flask--SQLAlchemy-2.3.2-red.svg?longCache=true&style=flat-square&logo=scala&logoColor=white&colorA=36363e)
 
 ![Flask-SQLAlchemy Tutorial](application/static/img/flask-sqlalchemy.jpg)
diff --git a/application/__init__.py b/application/__init__.py
@@ -7,8 +7,6 @@
 def create_app():
     """Construct the core application."""
     app = Flask(__name__, instance_relative_config=False)
-    app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
-    app.config["SQLALCHEMY_ECHO"] = True
     db.init_app(app)
     app.config.from_object('config.Config')
 
diff --git a/application/models.py b/application/models.py
@@ -3,7 +3,7 @@
 class User(db.Model):
     """Model for user accounts."""
 
-    __tablename__ = 'users'
+    __tablename__ = 'flasksqlalchemy-users'
     id = db.Column(db.Integer,
                    primary_key=True
                    )
diff --git a/application/routes.py b/application/routes.py
@@ -7,8 +7,8 @@
 @app.route('/', methods=['GET'])
 def entry():
     """Endpoint to create a user."""
-    new_user = User(username='myuser2',
-                    email='myuser2@example.com',
+    new_user = User(username='myuser3',
+                    email='myuser3@example.com',
                     created=dt.now(),
                     bio="Because he's the hero Gotham deserves, but not the one it needs right now.",
                     admin=False
diff --git a/config.py b/config.py
@@ -4,11 +4,21 @@
 class Config:
     """Set Flask configuration vars from .env file."""
 
-    # General
-    TESTING = os.environ["TESTING"]
-    FLASK_DEBUG = os.environ["FLASK_DEBUG"]
+    # General Config
+    SECRET_KEY = os.environ.get('SECRET_KEY')
+    FLASK_APP = os.environ.get('FLASK_APP')
+    FLASK_ENV = os.environ.get('FLASK_ENV')
+
+    # Assets
+    LESS_BIN = os.environ.get('LESS_BIN')
+    ASSETS_DEBUG = os.environ.get('ASSETS_DEBUG')
+    LESS_RUN_IN_DEBUG = os.environ.get('LESS_RUN_IN_DEBUG')
+
+    # Static Assets
+    STATIC_FOLDER = os.environ.get('STATIC_FOLDER')
+    TEMPLATES_FOLDER = os.environ.get('TEMPLATES_FOLDER')
+    COMPRESSOR_DEBUG = os.environ.get('COMPRESSOR_DEBUG')
 
     # Database
-    SQLALCHEMY_DATABASE_URI = os.environ["SQLALCHEMY_DATABASE_URI"]
-    # SQLALCHEMY_ECHO = os.environ["SQLALCHEMY_ECHO"]
-    # SQLALCHEMY_TRACK_MODIFICATIONS = os.environ["SQLALCHEMY_TRACK_MODIFICATIONS"]
+    SQLALCHEMY_DATABASE_URI = os.environ.get("SQLALCHEMY_DATABASE_URI")
+    SQLALCHEMY_TRACK_MODIFICATIONS = os.environ.get("SQLALCHEMY_TRACK_MODIFICATIONS")
diff --git a/requirements.txt b/requirements.txt
@@ -1,22 +1,10 @@
-astroid==2.1.0
 Click==7.0
 Flask==1.0.2
 Flask-SQLAlchemy==2.3.2
-isort==4.3.4
 itsdangerous==1.1.0
 Jinja2==2.10
-lazy-object-proxy==1.3.1
-MarkupSafe==1.1.0
-mccabe==0.6.1
-pycodestyle==2.5.0
-pydocstyle==3.0.0
-pyflakes==2.1.0
-pylama==7.6.6
-pylint==2.2.2
-PyMySQL==0.9.3
+MarkupSafe==1.1.1
+psycopg2-binary==2.7.7
 python-dotenv==0.10.1
-six==1.12.0
-snowballstemmer==1.2.1
-SQLAlchemy==1.2.17
-Werkzeug==0.14.1
-wrapt==1.11.1
+SQLAlchemy==1.3.1
+Werkzeug==0.15.1

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`class User(db.Model):`
`4`	`4`	`"""Model for user accounts."""`
`5`	`5`
`6`		`- __tablename__ = 'users'`
	`6`	`+ __tablename__ = 'flasksqlalchemy-users'`
`7`	`7`	`id = db.Column(db.Integer,`
`8`	`8`	`primary_key=True`
`9`	`9`	`)`