going back to angular routing
This commit is contained in:
@@ -24,10 +24,6 @@ module.exports = {
|
|||||||
* Overrides for the settings in `config/controllers.js`
|
* Overrides for the settings in `config/controllers.js`
|
||||||
* (specific to RunController)
|
* (specific to RunController)
|
||||||
*/
|
*/
|
||||||
_config: {},
|
_config: {}
|
||||||
|
|
||||||
create: function(req,res) {
|
|
||||||
res.view();
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,12 +7,20 @@ lunchApp = angular.module 'lunchApp', [
|
|||||||
lunchApp.config ['$routeProvider',
|
lunchApp.config ['$routeProvider',
|
||||||
($routeProvider) ->
|
($routeProvider) ->
|
||||||
$routeProvider
|
$routeProvider
|
||||||
|
.when '/home',
|
||||||
|
templateUrl: 'templates/home.html',
|
||||||
|
controller: 'HomeCtrl'
|
||||||
|
.when '/run/create',
|
||||||
|
templateUrl: 'templates/run/create.html',
|
||||||
|
controller: 'CreateRunCtrl'
|
||||||
.when '/run/:id',
|
.when '/run/:id',
|
||||||
templateUrl: 'templates/run.html',
|
templateUrl: 'templates/run/show.html',
|
||||||
controller: 'RunCtrl'
|
controller: 'RunCtrl'
|
||||||
.when '/run/:id/order/:inviteeName',
|
.when '/run/:id/order/:inviteeName',
|
||||||
templateUrl: 'templates/create-order.html',
|
templateUrl: 'templates/run/create-order.html',
|
||||||
controller: 'CreateOrderCtrl'
|
controller: 'CreateOrderCtrl'
|
||||||
|
.otherwise
|
||||||
|
redirectTo: '/home'
|
||||||
]
|
]
|
||||||
|
|
||||||
lunchApp.config ['$locationProvider',
|
lunchApp.config ['$locationProvider',
|
||||||
|
|||||||
7
assets/linker/js/controllers/home-controller.coffee
Normal file
7
assets/linker/js/controllers/home-controller.coffee
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
lunchControllers = angular.module 'lunchControllers'
|
||||||
|
|
||||||
|
lunchControllers.controller 'HomeCtrl', ['$scope', '$location',
|
||||||
|
HomeController = ($scope,$location) ->
|
||||||
|
$scope.createRun = () ->
|
||||||
|
$location.path '/run/create'
|
||||||
|
]
|
||||||
24
assets/linker/templates/home.jade
Normal file
24
assets/linker/templates/home.jade
Normal file
@@ -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
|
||||||
|
|
||||||
6
assets/linker/templates/layouts/interior-page.jade
Normal file
6
assets/linker/templates/layouts/interior-page.jade
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
.interior
|
||||||
|
include includes/nav
|
||||||
|
h1
|
||||||
|
block pagetitle
|
||||||
|
|
||||||
|
block interiorcontent
|
||||||
@@ -1,27 +1,5 @@
|
|||||||
extends ../layout
|
extends ../layout
|
||||||
|
|
||||||
block content
|
block content
|
||||||
#home-page
|
div(ng-view)
|
||||||
.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
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
extends layout
|
|
||||||
|
|
||||||
block content
|
|
||||||
.interior
|
|
||||||
include includes/nav
|
|
||||||
h1
|
|
||||||
block pagetitle
|
|
||||||
|
|
||||||
block interiorcontent
|
|
||||||
@@ -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/body-controller.js")
|
||||||
script(type="text/javascript", src="/linker/js/controllers/create-order-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/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/run-controller.js")
|
||||||
script(type="text/javascript", src="/linker/js/services/socket.js")
|
script(type="text/javascript", src="/linker/js/services/socket.js")
|
||||||
script(type="text/javascript", src="/linker/js/vendor/jquery.backstretch.min.js")
|
script(type="text/javascript", src="/linker/js/vendor/jquery.backstretch.min.js")
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
extends ../interior-layout
|
extends ../layouts/interior-layout
|
||||||
|
|
||||||
block pagetitle
|
block pagetitle
|
||||||
span.glyphicon.glyphicon-chevron-right
|
span.glyphicon.glyphicon-chevron-right
|
||||||
|
|||||||
Reference in New Issue
Block a user