Addition of groups, travis and frontend

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory" : "assets/bower_components"
+}

.gitignore

@@ -40,3 +40,13 @@ settings_local.py*
 
 # PyCharm
 .idea
+
+# dev assets
+studygroup/static
+assets/bower_components/
+
+# node modules
+node_modules/
+
+# test db
+test.db

.travis.yml

@@ -0,0 +1,9 @@
+language: python
+env:
+  - MEETUP_OAUTH_SECRET=secret MEETUP_OAUTH_KEY=key
+python:
+    - "2.7"
+install:
+    - "pip install -r requirements.txt"
+script:
+    - "python -m unittest discover"

README.md

@@ -36,15 +36,31 @@ development machine so that it pretends to be
 
         $ python manage.py db upgrade
 
-5. Start the server:
+5. Install The javascript builder:
+
+        Depending on your operating system install the npm package
+        (OSX) $
+            * Brew
+                - $ brew install npm
+            * Mac Ports
+                - $ port install npm
+
+        (Linux)
+            $ apt-get install npm
+
+        $ npm install
+        $ bower install
+        $ gulp
+
+6. Start the server:
 
         $ python run_server.py -p 8080
 
-6. Visit the page in your browser using the URL http://localhost:8080.
+7. Visit the page in your browser using the URL http://localhost:8080.
     You should see the Study Group page, and your server window should show
     URLs being served.
 
-7. If you click the Sign In Now button, it should take you to meetup.com and
+8. If you click the Sign In Now button, it should take you to meetup.com and
     ask you to authorize Boston Python Study Groups.
 
 

studygroup/static/css/jumbotron-narrow.css → assets/css/jumbotron-narrow.css

@@ -76,4 +76,4 @@ body {
   .jumbotron {
     border-bottom: 0;
   }
-}
+}

assets/js/app.js

@@ -0,0 +1,19 @@
+$(function () {
+    $('[data-provide="datepicker"]').datetimepicker({
+        icons: {
+            date: "fa fa-calendar",
+            up: "fa fa-arrow-up",
+            down: "fa fa-arrow-down"
+        },
+        format: 'MM/DD/YYYY'
+    });
+    $('[data-provide="datetimepicker"]').datetimepicker({
+        icons: {
+            time: "fa fa-clock-o",
+            date: "fa fa-calendar",
+            up: "fa fa-arrow-up",
+            down: "fa fa-arrow-down"
+        },
+        format: 'MM/DD/YYYY HH:mm'
+    });
+});

bower.json

@@ -0,0 +1,22 @@
+{
+  "name": "studygroup",
+  "version": "0.0.0",
+  "license": "MIT",
+  "authors": [
+    "Boston Python"
+  ],
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components"
+  ],
+  "dependencies": {
+    "bootstrap": "~3.3.6",
+    "eonasdan-bootstrap-datetimepicker": "~4.17.0",
+    "font-awesome": "~4.5.0",
+    "jquery": "~2.2.0",
+    "lodash": "~4.2.1",
+    "moment": "~2.11.2"
+  }
+}

gulpfile.js

@@ -0,0 +1,103 @@
+var gulp = require("gulp"),
+    sourcemaps = require("gulp-sourcemaps"),
+    concat = require("gulp-concat"),
+    less = require('gulp-less'),
+    minifyCss = require('gulp-minify-css'),
+    uglify = require('gulp-uglifyjs'),
+    symlink = require('gulp-sym')
+    STATIC = 'studygroup/static';
+
+
+var LIBS_SCRIPTS = [
+    'assets/bower_components/jquery/dist/jquery.js',
+    'assets/bower_components/bootstrap/dist/js/bootstrap.js',
+    'assets/bower_components/lodash/lodash.min.js',
+    'assets/bower_components/moment/min/moment.min.js',
+    'assets/bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js'
+];
+
+var LIBS_CSS = [
+    'assets/bower_components/font-awesome/css/font-awesome.css',
+    'assets/bower_components/bootstrap/dist/css/bootstrap.css',
+    'assets/bower_components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css',
+    'assets/css/*.css',
+];
+
+var LIBS_FONTS = [
+    'assets/bower_components/font-awesome/fonts/**.*',
+    'assets/bower_components/bootstrap/fonts/**.*',
+    'assets/fonts/*/**.*',
+];
+
+gulp.task("fonts", function () {
+    return gulp.src(LIBS_FONTS)
+        .pipe(gulp.dest(STATIC + '/fonts'));
+});
+
+gulp.task("lib-css", function () {
+    return gulp.src(LIBS_CSS)
+        .pipe(gulp.dest(STATIC + '/dev/css'));
+});
+
+gulp.task("lib-js", function () {
+    return gulp.src(LIBS_SCRIPTS)
+        .pipe(gulp.dest(STATIC + '/dev/js'));
+});
+
+gulp.task("js", function () {
+    return gulp.src("./assets/js/**/*.js")
+        .pipe(sourcemaps.init())
+        .pipe(concat("app.js"))
+        .pipe(sourcemaps.write("."))
+        .pipe(gulp.dest(STATIC + '/dev/js'));
+});
+
+gulp.task("img", function () {
+    return gulp.src("./frontend/img/*")
+        .pipe(gulp.dest(STATIC + '/img'));
+});
+
+gulp.task("less", function () {
+    return gulp.src('./assets/less/**/*.less')
+        .pipe(sourcemaps.init())
+        .pipe(less())
+        .pipe(sourcemaps.write())
+        .pipe(gulp.dest(STATIC + '/dev/css'));
+});
+
+gulp.task('minify-css', function () {
+    return gulp.src(STATIC + '/dev/css/*.css')
+        .pipe(minifyCss({compatibility: 'ie8'}))
+        .pipe(concat('style.min.css'))
+        .pipe(gulp.dest(STATIC + '/dist'));
+});
+
+gulp.task('minify-jslibs', function () {
+    return gulp.src(LIBS_SCRIPTS)
+        .pipe(uglify())
+        .pipe(concat('libs.min.js'))
+        .pipe(gulp.dest(STATIC + '/dist'));
+});
+
+gulp.task('minify-js', function () {
+    return gulp.src(STATIC + '/dev/js/app.js')
+        .pipe(uglify())
+        .pipe(concat('app.min.js'))
+        .pipe(gulp.dest(STATIC + '/dist'));
+});
+
+gulp.task('dev-link', function () {
+    return gulp.src([STATIC+'/fonts'])
+        .pipe(symlink([STATIC+'/dev/fonts']));
+});
+
+gulp.task("default", ["js", "less", "img", "fonts", "lib-css", "lib-js", "dev-link"]);
+
+gulp.task('watch', function () {
+    gulp.watch('./assets/less/**/*.less', ['less']);
+    gulp.watch('./assets/js/**/*.js', ['js']);
+    gulp.watch('./assets/img/*', ['img']);
+    gulp.watch(LIBS_FONTS, ['fonts']);
+    gulp.watch(LIBS_CSS, ['fonts']);
+    gulp.watch(LIBS_SCRIPTS, ['fonts']);
+});

migrations/versions/16f11fc2c7e4_.py

@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: 16f11fc2c7e4
+Revises: 9975799c2b8
+Create Date: 2016-02-02 19:24:50.744280
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '16f11fc2c7e4'
+down_revision = '9975799c2b8'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.add_column('group', sa.Column('start_date', sa.Date))
+    op.add_column('group', sa.Column('start_time', sa.Time))
+    op.add_column('group', sa.Column('active', sa.Boolean))
+
+
+def downgrade():
+    op.drop_column('group', 'start_date')
+    op.drop_column('group', 'start_time')
+    op.drop_column('group', 'active')

package.json

@@ -0,0 +1,19 @@
+{
+    "name": "studygroup",
+    "version": "0.1.0",
+    "description": "The studygroup js build",
+    "devDependencies": {},
+    "author": "Boston Python",
+    "dependencies": {
+        "bower": "^1.4.1",
+        "gulp": "^3.9.0",
+        "gulp-less": "^3.0.5",
+        "gulp-concat": "^2.6.0",
+        "gulp-sourcemaps": "^1.6.0",
+        "gulp-uglify": "^1.5.2",
+        "gulp-html-replace": "^1.5.5",
+        "gulp-minify-css": "^1.2.3",
+        "gulp-uglifyjs": "^0.6.2",
+        "gulp-sym": "^0.0.14 "
+    }
+}

requirements.txt

@@ -1,4 +1,3 @@
-Flask-Bootstrap==3.1.0.1
 Flask-Migrate==1.2.0
 Flask-OAuthlib==0.4.2
 Flask-SQLAlchemy==1.0
@@ -16,6 +15,10 @@ itsdangerous==0.23
 oauthlib==0.6.1
 psycopg2==2.5.2
 wsgiref==0.1.2
+lxml==3.3.5
+requests==2.3.0
+cssselect==0.9.1
+mock==1.0.1
 
 # Only for testing (separate out?)
 Flask-Testing==0.4

settings.py

@@ -7,9 +7,10 @@
 SQLALCHEMY_DATABASE_URI = get('SQLALCHEMY_DATABASE_URI')
 DEFAULT_MAX_MEMBERS = 10
 
+WEBPACK_MANIFEST_PATH = "/Users/mmilkin/code/studygroup/manifest.json"
 
 # import local config to override global config
 try:
     from settings_local import *
 except ImportError:
-    pass
+    pass

studygroup/application.py

@@ -1,6 +1,5 @@
 from flask import Flask
 from flask_oauthlib.client import OAuth
-from flask_bootstrap import Bootstrap
 from flask.ext.migrate import Migrate
 from flask.ext.sqlalchemy import SQLAlchemy
 
@@ -11,17 +10,18 @@
 oauth = OAuth()
 migrate = Migrate()
 
+
 def create_app(debug=True):
     from views import studygroup
-
+    from groups import groups
     app = Flask(__name__)
     app.debug = debug
     app.secret_key = 'development'
     app.config.from_object(settings)
 
     app.register_blueprint(studygroup)
+    app.register_blueprint(groups)
 
-    Bootstrap(app)
     db.init_app(app)
     oauth.init_app(app)
     migrate.init_app(app, db)

studygroup/auth.py

@@ -5,7 +5,7 @@
 def login_required(f):
     @wraps(f)
     def decorated_function(*args, **kwargs):
-        if g.user is None:
+        if getattr(g, 'user', None) is None:
             return redirect(url_for('studygroup.login', next=request.url))
         return f(*args, **kwargs)
     return decorated_function

studygroup/exceptions.py

@@ -1,10 +1,21 @@
 
-
 class ModelNotFoundException(Exception):
     pass
 
-class GroupFullException(Exception):
+class FormValidationException(Exception):
+    pass
+
+class UnAuthorizedException(FormValidationException):
+    def __init__(self, member_id):
+        message = "UnAuthorized action for member with Id: %s " % (member_id)
+        super(UnAuthorizedException, self).__init__(message)
+
+class MembershipException(FormValidationException):
+    def __init__(self, member_id, group_id):
+        message = "Member {%s} is already part of group: {%s} " % (member_id, group_id)
+        super(MembershipException, self).__init__(message)
 
+class GroupFullException(FormValidationException):
     def __init__(self, group):
         message = "Group: %s Id: %s" % (group.name, group.id)
-        super(GroupFullException, self).__init__(message)
+        super(GroupFullException, self).__init__(message)