Skip to content

Commit

Permalink
Merge pull request #8 from seankeating/empty
Browse files Browse the repository at this point in the history
Updated empty branch with new code
  • Loading branch information
icholy committed Jan 13, 2013
2 parents f34af7e + 0e14622 commit db0e9e8
Show file tree
Hide file tree
Showing 17 changed files with 26,349 additions and 17,818 deletions.
10 changes: 7 additions & 3 deletions README.md
Expand Up @@ -37,6 +37,7 @@ then visit `localhost:3333`
img/
glyphicons-halflings-white.png
glyphicons-halflings.png
routes/
styles/
templates/
models/
Expand All @@ -48,14 +49,16 @@ then visit `localhost:3333`
controllers.js
app.js
router.js
routes.js
store.js
initialize.js
/vendor/
scripts/
jquery-1.8.0.js
jquery-1.8.3.min.js
console-helper.js
ember-latest.js
ember-data-latest.js
handlebars-1.0.0.beta.6.js
handlebars-1.0.rc1.js
styles/
bootstrap.css
/public/
Expand All @@ -78,5 +81,6 @@ The generated output is placed in the `public/` (by default) directory when `bru
## Other
Software Versions used:

* jQuery 1.8.0
* jQuery 1.8.3
* Ember latest
* Handlebars 1.0 rc1
2 changes: 1 addition & 1 deletion app/controllers/application.js
@@ -1,5 +1,5 @@
var App = require('app');

App.ApplicationController = Em.Controller.extend({

});
2 changes: 2 additions & 0 deletions app/initialize.js
Expand Up @@ -5,6 +5,8 @@ require('templates');
require('models');
require('controllers');
require('views');
require('store');
require('router');
require('routes');

App.initialize();
15 changes: 3 additions & 12 deletions app/router.js
@@ -1,14 +1,5 @@
var App = require('app');

App.Router = Em.Router.extend({

enableLogging: true,

root: Em.Route.extend({

index: Em.Route.extend({
route: '/',
redirectsTo: ''
})
})
})
App.Router.map(function(match) {
match('/').to('index');
});
1 change: 1 addition & 0 deletions app/routes.js
@@ -0,0 +1 @@
// load all your routes here
3 changes: 3 additions & 0 deletions app/store.js
@@ -0,0 +1,3 @@
App.Store = DS.Store.extend({
revision: 11
});
1 change: 1 addition & 0 deletions app/templates.js
@@ -1,3 +1,4 @@
// load all your templates here

require('templates/application');
require('templates/index');
Empty file added app/templates/index.hbs
Empty file.
3 changes: 2 additions & 1 deletion app/views.js
@@ -1,3 +1,4 @@
// load all your views here

require('views/application');
require('views/application');
require('views/index');
2 changes: 1 addition & 1 deletion app/views/application.js
@@ -1,5 +1,5 @@
var App = require('app');

App.ApplicationView = Em.View.extend({
templateName: require('templates/application')
templateName: 'templates/application'
});
5 changes: 5 additions & 0 deletions app/views/index.js
@@ -0,0 +1,5 @@
var App = require('app');

App.IndexView = Em.View.extend({
templateName: 'templates/index'
});
4 changes: 2 additions & 2 deletions config.coffee
Expand Up @@ -16,8 +16,8 @@ exports.config =
order:
before: [
'vendor/scripts/console-helper.js',
'vendor/scripts/jquery-1.8.0.min.js',
'vendor/scripts/handlebars-1.0.0.beta.6.js',
'vendor/scripts/jquery-1.8.3.min.js',
'vendor/scripts/handlebars-1.0.rc.1.js',
'vendor/scripts/ember-latest.js',
'vendor/scripts/ember-data-latest.js',
'vendor/scripts/bootstrap.js'
Expand Down

0 comments on commit db0e9e8

Please sign in to comment.