From 385cf5c9c1b9b96a26aef4c654b37488c59c1646 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Wed, 15 May 2024 14:09:15 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BB=D0=BE=D0=BD=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B1=D0=BB=D1=88=D0=B8=D1=86=D1=8B=20=D0=B2=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BB=D0=B8=D1=87=D0=BD=D1=8B=D0=B9=20=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/app.vue              | 21 +++++++++++++++------
 front/pages/vtk/[slug].vue | 26 ++++++++++++++++++--------
 front/tailwind.config.js   |  2 +-
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/front/app.vue b/front/app.vue
index c67b4b8..2bd7ea7 100644
--- a/front/app.vue
+++ b/front/app.vue
@@ -3,7 +3,6 @@ const links = [[
   {
     label: 'Состояние вендотеков',
     icon: 'i-heroicons-credit-card',
-    to: '/vtk',
   },
   { label: 'Офис', to: '/vtk/office' },
   { label: 'Парк', to: '/vtk/park' },
@@ -12,7 +11,6 @@ const links = [[
   {
     label: 'Вебхуки битрикса',
     icon: 'i-heroicons-clipboard-document-list',
-    to: '/bx'
   },
   { label: 'Gitea', to: '/bx/gitea' },
   { label: 'Tg', to: '/bx/tg' },
@@ -20,14 +18,25 @@ const links = [[
 </script>
 
 <template>
-  <div class="container grid gap-4 sm:grid-cols-2 lg:grid-cols-4">
+  <div class="container grid gap-4 grid-cols-2 lg:grid-cols-4">
     <div class="col-span-4">
-      <div class="center">svs-tech.pro</div>
+      <div class="px-2 text-xl flex gap-4 align-center justify-between">
+        <h1 class="text-2xl font-extrabold">svs-tech.pro</h1>
+        <div class="flex gap-4">
+          <a href="https://git.svs-tech.pro/" label="git" target="_blank">
+            <UIcon name="i-simple-icons-git" dynamic />
+          </a>
+          <a href="https://bitwarden.svs-tech.pro/" label="bitwarden" target="_blank">
+            <UIcon name="i-simple-icons-bitwarden" dynamic />
+          </a>
+          <a href="https://crm.svs-tech.pro/" label="crm" target="_blank">Битрикс24</a>
+        </div>
+      </div>
     </div>
-    <div class="sm:col-span-4 lg:col-span-1">
+    <div class="col-span-4 lg:col-span-1">
       <UVerticalNavigation :links="links" />
     </div>
-    <div class="sm:col-span-1 lg:col-span-3">
+    <div class="col-span-4 lg:col-span-3">
       <NuxtPage />
     </div>
   </div>
diff --git a/front/pages/vtk/[slug].vue b/front/pages/vtk/[slug].vue
index dce1efc..2bbcf80 100644
--- a/front/pages/vtk/[slug].vue
+++ b/front/pages/vtk/[slug].vue
@@ -13,22 +13,32 @@ const { data, pending, error, status } = await useLazyFetch<APIBody>(`${config.p
         :description="error?.data && error.data.detail ? error.data.detail : error?.statusMessage" />
 
     <UTable v-else :loading="pending" :columns="[
-        { key: 'sn', label: 'Serial Number' },
+        { key: 'status', label: 'Status' },
         { key: 'name', label: 'Name' },
         { key: 'ip', label: 'IP' },
-        { key: 'last_online', label: 'Last Online' }
-    ]" :rows="pending ? [] : data?.data">
-        <template #last_online-data="{ row }">
-            <UIcon name="i-heroicons-check-circle" class="text-green-500 text-xl" v-if="row.last_online == -1" />
-            <span class="flex align-baseline gap-1" v-else>
-                <UIcon name="i-heroicons-x-circle" class="text-red-500 text-xl" />
-                {{ new Date(row.last_online).toLocaleTimeString('ru-RU') }}
+    ]" :rows="pending ? [] : data?.data" :ui="{
+        td: {
+            padding: 'px-2 md:px-4 py-2 md:py-4',
+        },
+    }">
+        <template #status-data="{ row }">
+            <span class="flex align-baseline justify-center gap-1">
+                <UIcon name="i-heroicons-check-circle" class="text-green-500 text-xl" v-if="row.last_online == -1" />
+                <span class="flex align-baseline gap-1" v-else>
+                    <UIcon name="i-heroicons-x-circle" class="text-red-500 text-xl" />
+                    {{ new Date(row.last_online).toLocaleTimeString('ru-RU') }}
+                </span>
             </span>
         </template>
         <template #name-data="{ row }">
             <div class="text-wrap">
+                {{ row.sn }} -
                 {{ row.name }}
             </div>
         </template>
+        <template #ip-data="{ row }">
+            <span v-if="row.ip !== 'Unknown'">{{ row.ip }}</span>
+            <span v-else>-</span>
+        </template>
     </UTable>
 </template>
\ No newline at end of file
diff --git a/front/tailwind.config.js b/front/tailwind.config.js
index 0359338..a4262b2 100644
--- a/front/tailwind.config.js
+++ b/front/tailwind.config.js
@@ -7,6 +7,6 @@ module.exports = {
                 sm: '0.5rem',
                 lg: '2rem'
             }
-        }
+        },
     },
 };
\ No newline at end of file