From 42ef462a0c4ff77c0bd8c1aabb0c41cd4cec359e Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Fri, 16 May 2014 21:14:00 -0500 Subject: [PATCH] Menu and other's orders sidebars on udpate order page --- assets/linker/js/app.coffee | 4 +- ....coffee => update-order-controller.coffee} | 11 +++++- assets/linker/styles/app.less | 1 + assets/linker/styles/update-order.less | 6 +++ .../templates/invitee/update-order.jade | 38 +++++++++++++++++++ assets/linker/templates/run/create-order.jade | 18 --------- views/layout.jade | 2 +- 7 files changed, 57 insertions(+), 23 deletions(-) rename assets/linker/js/controllers/{create-order-controller.coffee => update-order-controller.coffee} (60%) create mode 100644 assets/linker/styles/update-order.less create mode 100644 assets/linker/templates/invitee/update-order.jade delete mode 100644 assets/linker/templates/run/create-order.jade diff --git a/assets/linker/js/app.coffee b/assets/linker/js/app.coffee index 3403d4e..cae8da6 100644 --- a/assets/linker/js/app.coffee +++ b/assets/linker/js/app.coffee @@ -17,8 +17,8 @@ lunchApp.config ['$routeProvider', templateUrl: 'templates/run/show.html', controller: 'RunCtrl' .when '/order/:inviteeId', - templateUrl: 'templates/run/create-order.html', - controller: 'CreateOrderCtrl' + templateUrl: 'templates/invitee/update-order.html', + controller: 'UpdateOrderCtrl' .otherwise redirectTo: '/home' ] diff --git a/assets/linker/js/controllers/create-order-controller.coffee b/assets/linker/js/controllers/update-order-controller.coffee similarity index 60% rename from assets/linker/js/controllers/create-order-controller.coffee rename to assets/linker/js/controllers/update-order-controller.coffee index 744827d..f66ec66 100644 --- a/assets/linker/js/controllers/create-order-controller.coffee +++ b/assets/linker/js/controllers/update-order-controller.coffee @@ -1,9 +1,11 @@ lunchControllers = angular.module 'lunchControllers' -lunchControllers.controller 'CreateOrderCtrl', ['$scope','socket','$routeParams','$location', - CreateOrderController = ($scope, socket, $routeParams, $location) -> +lunchControllers.controller 'UpdateOrderCtrl', ['$scope','socket','$routeParams','$location','$sce', + UpdateOrderController = ($scope, socket, $routeParams, $location, $sce) -> $scope.show = false $scope.showMenuUrl = false + $scope.invitees = [] + $scope.menuUrl = '' socket.get '/invitee/findOne', id: $routeParams['inviteeId'], (inviteeResponse) -> $scope.invitee = inviteeResponse @@ -12,9 +14,14 @@ lunchControllers.controller 'CreateOrderCtrl', ['$scope','socket','$routeParams' (runResponse) -> $scope.show = true $scope.showMenuUrl = runResponse.menuUrl + $scope.menuUrl = $sce.trustAsResourceUrl(runResponse.menuUrl) $scope.run = runResponse $scope.$apply() + socket.get '/invitee/find', run_id: inviteeResponse.run_id, (allResponse) -> + $scope.invitees = allResponse + $scope.$apply() + $scope.submit = (invitee) -> socket.put '/invitee/' + $routeParams['inviteeId'], { order: invitee.order }, (response) -> $location.path '/run/' + $scope.run.id diff --git a/assets/linker/styles/app.less b/assets/linker/styles/app.less index 3deb1a2..1b279d5 100644 --- a/assets/linker/styles/app.less +++ b/assets/linker/styles/app.less @@ -5,6 +5,7 @@ @import "run.less"; @import "nav.less"; @import "header-footer.less"; +@import "update-order.less"; body { color: #fff; diff --git a/assets/linker/styles/update-order.less b/assets/linker/styles/update-order.less new file mode 100644 index 0000000..9bef616 --- /dev/null +++ b/assets/linker/styles/update-order.less @@ -0,0 +1,6 @@ +.others-orders { + .list-group-item { + border-width: 0 0 1px 0; + background-color: transparent; + } +} diff --git a/assets/linker/templates/invitee/update-order.jade b/assets/linker/templates/invitee/update-order.jade new file mode 100644 index 0000000..926db94 --- /dev/null +++ b/assets/linker/templates/invitee/update-order.jade @@ -0,0 +1,38 @@ +extends ../layouts/interior-page + +block pagetitle + span.glyphicon.glyphicon-list + span.text-muted Enter your order for: + |  {{ run.name }} + +block interiorcontent + div(ng-show='show') + p Hi {{ invitee.name }}! You are all going to {{ run.restaurant }}. + span(ng-show='showMenuUrl') Here is the + a(href='{{ run.menuUrl }}',target="_blank") menu. + + .row + .col-xs-12.col-sm-6 + h2 Update your order + form.form.create-order-form(role='form') + div.form-group + textarea#order.form-control(ng-model='invitee.order',placeholder='Your order',rows=8) + + button.btn.btn-lg.btn-primary.btn-block(ng-click='submit(invitee)') Submit Order + + .col-xs-12.col-sm-6 + div.pod(ng-show='showMenuUrl') + h2 + | Menu + a.btn.btn-sm.btn-default.pull-right(href='{{ run.menuUrl }}',target='_blank') + span.glyphicon.glyphicon-new-window + + iframe(ng-src='{{ menuUrl }}',width='100%',height='400px') + + div.pod.others-orders + h2 Other's orders + ul.list-group(ng-repeat='i in invitees') + li.list-group-item + strong {{ i.name }} + | : {{ i.order }} + diff --git a/assets/linker/templates/run/create-order.jade b/assets/linker/templates/run/create-order.jade deleted file mode 100644 index 2175932..0000000 --- a/assets/linker/templates/run/create-order.jade +++ /dev/null @@ -1,18 +0,0 @@ -extends ../layouts/interior-page - -block pagetitle - span.glyphicon.glyphicon-list - span.text-muted Enter your order for: - |  {{ run.name }} - -block interiorcontent - div(ng-show='show') - p Hi {{ invitee.name }}! You are all going to {{ run.restaurant }}. - span(ng-show='showMenuUrl') Here is the - a(href='{{ run.menuUrl }}',target="_blank") menu. - - form.form.create-order-form(role='form') - div.form-group - textarea#order.form-control(ng-model='invitee.order',placeholder='Your order') - - button.btn.btn-lg.btn-primary.btn-block(ng-click='submit(invitee)') Submit Order diff --git a/views/layout.jade b/views/layout.jade index 9f5407c..f3f1d16 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -29,10 +29,10 @@ html(lang="en",ng-app="lunchApp") script(type="text/javascript", src="/linker/js/controllers/module.js") script(type="text/javascript", src="/linker/js/analytics.js") script(type="text/javascript", src="/linker/js/controllers/body-controller.js") - script(type="text/javascript", src="/linker/js/controllers/create-order-controller.js") script(type="text/javascript", src="/linker/js/controllers/create-run-controller.js") script(type="text/javascript", src="/linker/js/controllers/home-controller.js") script(type="text/javascript", src="/linker/js/controllers/run-controller.js") + script(type="text/javascript", src="/linker/js/controllers/update-order-controller.js") script(type="text/javascript", src="/linker/js/services/socket.js") script(type="text/javascript", src="/linker/js/uservoice.js") script(type="text/javascript", src="/linker/js/vendor/jquery.backstretch.min.js")