Merge branch 'warunee-dev' into develop

src/views/MainLayout.vue

@@ -215,7 +215,10 @@ const activeBtn = () => {
  * ยังจับ boolean ผิด จึงต้อง set
  */
 onMounted(async () => {
-  await fetchroleUser(keycloak.tokenParsed.role);
+  if (keycloak.tokenParsed) {
+    await fetchroleUser(keycloak.tokenParsed.role);
+  }
+  
   await getDataNotification();
   myEventHandler(null, false);
   window.addEventListener("resize", (e: any) => {
@@ -715,8 +718,8 @@ const clickDelete = (id: string) => {
                 <q-item-section avatar>
                   <q-avatar size="md" font-size="20px">
                     <q-icon :name="menuItem.key === active
-                        ? menuItem.activeIcon
-                        : menuItem.icon
+                      ? menuItem.activeIcon
+                      : menuItem.icon
                       " />
                   </q-avatar>
                 </q-item-section>