diff options
Diffstat (limited to 'views')
| -rwxr-xr-x | views/home.ejs | 6 | ||||
| -rw-r--r-- | views/login.ejs | 29 | ||||
| -rw-r--r-- | views/partials/header.ejs | 12 | ||||
| -rw-r--r-- | views/partials/scripts.ejs | 22 | ||||
| -rw-r--r-- | views/partials/signin.ejs | 32 |
5 files changed, 81 insertions, 20 deletions
diff --git a/views/home.ejs b/views/home.ejs index 3246523..670dcbe 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -5,16 +5,14 @@ [[ include partials/meta ]] <script> window.addEventListener("load",function() { - init() window.scrollTo(0,0) }, false); </script> </head> <body class="loading"> <div class="rapper page"> - <a href="/" class="logo"><img src="assets/img/logo4.svg"></a> - <a href="#" data-role="show-signup-modal" class="signUp topLink">Sign Up</span></a> - <a href="#" data-role="show-signup-modal" class="signIn topLink">Sign In</span></a> + [[ include partials/header ]] + <table class="demo"> <tr> <td class="video" style="background-image:url(https://s3.amazonaws.com/luckyplop/6450f5b88c5c043a4551eff8902b1728f813bd66.jpg)"> diff --git a/views/login.ejs b/views/login.ejs new file mode 100644 index 0000000..af78f83 --- /dev/null +++ b/views/login.ejs @@ -0,0 +1,29 @@ +<!doctype html> +<html> +<head> + <title>vvalls</title> + [[ include partials/meta ]] + <script> + window.addEventListener("load",function() { + window.scrollTo(0,0) + }, false); + </script> +</head> +<body class="loading"> + <div class="rapper page" style="height: 100%;"> + [[ include partials/header ]] + + <div style="height: 70%; clear: both;"></div> + + [[ include partials/signin ]] + [[ include partials/footer ]] + +</div> +</body> +[[ include partials/scripts ]] +<script> +setTimeout(function(){ + $("[data-role='show-signup-modal']").trigger("click") +}) +</script> +</html> diff --git a/views/partials/header.ejs b/views/partials/header.ejs new file mode 100644 index 0000000..4ba9773 --- /dev/null +++ b/views/partials/header.ejs @@ -0,0 +1,12 @@ +<a href="/" class="logo"><img src="assets/img/logo4.svg"></a> + +<span class="topLinks"> +[[ if (logged_in) { ]] + <span>[[- user.displayName ]]</span> + <a href="/profile" class="topLink">View Profile</a> + <a href="/logout" class="topLink">Sign Out</a> +[[ } else { ]] + <a href="#" data-role="show-signup-modal" class="signUp topLink">Sign Up</a> + <a href="#" data-role="show-signin-modal" class="signIn topLink">Sign In</a> +[[ } ]] +</span> diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs index 6d652de..46c5d50 100644 --- a/views/partials/scripts.ejs +++ b/views/partials/scripts.ejs @@ -1,7 +1,11 @@ -<script src="assets/javascripts/vendor/jquery.min.js"></script> +<script type="text/javascript" src="assets/javascripts/vendor/bower_components/jquery/dist/jquery.min.js"></script> +<script type="text/javascript" src="assets/javascripts/vendor/bower_components/lodash/dist/lodash.min.js"></script> +<script type="text/javascript" src="assets/javascripts/vendor/bower_components/momentjs/min/moment.min.js"></script> <script type="text/javascript" src="assets/javascripts/vendor/tube.js"></script> <script type="text/javascript" src="assets/javascripts/vendor/loader.js"></script> <script type="text/javascript" src="assets/javascripts/vendor/polyfill.js"></script> +<script type="text/javascript" src="assets/javascripts/vendor/view.js"></script> +<script type="text/javascript" src="assets/javascripts/vendor/sha1.js"></script> <script type="text/javascript" src="assets/javascripts/util.js"></script> <script type="text/javascript" src="assets/javascripts/rectangles/_env.js"></script> @@ -34,8 +38,14 @@ <script type="text/javascript" src="assets/javascripts/rectangles/engine/map/ui.js"></script> <script type="text/javascript" src="assets/javascripts/rectangles/engine/map/draw.js"></script> -<script src="assets/javascripts/mx/mx.js"></script> -<script src="assets/javascripts/mx/extensions/mx.scene.js"></script> -<script src="assets/javascripts/mx/extensions/mx.movements.js"></script> -<script src="assets/javascripts/mx/primitives/mx.image.js"></script> -<script src="assets/javascripts/app.js"></script> +<script type="text/javascript" src="assets/javascripts/mx/mx.js"></script> +<script type="text/javascript" src="assets/javascripts/mx/extensions/mx.scene.js"></script> +<script type="text/javascript" src="assets/javascripts/mx/extensions/mx.movements.js"></script> +<script type="text/javascript" src="assets/javascripts/mx/primitives/mx.image.js"></script> + +<script type="text/javascript" src="assets/javascripts/ui/ModalView.js"></script> +<script type="text/javascript" src="assets/javascripts/ui/MasterView.js"></script> +<script type="text/javascript" src="assets/javascripts/ui/SignInModal.js"></script> +<script type="text/javascript" src="assets/javascripts/ui/SignUpModal.js"></script> + +<script type="text/javascript" src="assets/javascripts/app.js"></script> diff --git a/views/partials/signin.ejs b/views/partials/signin.ejs index a9a2bba..c285811 100644 --- a/views/partials/signin.ejs +++ b/views/partials/signin.ejs @@ -1,24 +1,31 @@ <div class="mediaDrawer fixed animate signin"> <span class="close">X</span> <div class="box"> - <form id="signIn"> + <form id="signIn" method="post"> + <input type="hidden" name="_csrf" value="[[- token ]]"> <a href="/auth/facebook" class="facebook"><b class="icon-social-facebook"></b><span>Sign in with Facebook</span></a> <b class="info">– or the ol' fashion way –</b> <li> <label class="description" for="usernameInput">Username:</label> <div> - <input id="usernameInput" name="usernameInput" class="element text medium" type="text" maxlength="255" value=""/> + <input id="usernameInput" name="username" class="element text medium" type="text" maxlength="255" value=""/> </div> </li> <li> <label class="description" for="passwordInput">Password:</label> <div> - <input id="passwordInput" name="passwordInput" class="element text medium" type="password" maxlength="255" value=""/> + <input id="passwordInput" name="password" class="element text medium" type="password" maxlength="255" value=""/> </div> </li> <li class="buttons"> - <input id="saveForm" class="button_text" type="submit" name="submit" value="Submit" /> + <input id="saveForm" class="button_text" type="submit" value="Submit" /> </li> + <div class="errors"> + <div>There was a problem with your submission:</div> + <div class="errorList"></div> + </div> + <br><br> + <a data-role="show-signup-modal" href="#">Make a new account</a> </form> </div> </div> @@ -26,36 +33,41 @@ <div class="mediaDrawer fixed animate signup"> <span class="close">X</span> <div class="box"> - <form id="signUp"> + <form id="signUp" method="post"> + <input type="hidden" name="_csrf" value="[[- token ]]"> <a href="/auth/facebook" class="facebook"><b class="icon-social-facebook"></b><span>Sign up with Facebook</span></a> <b class="info">– or the ol' fashion way –</b> <li> <label class="description" for="usernameInput">Username:</label> <div> - <input id="usernameInput" name="usernameInput" class="element text medium" type="text" maxlength="255" value=""/> + <input id="usernameInput" name="username" class="element text medium" type="text" maxlength="255"> </div> </li> <li> <label class="description" for="emailInput">Email:</label> <div> - <input id="emailInput" name="emailInput" class="element text medium" type="text" maxlength="255" value=""/> + <input id="emailInput" name="email" class="element text medium" type="text" maxlength="255"> </div> </li> <li> <label class="description" for="passwordInput1">Password:</label> <div> - <input id="passwordInput1" name="passwordInput1" class="element text medium" type="password" maxlength="255" value=""/> + <input id="passwordInput1" name="password" class="element text medium" type="password" maxlength="255"> </div> </li> <li> <label class="description" for="passwordInput2">Again!</label> <div> - <input id="passwordInput2" name="passwordInput2" class="element text medium" type="password" maxlength="255" value=""/> + <input id="passwordInput2" class="element text medium" type="password" maxlength="255"> </div> </li> <li class="buttons"> - <input id="saveForm" class="button_text" type="submit" name="submit" value="Submit" /> + <input id="saveForm" class="button_text" type="submit" value="Submit" /> </li> + <div class="errors"> + <div>There was a problem with your submission:</div> + <div class="errorList"></div> + </div> </form> </div> </div> |