diff --git a/.gitignore b/.gitignore
index 274eafef5..dff693412 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ assets/stylesheets/govuk_template/.sass-cache/
cache/
static/stylesheets/govuk-template*
static/css*
+static/css_all.css
\ No newline at end of file
diff --git a/app.py b/app.py
index 16ea1d352..239af4bc3 100644
--- a/app.py
+++ b/app.py
@@ -1,25 +1,17 @@
import os
-from flask import Flask, render_template
from flask.ext import assets
from flask.ext.script import Manager, Server
from webassets.filter import get_filter
from app import create_app
-application = create_app()
+application = create_app(os.getenv('NOTIFICATIONS_ADMIN_ENVIRONMENT') or 'development')
manager = Manager(application)
port = int(os.environ.get('PORT', 6012))
manager.add_command("runserver", Server(host='0.0.0.0', port=port))
-# debug mode - switch to False for production
-application.config['ASSETS_DEBUG'] = True
-application.config['DEBUG'] = True
env = assets.Environment(application)
-# debug mode - switch to True for production
-env.config['cache'] = False
-env.config['manifest'] = False
-
# Tell flask-assets where to look for our sass files.
env.load_path = [
os.path.join(os.path.dirname(__file__), 'app/assets/stylesheets'),
diff --git a/app/__init__.py b/app/__init__.py
index 93e47d205..006fd12ce 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,12 +1,33 @@
+import os
from flask import Flask
+from config import configs
+from flask._compat import string_types
-def create_app():
+def create_app(config_name):
application = Flask(__name__)
- # application.config['NOTIFY_API_ENVIRONMENT'] = config_name
- # application.config.from_object(configs[config_name])
+ application.config['NOTIFY_API_ENVIRONMENT'] = config_name
+ application.config.from_object(configs[config_name])
+ init_app(application)
+
from app.main import main as main_blueprint
application.register_blueprint(main_blueprint)
return application
+
+
+def init_app(app):
+ for key, value in app.config.items():
+ if key in os.environ:
+ app.config[key] = convert_to_boolean(os.environ[key])
+
+
+def convert_to_boolean(value):
+ if isinstance(value, string_types):
+ if value.lower() in ['t', 'true', 'on', 'yes', '1']:
+ return True
+ elif value.lower() in ['f', 'false', 'off', 'no', '0']:
+ return False
+
+ return value
diff --git a/app/main/views/index.py b/app/main/views/index.py
index be6433ae9..7f42e3611 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -8,11 +8,6 @@ def index():
return 'Hello from notifications-admin'
-@main.route("/")
-def idx():
- return render_template('index.html')
-
-
@main.route("/govuk")
def govuk():
return render_template('govuk_template.html')
diff --git a/app/templates/index.html b/app/templates/index.html
deleted file mode 100644
index 10476a320..000000000
--- a/app/templates/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-{% assets "css_all" %}
-
-{% endassets %}
-
-
-hi
-
-
\ No newline at end of file
diff --git a/config.py b/config.py
new file mode 100644
index 000000000..2a7e85db9
--- /dev/null
+++ b/config.py
@@ -0,0 +1,20 @@
+
+class Config(object):
+ DEBUG = False
+ ASSETS_DEBUG = False
+ cache = False
+ manifest = True
+
+
+class Development(Config):
+ DEBUG = True
+
+
+class Test(Config):
+ DEBUG = False
+
+
+configs = {
+ 'development': Development,
+ 'TEST': Test
+}