Better packaging.

app/__init__.py

@@ -0,0 +1,10 @@
+from flask import Flask
+from flask.ext.sqlalchemy import SQLAlchemy
+import settings
+
+app = Flask(__name__)
+app.secret_key = settings.APP_SESSION_KEY
+app.config['SQLALCHEMY_DATABASE_URI'] = settings.DATABASE_URI
+db = SQLAlchemy(app)
+
+from app import views

models.py → app/models.py

@@ -1,13 +1,7 @@
 import datetime
-from flask.ext.sqlalchemy import SQLAlchemy
 from sqlalchemy.ext.hybrid import hybrid_property
 
-
-from guildbit import app
-import settings
-
-app.config['SQLALCHEMY_DATABASE_URI'] = settings.DATABASE_URI
-db = SQLAlchemy(app)
+from app import db
 
 
 class Server(db.Model):

tasks.py → app/tasks.py

@@ -12,6 +12,7 @@ def something():
     print 'test'
     return
 
+
 @app.task
 def delete_server(id):
     r = requests.delete("%s/api/v1/servers/%i" % (settings.MURMUR_REST_HOST, id))

templates/index.html → app/templates/index.html

@@ -32,7 +32,7 @@ <h3 class="text-center">Deploy a Mumble server for your group. It's free!</h3>
 
             <div class="ten columns centered text-center">
                 <p>GuildBit is a free service to deploy temporary Mumble servers for your group. The service is completely
-                funded by donations. <a href="#">Learn how it works &raquo;</a></p>
+                funded by donations. <a href="/how-it-works">Learn how it works &raquo;</a></p>
             </div>
 
         </div>

templates/server_expired.html → app/templates/server_expired.html

@@ -28,7 +28,7 @@ <h2>Your server has expired!</h2>
 {% endblock %}
 
 {% block scripts %}
-    <script src="/static/js/libs/moment.min.js"></script>
+    <script src="/app/static/js/libs/moment.min.js"></script>
 
     <script type="text/javascript">
         // Format expiration date into human friendly

guildbit.py → app/views.py

@@ -1,17 +1,13 @@
 import uuid
 
-from flask import Flask
 from flask import render_template, redirect, url_for, jsonify
 from flask.ext.classy import FlaskView, route
 import requests
 
-from forms import DeployServerForm
-from models import *
 import settings
-import tasks
-
-app = Flask(__name__)
-app.secret_key = settings.APP_SESSION_KEY
+from app import app, tasks
+from app.forms import DeployServerForm
+from app.models import Server
 
 
 class HomeView(FlaskView):
@@ -101,9 +97,6 @@ def users(self, id):
         return jsonify(users=users)
 
 
-
 HomeView.register(app, route_base='/')
 ServerView.register(app)
 
-if __name__ == '__main__':
-    app.run(debug=settings.APP_DEBUG, host=settings.APP_HOST, port=settings.APP_PORT)

runserver.py

@@ -0,0 +1,5 @@
+from app import app
+import settings
+
+if __name__ == '__main__':
+    app.run(debug=settings.APP_DEBUG, host=settings.APP_HOST, port=settings.APP_PORT)

wsgi.py

@@ -0,0 +1,3 @@
+from app.views import app
+
+app = app