From 9ba61ebd7fc87dcaaddcd34dcd7f39e2858cefed Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Mon, 27 Apr 2015 17:29:43 +0200 Subject: Jade <3, BotleaguesApi.js --- src/include/foot.jade | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/include/foot.jade (limited to 'src/include/foot.jade') diff --git a/src/include/foot.jade b/src/include/foot.jade new file mode 100644 index 0000000..4bb069f --- /dev/null +++ b/src/include/foot.jade @@ -0,0 +1,2 @@ +script(src='/assets/js/script.js', type='text/javascript') +script(src='/assets/js/BotleaguesApi.js', type='text/javascript') \ No newline at end of file -- cgit v1.2.3 From f0218468f76a01e7644bc727ea9502015a5047c3 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Thu, 7 May 2015 12:00:54 +0300 Subject: Register page & more --- src/about.jade | 21 +++++++++++++++++++++ src/include/foot.jade | 4 +++- src/include/layout-main.jade | 13 ++++++++++--- src/index.jade | 7 +++++-- src/js/Botleagues.js | 22 ++++++++++++++++++++++ src/js/BotleaguesApi.js | 19 ------------------- src/js/BotleaguesCallback.js | 5 +++++ src/js/forms.js | 11 +++++++++++ src/register.jade | 30 ++++++++++++++++++++++++++++++ 9 files changed, 107 insertions(+), 25 deletions(-) create mode 100644 src/about.jade create mode 100644 src/js/Botleagues.js delete mode 100644 src/js/BotleaguesApi.js create mode 100644 src/js/BotleaguesCallback.js create mode 100644 src/js/forms.js create mode 100644 src/register.jade (limited to 'src/include/foot.jade') 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 -- cgit v1.2.3 From 36811d9e42876dddc3ff7e75611191a2c83017f9 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Thu, 7 May 2015 14:20:28 +0300 Subject: Login --- src/include/foot.jade | 1 + src/js/BotleaguesCallback.js | 4 +++- src/js/BotleaguesFrontend.js | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/js/BotleaguesFrontend.js (limited to 'src/include/foot.jade') diff --git a/src/include/foot.jade b/src/include/foot.jade index 3c49021..1e383f2 100644 --- a/src/include/foot.jade +++ b/src/include/foot.jade @@ -1,4 +1,5 @@ script(src='/assets/js/script.js', type='text/javascript') script(src='/assets/js/Botleagues.js', type='text/javascript') script(src='/assets/js/BotleaguesCallback.js', type='text/javascript') +script(src='/assets/js/BotleaguesFrontend.js', type='text/javascript') script(src='/assets/js/forms.js', type='text/javascript') \ No newline at end of file diff --git a/src/js/BotleaguesCallback.js b/src/js/BotleaguesCallback.js index 4c05262..271deb0 100644 --- a/src/js/BotleaguesCallback.js +++ b/src/js/BotleaguesCallback.js @@ -2,4 +2,6 @@ function BotleaguesCallback(){} BotleaguesCallback.register = function(data) { console.log(data); -}; \ No newline at end of file +}; + +BotleaguesCallback.login = function(data) {} \ No newline at end of file diff --git a/src/js/BotleaguesFrontend.js b/src/js/BotleaguesFrontend.js new file mode 100644 index 0000000..37e84d4 --- /dev/null +++ b/src/js/BotleaguesFrontend.js @@ -0,0 +1,7 @@ +function BotleaguesFrontend(){} + +BotleaguesFrontend.login = function() { + Botleagues.request({ + endpoint: 'user/login' + }, BotleaguesCallback.login); +}; \ No newline at end of file -- cgit v1.2.3