summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/pages/index.ejs2
-rw-r--r--views/pages/login.ejs23
-rw-r--r--views/partials/footer.ejs3
-rw-r--r--views/partials/header.ejs8
-rw-r--r--views/partials/login.ejs19
-rw-r--r--views/partials/scripts.ejs26
6 files changed, 41 insertions, 40 deletions
diff --git a/views/pages/index.ejs b/views/pages/index.ejs
new file mode 100644
index 0000000..dea659f
--- /dev/null
+++ b/views/pages/index.ejs
@@ -0,0 +1,2 @@
+<% include ../partials/header %>
+<% include ../partials/footer %>
diff --git a/views/pages/login.ejs b/views/pages/login.ejs
index 16c291b..722e1a3 100644
--- a/views/pages/login.ejs
+++ b/views/pages/login.ejs
@@ -1,22 +1,3 @@
-<!doctype html>
-<html>
-<head>
-<title>bucky</title>
-<link rel="stylesheet" href="/assets/css/css.css">
-</head>
-<body>
-
-<div id="bg"></div>
-
+<% include ../partials/header %>
<% include ../partials/login %>
-<% include ../partials/settings %>
-
-<div id="lobby">
- <form>
- <input type="text" id="create-room" placeholder="enter a url to make a room">
- </form>
-</div>
-
-</body>
-<% include ../partials/scripts %>
-</html> \ No newline at end of file
+<% include ../partials/footer %>
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
new file mode 100644
index 0000000..41d2ce3
--- /dev/null
+++ b/views/partials/footer.ejs
@@ -0,0 +1,3 @@
+</body>
+<% include ../partials/scripts %>
+</html> \ No newline at end of file
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
new file mode 100644
index 0000000..43c4465
--- /dev/null
+++ b/views/partials/header.ejs
@@ -0,0 +1,8 @@
+<!doctype html>
+<html>
+<head>
+<title>bucky</title>
+<link rel="stylesheet" href="/assets/css/bucky.css">
+<meta name="_csrf" value="<%= csrfToken %>">
+</head>
+<body> \ No newline at end of file
diff --git a/views/partials/login.ejs b/views/partials/login.ejs
index 959468a..b5e8c04 100644
--- a/views/partials/login.ejs
+++ b/views/partials/login.ejs
@@ -1,11 +1,18 @@
<div id="login">
<form>
- <label for="username">username</label>
- <input type="text" id="username">
+ <div>
+ <label for="username">username</label>
+ <input type="text" id="login-username" name="username">
+ </div>
- <label for="password">password</label>
- <input type="password" id="password">
-
- <button id="submit">LOGIN</button>
+ <div>
+ <label for="password">password</label>
+ <input type="password" id="login-password" name="password">
+ </div>
+
+ <div>
+ <label for="login-submit"></label>
+ <button id="login-submit">LOGIN</button>
+ </div>
</form>
</div>
diff --git a/views/partials/scripts.ejs b/views/partials/scripts.ejs
index 16c71b2..9ac68ee 100644
--- a/views/partials/scripts.ejs
+++ b/views/partials/scripts.ejs
@@ -1,16 +1,16 @@
-<script src="/js/vendor/zepto.min.js"></script>
-<script src="/js/vendor/lodash.min.js"></script>
-<script src="/js/vendor/oktween.js"></script>
-<script src="/js/vendor/parser.js"></script>
-<script src="/js/vendor/sha1.js"></script>
-<script src="/js/vendor/util.js"></script>
-<script src="/js/vendor/view/view.js"></script>
-<script src="/js/vendor/view/formview.js"></script>
-<script src="/js/vendor/view/router.js"></script>
-<script src="/js/lib/router.js"></script>
-<script src="/js/lib/views/login.js"></script>
-<script src="/js/lib/views/index/index.js"></script>
-<script src="/js/index.js"></script>
+<script src="/assets/js/vendor/jquery-2.1.4.min.js"></script>
+<script src="/assets/js/vendor/lodash.min.js"></script>
+<script src="/assets/js/vendor/oktween.js"></script>
+<script src="/assets/js/vendor/parser.js"></script>
+<script src="/assets/js/vendor/sha1.js"></script>
+<script src="/assets/js/vendor/util.js"></script>
+<script src="/assets/js/vendor/view/view.js"></script>
+<script src="/assets/js/vendor/view/formview.js"></script>
+<script src="/assets/js/vendor/view/router.js"></script>
+<script src="/assets/js/lib/router.js"></script>
+<script src="/assets/js/lib/views/login/login.js"></script>
+<script src="/assets/js/lib/views/index/index.js"></script>
+<script src="/assets/js/index.js"></script>
<!--
<script type="text/javascript" src="http://www.youtube.com/player_api"></script>