Skip to content

Commit

Permalink
Step002
Browse files Browse the repository at this point in the history
  • Loading branch information
rheaditi committed Nov 7, 2015
1 parent e30e14d commit 0327d91
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 3 deletions.
2 changes: 2 additions & 0 deletions app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ var Router = Ember.Router.extend({
});

Router.map(function() {
this.route('feed', { 'path' : '/newsfeed'});
this.route('login');
});

export default Router;
13 changes: 13 additions & 0 deletions app/styles/app.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
nav {
width: 100%;
max-height: 75px;
}

nav > ul {

}

nav ul > li {
display: inline-block;
padding-right: 30px;
}
12 changes: 10 additions & 2 deletions app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
<h2 id="title">Welcome to Ember</h2>
<nav>
<ul>
<li>{{#link-to "index"}}Home{{/link-to}}</li>
<li>{{#link-to "feed"}}Newsfeed{{/link-to}}</li>
<li>{{#link-to "login"}}Login{{/link-to}}</li>
</ul>
</nav>

{{outlet}}
<main>
{{outlet}}
</main>
1 change: 1 addition & 0 deletions app/templates/feed.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Favorites
3 changes: 3 additions & 0 deletions app/templates/login.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<h6>
Login Page
</h6>
6 changes: 5 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
"ember-resolver": "~0.1.18",
"jquery": "^1.11.3",
"loader.js": "ember-cli/loader.js#3.2.1",
"qunit": "~1.18.0"
"qunit": "~1.18.0",
"normalize-css": "normalize.css#~3.0.3"
},
"devDependencies": {
"normalize-css": "normalize.css#~3.0.3"
}
}
1 change: 1 addition & 0 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ module.exports = function(defaults) {
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.

app.import('bower_components/normalize-css/normalize.css');
return app.toTree();
};

0 comments on commit 0327d91

Please sign in to comment.