aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--assets/css/style.css16
-rw-r--r--assets/js/script.js2
-rw-r--r--routes/admin.js9
-rw-r--r--views/partials/header.hbs71
-rw-r--r--views/signin.hbs6
-rw-r--r--views/signin_admin.hbs51
-rw-r--r--views/signup.hbs16
7 files changed, 158 insertions, 13 deletions
diff --git a/assets/css/style.css b/assets/css/style.css
index f688524..108fffe 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -567,7 +567,7 @@ hr {
.input-confirm, .input-phone, .input-univ{
font-size: 1em !important;
border-radius: 0 !important;
- border-bottom: 0 !important;
+ border-bottom: 1px !important;
box-shadow: none !important;
}
@@ -575,7 +575,7 @@ hr {
font-size: 1em !important;
border-radius: 0 !important;
border-top-right-radius: 8px !important;
- border-bottom: 0 !important;
+ border-bottom: 1px !important;
box-shadow: none !important;
}
@@ -607,4 +607,16 @@ hr {
.input-group-addon {
min-width:50px;
text-align:left;
+}
+
+.signin-window {
+ padding: 0 !important;
+ width: auto !important;
+
+}
+
+.signin-window .modal-content {
+ height: auto !important;
+ width: 65% !important;
+ margin-left: 17%;
} \ No newline at end of file
diff --git a/assets/js/script.js b/assets/js/script.js
index 44d7422..7a4c21f 100644
--- a/assets/js/script.js
+++ b/assets/js/script.js
@@ -24,5 +24,7 @@ function main(){
});
$('.table-row').trigger('create');
+
+
}
$(document).ready(main); \ No newline at end of file
diff --git a/routes/admin.js b/routes/admin.js
index 68bb456..6a628d2 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -42,6 +42,15 @@ router.get('/', isAdmin, function(req,res){
req.session.messages = null;
});
+router.get('/signin', function (req, res, next) {
+ var msg = req.flash('error');
+ res.render('signin_admin', {
+ csrfToken: req.csrfToken(),
+ success: req.session.success,
+ errors: req.session.errors,
+ flashMsg: msg
+ });
+});
/** Retrieves infomation from the exam adding form and sends it to the database to add. */
router.post('/add/exam', function(req,res){
diff --git a/views/partials/header.hbs b/views/partials/header.hbs
index 57db052..bce9736 100644
--- a/views/partials/header.hbs
+++ b/views/partials/header.hbs
@@ -119,7 +119,7 @@
<li><a href="/admin">Admin Panel</a></li>
{{/if}}
{{ else }}
- <li><a href="/user/signin" >Sign In</a></li>
+ <li><a href="/user/signin">Sign In</a></li>
{{/if}}
<!--<li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li>-->
@@ -127,6 +127,7 @@
<li><a href="/user/logout">Logout</a> </li>
{{ else }}
<li><a href="/user/signup" >Sign up</a></li>
+ <li><a href="/admin/signin">Admin</a></li>
{{/if}}
</ul>
@@ -134,4 +135,70 @@
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
-</nav> <!-- Ignore error, opening tag will be generated at render time --> \ No newline at end of file
+</nav> <!-- Ignore error, opening tag will be generated at render time -->
+
+<article class="modal fade signin-window">
+ <div class="modal-dialog">
+ <div class="modal-content">
+
+ <section class="modal-body">
+ <div class="row">
+ <div class="slate signin-page col-sm-12 col-sm-offset-0 col-md-12 col-md-offset-0">
+ <div class="container">
+ {{# if success }}
+ <section class="alert alert-success">
+ <!-- Change those to banners later -->
+ <h2>Signup Successful!</h2>
+ </section>
+ {{ else }}
+ {{# if errors }}
+ <section class="alert alert-danger">
+ <ul>
+ {{# each errors }}
+ <li>{{ this.msg }}</li>
+ {{/each}}
+ </ul>
+ </section>
+ {{/if}}
+ {{/if}}
+ {{#if flashMsg}}
+ <section class="alert alert-danger">
+ {{flashMsg}}
+ </section>
+ {{/if}}
+
+ <h3 class="signin"><hr><i class="fa fa-sign-in" aria-hidden="true"></i> Sign In<hr></h3>
+ <form action="/user/signin" method="post">
+ <div class="form-group signin-group">
+ <div class="input-group input-group-lg">
+ <div class="input-group-addon addon-username">
+ <i class="fa fa-envelope" aria-hidden="true"></i>
+ </div>
+ <input type="text" class="form-control input-username" placeholder="email" name="usrname" required>
+ </div>
+ <div class="input-group input-group-lg">
+ <div class="input-group-addon addon-password">
+ <i class="fa fa-key" aria-hidden="true"></i>
+ </div>
+ <input type="password" class="form-control input-lg input-password" placeholder="password" name="password" required>
+ </div>
+ </div>
+ <input type="hidden" name="_csrf" value="{{ csrfToken }}">
+ <button class="signin-btn signin-insite btn-lg btn btn-primary btn-block"><span>Sign In</span></button>
+ </form>
+
+
+ <h4 class="signin signin-or">or</h4>
+ <a href="/auth/facebook" class="signin-fb signin-btn btn-lg btn btn-primary btn-block"><span>
+ <span class="fa fa-facebook"> </span> Sign In with Facebook</span></a>
+
+ </div>
+ </div>
+ </div>
+
+ </section>
+
+ </div>
+ </div>
+</article>
+
diff --git a/views/signin.hbs b/views/signin.hbs
index e985c13..5f0e4c7 100644
--- a/views/signin.hbs
+++ b/views/signin.hbs
@@ -31,13 +31,13 @@
<div class="input-group-addon addon-username">
<i class="fa fa-envelope" aria-hidden="true"></i>
</div>
- <input type="text" class="form-control input-username" placeholder="email" name="usrname">
+ <input type="text" class="form-control input-username" placeholder="email" name="usrname" required>
</div>
<div class="input-group input-group-lg">
<div class="input-group-addon addon-password">
<i class="fa fa-key" aria-hidden="true"></i>
</div>
- <input type="password" class="form-control input-lg input-password" placeholder="password" name="password">
+ <input type="password" class="form-control input-lg input-password" placeholder="password" name="password" required>
</div>
</div>
<input type="hidden" name="_csrf" value="{{ csrfToken }}">
@@ -47,7 +47,7 @@
<h4 class="signin signin-or">or</h4>
<a href="/auth/facebook" class="signin-fb signin-btn btn-lg btn btn-primary btn-block"><span>
- <span class="fa fa-facebook"> </span> Sign in with Facebook</span></a>
+ <span class="fa fa-facebook"> </span> Sign In with Facebook</span></a>
</div>
</div>
diff --git a/views/signin_admin.hbs b/views/signin_admin.hbs
new file mode 100644
index 0000000..35d64fe
--- /dev/null
+++ b/views/signin_admin.hbs
@@ -0,0 +1,51 @@
+<main id="solutions-main">
+ <div class="row">
+ <div class="slate signin-page col-sm-4 col-sm-offset-4 col-md-4 col-md-offset-4">
+ <div class="container">
+ {{# if success }}
+ <section class="alert alert-success">
+ <!-- Change those to banners later -->
+ <h2>Signup Successful!</h2>
+ </section>
+ {{ else }}
+ {{# if errors }}
+ <section class="alert alert-danger">
+ <ul>
+ {{# each errors }}
+ <li>{{ this.msg }}</li>
+ {{/each}}
+ </ul>
+ </section>
+ {{/if}}
+ {{/if}}
+ {{#if flashMsg}}
+ <section class="alert alert-danger">
+ {{flashMsg}}
+ </section>
+ {{/if}}
+
+ <h3 class="signin"><hr><i class="fa fa-sign-in" aria-hidden="true"></i> Admin Sign In<hr></h3>
+ <form action="/user/signin" method="post">
+ <div class="form-group signin-group">
+ <div class="input-group input-group-lg">
+ <div class="input-group-addon addon-username">
+ <i class="fa fa-user-secret" aria-hidden="true"></i>
+ </div>
+ <input type="text" class="form-control input-username" placeholder="email" name="usrname" required>
+ </div>
+ <div class="input-group input-group-lg">
+ <div class="input-group-addon addon-password">
+ <i class="fa fa-key" aria-hidden="true"></i>
+ </div>
+ <input type="password" class="form-control input-lg input-password" placeholder="password" name="password" required>
+ </div>
+ </div>
+ <input type="hidden" name="_csrf" value="{{ csrfToken }}">
+ <button class="signin-btn signin-insite btn-lg btn btn-primary btn-block"><span>Sign In</span></button>
+ </form>
+
+ </div>
+ </div>
+ </div>
+
+</main> \ No newline at end of file
diff --git a/views/signup.hbs b/views/signup.hbs
index 09b6c20..3c58edf 100644
--- a/views/signup.hbs
+++ b/views/signup.hbs
@@ -29,25 +29,29 @@
<h3 class="signup"><hr><i class="fa fa-user-plus" aria-hidden="true"></i> Sign Up<hr></h3>
- <form action="/user/signup" method="post">
- <div class="form-group signup-group ">
+ <form action="/user/signup" method="post" id="signup-form">
+ <div class="form-group signup-group ">
+
<div class="input-group input-group-lg">
<div class="input-group-addon addon-fname">
<i class="fa fa-male" aria-hidden="true"></i>
</div>
<input type="text" class="form-control input-fname" placeholder="first name" name="fname">
+ <p class="help-block"></p>
</div>
<div class="input-group input-group-lg">
<div class="input-group-addon">
<i class="fa fa-cube" aria-hidden="true"></i>
</div>
<input type="text" class="form-control input-lname" placeholder="last name" name="lname">
+ <p class="help-block"></p>
</div>
<div class="input-group input-group-lg">
- <div class="input-group-addon">
- <i class="fa fa-at" aria-hidden="true"></i>
- </div>
- <input type="email" class="form-control input-email" placeholder="email" name="email">
+ <div class="input-group-addon">
+ <i class="fa fa-at" aria-hidden="true"></i>
+ </div>
+ <input type="email" class="form-control input-email" placeholder="email" name="email" required>
+ <p class="help-block"></p>
</div>
<div class="input-group input-group-lg">
<div class="input-group-addon">
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-02 05:03:32 +0000