Compare commits
4
Commits
68aabbb361
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b34adf908d | ||
|
|
f7bcd58ba5 | ||
|
|
6a9b2ca31d | ||
|
|
17a8db543e |
@@ -14,7 +14,4 @@ npm install
|
||||
npm run build
|
||||
```
|
||||
|
||||
Ссылки:
|
||||
|
||||
* [Продакшн](https://uvpn.shop)
|
||||
* [Тест](https://austnv-uvpn-frontend-7aca.twc1.net)
|
||||
https://uvpn.shop
|
||||
|
||||
+2
-3
@@ -1,13 +1,12 @@
|
||||
{
|
||||
"name": "frontend",
|
||||
"version": "0.9.6",
|
||||
"version": "0.9.7",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"preview": "vite preview",
|
||||
"postbuild": "scp -r dist/. root@uvpn.shop:/opt/uvpn.shop/frontend"
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@lucide/vue": "^1.16.0",
|
||||
|
||||
@@ -32,12 +32,13 @@
|
||||
<div class="flex items-center gap-3">
|
||||
<img
|
||||
v-if="host.countryCode"
|
||||
:src="`https://cdn.jsdelivr.net/npm/flag-icons@7.2.3/flags/4x3/${host.countryCode}.svg`"
|
||||
:src="`https://cdn.jsdelivr.net/npm/flag-icons@7.2.3/flags/4x3/${host.countryCode.toLowerCase()}.svg`"
|
||||
class="h-5 w-auto rounded-sm"
|
||||
:alt="host.name"
|
||||
/>
|
||||
<span class="font-semibold text-gray-800 dark:text-white">{{ host.name }}</span>
|
||||
|
||||
<!-- Индикатор состояния (вместо online/offline) -->
|
||||
<!-- Индикатор состояния -->
|
||||
<span class="relative flex h-2 w-2">
|
||||
<span
|
||||
class="animate-ping absolute inline-flex h-full w-full rounded-full opacity-75"
|
||||
@@ -73,58 +74,11 @@
|
||||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue'
|
||||
import { Wifi, RefreshCw } from '@lucide/vue'
|
||||
import { getAllCountries } from '@tw-labs/countries'
|
||||
|
||||
const hosts = ref([])
|
||||
const loading = ref(true)
|
||||
const error = ref(null)
|
||||
|
||||
const countriesList = getAllCountries()
|
||||
|
||||
// Ручной маппинг для проблемных стран
|
||||
const countryOverrides = {
|
||||
'United States': 'us',
|
||||
'USA': 'us',
|
||||
'U.S.A.': 'us',
|
||||
'America': 'us',
|
||||
'United Arab Emirates': 'ae',
|
||||
'UAE': 'ae',
|
||||
}
|
||||
|
||||
const findCountryByFirstWord = (name) => {
|
||||
if (!name) return null
|
||||
|
||||
// 1. Проверяем ручные override
|
||||
const override = countryOverrides[name]
|
||||
if (override) {
|
||||
return { code: override.toUpperCase() }
|
||||
}
|
||||
|
||||
// 2. Ищем по первому слову
|
||||
const firstWord = name.split(' ')[0]
|
||||
if (!firstWord) return null
|
||||
|
||||
// Точное совпадение
|
||||
const exact = countriesList.find(c =>
|
||||
c.label.toLowerCase() === firstWord.toLowerCase()
|
||||
)
|
||||
if (exact) return exact
|
||||
|
||||
// Частичное совпадение
|
||||
const partial = countriesList.find(c =>
|
||||
firstWord.toLowerCase().includes(c.label.toLowerCase()) ||
|
||||
c.label.toLowerCase().includes(firstWord.toLowerCase())
|
||||
)
|
||||
if (partial) return partial
|
||||
|
||||
// 3. Пробуем найти по полному имени
|
||||
const fullMatch = countriesList.find(c =>
|
||||
name.toLowerCase().includes(c.label.toLowerCase()) ||
|
||||
c.label.toLowerCase().includes(name.toLowerCase())
|
||||
)
|
||||
return fullMatch || null
|
||||
}
|
||||
|
||||
const sortedHosts = computed(() => {
|
||||
return [...hosts.value].sort((a, b) => {
|
||||
if (a.ping === null && b.ping === null) return 0
|
||||
@@ -157,17 +111,14 @@ const fetchHosts = async () => {
|
||||
if (!res.ok) throw new Error()
|
||||
const data = await res.json()
|
||||
|
||||
hosts.value = data.map((h) => {
|
||||
const country = findCountryByFirstWord(h.name)
|
||||
return {
|
||||
hosts.value = data.map((h) => ({
|
||||
...h,
|
||||
countryCode: country?.code?.toLowerCase() || null,
|
||||
countryCode: h.country_code ? h.country_code.toLowerCase() : null,
|
||||
isOnline: true,
|
||||
ping: null,
|
||||
}
|
||||
})
|
||||
}))
|
||||
} catch {
|
||||
error.value = 'Ошибка загрузки'
|
||||
error.value = 'Ошибка загрузки данных'
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
@@ -182,32 +133,28 @@ const refreshData = async () => {
|
||||
if (!res.ok) throw new Error()
|
||||
const data = await res.json()
|
||||
|
||||
hosts.value = data.map((h) => {
|
||||
const country = findCountryByFirstWord(h.name)
|
||||
return {
|
||||
hosts.value = data.map((h) => ({
|
||||
...h,
|
||||
countryCode: country?.code?.toLowerCase() || null,
|
||||
countryCode: h.country_code ? h.country_code.toLowerCase() : null,
|
||||
isOnline: true,
|
||||
ping: null,
|
||||
}
|
||||
})
|
||||
}))
|
||||
|
||||
// Пингуем все хосты параллельно
|
||||
const pings = await Promise.all(hosts.value.map(h => pingHost(h)))
|
||||
hosts.value.forEach((h, i) => {
|
||||
if (h.isOnline) h.ping = pings[i]
|
||||
h.ping = pings[i]
|
||||
})
|
||||
|
||||
} catch {
|
||||
error.value = 'Ошибка обновления'
|
||||
error.value = 'Ошибка обновления данных'
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// При первом открытии — загружаем и пингуем
|
||||
onMounted(async () => {
|
||||
await fetchHosts()
|
||||
// Автоматический пинг только при первом открытии
|
||||
await refreshData()
|
||||
})
|
||||
</script>
|
||||
Reference in New Issue
Block a user