Skip to content

Commit

Permalink
add teams blueprint
Browse files Browse the repository at this point in the history
  • Loading branch information
Charlito committed Jun 4, 2014
1 parent f76996b commit 60b0dbc
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 10 deletions.
27 changes: 27 additions & 0 deletions db_repository/versions/015_migration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
from sqlalchemy import *
from migrate import *


from migrate.changeset import schema
pre_meta = MetaData()
post_meta = MetaData()
team = Table('team', pre_meta,
Column('id', INTEGER, primary_key=True, nullable=False),
Column('name', VARCHAR(length=80)),
Column('timezone', VARCHAR(length=40)),
)


def upgrade(migrate_engine):
# Upgrade operations go here. Don't create your own engine; bind
# migrate_engine to your metadata
pre_meta.bind = migrate_engine
post_meta.bind = migrate_engine
pre_meta.tables['team'].drop()


def downgrade(migrate_engine):
# Operations to reverse the above upgrade go here.
pre_meta.bind = migrate_engine
post_meta.bind = migrate_engine
pre_meta.tables['team'].create()
11 changes: 7 additions & 4 deletions scrim/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@
db = SQLAlchemy(scrim_app)
oid = OpenID(scrim_app)
admin = Admin(scrim_app, name='Scrim Finder')
#lm.init_app(scrim_app)

from scrim import views, models, momentjs
lm.init_app(scrim_app)

from scrim import views, models
from models import User

admin.add_view(ModelView(User, db.session))
lm.init_app(scrim_app)
scrim_app.jinja_env.globals['momentjs'] = momentjs

# Blueprints
from scrim.mod_teams.views import mod_teams as teams_module
scrim_app.register_blueprint(teams_module, url_prefix='/teams')
6 changes: 6 additions & 0 deletions scrim/mod_teams/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from scrim import db

class Team(db.Model):
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(80))
timezone = db.Column(db.String(40))
7 changes: 7 additions & 0 deletions scrim/mod_teams/views.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from flask import Blueprint

mod_teams = Blueprint('mod_teams', __name__)

@mod_teams.route('/')
def show_teams():
return 'Sup nigger', 200
6 changes: 0 additions & 6 deletions scrim/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from datetime import datetime
from scrim import db
from flask.ext.admin.contrib.sqla import ModelView

class User(db.Model):
id = db.Column(db.Integer, primary_key=True)
Expand Down Expand Up @@ -44,10 +43,5 @@ class Available(db.Model):
time_to = db.Column(db.String(80))
user_id = db.Column(db.Integer, db.ForeignKey('user.id'))

class Team(db.Model):
id = db.Column(db.Integer, primary_key=True)
name = db.Column(db.String(80))
timezone = db.Column(db.String(40))

class Scrim(db.Model):
id = db.Column(db.Integer, primary_key=True)

0 comments on commit 60b0dbc

Please sign in to comment.