From 3d81f129e37c5db2f28a49401bbebe15108cb1dd Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 22 Apr 2013 19:01:45 +0000 Subject: [PATCH] added login, fixed gitignore --- .gitignore | 4 +--- public/templates/header.tpl | 5 +++-- public/templates/login.tpl | 36 +++++++++++++++++++++++++++++++++ public/templates/register.tpl | 9 ++++++--- src/templates.js | 4 +--- src/user.js | 38 +++++++++++++++++++++++++++++++---- src/webserver.js | 7 +++++++ src/websockets.js | 4 ++++ 8 files changed, 92 insertions(+), 15 deletions(-) create mode 100644 public/templates/login.tpl diff --git a/.gitignore b/.gitignore index 771027916c..dac9b9918d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,4 @@ npm-debug.log node_modules/ -!/node_modules/ -!src/node_modules/ -sftp-config.json +sftp-config.json diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 96610984ec..2dcfd5f10f 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -24,7 +24,7 @@ } function templates_init() { - loadTemplates(['register', 'home']); + loadTemplates(['register', 'home', 'login']); } templates_init(); @@ -113,7 +113,7 @@ } \ No newline at end of file diff --git a/public/templates/register.tpl b/public/templates/register.tpl index 75d2847fdc..848dee5532 100644 --- a/public/templates/register.tpl +++ b/public/templates/register.tpl @@ -19,10 +19,13 @@ +

Register

-Username:
-Password:
- +
+
+
+ +