diff --git a/.eslintrc.js b/.eslintrc.js
index a0b479f..c155c70 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,19 +1,21 @@
+/* eslint-env node */
+require('@rushstack/eslint-patch/modern-module-resolution')
+
 module.exports = {
   root: true,
-  env: {
-    node: true,
-    es2022: true,
-  },
   extends: [
     'plugin:vue/vue3-essential',
     'eslint:recommended',
-    '@vue/typescript/recommended',
+    '@vue/eslint-config-typescript/recommended',
+    '@vue/eslint-config-prettier/recommended',
   ],
-  rules: {
-    // 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    // 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
-    'vue/no-mutating-props': 'off',
-    // '@typescript-eslint/no-explicit-any': 'off',
-    'vue/multi-word-component-names': 'off'
+  overrides: [
+    {
+      files: ['cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}'],
+      extends: ['plugin:cypress/recommended'],
+    },
+  ],
+  parserOptions: {
+    ecmaVersion: 'latest',
   },
 }
diff --git a/src/App.vue b/src/App.vue
index 1643ebf..ea76d33 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,4 @@
 <template>
-  <!-- <nav>
-    <router-link to="/">Home</router-link> |
-    <router-link to="/about">About</router-link>
-  </nav> -->
   <router-view />
 </template>
 
diff --git a/src/api/api.checkin.ts b/src/api/api.checkin.ts
index 011bfb1..474c052 100644
--- a/src/api/api.checkin.ts
+++ b/src/api/api.checkin.ts
@@ -1,7 +1,7 @@
-import env from "./index";
-const leave = `${env.API_URI}/leave`;
+import env from './index'
+const leave = `${env.API_URI}/leave`
 
 export default {
   checkin: () => `${leave}/check-in`,
   checkTime: () => `${leave}/check-time`,
-};
+}
diff --git a/src/components/FormTime.vue b/src/components/FormTime.vue
index e7d4939..4c10ec1 100644
--- a/src/components/FormTime.vue
+++ b/src/components/FormTime.vue
@@ -139,71 +139,71 @@ watch(
 )
 </script>
 <template>
-<div class="col-12 row">
-  <div class="row q-col-q-gutter-sm q-pa-md">
-    <q-card
-      flat
-      bordered
-      :class="$q.screen.gt.xs ? 'col-12 bg-grey-1' : 'col-12 '"
-    >
-      <q-card-section class="bg-primary text-white q-pa-sm">
-        <div class="text-center text-bold">เวลาปัจจุบัน</div>
-      </q-card-section>
-      <!-- <div class="q-pa-sm text-primary">เวลาปัจจุบัน</div> -->
-      <q-card-section class="text-center q-pa-sm">
-        <div class="row q-gutter-md">
-          <div class="col">{{ date2Thai(dateNow) }}</div>
-          <div class="col">{{ timeNoew }}</div>
+  <div class="col-12 row">
+    <div class="row q-col-q-gutter-sm q-pa-md">
+      <q-card
+        flat
+        bordered
+        :class="$q.screen.gt.xs ? 'col-12 bg-grey-1' : 'col-12 '"
+      >
+        <q-card-section class="bg-primary text-white q-pa-sm">
+          <div class="text-center text-bold">เวลาปัจจุบัน</div>
+        </q-card-section>
+        <!-- <div class="q-pa-sm text-primary">เวลาปัจจุบัน</div> -->
+        <q-card-section class="text-center q-pa-sm">
+          <div class="row q-gutter-md">
+            <div class="col">{{ date2Thai(dateNow) }}</div>
+            <div class="col">{{ timeNoew }}</div>
+          </div>
+        </q-card-section>
+      </q-card>
+
+      <q-card flat bordered class="col-12 q-mt-sm">
+        <div class="q-pa-sm">
+          <datepicker
+            :readonly="!statusAction"
+            v-model="date"
+            :locale="'th'"
+            :enableTimePicker="false"
+            week-start="0"
+            autoApply
+            outlined
+            lazy-rules
+            :max-date="dateNow"
+          >
+            <template #year="{ year }">
+              {{ year + 543 }}
+            </template>
+            <template #year-overlay-value="{ value }">
+              {{ parseInt(value + 543) }}
+            </template>
+            <template #trigger>
+              <q-input
+                :readonly="!statusAction"
+                ref="dateRef"
+                outlined
+                dense
+                :model-value="date !== null ? date2Thai(new Date(date)) : null"
+                :label="`${'วันที่ขอแก้ไข'}`"
+                format-header="YYYY-MM-DD"
+                lazy-rules
+                :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
+                hide-bottom-space
+              >
+                <template v-slot:prepend>
+                  <q-icon
+                    name="event"
+                    class="cursor-pointer"
+                    style="color: var(--q-primary)"
+                  >
+                  </q-icon>
+                </template>
+              </q-input> </template
+          ></datepicker>
         </div>
-      </q-card-section>
-    </q-card>
+      </q-card>
 
-    <q-card flat bordered class="col-12 q-mt-sm">
-      <div class="q-pa-sm">
-        <datepicker
-          :readonly="!statusAction"
-          v-model="date"
-          :locale="'th'"
-          :enableTimePicker="false"
-          week-start="0"
-          autoApply
-          outlined
-          lazy-rules
-          :max-date="dateNow"
-        >
-          <template #year="{ year }">
-            {{ year + 543 }}
-          </template>
-          <template #year-overlay-value="{ value }">
-            {{ parseInt(value + 543) }}
-          </template>
-          <template #trigger>
-            <q-input
-              :readonly="!statusAction"
-              ref="dateRef"
-              outlined
-              dense
-              :model-value="date !== null ? date2Thai(new Date(date)) : null"
-              :label="`${'วันที่ขอแก้ไข'}`"
-              format-header="YYYY-MM-DD"
-              lazy-rules
-              :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
-              hide-bottom-space
-            >
-              <template v-slot:prepend>
-                <q-icon
-                  name="event"
-                  class="cursor-pointer"
-                  style="color: var(--q-primary)"
-                >
-                </q-icon>
-              </template>
-            </q-input> </template
-        ></datepicker>
-      </div>
-    </q-card>
-
-    <!-- <q-card flat bordered class="q-pa-sm col-12 bg-grey-1 q-mt-sm" v-else>
+      <!-- <q-card flat bordered class="q-pa-sm col-12 bg-grey-1 q-mt-sm" v-else>
       <div class="row q-gutter-md text-grey-5">
         <div class="col-1">
           <q-icon color="grey-5" name="calendar_today" />
@@ -212,66 +212,66 @@ watch(
       </div>
     </q-card> -->
 
-    <q-card
-      flat
-      bordered
-      class="q-pa-sm col-12 q-mt-sm"
-      :style="{
-        borderColor: checkstatusBox ? '#B22222' : '',
-        borderWidth: checkstatusBox ? '2px' : '',
-      }"
-    >
-      <div class="row q-gutter-xs">
-        <div class="col-12">
-          <q-checkbox
-            keep-color
-            color="primary"
-            v-model="checkboxIn"
-            label="ขอแก้ไขเวลาเข้างาน"
-          />
-        </div>
-        <div class="col-12">
-          <q-checkbox
-            keep-color
-            v-model="checkboxOut"
-            color="primary"
-            label="ขอแก้ไขเวลาออกงาน"
-          />
+      <q-card
+        flat
+        bordered
+        class="q-pa-sm col-12 q-mt-sm"
+        :style="{
+          borderColor: checkstatusBox ? '#B22222' : '',
+          borderWidth: checkstatusBox ? '2px' : '',
+        }"
+      >
+        <div class="row q-gutter-xs">
+          <div class="col-12">
+            <q-checkbox
+              keep-color
+              color="primary"
+              v-model="checkboxIn"
+              label="ขอแก้ไขเวลาเข้างาน"
+            />
+          </div>
+          <div class="col-12">
+            <q-checkbox
+              keep-color
+              v-model="checkboxOut"
+              color="primary"
+              label="ขอแก้ไขเวลาออกงาน"
+            />
+          </div>
         </div>
+      </q-card>
+
+      <div
+        v-if="checkstatusBox"
+        class="text-red-9 q-pa-sm"
+        style="font-size: 10px"
+      >
+        กรุณาเลือก
       </div>
-    </q-card>
 
-    <div
-      v-if="checkstatusBox"
-      class="text-red-9 q-pa-sm"
-      style="font-size: 10px"
-    >
-      กรุณาเลือก
+      <q-card flat bordered class="q-pa-sm col-12 q-mt-sm">
+        <q-input
+          ref="reasonRef"
+          dense
+          outlined
+          v-model="reason"
+          label="เหตุผล"
+          type="textarea"
+          :rows="4"
+          label-color="grey-5"
+          :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
+          lazy-rules
+          hide-bottom-space
+          class="custom-aqua-border"
+        />
+      </q-card>
+    </div>
+    <div class="col-12"><q-separator /></div>
+    <div class="row col-12 q-pa-sm">
+      <q-space />
+      <q-btn color="secondary" label="บันทึก" @click="onCkickSave" />
     </div>
-
-    <q-card flat bordered class="q-pa-sm col-12 q-mt-sm">
-      <q-input
-        ref="reasonRef"
-        dense
-        outlined
-        v-model="reason"
-        label="เหตุผล"
-        type="textarea"
-        :rows="4"
-        label-color="grey-5"
-        :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
-        lazy-rules
-        hide-bottom-space
-        class="custom-aqua-border"
-      />
-    </q-card>
   </div>
-  <div class="col-12"><q-separator /></div>
-  <div class="row col-12 q-pa-sm">
-    <q-space/>
-    <q-btn color="secondary" label="บันทึก" @click="onCkickSave" />
-  </div>
-</div>
 </template>
 
 <style scoped></style>
diff --git a/src/components/PopUp.vue b/src/components/PopUp.vue
index 0d0cc37..feba530 100644
--- a/src/components/PopUp.vue
+++ b/src/components/PopUp.vue
@@ -41,7 +41,7 @@ watch(
 </script>
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card :style="$q.screen.lt.sm ? 'width: 100%;': 'width: 320px;'">
+    <q-card :style="$q.screen.lt.sm ? 'width: 100%;' : 'width: 320px;'">
       <HeaderPopup :title="props.title" :clickClose="clickClosePopup" />
       <FormTime
         :dataById="data"
diff --git a/src/plugins/auth.ts b/src/plugins/auth.ts
index 7d6e7f2..0c895be 100644
--- a/src/plugins/auth.ts
+++ b/src/plugins/auth.ts
@@ -1,71 +1,71 @@
-const ACCESS_TOKEN = "BMAHRIS_KEYCLOAK_IDENTITY";
+const ACCESS_TOKEN = 'BMAHRIS_KEYCLOAK_IDENTITY'
 
 interface AuthResponse {
-  access_token: string;
-  expires_in: number;
-  refresh_token: string;
+  access_token: string
+  expires_in: number
+  refresh_token: string
 }
 
-const authenticated = async () => ((await getToken()) ? true : false);
+const authenticated = async () => ((await getToken()) ? true : false)
 
 async function setAuthen(r: AuthResponse) {
-  await setCookie(ACCESS_TOKEN, r.access_token, r.expires_in);
-  window.location.href = "/";
+  await setCookie(ACCESS_TOKEN, r.access_token, r.expires_in)
+  window.location.href = '/'
 }
 
 async function logout() {
-  await deleteCookie(ACCESS_TOKEN);
-  window.location.href = "/login";
+  await deleteCookie(ACCESS_TOKEN)
+  window.location.href = '/login'
 }
 
 async function getToken() {
-  return getCookie(ACCESS_TOKEN);
+  return getCookie(ACCESS_TOKEN)
 }
 // 2024-08-29T02:55:13.000Z
 function setCookie(name: string, value: any, time: number) {
-  let expires = "";
+  let expires = ''
   if (time) {
-    const date = new Date();
-    date.setTime(date.getTime() + time * 1000);
+    const date = new Date()
+    date.setTime(date.getTime() + time * 1000)
     // date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
-    expires = "; expires=" + date.toUTCString();
+    expires = '; expires=' + date.toUTCString()
   }
-  document.cookie = name + "=" + (value || "") + expires + "; path=/";
+  document.cookie = name + '=' + (value || '') + expires + '; path=/'
 }
 
 function getCookie(name: string) {
-  const nameEQ = name + "=";
-  const ca = document.cookie.split(";");
+  const nameEQ = name + '='
+  const ca = document.cookie.split(';')
   for (let i = 0; i < ca.length; i++) {
-    let c = ca[i];
-    while (c.charAt(0) == " ") c = c.substring(1, c.length);
-    if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);
+    let c = ca[i]
+    while (c.charAt(0) == ' ') c = c.substring(1, c.length)
+    if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length)
   }
-  return null;
+  return null
 }
 
 function deleteCookie(name: string) {
-  document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`;
+  document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`
 }
 
 async function tokenParsed() {
-  const token = await getCookie(ACCESS_TOKEN);
+  const token = await getCookie(ACCESS_TOKEN)
   if (!token) {
-    return null;
+    return null
   }
-  const base64Url = token.split(".")[1];
-  const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
+  const base64Url = token.split('.')[1]
+  const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
   const jsonPayload = decodeURIComponent(
     window
       .atob(base64)
-      .split("")
+      .split('')
       .map(function (c) {
-        return "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2);
+        return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)
       })
-      .join("")
-  );
+      .join('')
+  )
 
-  return JSON.parse(jsonPayload);
+  return JSON.parse(jsonPayload)
 }
 
-export { getToken, authenticated, logout, setAuthen, tokenParsed };
+export { getToken, authenticated, logout, setAuthen, tokenParsed }
diff --git a/src/plugins/filters.ts b/src/plugins/filters.ts
index d5f1d75..04d9354 100644
--- a/src/plugins/filters.ts
+++ b/src/plugins/filters.ts
@@ -3,20 +3,18 @@
  *   - ไฟล์นี้จะไว้เก็บฟังก์ชันง่าย ๆ พวก Helper Functions ทั้งหลาย
  */
 
-
 const filters = {
-
-	/**
-	 * ฟังก์ชัน compactNumber ใช้แปลงตัวเลขยาว ๆ ให้กลายเป็นเลขสั้น ๆ แบบที่พวก Social Media ชอบใช้กัน เช่น 1,000 แปลงเป็น 1K หรือ 1,000,000 แปลงเป็น 1M
-	 * วิธีใช้ : {{ $filters.compactNumber(value) }}
-	 *
-	 * @param val รับค่าพารามิเตอร์เป็นตัวแปรชนิดตัวเลข
-	 * @returns คืนค่าเป็นตัวเลขที่แปลงค่าแล้ว
-	 */
-	compactNumber (val: number) {
-		const formatter = Intl.NumberFormat('en', { notation: 'compact'})
-		return formatter.format(val)
-	}
+  /**
+   * ฟังก์ชัน compactNumber ใช้แปลงตัวเลขยาว ๆ ให้กลายเป็นเลขสั้น ๆ แบบที่พวก Social Media ชอบใช้กัน เช่น 1,000 แปลงเป็น 1K หรือ 1,000,000 แปลงเป็น 1M
+   * วิธีใช้ : {{ $filters.compactNumber(value) }}
+   *
+   * @param val รับค่าพารามิเตอร์เป็นตัวแปรชนิดตัวเลข
+   * @returns คืนค่าเป็นตัวเลขที่แปลงค่าแล้ว
+   */
+  compactNumber(val: number) {
+    const formatter = Intl.NumberFormat('en', { notation: 'compact' })
+    return formatter.format(val)
+  },
 }
 
-export default filters;
\ No newline at end of file
+export default filters
diff --git a/src/views/ErrorNotFoundPage.vue b/src/views/ErrorNotFoundPage.vue
index 1be87ac..4768349 100644
--- a/src/views/ErrorNotFoundPage.vue
+++ b/src/views/ErrorNotFoundPage.vue
@@ -1,9 +1,9 @@
 <script lang="ts">
-import { defineComponent } from "vue";
+import { defineComponent } from 'vue'
 
 export default defineComponent({
-  name: "Error404NotFound",
-});
+  name: 'Error404NotFound',
+})
 </script>
 
 <template>
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index ec75625..67a4714 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -384,7 +384,7 @@ onMounted(async () => {
                       v-model="model"
                       :options="options"
                       prefix="ระบุสถานที่ :"
-                      :rules="[(val) => !!val || 'กรุณาระบุสถานที่']"
+                      :rules="[(val:string) => !!val || 'กรุณาระบุสถานที่']"
                       lazy-rules
                       @update:model-value="selectLocation()"
                       hide-bottom-space
@@ -401,7 +401,7 @@ onMounted(async () => {
                       outlined
                       v-model="useLocation"
                       label="ระบุสถานที่"
-                      :rules="[(val) => !!val || 'กรุณาระบุสถานที่']"
+                      :rules="[(val:string) => !!val || 'กรุณาระบุสถานที่']"
                       lazy-rules
                     />
                   </div>
@@ -470,9 +470,7 @@ onMounted(async () => {
             {{ date2Thai(Thai) }}
           </div>
           <div class="row col-12 justify-center q-pt-sm">
-            <div class="text-h3 text-weight-bold">
-              <!-- {{ formattedH }}<span class="q-ma-md">:</span> -->
-            </div>
+            <div class="text-h3 text-weight-bold"></div>
             <div class="text-h3 text-weight-bold">{{ timeChickin }}</div>
           </div>
         </div>
diff --git a/src/views/MainView.vue b/src/views/MainView.vue
index 0c0871c..a819da1 100644
--- a/src/views/MainView.vue
+++ b/src/views/MainView.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
 import { ref, onMounted, watch } from 'vue'
-import { useRouter } from 'vue-router'
 import { useQuasar } from 'quasar'
+import { useRouter } from 'vue-router'
+
 import http from '@/plugins/http'
 import config from '@/app.config'
 import { logout, tokenParsed } from '@/plugins/auth'
+import { useCounterMixin } from '@/stores/mixin'
 
 import type { notiType } from '@/interface/index/Main'
-import { useCounterMixin } from '@/stores/mixin'
 import type { Noti } from '@/interface/response/Main'
 
 const mixin = useCounterMixin()
@@ -15,21 +16,32 @@ const { date2Thai, hideLoader, messageError, dialogRemove, success } = mixin
 const router = useRouter()
 const $q = useQuasar()
 
-const notiTrigger = ref<boolean>(false)
-const notiList = ref<notiType[]>([])
-const totalNotiList = ref<number>(0)
-const totalNoti = ref<number>(0)
-/*** ฟังก์ชั่นดึงข้อมูลจำนวนการแจ้งเตือน */
-async function fetchTotolNotificate() {
-  await http.get(config.API.msgNotificateTotal).then((res) => {
-    totalNoti.value = res.data.result
-  })
-  // .catch((err) => {
-  //   messageError($q, err)
-  // })
+const fullName = ref<string>('') //ชื่อผู้ใช้งาน
+const notiTrigger = ref<boolean>(false) // เปิด,ปิดรายการ
+const notiList = ref<notiType[]>([]) // รายการแจ้งเตือน
+const totalNotiList = ref<number>(0) //จำนวนการรายการแจ้งเตือน
+const totalNoti = ref<number>(0) //จำนวนการแจ้งเตือน
+const statusLoad = ref<boolean>(false) // สถานะการโหลด
+//รูปแบบการแสดงผลของวันที่และเวลา
+const thaiOptions: Intl.DateTimeFormatOptions = {
+  hour: '2-digit',
+  minute: '2-digit',
+}
+
+/**
+ *  ฟังก์ชั่นดึงข้อมูลจำนวนการแจ้งเตือน
+ */
+async function fetchTotolNotificate() {
+  await http
+    .get(config.API.msgNotificateTotal)
+    .then(async (res) => {
+      totalNoti.value = await res.data.result
+    })
+    .catch((err) => {
+      messageError($q, err)
+    })
 }
 
-const statusLoad = ref<boolean>(false)
 /**
  * ฟังก์ชั่นดึงข้อมูลรายการแจ้งเตือน
  * @param index page ที่ต้องการโหลดข้อมูล
@@ -45,7 +57,6 @@ async function fetchNotifications(index: number, type: string) {
       if (type === 'DEL') {
         notiList.value = []
       }
-
       response.map((e: Noti) => {
         list.push({
           id: e.id,
@@ -61,9 +72,9 @@ async function fetchNotifications(index: number, type: string) {
       notiList.value.push(...list)
       statusLoad.value = totalNotiList.value === 0 ? true : false
     })
-  // .catch((err) => {
-  //   messageError($q, err)
-  // })
+    .catch((err) => {
+      messageError($q, err)
+    })
 }
 
 /**
@@ -74,22 +85,24 @@ async function onClickDelete(id: string, index: number) {
   dialogRemove($q, async () => {
     await http
       .delete(config.API.msgId(id))
-      .then(() => {
+      .then(async () => {
         notiList.value.splice(index, 1)
         totalNotiList.value--
+        notiList.value.length === 14 && (await fetchNotifications(1, 'DEL'))
         success($q, 'ลบข้อมูลสำเร็จ')
       })
       .catch((e) => {
         messageError($q, e)
       })
       .finally(async () => {
-        notiList.value.length === 14 && fetchNotifications(1, 'DEL')
         hideLoader()
       })
   })
 }
 
-/** function logout*/
+/**
+ * function logout
+ */
 function onClickLogout() {
   $q.dialog({
     title: 'ยืนยันการออกจากระบบ',
@@ -102,18 +115,14 @@ function onClickLogout() {
   })
 }
 
-const thaiOptions: Intl.DateTimeFormatOptions = {
-  hour: '2-digit',
-  minute: '2-digit',
-}
-
 const page = ref<number>(0)
+
 /**
  * โหลดรายการแจ้งเตือนเพิ่มเมื่อ scroll
  * @param index
  * @param done
  */
-function onLoad(index: any, done: any) {
+function onLoad(index: number, done: Function) {
   if (
     notiList.value.length < totalNotiList.value ||
     (notiList.value.length == 0 && totalNotiList.value === 0)
@@ -140,7 +149,6 @@ watch(
   }
 )
 
-const fullName = ref<string>('')
 onMounted(async () => {
   fetchTotolNotificate()
   const checkTokenParsed = await tokenParsed()
@@ -251,12 +259,6 @@ onMounted(async () => {
                       }}
                       น. <q-space />
                     </q-item-label>
-                    <!-- <q-item-label
-                      caption
-                      class="row items-center text-grey-7"
-                      style="font-size: 12px"
-                      >{{ item.timereceive }}</q-item-label
-                    > -->
                   </q-item-section>
                   <div>
                     <q-btn