From 11963bfb213021c40438e62902b9435dc16d7559 Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Tue, 8 Apr 2014 20:55:36 -0500 Subject: [PATCH] going back to angular routing --- api/controllers/RunController.js | 6 +---- assets/linker/js/app.coffee | 12 +++++++-- .../js/controllers/home-controller.coffee | 7 +++++ assets/linker/templates/home.jade | 24 +++++++++++++++++ .../linker/templates}/includes/nav.jade | 0 .../templates/layouts/interior-page.jade | 6 +++++ .../templates/{ => run}/create-order.jade | 0 .../{create-run.jade => run/create.jade} | 0 .../templates/{run.jade => run/show.jade} | 0 views/home/index.jade | 26 ++----------------- views/interior-layout.jade | 9 ------- views/layout.jade | 1 + views/run/create.jade | 2 +- 13 files changed, 52 insertions(+), 41 deletions(-) create mode 100644 assets/linker/js/controllers/home-controller.coffee create mode 100644 assets/linker/templates/home.jade rename {views => assets/linker/templates}/includes/nav.jade (100%) create mode 100644 assets/linker/templates/layouts/interior-page.jade rename assets/linker/templates/{ => run}/create-order.jade (100%) rename assets/linker/templates/{create-run.jade => run/create.jade} (100%) rename assets/linker/templates/{run.jade => run/show.jade} (100%) delete mode 100644 views/interior-layout.jade diff --git a/api/controllers/RunController.js b/api/controllers/RunController.js index 3e5c1dc..29de20f 100644 --- a/api/controllers/RunController.js +++ b/api/controllers/RunController.js @@ -24,10 +24,6 @@ module.exports = { * Overrides for the settings in `config/controllers.js` * (specific to RunController) */ - _config: {}, - - create: function(req,res) { - res.view(); - } + _config: {} }; diff --git a/assets/linker/js/app.coffee b/assets/linker/js/app.coffee index 24cbebe..0443036 100644 --- a/assets/linker/js/app.coffee +++ b/assets/linker/js/app.coffee @@ -7,12 +7,20 @@ lunchApp = angular.module 'lunchApp', [ lunchApp.config ['$routeProvider', ($routeProvider) -> $routeProvider + .when '/home', + templateUrl: 'templates/home.html', + controller: 'HomeCtrl' + .when '/run/create', + templateUrl: 'templates/run/create.html', + controller: 'CreateRunCtrl' .when '/run/:id', - templateUrl: 'templates/run.html', + templateUrl: 'templates/run/show.html', controller: 'RunCtrl' .when '/run/:id/order/:inviteeName', - templateUrl: 'templates/create-order.html', + templateUrl: 'templates/run/create-order.html', controller: 'CreateOrderCtrl' + .otherwise + redirectTo: '/home' ] lunchApp.config ['$locationProvider', diff --git a/assets/linker/js/controllers/home-controller.coffee b/assets/linker/js/controllers/home-controller.coffee new file mode 100644 index 0000000..a1785cc --- /dev/null +++ b/assets/linker/js/controllers/home-controller.coffee @@ -0,0 +1,7 @@ +lunchControllers = angular.module 'lunchControllers' + +lunchControllers.controller 'HomeCtrl', ['$scope', '$location', + HomeController = ($scope,$location) -> + $scope.createRun = () -> + $location.path '/run/create' +] diff --git a/assets/linker/templates/home.jade b/assets/linker/templates/home.jade new file mode 100644 index 0000000..cda0e9e --- /dev/null +++ b/assets/linker/templates/home.jade @@ -0,0 +1,24 @@ +#home-page(ng-controller='HomeCtrl') + .row + .col-xs-12.col-sm-6.offset-md-2 + #logo.pod + h1 + | lunch run + span.text-muted  me + .row + .col-xs-12.col-sm-6.offset-md-2 + #welcome.pod + p + | Organize a lunch run in less than a minute. All you need to know is + strong  who  + | you want to invite and + strong  where  + | you want to go. + p Get started below. No login required. + .row + .col-xs-12.col-sm-6.offset-md-2 + #cta.pod + a.btn.btn-block(ng-click='createRun()') + | start a run   + span.glyphicon.glyphicon-chevron-right + diff --git a/views/includes/nav.jade b/assets/linker/templates/includes/nav.jade similarity index 100% rename from views/includes/nav.jade rename to assets/linker/templates/includes/nav.jade diff --git a/assets/linker/templates/layouts/interior-page.jade b/assets/linker/templates/layouts/interior-page.jade new file mode 100644 index 0000000..6545639 --- /dev/null +++ b/assets/linker/templates/layouts/interior-page.jade @@ -0,0 +1,6 @@ +.interior + include includes/nav + h1 + block pagetitle + + block interiorcontent diff --git a/assets/linker/templates/create-order.jade b/assets/linker/templates/run/create-order.jade similarity index 100% rename from assets/linker/templates/create-order.jade rename to assets/linker/templates/run/create-order.jade diff --git a/assets/linker/templates/create-run.jade b/assets/linker/templates/run/create.jade similarity index 100% rename from assets/linker/templates/create-run.jade rename to assets/linker/templates/run/create.jade diff --git a/assets/linker/templates/run.jade b/assets/linker/templates/run/show.jade similarity index 100% rename from assets/linker/templates/run.jade rename to assets/linker/templates/run/show.jade diff --git a/views/home/index.jade b/views/home/index.jade index 3237323..1393d00 100644 --- a/views/home/index.jade +++ b/views/home/index.jade @@ -1,27 +1,5 @@ extends ../layout block content - #home-page - .row - .col-xs-12.col-sm-6.offset-md-2 - #logo.pod - h1 - | lunch run - span.text-muted  me - .row - .col-xs-12.col-sm-6.offset-md-2 - #welcome.pod - p - | Organize a lunch run in less than a minute. All you need to know is - strong  who  - | you want to invite and - strong  where  - | you want to go. - p Get started below. No login required. - .row - .col-xs-12.col-sm-6.offset-md-2 - #cta.pod - a.btn.btn-block(href='/run/create') - | start a run   - span.glyphicon.glyphicon-chevron-right - + div(ng-view) + diff --git a/views/interior-layout.jade b/views/interior-layout.jade deleted file mode 100644 index 2830bb7..0000000 --- a/views/interior-layout.jade +++ /dev/null @@ -1,9 +0,0 @@ -extends layout - -block content - .interior - include includes/nav - h1 - block pagetitle - - block interiorcontent diff --git a/views/layout.jade b/views/layout.jade index 3f8168e..38e4ce5 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -24,6 +24,7 @@ html(lang="en",ng-app="lunchApp") 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/services/socket.js") script(type="text/javascript", src="/linker/js/vendor/jquery.backstretch.min.js") diff --git a/views/run/create.jade b/views/run/create.jade index bb7c7be..a7af7ca 100644 --- a/views/run/create.jade +++ b/views/run/create.jade @@ -1,4 +1,4 @@ -extends ../interior-layout +extends ../layouts/interior-layout block pagetitle span.glyphicon.glyphicon-chevron-right