diff --git a/.gitignore b/.gitignore index 7759ab5..a844be4 100644 --- a/.gitignore +++ b/.gitignore @@ -48,4 +48,5 @@ config/local.js # custom ignores ######################## assets/templates/*.html +*.swp diff --git a/api/models/Run.js b/api/models/Run.js index 651de0f..6863afc 100644 --- a/api/models/Run.js +++ b/api/models/Run.js @@ -17,7 +17,9 @@ module.exports = { type: 'email', required: true }, - groupEmails: 'String', + groupEmails: { + type: 'array' + }, menuUrl: { type: 'url' }, diff --git a/assets/linker/js/.app.coffee.swp b/assets/linker/js/.app.coffee.swp deleted file mode 100644 index a3ddca9..0000000 Binary files a/assets/linker/js/.app.coffee.swp and /dev/null differ diff --git a/assets/linker/js/.controllers.coffee.swp b/assets/linker/js/.controllers.coffee.swp deleted file mode 100644 index 1c8565a..0000000 Binary files a/assets/linker/js/.controllers.coffee.swp and /dev/null differ diff --git a/assets/linker/js/controllers.coffee b/assets/linker/js/controllers.coffee index 7b8e293..e95bc92 100644 --- a/assets/linker/js/controllers.coffee +++ b/assets/linker/js/controllers.coffee @@ -3,10 +3,11 @@ lunchControllers = angular.module 'lunchControllers', [] lunchControllers.controller 'HomeCtrl', ['$scope', ($scope) -> ] -lunchControllers.controller 'CreateRunCtrl', ['$scope', '$http', ($scope, $http) -> - $scope.msg = 'im home, yah' - +lunchControllers.controller 'CreateRunCtrl', ['$scope', '$http', 'socket', ($scope, $http, socket) -> + $scope.stuffs = [{name: 'my name'}] $scope.create = (run) -> + socket.post '/run', run, (response) -> + ] lunchControllers.controller 'RunsCtrl', ['$scope', '$http', ($scope, $http) -> diff --git a/assets/linker/js/features/socket.js b/assets/linker/js/features/socket.js deleted file mode 100644 index 2c9b551..0000000 --- a/assets/linker/js/features/socket.js +++ /dev/null @@ -1,71 +0,0 @@ -/** - * app.js - * - * This file contains some conventional defaults for working with Socket.io + Sails. - * It is designed to get you up and running fast, but is by no means anything special. - * - * Feel free to change none, some, or ALL of this file to fit your needs! - */ - - -(function (io) { - - // as soon as this file is loaded, connect automatically, - var socket = io.connect(); - if (typeof console !== 'undefined') { - log('Connecting to Sails.js...'); - } - - socket.on('connect', function socketConnected() { - - // Listen for Comet messages from Sails - socket.on('message', function messageReceived(message) { - - /////////////////////////////////////////////////////////// - // Replace the following with your own custom logic - // to run when a new message arrives from the Sails.js - // server. - /////////////////////////////////////////////////////////// - log('New comet message received :: ', message); - ////////////////////////////////////////////////////// - - }); - - - /////////////////////////////////////////////////////////// - // Here's where you'll want to add any custom logic for - // when the browser establishes its socket connection to - // the Sails.js server. - /////////////////////////////////////////////////////////// - log( - 'Socket is now connected and globally accessible as `socket`.\n' + - 'e.g. to send a GET request to Sails, try \n' + - '`socket.get("/", function (response) ' + - '{ console.log(response); })`' - ); - /////////////////////////////////////////////////////////// - - - }); - - - // Expose connected `socket` instance globally so that it's easy - // to experiment with from the browser console while prototyping. - window.socket = socket; - - - // Simple log function to keep the example simple - function log () { - if (typeof console !== 'undefined') { - console.log.apply(console, arguments); - } - } - - -})( - - // In case you're wrapping socket.io to prevent pollution of the global namespace, - // you can replace `window.io` with your own `io` here: - window.io - -); diff --git a/assets/linker/js/services/socket.coffee b/assets/linker/js/services/socket.coffee new file mode 100644 index 0000000..cbad1bf --- /dev/null +++ b/assets/linker/js/services/socket.coffee @@ -0,0 +1,8 @@ +socketModule = angular.module 'socketModule', [] + socketModule.factory 'socket', ()-> +s = window.io.connect() + s.on 'connect', ()-> + s.on 'message', (message)-> + console.log 'New comet message received :: ', message + + return socket diff --git a/assets/templates/.home.jade.swp b/assets/templates/.home.jade.swp deleted file mode 100644 index f4d42b8..0000000 Binary files a/assets/templates/.home.jade.swp and /dev/null differ diff --git a/assets/templates/.runs.jade.swp b/assets/templates/.runs.jade.swp deleted file mode 100644 index 8d61488..0000000 Binary files a/assets/templates/.runs.jade.swp and /dev/null differ diff --git a/assets/templates/home.jade b/assets/templates/home.jade index e8cd291..28b3ff8 100644 --- a/assets/templates/home.jade +++ b/assets/templates/home.jade @@ -18,5 +18,5 @@ div.form-group label(for='menuUrl') Menu URL input#menuUrl.form-control(type='url',ng-model='run.menuUrl') - + button.btn.btn-primary(ng-click="create(run)",ng-disabled="form.$invalid") Create diff --git a/views/.layout.jade.swp b/views/.layout.jade.swp deleted file mode 100644 index 9be4a60..0000000 Binary files a/views/.layout.jade.swp and /dev/null differ diff --git a/views/layout.jade b/views/layout.jade index 94d5349..01a105a 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -27,5 +27,5 @@ html(lang="en",ng-app="lunchApp") 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/features/socket.js") + script(type="text/javascript", src="/linker/js/services/socket.js") // SCRIPTS END