From 019f7988ad2071c5d55c3119906b1bf1320705e7 Mon Sep 17 00:00:00 2001
From: yingfeng <yingfeng@iu.edu>
Date: Wed, 3 Jul 2024 10:17:39 -0400
Subject: [PATCH 1/2] AMP-3276: rename routes that share same name

---
 src/router.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/router.js b/src/router.js
index 67800df..e3ab9b1 100644
--- a/src/router.js
+++ b/src/router.js
@@ -195,7 +195,7 @@ var router = new Router({
     },
     {
       path: "/mgm-evaluation/:mgmCategoryId",
-      name: "mgm-evaluation",
+      name: "mgm-evaluation-category",
       component: MGMevaluation,
       meta: {
         authorize: {
@@ -212,7 +212,7 @@ var router = new Router({
     },
     {
       path: "/mgm-evaluation/:mgmCategoryId/:testResultIds",
-      name: "mgm-evaluation",
+      name: "mgm-evaluation-test-result",
       component: TestResultsVisualiz,
       meta: {
         authorize: {
@@ -456,6 +456,7 @@ router.beforeEach(async (to, from, next) => {
   const currentUser = accountService.currentUserValue;
 
   console.log("from: ", from, "\nto: ", to, "\nnext: ", next);
+  console.log("currentUser: ", currentUser);
 
   if (env.getDisableAuth() == "true" || !authorize) {
 	  console.log("router: No auth needed.")
@@ -465,8 +466,9 @@ router.beforeEach(async (to, from, next) => {
     // not logged in so redirect to access-denied page with login link and with the return url
     return router.push({ path: "/access-denied", query: { returnUrl: to.path }});
   } else {
-    // TODO, below API call is to validate auth token, in case the locally stored one is compromised;
-    // there might be better way to achieve this without making such extra API call
+    // TODO
+    // below API call is to validate the auth token before new page is loaded, in case the current login has expired;
+    // there should be better way to achieve this without making such extra API call
     var success = await accountService.validate();
     if (!success) {
       // return next();

From 9af6077d91a9dc34624e283202d8324e96ffcc47 Mon Sep 17 00:00:00 2001
From: yingfeng <yingfeng@iu.edu>
Date: Wed, 3 Jul 2024 11:04:48 -0400
Subject: [PATCH 2/2] AMP-3243: fix color on Modal close button

---
 src/components/shared/Modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/shared/Modal.vue b/src/components/shared/Modal.vue
index d7e62bf..aea21b1 100644
--- a/src/components/shared/Modal.vue
+++ b/src/components/shared/Modal.vue
@@ -16,7 +16,7 @@
         </div>
         <div class="modal-footer my-modal-footer">
           <slot name="footer">
-            <button type="button" class="btn btn-info" @click="close()">
+            <button type="button" class="btn btn-primary" @click="close()">
               Close
             </button>
           </slot>