Skip to content

Commit

Permalink
Upgraded boilerplate to 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
matteodem committed Oct 29, 2014
1 parent db89a19 commit eb8b26a
Show file tree
Hide file tree
Showing 12 changed files with 48 additions and 82 deletions.
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@0.9.4
METEOR@1.0
57 changes: 28 additions & 29 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
[email protected]
[email protected].3
[email protected].3
[email protected].2
[email protected].4
[email protected].4
[email protected].3
aldeed:[email protected]
aldeed:[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].10
[email protected].11
[email protected]
[email protected]
[email protected]
Expand All @@ -26,28 +24,31 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].7
[email protected].8
[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
iron:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
mike:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
mrt:[email protected]
nooitaf:[email protected]
[email protected]
nooitaf:[email protected]
[email protected]
[email protected]
[email protected]
Expand All @@ -59,18 +60,16 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].3
[email protected].4
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].8
[email protected].9
[email protected]
[email protected]
[email protected]
[email protected]
velocity:[email protected]
velocity:[email protected]
[email protected]
[email protected]
[email protected].3
[email protected].4
6 changes: 1 addition & 5 deletions client/config/router.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
Router.configure({
layoutTemplate: 'basicLayout',
notFoundTemplate: 'notFound',
yieldTemplates: {
'header': { to: 'header' },
'footer': { to: 'footer' }
}
notFoundTemplate: 'notFound'
});
4 changes: 2 additions & 2 deletions client/views/layouts/basic.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<template name="basicLayout">
<header>
{{> yield region='header'}}
{{> header}}
</header>
<div id="main">
{{> yield}}
{{! Also a sidebar! }}
</div>
<footer>
{{> yield region='footer'}}
{{> footer}}
</footer>
</template>
2 changes: 1 addition & 1 deletion client/views/notFound/notFound.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template name="notFound">
<p>
Seems like this site doesn't exist<br />
<a href="{{urlFor 'home'}}">Go to home</a>
<a href="/">Go to home</a>
</p>
</template>
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
Router.map (->
this.route '__routeName__',
path : '__routePath__'
)
Router.route '__routePath__', ->
this.render '__routeName__'
11 changes: 2 additions & 9 deletions private/cli/profiles/coffee/reset/homeRoute.coffee
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
HomeController = RouteController.extend(
template: 'home'
)

Router.map (->
this.route 'HomeRoute',
path : '/',
controller : HomeController
)
Router.route '/', ->
this.render 'HomeRoute'
6 changes: 2 additions & 4 deletions private/cli/profiles/default/create/routes/templates/route.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Router.map(function () {
this.route('__routeName__', {
path : '__routePath__'
});
Router.route('__routePath__', function () {
this.render('__routeName__');
});
11 changes: 2 additions & 9 deletions private/cli/profiles/default/reset/homeRoute.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
var HomeController = RouteController.extend({
template: 'home'
});

Router.map(function () {
this.route('home', {
path : '/',
controller : HomeController
});
Router.route('/', function () {
this.render('home');
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Router.map(function () {
this.route('__routeName__', {
path : '__routePath__'
});
Router.route('__routePath__', function () {
this.render('__routeName__');
});
11 changes: 2 additions & 9 deletions private/cli/profiles/es6/reset/homeRoute.next.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
var HomeController = RouteController.extend({
template: 'home'
});

Router.map(function () {
this.route('home', {
path : '/',
controller : HomeController
});
Router.route('/', function () {
this.render('home');
});
8 changes: 3 additions & 5 deletions routes/defaultRoutes.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
Router.map(function () {
// Home Route
this.route('home', {
path : '/'
});
// Home Route
Router.route('/', function () {
this.render('home');
});

0 comments on commit eb8b26a

Please sign in to comment.