route login

jamesdam · jamesdam · commit 60e8bfe139dd · 2012-09-22T17:09:01.000+08:00
diff --git a/app.js b/app.js
@@ -29,6 +29,7 @@ app.configure('development', function(){
 
 app.get('/', routes.index);
 app.get('/users', user.list);
+app.get('/login', routes.login);
 
 http.createServer(app).listen(app.get('port'), function(){
   console.log("Express server listening on port " + app.get('port'));
diff --git a/public/images/background.png b/public/images/background.png
diff --git a/public/images/facebook-logo-large.png b/public/images/facebook-logo-large.png
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -1,5 +1,8 @@
 body {
-  padding: 50px;
+  padding-top:60px;
+  padding-bottom:40px;
+  background:url(images/background.png);
+  overflow-y:scroll;
   font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
 }
 
diff --git a/routes/index.js b/routes/index.js
@@ -2,7 +2,14 @@
 /*
  * GET home page.
  */
-
 exports.index = function(req, res){
-  res.render('index', { title: 'Express' });
+  res.render('index', { title: 'Learn Path' });
+};
+
+/*
+ * GET login page.
+ */
+exports.login = function(req, res){
+  console.log('login');	
+  res.render('login',{ title: 'Login' });
 };
diff --git a/views/bit/topbar.jade b/views/bit/topbar.jade
@@ -0,0 +1,12 @@
+div.navbar.navbar-fixed-top
+  div.navbar-inner
+    div.container
+      a.brand(href = '/') Learn Path
+      form.navbar-search.input-preend
+        span.add-on
+          span
+          input.span6(name="query",type="text",placeholder = "search")
+          i.icon-search.icon-white
+      ul.nav.pull-right
+        li
+          a(href="/login") Login
diff --git a/views/layout.jade b/views/layout.jade
@@ -5,16 +5,6 @@ html
     link(rel='stylesheet', href='/stylesheets/style.css')
     link(rel='stylesheet', href='/stylesheets/bootstrap.min.css')
   body
-    div.navbar.navbar-fixed-top
-      div.navbar-inner
-        div.container
-          a.brand(href = '/') Learn Path
-          form.navbar-search.input-preend
-            span.add-on
-              span
-              input.span6(name="query",type="text",placeholder = "search")
-              i.icon-search.icon-white
-          ul.nav.pull-right
-            li
-              a(href="/login") Login
-    block content
+    include bit/topbar
+    div.container
+      block content
diff --git a/views/login.jade b/views/login.jade
@@ -0,0 +1,7 @@
+extends layout
+
+block content
+  h2 Login to continue
+  div.span4
+    a.btn(href = '/facebook_login_url')
+      img(src='images/facebook-logo-large.png')

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`body {`
`2`		`- padding: 50px;`
	`2`	`+ padding-top:60px;`
	`3`	`+ padding-bottom:40px;`
	`4`	`+ background:url(images/background.png);`
	`5`	`+ overflow-y:scroll;`
`3`	`6`	`font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;`
`4`	`7`	`}`
`5`	`8`