From da0a4322470f1f0494d8c674c514d8ad0546d56f Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel12@gmail.com>
Date: Tue, 6 Nov 2018 19:48:42 -0500
Subject: [PATCH 1/7] fixes password complexity popup -- now with specifics

---
 anchor/server/api/signup.js                          | 2 +-
 anchor/server/api/users.js                           | 6 +++---
 anchor/server/web/partials/nav.handlebars            | 2 +-
 anchor/server/web/partials/notification.handlebars   | 2 +-
 anchor/server/web/templates/signup/signup.handlebars | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/anchor/server/api/signup.js b/anchor/server/api/signup.js
index e7e750d..ad9f421 100644
--- a/anchor/server/api/signup.js
+++ b/anchor/server/api/signup.js
@@ -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);
           });
diff --git a/anchor/server/api/users.js b/anchor/server/api/users.js
index 4dbe101..3332ead 100644
--- a/anchor/server/api/users.js
+++ b/anchor/server/api/users.js
@@ -70,7 +70,7 @@ internals.applyRoutes = function (server, next) {
           _id: { $in: patientsObjectIds }
         };
 
-        //this is the global query object 
+        //this is the global query object
         query = filter;
       }
 
@@ -338,7 +338,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);
             });
@@ -745,7 +745,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);
           });
diff --git a/anchor/server/web/partials/nav.handlebars b/anchor/server/web/partials/nav.handlebars
index 677dd6b..81dc8a7 100644
--- a/anchor/server/web/partials/nav.handlebars
+++ b/anchor/server/web/partials/nav.handlebars
@@ -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}}
diff --git a/anchor/server/web/partials/notification.handlebars b/anchor/server/web/partials/notification.handlebars
index ca4ac2f..de65bf1 100644
--- a/anchor/server/web/partials/notification.handlebars
+++ b/anchor/server/web/partials/notification.handlebars
@@ -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()">
diff --git a/anchor/server/web/templates/signup/signup.handlebars b/anchor/server/web/templates/signup/signup.handlebars
index 601ed87..5c9ad99 100644
--- a/anchor/server/web/templates/signup/signup.handlebars
+++ b/anchor/server/web/templates/signup/signup.handlebars
@@ -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>

From 45b91de4afb436f041b0bbc7516acb6e9b2cb1fb Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel12@gmail.com>
Date: Thu, 22 Nov 2018 17:03:37 -0500
Subject: [PATCH 2/7] success when editing user as root

---
 anchor/server/api/users.js                        | 12 +++++++-----
 anchor/server/web/public/scripts/exercise/edit.js | 10 ----------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/anchor/server/api/users.js b/anchor/server/api/users.js
index 3332ead..2773d94 100644
--- a/anchor/server/api/users.js
+++ b/anchor/server/api/users.js
@@ -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()
@@ -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 = [];
@@ -226,7 +227,7 @@ internals.applyRoutes = function (server, next) {
     config: {
       auth: {
         strategies: ['simple', 'jwt', 'session'],
-        scope: 'admin'
+        scope: ['root','admin']
       }
     },
     handler: function (request, reply) {
@@ -247,6 +248,7 @@ internals.applyRoutes = function (server, next) {
   });
 
 
+
   server.route({
     method: 'GET',
     path: '/users/my',
@@ -394,7 +396,7 @@ internals.applyRoutes = function (server, next) {
     config: {
       auth: {
         strategies: ['simple', 'jwt', 'session'],
-        scope: 'admin'
+        scope: ['admin', 'root']
       },
       validate: {
         params: {
diff --git a/anchor/server/web/public/scripts/exercise/edit.js b/anchor/server/web/public/scripts/exercise/edit.js
index c6be724..8c421d1 100644
--- a/anchor/server/web/public/scripts/exercise/edit.js
+++ b/anchor/server/web/public/scripts/exercise/edit.js
@@ -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();
@@ -37,5 +29,3 @@ $('#update').click((event) => {
     }
   });
 });
-
-

From 329c23112bedc95dd55d99285ad54dafd5ceb2fb Mon Sep 17 00:00:00 2001
From: jenny-s51 <jshandel12@gmail.com>
Date: Wed, 28 Nov 2018 15:38:42 -0500
Subject: [PATCH 3/7] password complexity now static on sign-up/create-user
 pgs.

---
 anchor/server/web/public/css/createUser.css          | 7 +++++++
 anchor/server/web/public/scripts/users/create.js     | 4 ++--
 anchor/server/web/templates/signup/signup.handlebars | 5 ++---
 anchor/server/web/templates/users/create.handlebars  | 2 ++
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 anchor/server/web/public/css/createUser.css

diff --git a/anchor/server/web/public/css/createUser.css b/anchor/server/web/public/css/createUser.css
new file mode 100644
index 0000000..52c3065
--- /dev/null
+++ b/anchor/server/web/public/css/createUser.css
@@ -0,0 +1,7 @@
+.complexity {
+  margin-top: -237px;
+  margin-left: 22px;
+  font-size: 13px;
+  color: grey;
+  position: relative;
+}
diff --git a/anchor/server/web/public/scripts/users/create.js b/anchor/server/web/public/scripts/users/create.js
index 1d1379d..4dd0177 100644
--- a/anchor/server/web/public/scripts/users/create.js
+++ b/anchor/server/web/public/scripts/users/create.js
@@ -4,8 +4,8 @@ const schema = Joi.object({
   name: Joi.string().required(),
   email: Joi.string().email().lowercase().required(),
   username: Joi.string().token().lowercase().invalid('root').required(),
-  password: Joi.string().required().min(8).regex(/^[A-Z]+[a-z]+[0-9]+$/, '1 Uppercase, 1 lowercase, 1 number'),
-  confirmPassword: Joi.string().required().min(8).regex(/^[A-Z]+[a-z]+[0-9]+$/, '1 Uppercase, 1 lowercase, 1 number')
+  password: Joi.string().required(),
+  confirmPassword: Joi.string().required()
 });
 joiToForm('formFields',schema);
 
diff --git a/anchor/server/web/templates/signup/signup.handlebars b/anchor/server/web/templates/signup/signup.handlebars
index 5c9ad99..ff317fe 100644
--- a/anchor/server/web/templates/signup/signup.handlebars
+++ b/anchor/server/web/templates/signup/signup.handlebars
@@ -10,6 +10,7 @@
           </form>
         </div>
       </div>
+      <div class="complexity">8-20 characters, 1 lowercase, 1 uppercase, 1 special character</div>
     </div>
   </div>
 </div>
@@ -18,7 +19,5 @@
     background-color: #bbb;
   }
 </style>
-<script>
-
-</script>
 <script type="text/javascript" src="public/scripts/signup.js"></script>
+<link rel= stylesheet type="text/css" href="public/css/createUser.css">
diff --git a/anchor/server/web/templates/users/create.handlebars b/anchor/server/web/templates/users/create.handlebars
index f02384b..c5c71df 100644
--- a/anchor/server/web/templates/users/create.handlebars
+++ b/anchor/server/web/templates/users/create.handlebars
@@ -13,8 +13,10 @@
             </form>
           </div>
         </div>
+        <div class="complexity">8-20 characters, 1 lowercase, 1 uppercase, 1 special character</div>
       </div>
     </div>
   </div>
 </div>
 <script type="text/javascript" src="public/scripts/users/create.js"></script>
+<link rel= stylesheet type="text/css" href="public/css/createUser.css">

From 38cb627467951e9bb107c2bbf4f4fe23ca8e48c8 Mon Sep 17 00:00:00 2001
From: Eugenia <eugenia@bu.edu>
Date: Mon, 3 Dec 2018 11:03:21 -0500
Subject: [PATCH 4/7] password complexity requirements now stated @ top of
 "create user" pg.

---
 anchor/server/web/public/css/createUser.css   | 27 ++++++++++++++++---
 .../web/templates/users/create.handlebars     |  4 +--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/anchor/server/web/public/css/createUser.css b/anchor/server/web/public/css/createUser.css
index 52c3065..bd7f8d1 100644
--- a/anchor/server/web/public/css/createUser.css
+++ b/anchor/server/web/public/css/createUser.css
@@ -1,7 +1,26 @@
 .complexity {
-  margin-top: -237px;
-  margin-left: 22px;
-  font-size: 13px;
-  color: grey;
+  margin-top: -700px;
+   /* margin-left: 30px; */
+  font-size: 20px;
+  color: black;
   position: relative;
 }
+
+.form-group{
+  padding-bottom: 10px;
+}
+
+hr {
+  margin-bottom: 3rem;
+}
+
+label {
+  /* padding: 15px; */
+  /* margin-left: 0px */
+}
+
+.card {
+  padding-left: 30px;
+  padding-right: 30px;
+  /* padding-top: 30px; */
+}
diff --git a/anchor/server/web/templates/users/create.handlebars b/anchor/server/web/templates/users/create.handlebars
index c5c71df..80050b5 100644
--- a/anchor/server/web/templates/users/create.handlebars
+++ b/anchor/server/web/templates/users/create.handlebars
@@ -6,14 +6,14 @@
         <h3>Create User</h3>
         <hr>
         <div class="card">
-          <div style="padding: 20px">
+          <div style="padding-top: 30px; padding-bottom: 30px">
             <form id="form">
               <div id="formFields"></div>
               <button id="create" type="submit" class="btn btn-primary">Create</button>
             </form>
           </div>
         </div>
-        <div class="complexity">8-20 characters, 1 lowercase, 1 uppercase, 1 special character</div>
+        <div class="complexity">*Password must include 8-20 characters, 1 lowercase, 1 uppercase, and 1 special character*</div>
       </div>
     </div>
   </div>

From 45eb2cd190604a86fff4b0beb377328ff34123b7 Mon Sep 17 00:00:00 2001
From: Eugenia <eugenia@bu.edu>
Date: Mon, 3 Dec 2018 11:34:48 -0500
Subject: [PATCH 5/7] password standards now static on top of "sign up" and
 "create user" pgs.

---
 anchor/server/web/public/css/createUser.css   |  4 +++
 anchor/server/web/public/css/signup.css       | 27 +++++++++++++++++++
 anchor/server/web/public/css/users.css        |  3 +++
 .../web/templates/signup/signup.handlebars    |  5 ++--
 .../web/templates/users/index.handlebars      |  1 +
 5 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 anchor/server/web/public/css/signup.css
 create mode 100644 anchor/server/web/public/css/users.css

diff --git a/anchor/server/web/public/css/createUser.css b/anchor/server/web/public/css/createUser.css
index bd7f8d1..fd2c399 100644
--- a/anchor/server/web/public/css/createUser.css
+++ b/anchor/server/web/public/css/createUser.css
@@ -24,3 +24,7 @@ label {
   padding-right: 30px;
   /* padding-top: 30px; */
 }
+
+body > div.container-fluid.h-100 > div > nav{
+  height: 130%;
+}
diff --git a/anchor/server/web/public/css/signup.css b/anchor/server/web/public/css/signup.css
new file mode 100644
index 0000000..b8cb01d
--- /dev/null
+++ b/anchor/server/web/public/css/signup.css
@@ -0,0 +1,27 @@
+/*
+.card-title {
+  margin-bottom: 10px;
+} */
+
+
+.complexity {
+  margin-top: -620px;
+  margin-left: 23px;
+  font-size: 18px;
+  color: #3e8acc;
+  position: relative
+
+}
+
+hr {
+margin-bottom: 5em;
+}
+
+/* .form-group{
+  padding-bottom: 20px;
+} */
+
+/* label {
+  padding: 20px;
+  margin-left: -20px
+} */
diff --git a/anchor/server/web/public/css/users.css b/anchor/server/web/public/css/users.css
new file mode 100644
index 0000000..8de45f4
--- /dev/null
+++ b/anchor/server/web/public/css/users.css
@@ -0,0 +1,3 @@
+body > div.container-fluid.h-100 > div > nav{
+  height: 170%;
+}
diff --git a/anchor/server/web/templates/signup/signup.handlebars b/anchor/server/web/templates/signup/signup.handlebars
index ff317fe..b28d8a9 100644
--- a/anchor/server/web/templates/signup/signup.handlebars
+++ b/anchor/server/web/templates/signup/signup.handlebars
@@ -4,13 +4,14 @@
       <div class="card">
         <div class="card-body">
           <h4 class="card-title">Sign Up</h4>
+          <hr>
           <form id="signupForm">
             <div id="signUpFormFields"></div>
             <button id="signup" type="submit" class="btn btn-primary">Sign Up</button>
           </form>
         </div>
       </div>
-      <div class="complexity">8-20 characters, 1 lowercase, 1 uppercase, 1 special character</div>
+      <div class="complexity">*Password must include 8-20 characters, 1 lowercase, 1 uppercase, and 1 special character*</div>
     </div>
   </div>
 </div>
@@ -20,4 +21,4 @@
   }
 </style>
 <script type="text/javascript" src="public/scripts/signup.js"></script>
-<link rel= stylesheet type="text/css" href="public/css/createUser.css">
+<link rel="stylesheet" type="text/css" href="public/css/signup.css">
diff --git a/anchor/server/web/templates/users/index.handlebars b/anchor/server/web/templates/users/index.handlebars
index a075061..f916956 100644
--- a/anchor/server/web/templates/users/index.handlebars
+++ b/anchor/server/web/templates/users/index.handlebars
@@ -138,3 +138,4 @@
   });
 </script>
 <script type="text/javascript" src="public/scripts/users/index.js"></script>
+<<link rel= stylesheet type="text/css" href="public/css/users.css">

From a9751dec82d6f17ad46f1258123901e34658c8c3 Mon Sep 17 00:00:00 2001
From: Eugenia <eugenia@bu.edu>
Date: Thu, 6 Dec 2018 15:51:10 -0500
Subject: [PATCH 6/7] can now edit root

---
 anchor/server/api/users.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/anchor/server/api/users.js b/anchor/server/api/users.js
index 2773d94..5b69984 100644
--- a/anchor/server/api/users.js
+++ b/anchor/server/api/users.js
@@ -400,7 +400,8 @@ internals.applyRoutes = function (server, next) {
       },
       validate: {
         params: {
-          id: Joi.string().invalid('000000000000000000000000')
+          id: Joi.string()
+          // .invalid('000000000000000000000000')
         },
         payload: {
           username: Joi.string().token().lowercase().required(),

From 242b16884a2251025f6d30def2a6ba4f11d0722d Mon Sep 17 00:00:00 2001
From: Eugenia <eugenia@bu.edu>
Date: Thu, 6 Dec 2018 15:58:17 -0500
Subject: [PATCH 7/7] fixed error

---
 anchor/server/web/templates/users/index.handlebars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anchor/server/web/templates/users/index.handlebars b/anchor/server/web/templates/users/index.handlebars
index f916956..350d83d 100644
--- a/anchor/server/web/templates/users/index.handlebars
+++ b/anchor/server/web/templates/users/index.handlebars
@@ -138,4 +138,4 @@
   });
 </script>
 <script type="text/javascript" src="public/scripts/users/index.js"></script>
-<<link rel= stylesheet type="text/css" href="public/css/users.css">
+<link rel= stylesheet type="text/css" href="public/css/users.css">