From 6f3d47ff6ef0d6a87c808dea959c627043a348fa Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Fri, 14 Mar 2014 11:12:42 -0500 Subject: [PATCH] run watch page --- api/models/Run.js | 4 ++++ assets/linker/js/app.coffee | 2 ++ .../js/controllers/create-run-controller.coffee | 1 + assets/linker/js/controllers/run-controller.coffee | 11 ++++++++++- assets/templates/create-run.jade | 10 +++++++++- assets/templates/run.jade | 7 ++++++- 6 files changed, 32 insertions(+), 3 deletions(-) diff --git a/api/models/Run.js b/api/models/Run.js index 2574147..d0583b8 100644 --- a/api/models/Run.js +++ b/api/models/Run.js @@ -9,6 +9,10 @@ module.exports = { attributes: { + name: { + type: 'string', + required: true + }, creatorName: { type: 'string', required: true diff --git a/assets/linker/js/app.coffee b/assets/linker/js/app.coffee index cfd694f..a678f89 100644 --- a/assets/linker/js/app.coffee +++ b/assets/linker/js/app.coffee @@ -13,6 +13,8 @@ lunchApp.config ['$routeProvider', .when '/run/:id', templateUrl: 'templates/run.html', controller: 'RunCtrl' + .otherwise + redirectTo: '/' ] lunchApp.config ['$locationProvider', diff --git a/assets/linker/js/controllers/create-run-controller.coffee b/assets/linker/js/controllers/create-run-controller.coffee index f27441f..2f91791 100644 --- a/assets/linker/js/controllers/create-run-controller.coffee +++ b/assets/linker/js/controllers/create-run-controller.coffee @@ -16,4 +16,5 @@ lunchControllers.controller 'CreateRunCtrl', ['$scope', '$http', '$location', 's console.log response.id console.log $location $location.path '/run/' + response.id + $scope.$apply() ] diff --git a/assets/linker/js/controllers/run-controller.coffee b/assets/linker/js/controllers/run-controller.coffee index 3c90055..b73ae31 100644 --- a/assets/linker/js/controllers/run-controller.coffee +++ b/assets/linker/js/controllers/run-controller.coffee @@ -1,4 +1,13 @@ lunchControllers = angular.module 'lunchControllers' -lunchControllers.controller 'RunCtrl', ['$scope', ($scope) -> +lunchControllers.controller 'RunCtrl', ['$scope', 'socket', '$routeParams', ($scope, socket, $routeParams) -> + $scope.show = false + + socket.get '/run', + where: + id: $routeParams['id'], + (response) -> + $scope.show = true + $scope.run = response[0] + $scope.$apply() ] diff --git a/assets/templates/create-run.jade b/assets/templates/create-run.jade index 6e979fb..8b4f747 100644 --- a/assets/templates/create-run.jade +++ b/assets/templates/create-run.jade @@ -1,6 +1,9 @@ div(ng-controller='CreateRunCtrl') h2 Create a new run yo form(name='form',novalidate,role='form') + div.form-group + label(for='name') Name your run + input#name.form-control(type='text',ng-model='run.name',required) div.form-group label(for='creatorName') Your name input#creatorName.form-control(type='text',ng-model='run.creatorName',required) @@ -10,7 +13,12 @@ div(ng-controller='CreateRunCtrl') div.form-group label(for='groupEmails') Group emails span(ng-repeat='i in run.invitees') - input#groupEmail.form-control(ng-model='i.email',required) + .form-group + label Name + input.form-control(ng-model='i.name',required) + .form-group + label Email + input.form-control(ng-model='i.email',required) button.btn.btn-default(ng-click='addInvitee()') Add div.form-group label(for='restaurant') Restaurant diff --git a/assets/templates/run.jade b/assets/templates/run.jade index bdf171d..0d13595 100644 --- a/assets/templates/run.jade +++ b/assets/templates/run.jade @@ -1 +1,6 @@ -span hello there folks! +div(ng-show="show") + h2 {{ run.name }} + p {{ run.creatorName }}, here's your lunch run! Wait here to see real-time updates of your invitees' orders. + + div(ng-repeat="i in run.invitees") + p {{ i.name }}, {{ i.email }}