From 6a5e0a940b7801fa93190ec14f1d4d8e06fae6b4 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Sun, 9 Jun 2024 22:48:49 +0200
Subject: [PATCH] admin page enhancements

---
 frontend/src/layouts/modals/Changes.vue |  4 +---
 frontend/src/views/Admins.vue           | 29 ++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/frontend/src/layouts/modals/Changes.vue b/frontend/src/layouts/modals/Changes.vue
index 9a5dab6..02b26cf 100644
--- a/frontend/src/layouts/modals/Changes.vue
+++ b/frontend/src/layouts/modals/Changes.vue
@@ -5,9 +5,7 @@
         <v-row>
           <v-col>{{ $t('admin.changes') }}</v-col>
           <v-spacer></v-spacer>
-          <v-col cols="auto">
-            <v-icon icon="mdi-close" @click="$emit('close')" />
-          </v-col>
+          <v-col cols="auto"><v-icon icon="mdi-close-box" @click="$emit('close')" /></v-col>
         </v-row>
       </v-card-title>
       <v-divider></v-divider>
diff --git a/frontend/src/views/Admins.vue b/frontend/src/views/Admins.vue
index bea2984..cd87f43 100644
--- a/frontend/src/views/Admins.vue
+++ b/frontend/src/views/Admins.vue
@@ -28,19 +28,19 @@
           <v-row>
             <v-col>{{ $t('admin.date') }}</v-col>
             <v-col dir="ltr">
-              {{ item.lastLogin.split(" ")[0]?? '-' }}
+              {{ item.loginDate }}
             </v-col>
           </v-row>
           <v-row>
             <v-col>{{ $t('admin.time') }}</v-col>
             <v-col dir="ltr">
-              {{ item.lastLogin.split(" ")[1]?? '-' }}
+              {{ item.loginTime }}
             </v-col>
           </v-row>
           <v-row>
             <v-col>IP</v-col>
             <v-col dir="ltr">
-              {{ item.lastLogin.split(" ")[2]?? '-' }}
+              {{ item.ip }}
             </v-col>
           </v-row>
         </v-card-text>
@@ -63,12 +63,13 @@
 <script lang="ts" setup>
 import AdminModal from '@/layouts/modals/Admin.vue'
 import ChngModal from '@/layouts/modals/Changes.vue'
+import { i18n } from '@/locales'
 import HttpUtils from '@/plugins/httputil'
 import { Ref, ref, inject, onMounted } from 'vue'
 
 const loading:Ref = inject('loading')?? ref(false)
 
-const users = ref([])
+const users = ref(<any[]>[])
 
 onMounted(async () => {loadData()})
 
@@ -77,10 +78,28 @@ const loadData = async () => {
   const msg = await HttpUtils.get('api/users')
   loading.value = false
   if (msg.success) {
-    users.value = msg.obj
+    console.log(msg.obj)
+    msg.obj.forEach((u:any) => {
+      const lastLogin = u.lastLogin.split(" ")
+      const localLastLogin = lastLogin.length > 2 ? dateFormatted(Date.parse(lastLogin[0] + " " + lastLogin[1])) : "- -"
+      const loginDateTime = localLastLogin.split(" ")
+      users.value.push({
+        id: u.id,
+        username: u.username,
+        loginDate: loginDateTime[0],
+        loginTime: loginDateTime[1],
+        ip: lastLogin[2]?? "-",
+      })
+    })
   }
 }
 
+const dateFormatted = (dt: number): string => {
+  const locale = i18n.global.locale.value.replace('zh', 'zh-')
+  const date = new Date(dt)
+  return date.toLocaleString(locale)
+}
+
 const editModal = ref({
   visible: false,
   user: {},