diff --git a/frontend_management/components/course/AnnouncementsTab.vue b/frontend_management/components/course/AnnouncementsTab.vue
index aa529d46..ab094e2f 100644
--- a/frontend_management/components/course/AnnouncementsTab.vue
+++ b/frontend_management/components/course/AnnouncementsTab.vue
@@ -449,10 +449,7 @@ const deleteAttachment = async (attachmentId: number) => {
   }
 };
 
-const formatDate = (dateStr: string) => {
-  const date = new Date(dateStr);
-  return date.toLocaleDateString('th-TH', { day: 'numeric', month: 'short', year: 'numeric' });
-};
+// Date formatting function is auto-imported from utils/date.ts
 
 const formatFileSize = (bytes: number) => {
   if (bytes < 1024) return bytes + ' B';
diff --git a/frontend_management/components/course/ApprovalHistoryTab.vue b/frontend_management/components/course/ApprovalHistoryTab.vue
index f1dd8942..335845b3 100644
--- a/frontend_management/components/course/ApprovalHistoryTab.vue
+++ b/frontend_management/components/course/ApprovalHistoryTab.vue
@@ -20,7 +20,7 @@
           v-for="item in history"
           :key="item.id"
           :title="titleMap[item.action] || item.action"
-          :subtitle="formatDate(item.created_at)"
+          :subtitle="formatDateTime(item.created_at)"
           :color="colorMap[item.action] || 'grey'"
           :icon="iconMap[item.action] || 'circle'"
         >
@@ -91,12 +91,7 @@ const getActorName = (item: ApprovalHistory) => {
   return actor.username || actor.email || 'Unknown User';
 };
 
-const formatDate = (dateString: string) => {
-  return new Date(dateString).toLocaleString('th-TH', {
-    dateStyle: 'medium',
-    timeStyle: 'short'
-  });
-};
+// Date formatting function is auto-imported from utils/date.ts
 
 onMounted(() => {
   fetchHistory();
diff --git a/frontend_management/components/course/QuizResultsTab.vue b/frontend_management/components/course/QuizResultsTab.vue
index eef37e63..c69ebe97 100644
--- a/frontend_management/components/course/QuizResultsTab.vue
+++ b/frontend_management/components/course/QuizResultsTab.vue
@@ -450,14 +450,7 @@ const openStudentDetail = async (studentId: number) => {
 
 const formatDate = (dateStr: string) => {
   if (!dateStr) return '-';
-  const date = new Date(dateStr);
-  return date.toLocaleDateString('th-TH', { 
-    day: 'numeric', 
-    month: 'short', 
-    year: 'numeric',
-    hour: '2-digit',
-    minute: '2-digit'
-  });
+  return formatDateTime(dateStr);
 };
 
 // Lifecycle
diff --git a/frontend_management/components/course/StudentsTab.vue b/frontend_management/components/course/StudentsTab.vue
index 9a8f4416..1cd742b1 100644
--- a/frontend_management/components/course/StudentsTab.vue
+++ b/frontend_management/components/course/StudentsTab.vue
@@ -404,8 +404,7 @@ const getStudentStatusLabel = (status: string) => {
 };
 
 const formatEnrollDate = (dateStr: string) => {
-  const date = new Date(dateStr);
-  return date.toLocaleDateString('th-TH', { day: 'numeric', month: 'short', year: 'numeric' });
+  return formatDate(dateStr);
 };
 
 const getLessonTypeIcon = (type: string) => {
@@ -436,8 +435,7 @@ const formatVideoTime = (seconds: number) => {
 
 const formatCompletedDate = (dateStr: string | null) => {
   if (!dateStr) return '-';
-  const date = new Date(dateStr);
-  return date.toLocaleDateString('th-TH', { day: 'numeric', month: 'short' });
+  return formatDate(dateStr);
 };
 
 // Fetch on mount
diff --git a/frontend_management/pages/admin/audit-log/index.vue b/frontend_management/pages/admin/audit-log/index.vue
index 1214298e..8038014e 100644
--- a/frontend_management/pages/admin/audit-log/index.vue
+++ b/frontend_management/pages/admin/audit-log/index.vue
@@ -136,7 +136,7 @@
       <!-- Created At Custom Column -->
       <template v-slot:body-cell-created_at="props">
         <q-td :props="props">
-            {{ formatDate(props.value) }}
+            {{ formatDateTime(props.value) }}
         </q-td>
       </template>
 
@@ -169,7 +169,7 @@
             </div>
              <div>
               <div class="text-subtitle2 text-grey">Date & Time</div>
-              <div>{{ formatDate(selectedLog.created_at) }}</div>
+              <div>{{ formatDateTime(selectedLog.created_at) }}</div>
             </div>
 
             <div>
@@ -241,7 +241,7 @@
 </template>
 
 <script setup lang="ts">
-import { useQuasar } from 'quasar';
+import { useQuasar, type QTableColumn } from 'quasar';
 import { adminService, type AuditLog, type AuditLogStats } from '~/services/admin.service';
 
 definePageMeta({
@@ -284,15 +284,15 @@ const pagination = ref({
 });
 
 // Table setup
-const columns = [
-  { name: 'id', label: 'ID', field: 'id', align: 'left', style: 'width: 60px' },
-  { name: 'action', label: 'Action', field: 'action', align: 'left' },
-  { name: 'user', label: 'User', field: 'user', align: 'left' },
-  { name: 'entity_type', label: 'Entity Type', field: 'entity_type', align: 'left' },
-  { name: 'entity_id', label: 'Entity ID', field: 'entity_id', align: 'left' },
+const columns: QTableColumn[] = [
+  { name: 'id', label: 'ID', field: 'id', align: 'left' as const, style: 'width: 60px' },
+  { name: 'action', label: 'Action', field: 'action', align: 'left' as const },
+  { name: 'user', label: 'User', field: 'user', align: 'left' as const },
+  { name: 'entity_type', label: 'Entity Type', field: 'entity_type', align: 'left' as const },
+  { name: 'entity_id', label: 'Entity ID', field: 'entity_id', align: 'left' as const },
 
-  { name: 'created_at', label: 'Date & Time', field: 'created_at', align: 'left' },
-  { name: 'actions', label: '', field: 'actions', align: 'center' }
+  { name: 'created_at', label: 'Date & Time', field: 'created_at', align: 'left' as const },
+  { name: 'actions', label: '', field: 'actions', align: 'center' as const }
 ];
 
 // Actions options (for filtering)
@@ -416,10 +416,7 @@ const tryFormatJson = (str: string | null) => {
     }
 };
 
-const formatDate = (date: string) => {
-  if (!date) return '-';
-  return new Date(date).toLocaleString('th-TH');
-};
+// Date formatting function is auto-imported from utils/date.ts
 
 const ACTION_COLOR_MAP: Record<string, string> = {
   DELETE: 'negative',
@@ -453,10 +450,12 @@ onMounted(() => {
 :deep(input[type=number]::-webkit-outer-spin-button),
 :deep(input[type=number]::-webkit-inner-spin-button) {
   -webkit-appearance: none;
+  appearance: none;
   margin: 0;
 }
 
 :deep(input[type=number]) {
   -moz-appearance: textfield;
+  appearance: textfield;
 }
 </style>
diff --git a/frontend_management/pages/admin/categories/index.vue b/frontend_management/pages/admin/categories/index.vue
index 02648abe..a909a66f 100644
--- a/frontend_management/pages/admin/categories/index.vue
+++ b/frontend_management/pages/admin/categories/index.vue
@@ -233,13 +233,7 @@ const fetchCategories = async () => {
   }
 };
 
-const formatDate = (date: string) => {
-  return new Date(date).toLocaleDateString('th-TH', {
-    year: 'numeric',
-    month: '2-digit',
-    day: '2-digit'
-  });
-};
+// Date formatting function is auto-imported from utils/date.ts
 
 const resetForm = () => {
   form.value = {
diff --git a/frontend_management/pages/admin/courses/[id].vue b/frontend_management/pages/admin/courses/[id].vue
index 07c78cf3..38bc7612 100644
--- a/frontend_management/pages/admin/courses/[id].vue
+++ b/frontend_management/pages/admin/courses/[id].vue
@@ -356,23 +356,7 @@ const getActionColor = (action: string) => {
   return colors[action] || 'grey';
 };
 
-const formatDate = (date: string) => {
-  return new Date(date).toLocaleDateString('th-TH', {
-    day: 'numeric',
-    month: 'short',
-    year: '2-digit'
-  });
-};
-
-const formatDateTime = (date: string) => {
-  return new Date(date).toLocaleDateString('th-TH', {
-    day: 'numeric',
-    month: 'short',
-    year: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit'
-  });
-};
+// Date formatting functions are auto-imported from utils/date.ts
 
 const confirmApprove = () => {
   if (!course.value) return;
diff --git a/frontend_management/pages/admin/courses/pending.vue b/frontend_management/pages/admin/courses/pending.vue
index e5871eb9..a12b174a 100644
--- a/frontend_management/pages/admin/courses/pending.vue
+++ b/frontend_management/pages/admin/courses/pending.vue
@@ -135,7 +135,7 @@
                 <div v-if="course.latest_submission" class="mt-3 text-sm text-gray-500">
                   <q-icon name="send" size="16px" class="mr-1" />
                   ส่งโดย {{ course.latest_submission.submitter.username }} 
-                  เมื่อ {{ formatDate(course.latest_submission.created_at) }}
+                  เมื่อ {{ formatDateTime(course.latest_submission.created_at) }}
                 </div>
               </div>
 
@@ -203,7 +203,7 @@
         <template v-slot:body-cell-submitted_at="props">
           <q-td :props="props">
             <div v-if="props.row.latest_submission">
-               <div class="text-xs">{{ formatDate(props.row.latest_submission.created_at) }}</div>
+               <div class="text-xs">{{ formatDateTime(props.row.latest_submission.created_at) }}</div>
                <div class="text-xs text-gray-500">โดย {{ props.row.latest_submission.submitter.username }}</div>
             </div>
             <span v-else>-</span>
@@ -298,15 +298,7 @@ const getPrimaryInstructor = (course: PendingCourse) => {
   return primary?.user.username || course.creator.username;
 };
 
-const formatDate = (date: string) => {
-  return new Date(date).toLocaleDateString('th-TH', {
-    day: 'numeric',
-    month: 'short',
-    year: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit'
-  });
-};
+// Date formatting function is auto-imported from utils/date.ts
 
 const viewCourse = (course: PendingCourse) => {
   router.push(`/admin/courses/${course.id}`);
diff --git a/frontend_management/pages/admin/index.vue b/frontend_management/pages/admin/index.vue
index e4e6b968..6dd6cc34 100644
--- a/frontend_management/pages/admin/index.vue
+++ b/frontend_management/pages/admin/index.vue
@@ -136,7 +136,7 @@
                     <p class="text-xs text-gray-500 truncate">โดย {{ course.creator.username }}</p>
                 </div>
                 <div class="text-xs text-gray-400 whitespace-nowrap">
-                    {{ formatDate(course.created_at) }}
+                    {{ formatDateStr(course.created_at) }}
                 </div>
             </div>
         </div>
@@ -170,7 +170,7 @@
                         <span class="text-gray-600 mx-1">{{ formatAction(log.action) }}</span>
                         <span class="text-primary-700 font-medium">{{ log.entity_type }} #{{ log.entity_id }}</span>
                     </p>
-                    <p class="text-xs text-gray-400 mt-0.5">{{ formatDate(log.created_at) }}</p>
+                    <p class="text-xs text-gray-400 mt-0.5">{{ formatDateStr(log.created_at) }}</p>
                 </div>
             </div>
         </div>
@@ -254,14 +254,7 @@ const fetchDashboardData = async () => {
 };
 
 // Utilities
-const formatDate = (date: string) => {
-    return new Date(date).toLocaleDateString('th-TH', {
-        day: 'numeric',
-        month: 'short',
-        hour: '2-digit',
-        minute: '2-digit'
-    });
-};
+const formatDateStr = (date: string) => formatDateTime(date);
 
 const getActionIcon = (action: string) => {
     if (action.includes('create')) return 'add_circle';
diff --git a/frontend_management/pages/admin/profile/index.vue b/frontend_management/pages/admin/profile/index.vue
index 32dee306..8a876162 100644
--- a/frontend_management/pages/admin/profile/index.vue
+++ b/frontend_management/pages/admin/profile/index.vue
@@ -301,7 +301,7 @@
 
 <script setup lang="ts">
 import { useQuasar } from 'quasar';
-import { userService, type UserProfileResponse } from '~/services/user.service';
+import { userService } from '~/services/user.service';
 import { authService } from '~/services/auth.service';
 
 definePageMeta({
@@ -368,20 +368,8 @@ const getRoleLabel = (role: string) => {
   return labels[role] || role;
 };
 
-const formatDate = (date: string, includeTime = true) => {
-  const options: Intl.DateTimeFormatOptions = {
-    day: 'numeric',
-    month: 'short',
-    year: '2-digit'
-  };
-
-  if (includeTime) {
-    options.hour = '2-digit';
-    options.minute = '2-digit';
-  }
-
-  return new Date(date).toLocaleDateString('th-TH', options);
-};
+// Use formatting utilities from utils/date.ts
+// Format functions are auto-imported
 
 // Avatar upload
 const avatarInputRef = ref<HTMLInputElement | null>(null);
@@ -425,8 +413,8 @@ const handleAvatarUpload = async (event: Event) => {
   try {
     const response = await userService.uploadAvatar(file);
     
-    // Re-fetch profile to get presigned URL from backend
-    await fetchProfile();
+    // Force refresh profile cache and update local state
+    await fetchProfile(true);
     
     $q.notify({
       type: 'positive',
@@ -457,8 +445,8 @@ const handleUpdateProfile = async () => {
       phone: editForm.value.phone || null
     });
     
-    // Refresh profile data from API
-    await fetchProfile();
+    // Force refresh profile cache and update local state
+    await fetchProfile(true);
     
     $q.notify({
       type: 'positive',
@@ -546,25 +534,29 @@ watch(showEditModal, (newVal) => {
   }
 });
 
-// Fetch profile from API
-const fetchProfile = async () => {
+// Helper to map fullProfile to local profile state
+const mapProfileData = (data: typeof authStore.fullProfile) => {
+  if (!data) return;
+  profile.value = {
+    fullName: `${data.profile.first_name} ${data.profile.last_name}`,
+    email: data.email,
+    emailVerified: !!data.email_verified_at,
+    username: data.username,
+    phone: data.profile.phone || '',
+    role: data.role.code,
+    roleName: data.role.name.th,
+    avatar: '',
+    avatarUrl: data.profile.avatar_url,
+    createdAt: data.created_at
+  };
+};
+
+// Fetch profile — uses auth store cache, force=true to refresh
+const fetchProfile = async (force = false) => {
   loading.value = true;
   try {
-    const data = await userService.getProfile();
-    
-    // Map API response to profile
-    profile.value = {
-      fullName: `${data.profile.first_name} ${data.profile.last_name}`,
-      email: data.email,
-      emailVerified: !!data.email_verified_at,
-      username: data.username,
-      phone: data.profile.phone || '',
-      role: data.role.code,
-      roleName: data.role.name.th,
-      avatar: '',
-      avatarUrl: data.profile.avatar_url,
-      createdAt: data.created_at
-    };
+    await authStore.fetchUserProfile(force);
+    mapProfileData(authStore.fullProfile);
   } catch (error) {
     $q.notify({
       type: 'negative',
@@ -576,7 +568,7 @@ const fetchProfile = async () => {
   }
 };
 
-// Load profile on mount
+// Load profile on mount (uses cache if available)
 onMounted(() => {
   fetchProfile();
 });
diff --git a/frontend_management/pages/admin/users/index.vue b/frontend_management/pages/admin/users/index.vue
index 8635e0c3..bbf6fac2 100644
--- a/frontend_management/pages/admin/users/index.vue
+++ b/frontend_management/pages/admin/users/index.vue
@@ -324,13 +324,7 @@ const getRoleBadgeColor = (roleCode: string) => {
   return colors[roleCode] || 'grey';
 };
 
-const formatDate = (date: string) => {
-  return new Date(date).toLocaleDateString('th-TH', {
-    day: 'numeric',
-    month: 'short',
-    year: '2-digit'
-  });
-};
+// Date formatting function is auto-imported from utils/date.ts
 
 const viewUser = (user: AdminUserResponse) => {
   selectedUser.value = user;
diff --git a/frontend_management/pages/instructor/courses/index.vue b/frontend_management/pages/instructor/courses/index.vue
index 43b17b11..946162f0 100644
--- a/frontend_management/pages/instructor/courses/index.vue
+++ b/frontend_management/pages/instructor/courses/index.vue
@@ -449,13 +449,7 @@ const getStatusLabel = (status: string) => {
   return labels[status] || status;
 };
 
-const formatDate = (date: string) => {
-  return new Date(date).toLocaleDateString('th-TH', {
-    day: 'numeric',
-    month: 'short',
-    year: '2-digit'
-  });
-};
+// Date formatting function is auto-imported from utils/date.ts
 // Clone Dialog
 const cloneDialog = ref(false);
 const cloneLoading = ref(false);
diff --git a/frontend_management/pages/instructor/index.vue b/frontend_management/pages/instructor/index.vue
index 16411da0..d53015d7 100644
--- a/frontend_management/pages/instructor/index.vue
+++ b/frontend_management/pages/instructor/index.vue
@@ -64,21 +64,21 @@
     <div class="grid grid-cols-1 md:grid-cols-3 gap-6 mb-8">
       <q-card class="p-6 text-center">
         <div class="text-4xl font-bold text-primary-600 mb-2">
-          {{ instructorStore.stats.totalCourses }}
+          {{ stats.totalCourses }}
         </div>
         <div class="text-gray-600">หลักสูตรทั้งหมด</div>
       </q-card>
 
       <q-card class="p-6 text-center">
         <div class="text-4xl font-bold text-secondary-600 mb-2">
-          {{ instructorStore.stats.totalStudents }}
+          {{ stats.totalStudents }}
         </div>
         <div class="text-gray-600">ผู้เรียนทั้งหมด</div>
       </q-card>
 
       <q-card class="p-6 text-center">
         <div class="text-4xl font-bold text-accent-600 mb-2">
-          {{ instructorStore.stats.completedStudents }}
+          {{ stats.completedStudents }}
         </div>
         <div class="text-gray-600">เรียนจบแล้ว</div>
       </q-card>
@@ -96,28 +96,28 @@
                 <q-icon name="check_circle" color="green" size="24px" />
                 <span class="font-medium text-gray-700">เผยแพร่แล้ว</span>
               </div>
-              <span class="text-2xl font-bold text-green-600">{{ instructorStore.courseStatusCounts.approved }}</span>
+              <span class="text-2xl font-bold text-green-600">{{ courseStatusCounts.approved }}</span>
             </div>
             <div class="flex items-center justify-between p-3 bg-orange-50 rounded-lg">
               <div class="flex items-center gap-3">
                 <q-icon name="hourglass_empty" color="orange" size="24px" />
                 <span class="font-medium text-gray-700">รอตรวจสอบ</span>
               </div>
-              <span class="text-2xl font-bold text-orange-600">{{ instructorStore.courseStatusCounts.pending }}</span>
+              <span class="text-2xl font-bold text-orange-600">{{ courseStatusCounts.pending }}</span>
             </div>
             <div class="flex items-center justify-between p-3 bg-gray-50 rounded-lg">
               <div class="flex items-center gap-3">
                 <q-icon name="edit_note" color="grey" size="24px" />
                 <span class="font-medium text-gray-700">แบบร่าง</span>
               </div>
-              <span class="text-2xl font-bold text-gray-600">{{ instructorStore.courseStatusCounts.draft }}</span>
+              <span class="text-2xl font-bold text-gray-600">{{ courseStatusCounts.draft }}</span>
             </div>
-            <div v-if="instructorStore.courseStatusCounts.rejected > 0" class="flex items-center justify-between p-3 bg-red-50 rounded-lg">
+            <div v-if="courseStatusCounts.rejected > 0" class="flex items-center justify-between p-3 bg-red-50 rounded-lg">
               <div class="flex items-center gap-3">
                 <q-icon name="cancel" color="red" size="24px" />
                 <span class="font-medium text-gray-700">ถูกปฏิเสธ</span>
               </div>
-              <span class="text-2xl font-bold text-red-600">{{ instructorStore.courseStatusCounts.rejected }}</span>
+              <span class="text-2xl font-bold text-red-600">{{ courseStatusCounts.rejected }}</span>
             </div>
           </div>
         </q-card-section>
@@ -138,7 +138,7 @@
 
           <div class="space-y-4">
             <q-card
-              v-for="course in instructorStore.recentCourses"
+              v-for="course in recentCourses"
               :key="course.id"
               class="cursor-pointer hover:shadow-md transition"
               @click="router.push(`/instructor/courses/${course.id}`)"
@@ -172,6 +172,7 @@
 
 <script setup lang="ts">
 import { useQuasar } from 'quasar';
+import { instructorService } from '~/services/instructor.service';
 
 definePageMeta({
   layout: 'instructor',
@@ -179,10 +180,32 @@ definePageMeta({
 });
 
 const authStore = useAuthStore();
-const instructorStore = useInstructorStore();
 const router = useRouter();
 const $q = useQuasar();
 
+// Dashboard local state
+const stats = ref({
+  totalCourses: 0,
+  totalStudents: 0,
+  completedStudents: 0
+});
+
+const courseStatusCounts = ref({
+  approved: 0,
+  pending: 0,
+  draft: 0,
+  rejected: 0
+});
+
+const recentCourses = ref<{
+  id: number;
+  title: string;
+  students: number;
+  lessons: number;
+  icon: string;
+  thumbnail: string | null;
+}[]>([]);
+
 // Navigation functions
 const goToProfile = () => {
   router.push('/instructor/profile');
@@ -212,9 +235,41 @@ const handleLogout = () => {
   });
 };
 
-// Fetch dashboard data on mount
+// Fetch dashboard data
+const fetchDashboardData = async () => {
+  try {
+    const [courses, studentStats] = await Promise.all([
+      instructorService.getCourses(),
+      instructorService.getMyStudentsStats()
+    ]);
+
+    stats.value.totalCourses = courses.length;
+    stats.value.totalStudents = studentStats.total_students;
+    stats.value.completedStudents = studentStats.total_completed;
+
+    courseStatusCounts.value = {
+      approved: courses.filter(c => c.status === 'APPROVED').length,
+      pending: courses.filter(c => c.status === 'PENDING').length,
+      draft: courses.filter(c => c.status === 'DRAFT').length,
+      rejected: courses.filter(c => c.status === 'REJECTED').length
+    };
+
+    recentCourses.value = courses.slice(0, 3).map(course => ({
+      id: course.id,
+      title: course.title.th,
+      students: 0,
+      lessons: 0,
+      icon: 'book',
+      thumbnail: course.thumbnail_url || null
+    }));
+  } catch (error) {
+    console.error('Failed to fetch dashboard data:', error);
+  }
+};
+
+// Fetch data on mount
 onMounted(() => {
-  instructorStore.fetchDashboardData();
   authStore.fetchUserProfile();
+  fetchDashboardData();
 });
 </script>
diff --git a/frontend_management/pages/instructor/profile/index.vue b/frontend_management/pages/instructor/profile/index.vue
index 6a602a39..6a36b365 100644
--- a/frontend_management/pages/instructor/profile/index.vue
+++ b/frontend_management/pages/instructor/profile/index.vue
@@ -301,7 +301,7 @@
 
 <script setup lang="ts">
 import { useQuasar } from 'quasar';
-import { userService, type UserProfileResponse } from '~/services/user.service';
+import { userService } from '~/services/user.service';
 import { authService } from '~/services/auth.service';
 
 definePageMeta({
@@ -368,20 +368,8 @@ const getRoleLabel = (role: string) => {
   return labels[role] || role;
 };
 
-const formatDate = (date: string, includeTime = true) => {
-  const options: Intl.DateTimeFormatOptions = {
-    day: 'numeric',
-    month: 'short',
-    year: '2-digit'
-  };
-
-  if (includeTime) {
-    options.hour = '2-digit';
-    options.minute = '2-digit';
-  }
-
-  return new Date(date).toLocaleDateString('th-TH', options);
-};
+// Use formatting utilities from utils/date.ts
+// Format functions are auto-imported
 
 // Avatar upload
 const avatarInputRef = ref<HTMLInputElement | null>(null);
@@ -425,8 +413,8 @@ const handleAvatarUpload = async (event: Event) => {
   try {
     const response = await userService.uploadAvatar(file);
     
-    // Re-fetch profile to get presigned URL from backend
-    await fetchProfile();
+    // Force refresh profile cache and update local state
+    await fetchProfile(true);
     
     $q.notify({
       type: 'positive',
@@ -457,8 +445,8 @@ const handleUpdateProfile = async () => {
       phone: editForm.value.phone || null
     });
     
-    // Refresh profile data from API
-    await fetchProfile();
+    // Force refresh profile cache and update local state
+    await fetchProfile(true);
     
     $q.notify({
       type: 'positive',
@@ -546,25 +534,29 @@ watch(showEditModal, (newVal) => {
   }
 });
 
-// Fetch profile from API
-const fetchProfile = async () => {
+// Helper to map fullProfile to local profile state
+const mapProfileData = (data: typeof authStore.fullProfile) => {
+  if (!data) return;
+  profile.value = {
+    fullName: `${data.profile.first_name} ${data.profile.last_name}`,
+    email: data.email,
+    emailVerified: !!data.email_verified_at,
+    username: data.username,
+    phone: data.profile.phone || '',
+    role: data.role.code,
+    roleName: data.role.name.th,
+    avatar: '',
+    avatarUrl: data.profile.avatar_url,
+    createdAt: data.created_at
+  };
+};
+
+// Fetch profile — uses auth store cache, force=true to refresh
+const fetchProfile = async (force = false) => {
   loading.value = true;
   try {
-    const data = await userService.getProfile();
-    
-    // Map API response to profile
-    profile.value = {
-      fullName: `${data.profile.first_name} ${data.profile.last_name}`,
-      email: data.email,
-      emailVerified: !!data.email_verified_at,
-      username: data.username,
-      phone: data.profile.phone || '',
-      role: data.role.code,
-      roleName: data.role.name.th,
-      avatar: '',
-      avatarUrl: data.profile.avatar_url,
-      createdAt: data.created_at
-    };
+    await authStore.fetchUserProfile(force);
+    mapProfileData(authStore.fullProfile);
   } catch (error) {
     $q.notify({
       type: 'negative',
@@ -576,7 +568,7 @@ const fetchProfile = async () => {
   }
 };
 
-// Load profile on mount
+// Load profile on mount (uses cache if available)
 onMounted(() => {
   fetchProfile();
 });
diff --git a/frontend_management/stores/auth.ts b/frontend_management/stores/auth.ts
index 3858242a..c789eaf3 100644
--- a/frontend_management/stores/auth.ts
+++ b/frontend_management/stores/auth.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
 import { authService } from '~/services/auth.service';
-import { userService } from '~/services/user.service';
+import { userService, type UserProfileResponse } from '~/services/user.service';
 
 interface User {
     id: string;
@@ -15,7 +15,8 @@ export const useAuthStore = defineStore('auth', {
     state: () => ({
         user: null as User | null,
         token: null as string | null,
-        isAuthenticated: false
+        isAuthenticated: false,
+        fullProfile: null as UserProfileResponse | null
     }),
 
     getters: {
@@ -61,6 +62,7 @@ export const useAuthStore = defineStore('auth', {
             this.user = null;
             this.token = null;
             this.isAuthenticated = false;
+            this.fullProfile = null;
 
             // Clear cookies
             const tokenCookie = useCookie('token');
@@ -126,10 +128,16 @@ export const useAuthStore = defineStore('auth', {
             }
         },
 
-        async fetchUserProfile() {
+        async fetchUserProfile(force = false) {
+            // Skip if already cached (unless force refresh)
+            if (!force && this.fullProfile) return;
+
             try {
                 const response = await userService.getProfile();
 
+                // Cache raw API response
+                this.fullProfile = response;
+
                 // Update local user state
                 this.user = {
                     id: response.id.toString(),
diff --git a/frontend_management/stores/instructor.ts b/frontend_management/stores/instructor.ts
deleted file mode 100644
index cf8e2152..00000000
--- a/frontend_management/stores/instructor.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { defineStore } from 'pinia';
-import { instructorService } from '~/services/instructor.service';
-
-interface Course {
-    id: number;
-    title: string;
-    students: number;
-    lessons: number;
-    icon: string;
-    thumbnail: string | null;
-}
-
-interface DashboardStats {
-    totalCourses: number;
-    totalStudents: number;
-    completedStudents: number;
-}
-
-interface CourseStatusCounts {
-    approved: number;
-    pending: number;
-    draft: number;
-    rejected: number;
-}
-
-export const useInstructorStore = defineStore('instructor', {
-    state: () => ({
-        stats: {
-            totalCourses: 0,
-            totalStudents: 0,
-            completedStudents: 0
-        } as DashboardStats,
-
-        courseStatusCounts: {
-            approved: 0,
-            pending: 0,
-            draft: 0,
-            rejected: 0
-        } as CourseStatusCounts,
-
-        recentCourses: [] as Course[],
-        loading: false
-    }),
-
-    getters: {
-        getDashboardStats: (state) => state.stats,
-        getRecentCourses: (state) => state.recentCourses
-    },
-
-    actions: {
-        async fetchDashboardData() {
-            this.loading = true;
-            try {
-                // Fetch courses and student stats in parallel
-                const [courses, studentStats] = await Promise.all([
-                    instructorService.getCourses(),
-                    instructorService.getMyStudentsStats()
-                ]);
-
-                // Update student stats from dedicated API
-                this.stats.totalCourses = courses.length;
-                this.stats.totalStudents = studentStats.total_students;
-                this.stats.completedStudents = studentStats.total_completed;
-
-                // Update course status counts
-                this.courseStatusCounts = {
-                    approved: courses.filter(c => c.status === 'APPROVED').length,
-                    pending: courses.filter(c => c.status === 'PENDING').length,
-                    draft: courses.filter(c => c.status === 'DRAFT').length,
-                    rejected: courses.filter(c => c.status === 'REJECTED').length
-                };
-
-                // Build recent courses list (first 3) from existing data
-                this.recentCourses = courses.slice(0, 3).map(course => ({
-                    id: course.id,
-                    title: course.title.th,
-                    students: 0,
-                    lessons: 0,
-                    icon: 'book',
-                    thumbnail: course.thumbnail_url || null
-                }));
-            } catch (error) {
-                console.error('Failed to fetch dashboard data:', error);
-            } finally {
-                this.loading = false;
-            }
-        }
-    }
-});
diff --git a/frontend_management/utils/date.ts b/frontend_management/utils/date.ts
new file mode 100644
index 00000000..1ce80cda
--- /dev/null
+++ b/frontend_management/utils/date.ts
@@ -0,0 +1,33 @@
+/**
+ * Format a date string into Thai locale format (Date only)
+ * Example: 10 ม.ค. 67
+ */
+export const formatDate = (date: string | Date | null | undefined): string => {
+    if (!date) return '-';
+
+    const d = typeof date === 'string' ? new Date(date) : date;
+
+    return d.toLocaleDateString('th-TH', {
+        day: 'numeric',
+        month: 'short',
+        year: '2-digit'
+    });
+};
+
+/**
+ * Format a date string into Thai locale format (Date and Time)
+ * Example: 10 ม.ค. 67 14:30
+ */
+export const formatDateTime = (date: string | Date | null | undefined): string => {
+    if (!date) return '-';
+
+    const d = typeof date === 'string' ? new Date(date) : date;
+
+    return d.toLocaleDateString('th-TH', {
+        day: 'numeric',
+        month: 'short',
+        year: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit'
+    });
+};