From 8e8ab506710da272e325dc5e1a12a428149f20df Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Mon, 27 Apr 2015 16:21:04 +0200 Subject: Jade, imagemin, bower dependencies, gulpfile --- src/index.jade | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/index.jade (limited to 'src') diff --git a/src/index.jade b/src/index.jade new file mode 100644 index 0000000..dda3b97 --- /dev/null +++ b/src/index.jade @@ -0,0 +1,8 @@ +doctype html +html(lang="en") + head + title= Botleagues + link(rel='stylesheet', href='/assets/css/bootswatch.css', type='text/css') + link(rel='stylesheet', href='/assets/css/fontawesome.css', type='text/css') + body + p Hello world. \ No newline at end of file -- cgit v1.2.3 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 --- gulpfile.js | 19 +++++++++++++++++-- package.json | 3 ++- src/include/foot.jade | 2 ++ src/include/head.jade | 8 ++++++++ src/include/layout-main.jade | 21 +++++++++++++++++++++ src/index.jade | 32 ++++++++++++++++++++++++-------- src/js/BotleaguesApi.js | 22 ++++++++++++++++++++++ 7 files changed, 96 insertions(+), 11 deletions(-) create mode 100644 src/include/foot.jade create mode 100644 src/include/head.jade create mode 100644 src/include/layout-main.jade create mode 100644 src/js/BotleaguesApi.js (limited to 'src') diff --git a/gulpfile.js b/gulpfile.js index b7e9091..2abb17e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -24,9 +24,17 @@ var gulp = require('gulp'), var bootswatch_theme = 'superhero'; gulp.task('default', [], function() { + gulp.start('styles', 'scripts', 'images', 'jade'); +}); + +gulp.task('all', [], function() { gulp.start('fonts', 'styles', 'scripts', 'images', 'jade'); }); +gulp.task('rebuild', ['clean'], function() { + gulp.start('all'); +}); + gulp.task('clean', function(cb) { del(['./build/assets/css', './build/assets/js', './build/assets/less', './build/assets/img', './build/assets/fonts', './build/*.html'], cb) }); @@ -102,9 +110,8 @@ gulp.task('styles', function() { gulp.task('scripts', function(){ var fileList = [ + './bower_components/jquery/dist/jquery.min.js', './bower_components/bootstrap/dist/js/bootstrap.min.js', - './bower_components/jquery/jquery.min.js', - './src/js/*.js' ]; var dst = './build/assets/js'; @@ -115,6 +122,14 @@ gulp.task('scripts', function(){ .pipe(stripdebug()) .pipe(uglify()) .pipe(gulp.dest(dst)); + + var src = './src/js/*.js'; + + gulp.src(src) + .pipe(changed(dst)) + .pipe(stripdebug()) + .pipe(uglify()) + .pipe(gulp.dest(dst)); }); gulp.task('images', function(){ diff --git a/package.json b/package.json index 82d01d3..8850d7a 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "gulp-foreach": "^0.1.0", "gulp-if": "^1.2.5", "gulp-imagemin": "~2.2.1", - "gulp-jade": "~1.0.0" + "gulp-jade": "~1.0.0", "gulp-jshint": "^1.9.2", "gulp-less": "^3.0.0", "gulp-minify-css": "^0.4.5", @@ -25,6 +25,7 @@ "gulp-uglify": "~1.2.0", "gulp-util": "^3.0.3", "merge-stream": "^0.1.7", + "markdown-js": "0.0.3" }, "scripts": { "test": "echo \"Error: no test specified\" && exit 1" 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 diff --git a/src/include/head.jade b/src/include/head.jade new file mode 100644 index 0000000..63cb17c --- /dev/null +++ b/src/include/head.jade @@ -0,0 +1,8 @@ +title Botleagues + +meta(charset='utf-8') +meta(http-equiv='X-UA-Compatible', content='IE=edge') +meta(name='viewport', content='width=device-width, initial-scale=1') + +link(rel='stylesheet', href='/assets/css/bootswatch.css', type='text/css') +link(rel='stylesheet', href='/assets/css/font-awesome.css', type='text/css') \ No newline at end of file diff --git a/src/include/layout-main.jade b/src/include/layout-main.jade new file mode 100644 index 0000000..68ff9de --- /dev/null +++ b/src/include/layout-main.jade @@ -0,0 +1,21 @@ +doctype html +html(lang="en") + head + include ./head.jade + + body + .container + + .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 + h3 Botleagues + + block content + + footer.footer: :markdown + © [ViviSoft](http://vivisoft.nl/) 2015 + + include ./foot.jade \ No newline at end of file diff --git a/src/index.jade b/src/index.jade index dda3b97..7ade8fe 100644 --- a/src/index.jade +++ b/src/index.jade @@ -1,8 +1,24 @@ -doctype html -html(lang="en") - head - title= Botleagues - link(rel='stylesheet', href='/assets/css/bootswatch.css', type='text/css') - link(rel='stylesheet', href='/assets/css/fontawesome.css', type='text/css') - body - p Hello world. \ No newline at end of file +extends ./include/layout-main.jade + +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 + + .row.marketing + .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/js/BotleaguesApi.js b/src/js/BotleaguesApi.js new file mode 100644 index 0000000..44e9c0e --- /dev/null +++ b/src/js/BotleaguesApi.js @@ -0,0 +1,22 @@ +function BotleaguesApi(){} + +BotleaguesApi.url = 'https://api.local.botleagues.camilstaps.nl'; + +BotleaguesApi.request = function(user_options) { + var options = { + endpoint: null, + method: 'GET', + dataType: 'jsonp', + jsonp: 'callback' + }; + for (var name in user_options) { + options[name] = user_options[name]; + } + + console.log(options); + + var url = BotleaguesApi.url + options['endpoint']; + delete options['endpoint']; + + jQuery.ajax(url, options); +} \ No newline at end of file -- cgit v1.2.3 From 2c8f1011bb2329f350396bbfe1c5486d4af7f719 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Mon, 27 Apr 2015 22:14:10 +0200 Subject: Working jsonp --- gulpfile.js | 4 +++- src/js/BotleaguesApi.js | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/gulpfile.js b/gulpfile.js index 2abb17e..3c3e596 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -23,6 +23,8 @@ var gulp = require('gulp'), var bootswatch_theme = 'superhero'; +var production = false; + gulp.task('default', [], function() { gulp.start('styles', 'scripts', 'images', 'jade'); }); @@ -127,7 +129,7 @@ gulp.task('scripts', function(){ gulp.src(src) .pipe(changed(dst)) - .pipe(stripdebug()) + .pipe(gulpif(production, stripdebug())) .pipe(uglify()) .pipe(gulp.dest(dst)); }); diff --git a/src/js/BotleaguesApi.js b/src/js/BotleaguesApi.js index 44e9c0e..c37adab 100644 --- a/src/js/BotleaguesApi.js +++ b/src/js/BotleaguesApi.js @@ -6,15 +6,12 @@ BotleaguesApi.request = function(user_options) { var options = { endpoint: null, method: 'GET', - dataType: 'jsonp', - jsonp: 'callback' + dataType: 'jsonp' }; for (var name in user_options) { options[name] = user_options[name]; } - console.log(options); - var url = BotleaguesApi.url + options['endpoint']; delete options['endpoint']; -- 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') 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') 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 From 9de17f00941e56d7c063241e3f87bfeb70e50276 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Thu, 7 May 2015 15:43:22 +0300 Subject: HTTP authentication --- src/js/Botleagues.js | 4 ++++ src/js/BotleaguesCallback.js | 4 +++- src/js/BotleaguesFrontend.js | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/js/Botleagues.js b/src/js/Botleagues.js index fd8ed21..efc56d8 100644 --- a/src/js/Botleagues.js +++ b/src/js/Botleagues.js @@ -19,4 +19,8 @@ Botleagues.request = function(user_options, callback) { delete options['endpoint']; jQuery.ajax(url, options); +}; + +Botleagues.redirect = function(user_options) { + window.location = Botleagues.url + '/' + user_options['endpoint']; }; \ No newline at end of file diff --git a/src/js/BotleaguesCallback.js b/src/js/BotleaguesCallback.js index 271deb0..1efe8d6 100644 --- a/src/js/BotleaguesCallback.js +++ b/src/js/BotleaguesCallback.js @@ -4,4 +4,6 @@ BotleaguesCallback.register = function(data) { console.log(data); }; -BotleaguesCallback.login = function(data) {} \ No newline at end of file +BotleaguesCallback.login = function(data) { + console.log(data); +} \ No newline at end of file diff --git a/src/js/BotleaguesFrontend.js b/src/js/BotleaguesFrontend.js index 37e84d4..461ce92 100644 --- a/src/js/BotleaguesFrontend.js +++ b/src/js/BotleaguesFrontend.js @@ -1,7 +1,7 @@ function BotleaguesFrontend(){} BotleaguesFrontend.login = function() { - Botleagues.request({ - endpoint: 'user/login' - }, BotleaguesCallback.login); + Botleagues.redirect({ + endpoint: 'user/login?redirect=http://local.botleagues.camilstaps.nl/' + }); }; \ No newline at end of file -- cgit v1.2.3 From 3282ddaa098463adc778a2a81f5239769c922f65 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Thu, 7 May 2015 16:50:29 +0300 Subject: Register form + validation --- src/css/forms.less | 3 +++ src/css/style.less | 1 + src/include/head.jade | 3 ++- src/include/layout-main.jade | 2 ++ src/js/Botleagues.js | 4 ++-- src/js/BotleaguesCallback.js | 33 ++++++++++++++++++++++++++++----- src/js/BotleaguesFrontend.js | 21 +++++++++++++++++++++ src/js/forms.js | 1 + src/register.jade | 2 +- 9 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 src/css/forms.less create mode 100644 src/css/style.less (limited to 'src') diff --git a/src/css/forms.less b/src/css/forms.less new file mode 100644 index 0000000..233bde5 --- /dev/null +++ b/src/css/forms.less @@ -0,0 +1,3 @@ +label { + display: block; +} \ No newline at end of file diff --git a/src/css/style.less b/src/css/style.less new file mode 100644 index 0000000..f32a0b2 --- /dev/null +++ b/src/css/style.less @@ -0,0 +1 @@ +@import 'forms.less'; \ No newline at end of file diff --git a/src/include/head.jade b/src/include/head.jade index 63cb17c..b3b12e4 100644 --- a/src/include/head.jade +++ b/src/include/head.jade @@ -5,4 +5,5 @@ meta(http-equiv='X-UA-Compatible', content='IE=edge') meta(name='viewport', content='width=device-width, initial-scale=1') link(rel='stylesheet', href='/assets/css/bootswatch.css', type='text/css') -link(rel='stylesheet', href='/assets/css/font-awesome.css', type='text/css') \ No newline at end of file +link(rel='stylesheet', href='/assets/css/font-awesome.css', type='text/css') +link(rel='stylesheet', href='/assets/css/style.css', type='text/css') \ No newline at end of file diff --git a/src/include/layout-main.jade b/src/include/layout-main.jade index b680d9f..72331ee 100644 --- a/src/include/layout-main.jade +++ b/src/include/layout-main.jade @@ -20,6 +20,8 @@ html(lang="en") li(role='presentation'): a(href=val,title=key)= key h3 Botleagues + #messages + block content footer.footer: :markdown diff --git a/src/js/Botleagues.js b/src/js/Botleagues.js index efc56d8..f9d34b7 100644 --- a/src/js/Botleagues.js +++ b/src/js/Botleagues.js @@ -7,8 +7,8 @@ Botleagues.request = function(user_options, callback) { endpoint: null, method: 'GET', dataType: 'json', - done: function(data) { - callback(data); + complete: function(data) { + callback(data.responseJSON); } }; for (var name in user_options) { diff --git a/src/js/BotleaguesCallback.js b/src/js/BotleaguesCallback.js index 1efe8d6..f162e7c 100644 --- a/src/js/BotleaguesCallback.js +++ b/src/js/BotleaguesCallback.js @@ -1,9 +1,32 @@ function BotleaguesCallback(){} BotleaguesCallback.register = function(data) { - console.log(data); -}; + $('form.form-register .form-group') + .removeClass('has-feedback has-success has-warning, has-error') + .find('.form-control-feedback').remove(); -BotleaguesCallback.login = function(data) { - console.log(data); -} \ No newline at end of file + if (typeof data.error !== 'undefined') { + BotleaguesFrontend.error({message: data.error, prepend_to: $('form.form-register')}); + if (typeof data.errors !== 'undefined') { + for (var key in data.errors) { + var error_msg = data.errors[key].join('; '); + + $('#register-' + key) + .attr('title', error_msg) + .parent() + .addClass('has-feedback has-error') + .append( + $('') + .addClass('glyphicon glyphicon-remove form-control-feedback') + .attr('aria-hidden', true) + ) + .find('label') + .append( + $('') + .addClass('pull-right text-danger') + .text(error_msg) + ); + } + } + } +}; \ No newline at end of file diff --git a/src/js/BotleaguesFrontend.js b/src/js/BotleaguesFrontend.js index 461ce92..e9ab570 100644 --- a/src/js/BotleaguesFrontend.js +++ b/src/js/BotleaguesFrontend.js @@ -1,5 +1,26 @@ function BotleaguesFrontend(){} +BotleaguesFrontend.error = function(user_options) { + options = { + dismissable: true, + prepend_to: $('#messages'), + type: 'danger' + }; + for (var key in user_options) { + options[key] = user_options[key]; + } + + var html = '
'; + if (options.dismissable === true) + html += '×'; + html += options.message; + html += '
'; + + html = $(html); + + html.prependTo(options.prepend_to).delay(3000).fadeOut().queue(html.remove); +}; + BotleaguesFrontend.login = function() { Botleagues.redirect({ endpoint: 'user/login?redirect=http://local.botleagues.camilstaps.nl/' diff --git a/src/js/forms.js b/src/js/forms.js index 5ad9959..24f0f43 100644 --- a/src/js/forms.js +++ b/src/js/forms.js @@ -7,5 +7,6 @@ $('form.form-register').submit(function(){ 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 index 2aca779..8f79715 100644 --- a/src/register.jade +++ b/src/register.jade @@ -7,7 +7,7 @@ block content .row .col-lg-6 h4 Register - form.form-register + form.form-register(action='#') .form-group label(for="register-email") Email input.form-control#register-email(type='email',name='email',placeholder="Enter email") -- cgit v1.2.3