From 026d98ed233f6c54ab57acb2efd04a15ab584c2e Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Fri, 14 Mar 2014 10:37:15 -0500 Subject: [PATCH] Organize controllers, config --- Gruntfile.js | 1 + assets/linker/js/app.coffee | 11 +++++++--- assets/linker/js/controllers.coffee | 21 ------------------- .../controllers/create-run-controller.coffee | 19 +++++++++++++++++ .../js/controllers/home-controller.coffee | 4 ++++ assets/linker/js/controllers/module.coffee | 1 + .../js/controllers/run-controller.coffee | 4 ++++ assets/linker/js/services/socket.coffee | 2 +- assets/templates/run.jade | 1 + views/layout.jade | 5 ++++- 10 files changed, 43 insertions(+), 26 deletions(-) delete mode 100644 assets/linker/js/controllers.coffee create mode 100644 assets/linker/js/controllers/create-run-controller.coffee create mode 100644 assets/linker/js/controllers/home-controller.coffee create mode 100644 assets/linker/js/controllers/module.coffee create mode 100644 assets/linker/js/controllers/run-controller.coffee create mode 100644 assets/templates/run.jade diff --git a/Gruntfile.js b/Gruntfile.js index 0a7fac6..5ef15c7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -35,6 +35,7 @@ module.exports = function(grunt) { 'linker/js/vendor/angular.js', 'linker/js/vendor/angular-*.js', 'linker/js/app.js', + 'linker/js/**/module.js', 'linker/**/*.js' ].map(function(path) { return '.tmp/public/' + path; diff --git a/assets/linker/js/app.coffee b/assets/linker/js/app.coffee index b30fae7..cfd694f 100644 --- a/assets/linker/js/app.coffee +++ b/assets/linker/js/app.coffee @@ -10,7 +10,12 @@ lunchApp.config ['$routeProvider', .when '/', templateUrl: 'templates/home.html', controller: 'HomeCtrl' - .when '/runs', - templateUrl: 'templates/runs.html', - controller: 'RunsCtrl' + .when '/run/:id', + templateUrl: 'templates/run.html', + controller: 'RunCtrl' +] + +lunchApp.config ['$locationProvider', + ($locationProvider) -> + $locationProvider.html5Mode(false).hashPrefix '' ] diff --git a/assets/linker/js/controllers.coffee b/assets/linker/js/controllers.coffee deleted file mode 100644 index fa5f5c6..0000000 --- a/assets/linker/js/controllers.coffee +++ /dev/null @@ -1,21 +0,0 @@ -lunchControllers = angular.module 'lunchControllers', [] - -lunchControllers.controller 'HomeCtrl', ['$scope', ($scope) -> -] - -lunchControllers.controller 'CreateRunCtrl', ['$scope', '$http', 'socket', ($scope, $http, socket) -> - $scope.run = - invitees: [{email: ''}] - - $scope.addInvitee = () -> - $scope.run.invitees.push { email: '' } - - $scope.create = (run) -> - data = angular.copy run - socket.post '/run', data, (response) -> - return -] - -lunchControllers.controller 'RunsCtrl', ['$scope', '$http', ($scope, $http) -> - $scope.helloMsg = 'hello there boys and girls!' -] diff --git a/assets/linker/js/controllers/create-run-controller.coffee b/assets/linker/js/controllers/create-run-controller.coffee new file mode 100644 index 0000000..f27441f --- /dev/null +++ b/assets/linker/js/controllers/create-run-controller.coffee @@ -0,0 +1,19 @@ +lunchControllers = angular.module 'lunchControllers' + +lunchControllers.controller 'CreateRunCtrl', ['$scope', '$http', '$location', 'socket', ($scope, $http, $location, socket) -> + $scope.run = + creatorName: 'ben ramey' + creatorEmail: 'ben.ramey@gmail.com' + invitees: [{email: 'bob@bob.com'}] + restaurant: 'subway' + + $scope.addInvitee = () -> + $scope.run.invitees.push { email: '' } + + $scope.create = (run) -> + data = angular.copy run + socket.post '/run', data, (response) -> + console.log response.id + console.log $location + $location.path '/run/' + response.id +] diff --git a/assets/linker/js/controllers/home-controller.coffee b/assets/linker/js/controllers/home-controller.coffee new file mode 100644 index 0000000..473e79f --- /dev/null +++ b/assets/linker/js/controllers/home-controller.coffee @@ -0,0 +1,4 @@ +lunchControllers = angular.module 'lunchControllers' + +lunchControllers.controller 'HomeCtrl', ['$scope', ($scope) -> +] diff --git a/assets/linker/js/controllers/module.coffee b/assets/linker/js/controllers/module.coffee new file mode 100644 index 0000000..818fa99 --- /dev/null +++ b/assets/linker/js/controllers/module.coffee @@ -0,0 +1 @@ +controllersModule = angular.module 'lunchControllers', [] diff --git a/assets/linker/js/controllers/run-controller.coffee b/assets/linker/js/controllers/run-controller.coffee new file mode 100644 index 0000000..3c90055 --- /dev/null +++ b/assets/linker/js/controllers/run-controller.coffee @@ -0,0 +1,4 @@ +lunchControllers = angular.module 'lunchControllers' + +lunchControllers.controller 'RunCtrl', ['$scope', ($scope) -> +] diff --git a/assets/linker/js/services/socket.coffee b/assets/linker/js/services/socket.coffee index 0380df8..99d321f 100644 --- a/assets/linker/js/services/socket.coffee +++ b/assets/linker/js/services/socket.coffee @@ -1,6 +1,6 @@ lunchServices = angular.module 'lunchServices', [] -lunchServices.factory 'socket', () -> +lunchServices.factory 'socket', socketFactory = () -> s = window.io.connect() s.on 'connect', () -> s.on 'message', (message) -> diff --git a/assets/templates/run.jade b/assets/templates/run.jade new file mode 100644 index 0000000..bdf171d --- /dev/null +++ b/assets/templates/run.jade @@ -0,0 +1 @@ +span hello there folks! diff --git a/views/layout.jade b/views/layout.jade index 01a105a..ee4522d 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -26,6 +26,9 @@ html(lang="en",ng-app="lunchApp") script(type="text/javascript", src="/linker/js/vendor/angular.js") script(type="text/javascript", src="/linker/js/vendor/angular-route.js") script(type="text/javascript", src="/linker/js/app.js") - script(type="text/javascript", src="/linker/js/controllers.js") + script(type="text/javascript", src="/linker/js/controllers/module.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") // SCRIPTS END