From f936c30cbcf9c5e1e5e77929f37a28603ab7c73a Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 6 Sep 2015 01:50:43 -0400 Subject: searchbox html --- fortune/hoots | 6 +++--- lib/auth.js | 6 ++++++ lib/index.js | 2 +- public/assets/css/bucky.css | 32 ++++++++++++++++++++++------- public/assets/js/lib/views/index/hootbox.js | 2 +- views/pages/index.ejs | 6 ++++++ views/partials/header.ejs | 2 ++ 7 files changed, 44 insertions(+), 12 deletions(-) diff --git a/fortune/hoots b/fortune/hoots index 5b3c7db..13de5a0 100644 --- a/fortune/hoots +++ b/fortune/hoots @@ -25,7 +25,7 @@ ping hrmm allo yoyo -heyyy +heyy whaa yooo hiii @@ -38,6 +38,6 @@ damn sing melt bark -sup?! -omggg +sup? +omgg reee diff --git a/lib/auth.js b/lib/auth.js index 0fb757c..38901e4 100644 --- a/lib/auth.js +++ b/lib/auth.js @@ -69,4 +69,10 @@ var auth = module.exports = { }); })(req, res, next) }, + + logout: function (req, res) { + req.logout(); + res.redirect('/'); + }, + } \ No newline at end of file diff --git a/lib/index.js b/lib/index.js index 7732001..45def38 100644 --- a/lib/index.js +++ b/lib/index.js @@ -73,7 +73,7 @@ site.route = function(){ }) app.get("/login", function(req, res){ res.render("pages/login", { - title: "" + title: "login" }) }) app.get("/index", middleware.ensureAuthenticated, function(req, res){ diff --git a/public/assets/css/bucky.css b/public/assets/css/bucky.css index 0db5a00..c73af3d 100644 --- a/public/assets/css/bucky.css +++ b/public/assets/css/bucky.css @@ -36,6 +36,11 @@ button { .head a:active { color: #000;} .head a:hover { color: #558;} +h1 { + font-size: 30px; + font-weight: bold; + margin: 0; +} .bluebox { background-color: #d8e0ec; color: #000000; @@ -44,6 +49,13 @@ button { padding: 3px; margin: 0 0 5px 0; } +.bluebox input[type=text] { + border: 1px solid #000; + font-size: 12px; + position: relative; + top: 1px; + margin-bottom: 5px; +} hr { border-color: #000; } @@ -52,22 +64,28 @@ hr { width: 300px; } +#searchbox.bluebox { + text-align: left; + padding: 3px 2px 3px 4px; +} +#searchbox input[type=text] { + width: 225px; + margin-left: 3px; +} + #hootbox.bluebox { + text-align: left; padding: 0; } #hootbox form { padding: 4px; } #hootbox input[type=text] { - border: 2px solid #000; - font-size: 13px; - position: relative; - top: 2px; - margin-bottom: 5px; - width: 230px; + width: 225px; + margin-left: 3px; } #hootbox button { - width: 36px; + width: 44px; } #hoots { margin: 0; diff --git a/public/assets/js/lib/views/index/hootbox.js b/public/assets/js/lib/views/index/hootbox.js index 43c4fe9..048c017 100644 --- a/public/assets/js/lib/views/index/hootbox.js +++ b/public/assets/js/lib/views/index/hootbox.js @@ -12,7 +12,7 @@ var HootboxView = FormView.extend({ }, load: function(comments){ - comments.forEach(this.prependComment.bind(this)) + comments.forEach(this.appendComment.bind(this)) }, parse: function(comment){ diff --git a/views/pages/index.ejs b/views/pages/index.ejs index 7b6732e..3b5e0f9 100644 --- a/views/pages/index.ejs +++ b/views/pages/index.ejs @@ -6,6 +6,12 @@

welcome to bucky

<%= title %>