Merge pull request #26 from vuLgAr/master

use pipenv and cleanup templates

Author: mjhea0

.env

@@ -0,0 +1,2 @@
+APP_SETTINGS="project.server.config.DevelopmentConfig"
+FLASK_DEBUG=1

.gitignore

@@ -1,12 +1,8 @@
-.env
-env
-venv
 __pycache__
 
-*.pyc
-*.db
 *.coverage
-.DS_Store
-env.sh
-migrations
+*.db
+*.pyc
+
 htmlcov
+migrations

.python-version

@@ -7,8 +7,8 @@ python:
   - "2.7"
 
 install:
-  - pip install -r requirements.txt
-  - pip install coveralls
+  - "pip install pipenv"
+  - "pipenv install --dev"
 
 script:
   - python manage.py cov

.travis.yml

@@ -0,0 +1,28 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[packages]
+
+flask = "*"
+flask-bcrypt = "*"
+flask-bootstrap = "*"
+flask-login = "*"
+flask-migrate = "*"
+flask-sqlalchemy = "*"
+flask-wtf = "*"
+
+
+[dev-packages]
+
+coverage = "*"
+flask-debugtoolbar = "*"
+flask-testing = "*"
+
+
+[requires]
+
+python_version = "3.6.4"

Pipfile

@@ -11,18 +11,26 @@ Flask starter project...
 1. Create and activate a virtualenv
 1. Install the requirements
 
-### Set Environment Variables
 
-Update *project/server/config.py*, and then run:
+### Configuring
+
+Inspect and update `project/server/config.py`.
+
+
+### Setting Environment Variables
+
+Eg: for using the development config with debug mode enabled
 
 ```sh
 $ export APP_SETTINGS="project.server.config.DevelopmentConfig"
+$ export FLASK_DEBUG=1
 ```
 
-or
+Alternatively using pipenv or python-dotenv you can define your application configuration in the `.env` file.
 
 ```sh
-$ export APP_SETTINGS="project.server.config.ProductionConfig"
+APP_SETTINGS="project.server.config.DevelopmentConfig"
+FLASK_DEBUG=1
 ```
 
 ### Create DB
@@ -37,16 +45,9 @@ $ python manage.py create_data
 
 ### Run the Application
 
-With debug mode:
-
-```sh
-$ export FLASK_DEBUG=1 && python manage.py run
-```
-
-Without debug mode:
 
 ```sh
-$ export FLASK_DEBUG=0 && python manage.py run
+$ python manage.py run
 ```
 
 Access the application at the address [http://localhost:5000/](http://localhost:5000/)

Pipfile.lock

@@ -30,15 +30,14 @@
             {% for category, message in messages %}
             <div class="alert alert-{{ category }}">
               <a class="close" title="Close" href="#" data-dismiss="alert">&times;</a>
-             {{message}}
+              {{message}}
             </div>
             {% endfor %}
           </div>
         </div>
         {% endif %}
         {% endwith %}
 
-
         <!-- child template -->
         {% block content %}{% endblock %}
 

README.md

@@ -1,12 +1,12 @@
 {% extends "_base.html" %}
-
 {% block page_title %}- Unauthorized{% endblock %}
-
 {% block content %}
+
 <div class="jumbotron">
   <div class="text-center">
     <h1>401</h1>
     <p>You are not authorized to view this page. Please <a href="{{ url_for('user.login')}}">log in</a>.</p>
   </div>
 </div>
+
 {% endblock %}

project/client/templates/_base.html

@@ -1,12 +1,12 @@
 {% extends "_base.html" %}
-
-{% block page_title %}- Unauthorized{% endblock %}
-
+{% block page_title %}- Forbidden{% endblock %}
 {% block content %}
+
 <div class="jumbotron">
   <div class="text-center">
-    <h1>401</h1>
-    <p>You are not authorized to view this page. Please <a href="{{ url_for('user.login')}}">log in</a>.</p>
+    <h1>403</h1>
+    <p>You are forbidden from viewing this page. Please <a href="{{ url_for('user.login')}}">log in</a>.</p>
   </div>
 </div>
+
 {% endblock %}