need pull

4 files changed, 33 insertions, 10 deletions

diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs
index 987072f..667860c 100644
--- a/views/layouts/layout.hbs
+++ b/views/layouts/layout.hbs
@@ -17,6 +17,8 @@
     <!--Fonts-->
     <link href='https://fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
     <link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous">
+
 
     <!--JS-->
     <script src="/assets/js/jquery-2.2.4.min.js"></script>
diff --git a/views/partials/header.hbs b/views/partials/header.hbs
index d4c51e3..98ccffb 100644
--- a/views/partials/header.hbs
+++ b/views/partials/header.hbs
@@ -37,7 +37,8 @@
                     </ul>
                 </li>
                 <li><a href="#" data-toggle="modal" data-target=".login-window">Log In</a></li>
-                <li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li>
+                <!--<li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li>-->
+                <li><a href="/signup" >Sign up</a></li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links <span class="caret"></span></a>
                     <ul class="dropdown-menu">
diff --git a/views/partials/login.hbs b/views/partials/login.hbs
index 521c730..05df72e 100644
--- a/views/partials/login.hbs
+++ b/views/partials/login.hbs
@@ -9,7 +9,7 @@
             </section>
 
             <section class="modal-body">
-                <form role="form">
+                <form role="form" action="" method="post">
                     <div class="form-group">
                         <input type="text" class="form-control" placeholder="Username">
                     </div>
diff --git a/views/signup.hbs b/views/signup.hbs
index a389b63..37c2a35 100644
--- a/views/signup.hbs
+++ b/views/signup.hbs
@@ -1,28 +1,47 @@
 <main id="solutions-main">
+
 <div class="row" id="solutions-main">
-    <div class="col-md-4 col-md-offset-4 col-sm-6 sol-sm-offset-3">
+    {{# if success }}
+        <section class="success">
+            <h2>Successful Validation!</h2>
+        </section>
+    {{ else }}
+        {{# if errors }}
+            <section class="errors">
+                <ul>
+                    {{# each errors }}
+                        <li>{{ this.msg }}</li>
+                    {{/each}}
+                </ul>
+            </section>
+        {{/if}}
+    {{/if}}
+    <div class="col-md-4 col-md-offset-4 col-sm-6 col-sm-offset-3">
         <h2><i class="fa fa-user-plus" aria-hidden="true"></i> Sign Up</h2>
-        <form action="" method="post">
+        <form action="/signup" method="post">
             <div class="form-group">
-                <input type="text" class="form-control" placeholder="First Name">
+                <input type="text" class="form-control" placeholder="First Name" name="fname">
             </div>
 
             <div class="form-group">
-                <input type="text" class="form-control" placeholder="Last Name">
+                <input type="text" class="form-control" placeholder="Last Name" name="lname">
             </div>
 
             <div class="form-group">
-                <input type="email" class="form-control" placeholder="Email">
+                <input type="email" class="form-control" placeholder="Email" name="email">
             </div>
 
             <div class="form-group">
-                <input type="email" class="form-control" placeholder="New Username">
+                <input type="email" class="form-control" placeholder="New Username" name="username">
             </div>
             <div class="form-group">
-                <input type="password" class="form-control" placeholder="New Password">
+                <input type="password" class="form-control" placeholder="New Password" name="password">
             </div>
 
             <div class="form-group">
+                <input type="password" class="form-control" placeholder="New Password" name="confirmPassword">
+            </div>
+            <div class="form-group">
                 <input type="text" class="form-control" placeholder="University (optional)">
             </div>
 
@@ -30,9 +49,10 @@
                 <input type="text" class="form-control" placeholder="Department (optional)">
             </div>
             <input type="hidden" name="_csrf" value="{{ csrfToken }}">
-            <button type="submit" class="btn btn-primary">Sign Up</button>
+            <button type="signup" class="btn btn-primary">Sign Up</button>
         </form>
     </div>
 
 </div>
+
 </main>
\ No newline at end of file