From a532390f81e35f611fd02ad3d543f4d52217ca3c Mon Sep 17 00:00:00 2001
From: nanalelfe <nargiza.nosirova@mail.utoronto.ca>
Date: Sun, 14 Aug 2016 06:13:55 -0400
Subject: Fixed signin and signup

---
 views/partials/header.hbs | 11 -----------
 views/signin.hbs          | 14 ++++++++++++--
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'views')

diff --git a/views/partials/header.hbs b/views/partials/header.hbs
index 8931204..57db052 100644
--- a/views/partials/header.hbs
+++ b/views/partials/header.hbs
@@ -114,11 +114,7 @@
                 </li>
                 {{# if login }}
                     {{# if user.email }}
-                        {{# if user.login_info}}
                         <li><a href="/user/user_profile">Profile Page</a></li>
-                         {{else}}
-                            <li><a href="/user/signin" >Sign In</a></li>
-                        {{/if}}
                     {{else}}
                         <li><a href="/admin">Admin Panel</a></li>
                     {{/if}}
@@ -128,14 +124,7 @@
 
                 <!--<li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li>-->
                 {{# if login }}
-                    {{# if user.login_info}}
                     <li><a href="/user/logout">Logout</a> </li>
-                     {{else if user.email}}
-                        <li><a href="/user/signup" >Sign up</a></li>
-                     {{ else }}
-                        <li><a href="/user/logout">Logout</a> </li>
-
-                    {{/if}}
                 {{ else }}
                     <li><a href="/user/signup" >Sign up</a></li>
                 {{/if}}
diff --git a/views/signin.hbs b/views/signin.hbs
index 7bea713..b112485 100644
--- a/views/signin.hbs
+++ b/views/signin.hbs
@@ -24,7 +24,12 @@
                 </section>
             {{/if}}
 
-            <h3><i class="fa fa-sign-in" aria-hidden="true"></i> Sign In</h3>
+        </div>
+
+    </div>
+    <div class="row">
+        <div class="insite-signin col-sm-3 col-sm-offset-3 col-md-3 col-md-offset-3">
+            <h3><i class="fa fa-sign-in" aria-hidden="true"></i> Sign in</h3>
             <form action="/user/signin" method="post">
                 <div class="form-group">
                     <input type="text" class="form-control" placeholder="New Username" name="usrname">
@@ -36,7 +41,12 @@
                 <button class="btn btn-primary">Sign In</button>
             </form>
         </div>
-
+        <div class="col-sm-3 col-md-3">
+            <h3><i class="fa fa-sign-in" aria-hidden="true"></i> Sign in with:</h3>
+            <a href="/auth/facebook" class="btn btn-primary"><span class="fa fa-facebook"></span> Facebook</a>
+        </div>
     </div>
 
+
+
 </main>
\ No newline at end of file
-- 
cgit v1.2.3