From 29206122aa1a184978ff872a0d2106d4d7430e8d Mon Sep 17 00:00:00 2001 From: Ben Ramey Date: Mon, 7 Apr 2014 21:40:35 -0500 Subject: [PATCH] Pretty good looking homepage --- assets/linker/js/app.coffee | 8 +++++++ .../js/controllers/home-controller.coffee | 6 +++-- assets/linker/styles/home.less | 7 ++++-- assets/linker/templates/home.jade | 24 +++++++++++++++++++ views/home/index.jade | 17 +------------ views/layout.jade | 2 -- 6 files changed, 42 insertions(+), 22 deletions(-) diff --git a/assets/linker/js/app.coffee b/assets/linker/js/app.coffee index 24cbebe..45316c6 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/create-run.html', + controller: 'CreateRunCtrl' .when '/run/:id', templateUrl: 'templates/run.html', controller: 'RunCtrl' .when '/run/:id/order/:inviteeName', templateUrl: 'templates/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 index 7d5b562..a1785cc 100644 --- a/assets/linker/js/controllers/home-controller.coffee +++ b/assets/linker/js/controllers/home-controller.coffee @@ -1,5 +1,7 @@ lunchControllers = angular.module 'lunchControllers' -lunchControllers.controller 'HomeCtrl', ['$scope', - HomeController = ($scope) -> +lunchControllers.controller 'HomeCtrl', ['$scope', '$location', + HomeController = ($scope,$location) -> + $scope.createRun = () -> + $location.path '/run/create' ] diff --git a/assets/linker/styles/home.less b/assets/linker/styles/home.less index bc257cd..7e583bb 100644 --- a/assets/linker/styles/home.less +++ b/assets/linker/styles/home.less @@ -1,8 +1,11 @@ #home-page .pod { margin-top: 5px; padding: 20px; - background-color: rgba(0,0,0,0.6); - color: #eee; + background-color: rgba(0,0,0,0.8); + color: #ddd; + strong { + color: #fff; + } h1 { margin: 0; } diff --git a/assets/linker/templates/home.jade b/assets/linker/templates/home.jade index e69de29..cda0e9e 100644 --- a/assets/linker/templates/home.jade +++ 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/home/index.jade b/views/home/index.jade index e7dc2a0..c2a2c24 100644 --- a/views/home/index.jade +++ b/views/home/index.jade @@ -1,19 +1,4 @@ extends ../layout block content - #home-page - .row - .col-xs-12.col-sm-6.offset-md-2 - #logo.pod - h1 lunch run me - .row - .col-xs-12.col-sm-6.offset-md-2 - #welcome.pod - | hello there - .row - .col-xs-12.col-sm-6.offset-md-2 - #cta.pod - a.btn.btn-block - | start a run   - span.glyphicon.glyphicon-chevron-right - + div(ng-view) diff --git a/views/layout.jade b/views/layout.jade index 46c9b37..362f0be 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -20,8 +20,6 @@ html(lang="en",ng-app="lunchApp") .container #page block content - div(ng-view) - // TEMPLATES // TEMPLATES END