Register page & more

9 files changed, 107 insertions, 25 deletions

diff --git a/src/about.jade b/src/about.jade
new file mode 100644
index 0000000..2c424d4
--- /dev/null
+++ b/src/about.jade
@@ -0,0 +1,21 @@
+extends ./include/layout-main.jade
+
+block menu
+  -var selected = '/about'
+
+block content
+  .row
+    .col-lg-6
+      h4 Subheading
+      p Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.
+      h4 Subheading
+      p Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.
+      h4 Subheading
+      p Maecenas sed diam eget risus varius blandit sit amet non magna.
+    .col-lg-6
+      h4 Subheading
+      p Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.
+      h4 Subheading
+      p Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.
+      h4 Subheading
+      p Maecenas sed diam eget risus varius blandit sit amet non magna.
\ No newline at end of file
diff --git a/src/include/foot.jade b/src/include/foot.jade
index 4bb069f..3c49021 100644
--- a/src/include/foot.jade
+++ b/src/include/foot.jade
@@ -1,2 +1,4 @@
 script(src='/assets/js/script.js', type='text/javascript')
-script(src='/assets/js/BotleaguesApi.js', type='text/javascript')
\ No newline at end of file
+script(src='/assets/js/Botleagues.js', type='text/javascript')
+script(src='/assets/js/BotleaguesCallback.js', type='text/javascript')
+script(src='/assets/js/forms.js', type='text/javascript')
\ No newline at end of file
diff --git a/src/include/layout-main.jade b/src/include/layout-main.jade
index 68ff9de..b680d9f 100644
--- a/src/include/layout-main.jade
+++ b/src/include/layout-main.jade
@@ -6,11 +6,18 @@ html(lang="en")
   body
     .container
 
+      block menu
+        -var selected = '/'; //default
+
+      -var menu = { 'Home': '/', 'About': '/about', 'Contact': '/contact' };
+
       .header.clearfix
         nav: ul.nav.nav-pills.pull-right
-            li.active(role='presentation'): a(href='#') Home
-            li(role='presentation'): a(href='#') About
-            li(role='presentation'): a(href='#') Contact
+          each val, key in menu
+            if selected === val
+              li.active(role='presentation'): a(href=val,title=key)= key
+            else
+              li(role='presentation'): a(href=val,title=key)= key
         h3 Botleagues
 
       block content
diff --git a/src/index.jade b/src/index.jade
index 7ade8fe..f405884 100644
--- a/src/index.jade
+++ b/src/index.jade
@@ -1,13 +1,16 @@
 extends ./include/layout-main.jade
 
+block menu
+  -var selected = '/'
+
 block content
   .jumbotron
     h1 Welcome
     p.lead Botleagues: write Java bots for different games, join competitions and win prizes!
     p.row
-      a.btn.btn-lg.btn-success.pull-right(href='#', role='button') Sign up
+      a.btn.btn-lg.btn-success.pull-right(href='/register', role='button') Register now
 
-  .row.marketing
+  .row
     .col-lg-6
       h4 Subheading
       p Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.
diff --git a/src/js/Botleagues.js b/src/js/Botleagues.js
new file mode 100644
index 0000000..fd8ed21
--- /dev/null
+++ b/src/js/Botleagues.js
@@ -0,0 +1,22 @@
+function Botleagues(){}
+
+Botleagues.url = 'https://api.local.botleagues.camilstaps.nl';
+
+Botleagues.request = function(user_options, callback) {
+    var options = {
+        endpoint: null,
+        method: 'GET',
+        dataType: 'json',
+        done: function(data) {
+            callback(data);
+        }
+    };
+    for (var name in user_options) {
+        options[name] = user_options[name];
+    }
+
+    var url = Botleagues.url + '/' + options['endpoint'];
+    delete options['endpoint'];
+
+    jQuery.ajax(url, options);
+};
\ No newline at end of file
diff --git a/src/js/BotleaguesApi.js b/src/js/BotleaguesApi.js
deleted file mode 100644
index c37adab..0000000
--- a/src/js/BotleaguesApi.js
+++ /dev/null
@@ -1,19 +0,0 @@
-function BotleaguesApi(){}
-
-BotleaguesApi.url = 'https://api.local.botleagues.camilstaps.nl';
-
-BotleaguesApi.request = function(user_options) {
-    var options = {
-        endpoint: null,
-        method: 'GET',
-        dataType: 'jsonp'
-    };
-    for (var name in user_options) {
-        options[name] = user_options[name];
-    }
-
-    var url = BotleaguesApi.url + options['endpoint'];
-    delete options['endpoint'];
-
-    jQuery.ajax(url, options);
-}
\ No newline at end of file
diff --git a/src/js/BotleaguesCallback.js b/src/js/BotleaguesCallback.js
new file mode 100644
index 0000000..4c05262
--- /dev/null
+++ b/src/js/BotleaguesCallback.js
@@ -0,0 +1,5 @@
+function BotleaguesCallback(){}
+
+BotleaguesCallback.register = function(data) {
+    console.log(data);
+};
\ No newline at end of file
diff --git a/src/js/forms.js b/src/js/forms.js
new file mode 100644
index 0000000..5ad9959
--- /dev/null
+++ b/src/js/forms.js
@@ -0,0 +1,11 @@
+$('form.form-register').submit(function(){
+    Botleagues.request({
+        endpoint: 'user',
+        method: 'POST',
+        data: {
+            email: $(this).find('input[name="email"]').val(),
+            password: $(this).find('input[name="password"]').val()
+        }
+    }, BotleaguesCallback.register);
+    event.preventDefault();
+});
\ No newline at end of file
diff --git a/src/register.jade b/src/register.jade
new file mode 100644
index 0000000..2aca779
--- /dev/null
+++ b/src/register.jade
@@ -0,0 +1,30 @@
+extends ./include/layout-main.jade
+
+block menu
+  -var selected = '/register'
+
+block content
+  .row
+    .col-lg-6
+      h4 Register
+      form.form-register
+        .form-group
+          label(for="register-email") Email
+          input.form-control#register-email(type='email',name='email',placeholder="Enter email")
+        .form-group
+          label(for="register-password") Password
+          input.form-control#register-password(type='password',name='password',placeholder="Enter password")
+        .form-group
+          label(for="register-password2") Password (confirmation)
+          input.form-control#register-password2(type='password',name='password',placeholder="Enter password again")
+        .checkbox: label
+          input#accepts-toc(type='checkbox',name="accepts-toc")
+          | I accept the terms and conditions
+        button.btn.btn-lg.btn-success.pull-right(type='submit') Register
+    .col-lg-6
+      h4 Subheading
+      p Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.
+      h4 Subheading
+      p Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Cras mattis consectetur purus sit amet fermentum.
+      h4 Subheading
+      p Maecenas sed diam eget risus varius blandit sit amet non magna.
\ No newline at end of file