diff --git a/nodejs/bin/www b/nodejs/bin/www index 93acb9a..0b61fb7 100755 --- a/nodejs/bin/www +++ b/nodejs/bin/www @@ -12,7 +12,7 @@ var http = require('http'); * Get port from environment and store in Express. */ -var port = normalizePort(process.env.NODE_PORT || '3000'); +var port = normalizePort(process.env.NODE_PORT || app.conf.port || '3000'); app.set('port', port); /** diff --git a/nodejs/public/css/styles.css b/nodejs/public/css/styles.css index ad05db6..3f72d95 100755 --- a/nodejs/public/css/styles.css +++ b/nodejs/public/css/styles.css @@ -1,13 +1,24 @@ -.hover-effect { - transition: all .5s ease; +*{ + transition: all .4s ease; } -.hover-effect:hover { - color: darkblue; - transition: all .5s ease; +a:hover, button:hover, div.form-group:hover{ + color: inherit; + transition: all .4s ease; background-color: inherit; - -ms-transform: scale(1.1); - -webkit-transform: scale(1.1); - transform: scale(1.1); /* Standard syntax */ + -ms-transform: scale(1.05); + -webkit-transform: scale(1.05); + transform: scale(1.05); /* Standard syntax */ + z-index: 999999; } + +div.card-body{ + padding-left: 1.5em; + padding-right: 1.5em; +} + + +.my-2 > a { + padding-right: .5em; +} \ No newline at end of file diff --git a/nodejs/public/js/val.js b/nodejs/public/js/val.js index 5372bf4..7b19e14 100755 --- a/nodejs/public/js/val.js +++ b/nodejs/public/js/val.js @@ -20,7 +20,7 @@ return; } - $( '' ).html( ' - ' + error_message ).appendTo( $input.parents('.form-group').children( 'label' ) ); + $( '' ).html( ' - ' + error_message ).appendTo( $input.parents('.form-group').children( 'label' ) ); $input.addClass("is-invalid"); failedCount++; return false; @@ -35,7 +35,7 @@ value = $input.val(), //link to input value rule = attr[0]; - $input.parents('.form-group').children( 'label' ).children( 'b' ).remove(); //removes old error + $input.parents('.form-group').children( 'label' ).children( '.jvalidate-error' ).remove(); //removes old error $input.removeClass( "is-invalid" ); //removes is-invalid class //checks if field is required, and length diff --git a/nodejs/routes/auth.js b/nodejs/routes/auth.js index 8cdaa9b..cead2fc 100755 --- a/nodejs/routes/auth.js +++ b/nodejs/routes/auth.js @@ -52,6 +52,7 @@ router.post('/resetpassword/:token', async function(req, res, next){ if(token.is_valid && 86400000+Number(token.created_on) > (new Date).getTime()){ let user = await User.get(token.created_by); await user.setPassword(req.body); + token.update({is_valid: false}); return res.json({ message: 'Password has been changed.' }); diff --git a/nodejs/views/groups.ejs b/nodejs/views/groups.ejs index f7a47cc..1e11270 100644 --- a/nodejs/views/groups.ejs +++ b/nodejs/views/groups.ejs @@ -1,7 +1,7 @@ <%- include('top') %> @@ -155,24 +156,31 @@ currentUser = user; renderProfile(user); renderUserGroups(user); + $('#username').text(user.uid); }); }); +