Updated Home, Register, Login, rerouted from login to marketplace

LizaHCarter · Sep 2, 2014 · c469639 · c469639
2 parents 4fa387d + 8cc1d62
commit c469639
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 5 deletions.
diff --git a/app/controllers/users.js b/app/controllers/users.js
@@ -34,7 +34,7 @@ exports.authenticate = function(req, res){
       req.session.regenerate(function(){
         req.session.userId = user._id;
         req.session.save(function(){
-          res.redirect('/');
+          res.redirect('/marketplace');
         });
       });
     }else{

diff --git a/app/static/css/style.css b/app/static/css/style.css
diff --git a/app/static/css/style.less b/app/static/css/style.less
@@ -4,9 +4,19 @@
 @bidButton: #ebebeb;
 @themeBlue: #0f1c3c;
 @themeRed: #711a1a;
+@themeGray: #ECECEC;
 
+#brand:hover{
+  color: #711a1a;
+}
+
+#bs-navbar-collapse a:hover{
+  background-color: #711a1a;
+  color: white;
+}
 body{
   color: @themeBlue;
+  background-color: @themeGray;
 }
 
 #brand{
@@ -39,6 +49,10 @@ body{
   border: 3px solid @themeBlue;
 }
 
+.panel-body{
+  background-color: @themeGray;
+}
+
 .profile-photo {
   height: 200px;
   width: 150px;
@@ -271,7 +285,13 @@ body{
    background-image: url("/img/wine_cellar_bg.png");
    background-size: cover;
    background-repeat: no-repeat;
-
+ }
+ .cheers {
+   position: relative;
+   right: 635px;
+   top: 75px;
+   font-size: 100px;
+  font-family: 'Berkshire Swash', cursive;
  }
 }
 
@@ -285,9 +305,60 @@ body{
 .homePage {
    background-image: url("/img/wine_cellar_home.png");
    background-size: cover;
-   height: 1080px;
+   height: 975px;
+   position: relative;
+   margin: 0px auto;
 }
 
+#goRegister a {
+  color: @themeRed;
+  text-align: center;
+  font-size: 20px;
+  position: absolute;
+  left: 930px;
+  top: 500px;
+  /*font-family: 'Berkshire Swash', cursive;*/
+  font-size: 50px;
+  padding: 30px;
+}
+
+
+#goLogin a {
+  color: @themeRed;
+  text-align: center;
+  font-size: 20px;
+  position: absolute;
+  left: 530px;
+  top: 500px;
+  /*font-family: 'Berkshire Swash', cursive;*/
+  font-size: 50px;
+  padding: 30px;
+}
+
+#goLogin a:hover {
+  border: 1px solid @themeRed;
+  border-radius: 15%;
+}
+
+#goRegister a:hover {
+  border: 1px solid @themeRed;
+  border-radius: 15%;
+}
+
+.slogan {
+  position: absolute;
+  left: 540px;
+  top: 150px;
+  font-family: 'Berkshire Swash', cursive;
+  font-size: 45px;
+  color: @themeGray;
+
+}
+
+
+
+
+
 
 
 

diff --git a/app/views/home/index.jade b/app/views/home/index.jade
@@ -2,6 +2,11 @@ extends ../shared/template
 block content
   body
     .homePage
+      #goRegister: a(href= '/register') Register
+      #goLogin: a(href='/login') Login
+      .slogan . <br/> Bid.<br/> &nbsp &nbsp &nbsp Trade.<br/> &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Drink...
+
+
 block scripts
   script(src='/js/user/home.js')
 
diff --git a/app/views/users/login.jade b/app/views/users/login.jade
@@ -14,6 +14,7 @@ block content
                   label(for='password')
                   input.form-control.input-bar#password(type='password', name='password', placeholder= 'Password')
                 button.btn(type='submit') Submit
+        .cheers Cheers!
         .row
           .col-xs-12.col-md-3
 

diff --git a/test/acceptance/users.js b/test/acceptance/users.js
@@ -81,7 +81,7 @@ describe('users', function(){
       .send('email=nodeapptest%2Bbob%40gmail.com&password=1234')
       .end(function(err, res){
         expect(res.status).to.equal(302);
-        expect(res.headers.location).to.equal('/');
+        expect(res.headers.location).to.equal('/marketplace');
         done();
       });
     });