cfierro · MelindaK · Oct 11, 2015 · Oct 11, 2015 · Oct 21, 2015 · Nov 18, 2015
diff --git a/README.md b/README.md
@@ -1,3 +1,73 @@
-./scripts/bootstrap.sh
+# Todo List App
+
+The Todo List App is an application for creating and sharing todolists.
+
+This repo contains:
+
+* Resources for creating users, todo lists, todos, and todo list permissions.
+* User tests for the above resources.
+
+
+## Environment Setup
+
+Clone the repository:
+
+`git clone https://github.com/cfierro/todo.git`
+
+Grab your fork:
+
+'git remote add [yourname] https://github.com/[yourname]/todo.git'
+
+Install dependencies using the bootstrap script:
+
+`./scripts/bootstrap.sh`
+
+
+## Directory Structure
+
+* app/authentication - resources for user authentication
+  * log in
+  * log out
+  * get logged in user info
+* app/lib - shared libraries across multiple resources
+  * /authenticaion - decorator for requiring a user to be logged in
+  * /models - includes a base table mixin for all data tables
+  * /response_uit - methods for building status responses
+  * /status - classes for returning raised exceptions
+* app/permissions - model and resources for list permissions
+* app/todo_lists - model and resources for todo lists
+* app/todos - model and resources for todos
+* app/users - model and resources for users
+* app/__init__.py - initialize python packages. Includes:
+  * Import Flask libraries
+  * Error handler
+  * database creation
+  * Model imports
+  * Resources urls for APIs
+* env - virtual environment
+* scripts - bootstrap script fo installing dependencies
+* unittest/resources - unittests for user, todo, todo_list, and auth resources
+* .gitignore - files to ignore upon git commit
+* config.py -
+* README.md - this file!
+* requirements.txt - required libraries
+* run.py - runs the application.
+* shell.py -
+
+
+## Development
+
+Run the following from the top level directory:
+
+Activate your virutual environment.
+
+`source env/bin/activate`
+
+To run the app:
+
+`python run.py`
+
+To run unit tests:
+
+`py.test unittest`
 
-source env/bin/activate
diff --git a/app.db b/app.db
diff --git a/app/static/css/main.css b/app/static/css/main.css
@@ -0,0 +1,34 @@
+body {
+  font-family: 'Josefin Sans', sans-serif;
+  font-size: 18px;
+  background: #BAA5D6; }
+
+.todo-app h1 {
+  text-align: center; }
+
+.todo-lists-container {
+  width: 50%;
+  margin: 0 auto; }
+  .todo-lists-container ul {
+    list-style: none;
+    margin-left: 0;
+    padding-left: 0; }
+
+.listName {
+  outline: none;
+  border: none;
+  background: transparent;
+  font-family: 'Josefin Sans', sans-serif;
+  font-size: 1.5em;
+  text-align: center;
+  width: 80%; }
+  .listName:focus + .deleteList {
+    display: inline-block; }
+
+.todo {
+  outline: none;
+  padding: 3px;
+  width: 80%; }
+
+.addList {
+  margin: 0 auto; }
diff --git a/app/templates/index.html b/app/templates/index.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title></title>
+    <link href='https://fonts.googleapis.com/css?family=Josefin+Sans:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="static/css/main.css">
   </head>
   <body>

diff --git a/app/todo_lists/resources.py b/app/todo_lists/resources.py
@@ -1,3 +1,5 @@
+import json
+
 from flask import request, session
 from flask_restful import Resource
 from sqlalchemy import and_
@@ -30,10 +32,12 @@ def get(self):
     def post(self):
         """Method creates a todoList and returns it in an Ok response.
         """
-        if not(request.form.get('name')):
+        data = json.loads(request.data)
+
+        if not(data.get('name')):
             raise status.BadRequest()
 
-        todoList = TodoList(request.form.get('name'), session.get('userId'))
+        todoList = TodoList(data.get('name'), session.get('userId'))
         db.session.add(todoList)
         db.session.commit()
 
@@ -56,6 +60,7 @@ def put(self, todoListId):
         """
         userId = session.get('userId')
         todoList = TodoList.query.get(todoListId)
+        data = json.loads(request.data)
 
         if todoList is None:
             raise status.NotFound()
@@ -67,7 +72,7 @@ def put(self, todoListId):
         if permission is None:
             raise status.Unauthorized()
 
-        todoList.name = request.form.get('name') or todoList.name
+        todoList.name = data.get('name') or todoList.name
         db.session.commit()
 
         return response_util.buildOkResponse(todoList.toDict())

diff --git a/app/todos/resources.py b/app/todos/resources.py
@@ -1,3 +1,5 @@
+import json
+
 from flask import request, session
 from flask_restful import Resource
 from sqlalchemy import and_
@@ -44,10 +46,11 @@ def get(self):
     def post(self):
         """Method adds a new todo and returns the todo in an OK response..
         """
+        data = json.loads(request.data)
         userId = session.get('userId')
-        todoListId = request.form.get('todoListId')
+        todoListId = data.get('todoListId')
 
-        if not(request.form.get('subject') and todoListId):
+        if not(data.get('subject') and todoListId):
             raise status.BadRequest()
 
         permission = TodoListPermission.query.filter(
@@ -57,14 +60,14 @@ def post(self):
         if permission is None:
             raise status.Forbidden()
 
-        todo = Todo(request.form.get('subject'),
+        todo = Todo(data.get('subject'),
                     todoListId,
                     userId,
-                    request.form.get('dueDate'),
-                    request.form.get('description'),
-                    request.form.get('priority'),
-                    request.form.get('completed'),
-                    request.form.get('assigneeId'))
+                    data.get('dueDate'),
+                    data.get('description'),
+                    data.get('priority'),
+                    data.get('completed'),
+                    data.get('assigneeId'))
         db.session.add(todo)
         db.session.commit()
 
@@ -81,6 +84,7 @@ def put(self, todoId):
         Args:
             todoId - Interger, primary key identifying the todo.
         """
+        data = json.loads(request.data)
         userId = session.get('userId')
         todo = Todo.query.get(todoId)
 
@@ -94,12 +98,15 @@ def put(self, todoId):
         if permission is None:
             raise status.Forbidden()
 
-        todo.subject = request.form.get('subject') or todo.subject
-        todo.dueDate = request.form.get('dueDate') or todo.dueDate
-        todo.description = request.form.get('description') or todo.description
-        todo.priority = request.form.get('priority') or todo.priority
-        todo.completed = request.form.get('completed') or todo.completed
-        todo.assigneeId = request.form.get('assigneeId') or todo.assigneeId
+        todo.subject = data.get('subject') or todo.subject
+        todo.dueDate = data.get('dueDate') or todo.dueDate
+        todo.description = data.get('description') or todo.description
+        todo.priority = data.get('priority') or todo.priority
+        todo.assigneeId = data.get('assigneeId') or todo.assigneeId
+
+        todo.completed = data.get('completed') \
+            if data.get('completed') != todo.completed \
+            else todo.completed
 
         db.session.commit()
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -0,0 +1,13 @@
+var gulp = require('gulp');
+var sass = require('gulp-sass');
+
+gulp.task('styles', function() {
+    gulp.src('sass/**/*.scss')
+        .pipe(sass().on('error', sass.logError))
+        .pipe(gulp.dest('./app/static/css'));
+});
+
+//Watch task
+gulp.task('default',function() {
+    gulp.watch('sass/**/*.scss',['styles']);
+});
diff --git a/index.js b/index.js
diff --git a/js/src/Collection/ItemCollection.js b/js/src/Collection/ItemCollection.js
diff --git a/js/src/Collection/TodoCollection.js b/js/src/Collection/TodoCollection.js
@@ -0,0 +1,18 @@
+var Backbone = require('backbone');
+
+var TodoModel = require('../Model/TodoModel.js');
+
+var TodoCollection = Backbone.Collection.extend({
+    initialize: function(models, options){
+        this.id = options.id
+    },
+    model: TodoModel,
+    url: function(){
+        return '/todos?todoListId=' + this.id;
+    },
+    parse: function(response){
+        return response.result;
+    }
+})
+
+module.exports = TodoCollection;
diff --git a/js/src/Collection/TodoListCollection.js b/js/src/Collection/TodoListCollection.js
@@ -0,0 +1,13 @@
+var Backbone = require('backbone');
+
+var TodoListModel = require('../Model/TodoListModel.js');
+
+var TodoListCollection = Backbone.Collection.extend({
+    model: TodoListModel,
+    url: '/todolists',
+    parse: function(response){
+        return response.result;
+    }
+})
+
+module.exports = TodoListCollection;
diff --git a/js/src/Model/ItemModel.js b/js/src/Model/ItemModel.js
diff --git a/js/src/Model/TodoListModel.js b/js/src/Model/TodoListModel.js
@@ -0,0 +1,18 @@
+var Backbone = require('backbone');
+// var TodoListCollection = require('../Collection/TodoListCollection.js')
+
+var TodoListModel = Backbone.Model.extend({
+    urlRoot: '/todolists',
+    defaults: {
+        name: 'List Name',
+        creator: 'User'
+    },
+    parse: function(response, options){
+        if (options.collection) {
+            return response;
+        }
+        return response.result;
+    }
+})
+
+module.exports = TodoListModel;
diff --git a/js/src/Model/TodoModel.js b/js/src/Model/TodoModel.js
@@ -0,0 +1,21 @@
+var Backbone = require('backbone');
+
+var TodoModel = Backbone.Model.extend({
+    urlRoot: 'todos/',
+    defaults: {
+        subject: 'Subject',
+        dueDate: null,
+        description: '',
+        priority: null,
+        completed: false,
+        assignee: null,
+    },
+    parse: function(response, options){
+        if (options.collection) {
+            return response;
+        }
+        return response.result;
+    }
+})
+
+module.exports = TodoModel;
diff --git a/js/src/Model/UserModel.js b/js/src/Model/UserModel.js
@@ -0,0 +1,11 @@
+var Backbone = require('backbone');
+
+var UserModel = Backbone.Model.extend({
+    url: '/me',
+    parse: function(response){
+        return response.result;
+    }
+
+})
+
+module.exports = UserModel;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     <html>
       <head>
         <title></title>
+        <link href='https://fonts.googleapis.com/css?family=Josefin+Sans:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="static/css/main.css">
       </head>
       <body>
@@ Expand Down @@