Skip to content

high-priority UI fixes #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jenny-s51 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

high-priority UI fixes #111

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
da0a432
fixes password complexity popup -- now with specifics
jenny-s51 Nov 7, 2018
45b91de
success when editing user as root
jenny-s51 Nov 22, 2018
329c231
password complexity now static on sign-up/create-user pgs.
jenny-s51 Nov 28, 2018
38cb627
password complexity requirements now stated @ top of "create user" pg.
jenny-s51 Dec 3, 2018
45eb2cd
password standards now static on top of "sign up" and "create user" pgs.
jenny-s51 Dec 3, 2018
a9751de
can now edit root
jenny-s51 Dec 6, 2018
4dd1848
Merge remote-tracking branch 'origin/jenny_UI-fixes' into fixed_editu…
jenny-s51 Dec 6, 2018
242b168
fixed error
jenny-s51 Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion anchor/server/api/signup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ internals.applyRoutes = function (server, next) {
Joi.validate(request.payload.password, new PasswordComplexity(complexityOptions), (err, value) => {

if (err) {
return reply(Boom.conflict('Password does not meet complexity standards'));
return reply(Boom.conflict('Your password must have at least 8 characters, 1 lowercase letter, 1 uppercase letter, 1 numeric character, and 1 symbol.'));
}
reply(true);
});
Expand Down
18 changes: 10 additions & 8 deletions anchor/server/api/users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ internals.applyRoutes = function (server, next) {
path: '/table/users',
config: {
auth: {
strategies: ['simple', 'jwt', 'session']
strategies: ['simple', 'jwt', 'session'],
scope: ['root','clinician', 'analyst', 'admin']
},
validate: {
query: Joi.any()
Expand Down Expand Up @@ -56,8 +57,8 @@ internals.applyRoutes = function (server, next) {
}
query.inStudy = true;
}
//clinician
else if (accessLevel === 2) {
//clinician or root
else if (accessLevel === 2 || accessLevel === 3) {

const userAccess = JSON.parse(request.auth.credentials.user.roles.clinician.userAccess);
const patientsObjectIds = [];
Expand All @@ -70,7 +71,7 @@ internals.applyRoutes = function (server, next) {
_id: { $in: patientsObjectIds }
};

//this is the global query object
//this is the global query object
query = filter;
}

Expand Down Expand Up @@ -226,7 +227,7 @@ internals.applyRoutes = function (server, next) {
config: {
auth: {
strategies: ['simple', 'jwt', 'session'],
scope: 'admin'
scope: ['root','admin']
}
},
handler: function (request, reply) {
Expand All @@ -247,6 +248,7 @@ internals.applyRoutes = function (server, next) {
});



server.route({
method: 'GET',
path: '/users/my',
Expand Down Expand Up @@ -338,7 +340,7 @@ internals.applyRoutes = function (server, next) {
Joi.validate(request.payload.password, new PasswordComplexity(complexityOptions), (err, value) => {

if (err) {
return reply(Boom.conflict('Password does not meet complexity standards'));
return reply(Boom.conflict('Your password must have at least 8 characters, 1 lowercase letter, 1 uppercase letter, 1 numeric character, and 1 symbol.'));
}
reply(true);
});
Expand Down Expand Up @@ -394,7 +396,7 @@ internals.applyRoutes = function (server, next) {
config: {
auth: {
strategies: ['simple', 'jwt', 'session'],
scope: 'admin'
scope: ['admin', 'root']
},
validate: {
params: {
Expand Down Expand Up @@ -745,7 +747,7 @@ internals.applyRoutes = function (server, next) {
Joi.validate(request.payload.password, new PasswordComplexity(complexityOptions), (err, value) => {

if (err) {
return reply(Boom.conflict('Password does not meet complexity standards'));
return reply(Boom.conflict('Your password must have at least 8 characters, 1 lowercase letter, 1 uppercase letter, 1 numeric character, and 1 symbol.'));
}
reply(true);
});
Expand Down
2 changes: 1 addition & 1 deletion anchor/server/web/partials/nav.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<a class="nav-link" href="login" style="color:white;">LOGIN</a>
</li>
<li class="nav-item">
<a class="nav-link" href="signup" style="color:white;">SIGNUP</a>
<a class="nav-link" href="signup" style="color:white;">SIGN UP</a>
</li>
</ul>
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion anchor/server/web/partials/notification.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="alert" role="alert" id="alert" style="position: fixed;
top: 7.5%;
left: 10%;
height: 50px;
/* height: 50px; */
width: 80%;
z-index: 999999">
<button type="button" class="close" aria-label="Close" onclick="$('#alert').hide()">
Expand Down
10 changes: 0 additions & 10 deletions anchor/server/web/public/scripts/exercise/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ const schema = Joi.object({

joiToForm('formFields', schema);

// $('#update').click((event) => {
// const exerciseId = window.location.pathname.split('/').pop();
// event.preventDefault();
// const values = {};
// $.each($('#form').serializeArray(), (i, field) => {
// values[field.name] = field.value;
// });

$('#update').click((event) => {
const exerciseId = window.location.pathname.split('/').pop();
event.preventDefault();
Expand All @@ -37,5 +29,3 @@ $('#update').click((event) => {
}
});
});


2 changes: 1 addition & 1 deletion anchor/server/web/templates/signup/signup.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="col-xl-6 col-lg-6">
<div class="card">
<div class="card-body">
<h4 class="card-title">Signup</h4>
<h4 class="card-title">Sign Up</h4>
<form id="signupForm">
<div id="signUpFormFields"></div>
<button id="signup" type="submit" class="btn btn-primary">Sign Up</button>
Expand Down