Merge branch 'master' into dev

app.vue

@@ -1,8 +1,9 @@
 <script setup>
 const { title, description, image } = useAppConfig()
 useSeoMeta({
-  title,
+  title: title + ' - ' + description,
   description,
+  ogType: 'website',
   ogTitle: title,
   ogDescription: description,
   ogImage: image,
@@ -20,7 +21,7 @@ useHead({
     {
       rel: 'icon',
       type: 'image/png',
-      href: '/sink.png',
+      href: '/icon-192.png',
     },
   ],
 })

components/dashboard/metrics/Locations.vue

@@ -72,7 +72,7 @@ const Tooltip = {
         >
           <VisTopoJSONMap
             :topojson="worldMapTopoJSON"
-            map-feature-name="states"
+            map-feature-name="countries"
           />
           <ChartSingleTooltip
             index="id"

components/home/Cta.vue

@@ -3,7 +3,7 @@
     class="flex flex-col items-center max-w-4xl p-8 mx-auto my-12 text-center bg-black rounded-lg md:px-20 md:py-20"
   >
     <h2 class="text-4xl tracking-tight text-white md:text-6xl">
-      Deployment immediately.
+      Deployment immediately
     </h2>
     <p class="mt-4 text-lg text-slate-400 md:text-xl">
       With just a few simple clicks, you can start deploying without any expenses.
@@ -12,6 +12,7 @@
       <HomeLink
         href="https://github.com/ccbikai/sink?tab=readme-ov-file#%EF%B8%8F-deployment"
         type="inverted"
+        title="Start Deploy"
       >
         Start Deploy
       </HomeLink>

components/home/Hero.vue

@@ -23,6 +23,7 @@ const { title, description } = useAppConfig()
         <HomeLink
           href="/dashboard"
           target="_blank"
+          title="Dashboard"
           class="flex items-center justify-center gap-1"
           rel="noopener"
         >
@@ -36,6 +37,7 @@ const { title, description } = useAppConfig()
           type="outline"
           rel="noopener"
           href="https://github.com/ccbikai/sink"
+          title="Github"
           class="flex items-center justify-center gap-1"
           target="_blank"
         >

components/home/Twitter.vue

@@ -7,6 +7,7 @@ import { ArrowRight } from 'lucide-vue-next'
   <a
     href="https://x.com/ccbikai"
     target="_blank"
+    title="X(Twitter)"
     class="inline-flex items-center px-3 py-1 mx-auto my-4 space-x-1 text-sm font-medium rounded-lg bg-muted"
   >
     <XIcon class="w-4 h-4" />

components/layouts/Footer.vue

@@ -12,12 +12,14 @@ onMounted(() => {
     <div class="container flex flex-col items-center py-8 mx-auto sm:flex-row">
       <a
         href="/"
-        class="text-xl font-black leading-none text-gray-900 dark:text-gray-100 select-none logo"
+        class="text-xl font-black leading-none text-gray-900 select-none dark:text-gray-100 logo"
+        title="Sink"
       >Sink</a>
       <a
         class="mt-4 text-sm text-gray-500 sm:ml-4 sm:pl-4 sm:border-l sm:border-gray-200 sm:mt-0"
         href="https://html.zone"
         target="_blank"
+        title="HTML.ZONE"
       >
         &copy; {{ new Date().getFullYear() }} Products of HTML.ZONE
       </a>

components/layouts/Header.vue

@@ -15,6 +15,7 @@ const showMenu = ref(false)
         <div class="flex items-center justify-start w-1/4 h-full pr-4">
           <a
             href="/"
+            title="Sink"
             class="flex items-center py-4 space-x-2 text-xl font-black text-gray-900 dark:text-gray-100 md:py-0"
           >
             <span
@@ -40,7 +41,7 @@ const showMenu = ref(false)
           >
             <a
               href="/"
-              target="_blank"
+              title="Sink"
               class="inline-flex items-center w-auto h-16 px-4 text-xl font-black leading-none text-gray-900 dark:text-gray-100 md:hidden"
             >
               <span
@@ -61,10 +62,12 @@ const showMenu = ref(false)
               <a
                 class="w-full px-6 py-2 mr-0 text-gray-700 cursor-pointer dark:text-gray-300 md:px-3 md:mr-2 lg:mr-3 md:w-auto"
                 href="/dashboard"
+                title="Sink Dashboard"
               >Dashboard</a>
               <a
                 href="https://github.com/ccbikai/sink"
                 target="_blank"
+                title="Github"
                 class="inline-flex items-center w-full px-6 py-3 text-sm font-medium leading-4 text-white bg-gray-900 md:px-3 md:w-auto md:rounded-full hover:bg-gray-800 focus:outline-none md:focus:ring-2 focus:ring-0 focus:ring-offset-2 focus:ring-gray-800"
               >
                 <GitHubIcon

eslint.config.mjs

@@ -5,7 +5,7 @@ import withNuxt from './.nuxt/eslint.config.mjs'
 export default withNuxt(
   // antfu(),
   {
-    ignores: ['components/ui', 'scripts/build-map.js'],
+    ignores: ['components/ui'],
   },
   {
     rules: {

scripts/build-map.js

@@ -1,19 +1,5 @@
 import { writeFileSync } from 'fs'
 import { join } from 'path'
 import { WorldMapSimplestTopoJSON } from '@unovis/ts/maps.js'
-import WorldMapTopoJSON from '../assets/location/world.json' with { type: "json" } // https://github.com/apache/echarts/blob/master/test/data/map/json/world.json
 
-WorldMapTopoJSON.objects.states.geometries.map((state) => {
-  const name = state.properties.name
-  const country = WorldMapSimplestTopoJSON.objects.countries.geometries.find(country => country.properties.name === name)
-  state.id = state.name || ''
-  if (country) {
-    state.id = country.id || ''
-    state.properties = {
-      name: country.properties?.name || '',
-    }
-  }
-  return state
-})
-
-writeFileSync(join(import.meta.dirname, '../public/world.json'), JSON.stringify(WorldMapTopoJSON), 'utf8')
+writeFileSync(join(import.meta.dirname, '../public/world.json'), JSON.stringify(WorldMapSimplestTopoJSON), 'utf8')