refactor: remove regions from dashboard locations component
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useParams, useRouter } from 'next/navigation'
|
import { useParams, useRouter } from 'next/navigation'
|
||||||
import { getSite, type Site } from '@/lib/api/sites'
|
import { getSite, type Site } from '@/lib/api/sites'
|
||||||
import { getStats, getRealtime, getDailyStats, getTopPages, getTopReferrers, getCountries, getCities, getRegions } from '@/lib/api/stats'
|
import { getStats, getRealtime, getDailyStats, getTopPages, getTopReferrers, getCountries, getCities } from '@/lib/api/stats'
|
||||||
import { formatNumber, getDateRange } from '@/lib/utils/format'
|
import { formatNumber, getDateRange } from '@/lib/utils/format'
|
||||||
import { toast } from 'sonner'
|
import { toast } from 'sonner'
|
||||||
import LoadingOverlay from '@/components/LoadingOverlay'
|
import LoadingOverlay from '@/components/LoadingOverlay'
|
||||||
@@ -28,7 +28,6 @@ export default function SiteDashboardPage() {
|
|||||||
const [topReferrers, setTopReferrers] = useState<any[]>([])
|
const [topReferrers, setTopReferrers] = useState<any[]>([])
|
||||||
const [countries, setCountries] = useState<any[]>([])
|
const [countries, setCountries] = useState<any[]>([])
|
||||||
const [cities, setCities] = useState<any[]>([])
|
const [cities, setCities] = useState<any[]>([])
|
||||||
const [regions, setRegions] = useState<any[]>([])
|
|
||||||
const [dateRange, setDateRange] = useState(getDateRange(30))
|
const [dateRange, setDateRange] = useState(getDateRange(30))
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -42,7 +41,7 @@ export default function SiteDashboardPage() {
|
|||||||
const loadData = async () => {
|
const loadData = async () => {
|
||||||
try {
|
try {
|
||||||
setLoading(true)
|
setLoading(true)
|
||||||
const [siteData, statsData, realtimeData, dailyData, pagesData, referrersData, countriesData, citiesData, regionsData] = await Promise.all([
|
const [siteData, statsData, realtimeData, dailyData, pagesData, referrersData, countriesData, citiesData] = await Promise.all([
|
||||||
getSite(siteId),
|
getSite(siteId),
|
||||||
getStats(siteId, dateRange.start, dateRange.end),
|
getStats(siteId, dateRange.start, dateRange.end),
|
||||||
getRealtime(siteId),
|
getRealtime(siteId),
|
||||||
@@ -51,7 +50,6 @@ export default function SiteDashboardPage() {
|
|||||||
getTopReferrers(siteId, dateRange.start, dateRange.end, 10),
|
getTopReferrers(siteId, dateRange.start, dateRange.end, 10),
|
||||||
getCountries(siteId, dateRange.start, dateRange.end, 10),
|
getCountries(siteId, dateRange.start, dateRange.end, 10),
|
||||||
getCities(siteId, dateRange.start, dateRange.end, 10),
|
getCities(siteId, dateRange.start, dateRange.end, 10),
|
||||||
getRegions(siteId, dateRange.start, dateRange.end, 10),
|
|
||||||
])
|
])
|
||||||
setSite(siteData)
|
setSite(siteData)
|
||||||
setStats(statsData || { pageviews: 0, visitors: 0 })
|
setStats(statsData || { pageviews: 0, visitors: 0 })
|
||||||
@@ -61,7 +59,6 @@ export default function SiteDashboardPage() {
|
|||||||
setTopReferrers(Array.isArray(referrersData) ? referrersData : [])
|
setTopReferrers(Array.isArray(referrersData) ? referrersData : [])
|
||||||
setCountries(Array.isArray(countriesData) ? countriesData : [])
|
setCountries(Array.isArray(countriesData) ? countriesData : [])
|
||||||
setCities(Array.isArray(citiesData) ? citiesData : [])
|
setCities(Array.isArray(citiesData) ? citiesData : [])
|
||||||
setRegions(Array.isArray(regionsData) ? regionsData : [])
|
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
toast.error('Failed to load data: ' + (error.message || 'Unknown error'))
|
toast.error('Failed to load data: ' + (error.message || 'Unknown error'))
|
||||||
} finally {
|
} finally {
|
||||||
@@ -139,7 +136,7 @@ export default function SiteDashboardPage() {
|
|||||||
|
|
||||||
<div className="grid gap-6 lg:grid-cols-2 mb-8">
|
<div className="grid gap-6 lg:grid-cols-2 mb-8">
|
||||||
<TopReferrers referrers={topReferrers} />
|
<TopReferrers referrers={topReferrers} />
|
||||||
<Countries countries={countries} cities={cities} regions={regions} />
|
<Countries countries={countries} cities={cities} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -7,12 +7,11 @@ import * as Flags from 'country-flag-icons/react/3x2'
|
|||||||
interface LocationProps {
|
interface LocationProps {
|
||||||
countries: Array<{ country: string; pageviews: number }>
|
countries: Array<{ country: string; pageviews: number }>
|
||||||
cities: Array<{ city: string; country: string; pageviews: number }>
|
cities: Array<{ city: string; country: string; pageviews: number }>
|
||||||
regions: Array<{ region: string; country: string; pageviews: number }>
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type Tab = 'countries' | 'regions' | 'cities'
|
type Tab = 'countries' | 'cities'
|
||||||
|
|
||||||
export default function Locations({ countries, cities, regions }: LocationProps) {
|
export default function Locations({ countries, cities }: LocationProps) {
|
||||||
const [activeTab, setActiveTab] = useState<Tab>('countries')
|
const [activeTab, setActiveTab] = useState<Tab>('countries')
|
||||||
|
|
||||||
const getFlagComponent = (countryCode: string) => {
|
const getFlagComponent = (countryCode: string) => {
|
||||||
@@ -55,27 +54,6 @@ export default function Locations({ countries, cities, regions }: LocationProps)
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (activeTab === 'regions') {
|
|
||||||
if (!regions || regions.length === 0) {
|
|
||||||
return <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
|
|
||||||
}
|
|
||||||
return (
|
|
||||||
<div className="space-y-3">
|
|
||||||
{regions.map((region, index) => (
|
|
||||||
<div key={index} className="flex items-center justify-between">
|
|
||||||
<div className="flex-1 truncate text-neutral-900 dark:text-white flex items-center gap-3">
|
|
||||||
<span className="shrink-0">{getFlagComponent(region.country)}</span>
|
|
||||||
<span className="truncate">{region.region === 'Unknown' ? 'Unknown' : region.region}</span>
|
|
||||||
</div>
|
|
||||||
<div className="text-sm font-semibold text-neutral-600 dark:text-neutral-400 ml-4">
|
|
||||||
{formatNumber(region.pageviews)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (activeTab === 'cities') {
|
if (activeTab === 'cities') {
|
||||||
if (!cities || cities.length === 0) {
|
if (!cities || cities.length === 0) {
|
||||||
return <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
|
return <p className="text-neutral-600 dark:text-neutral-400">No data available</p>
|
||||||
@@ -115,16 +93,6 @@ export default function Locations({ countries, cities, regions }: LocationProps)
|
|||||||
>
|
>
|
||||||
Countries
|
Countries
|
||||||
</button>
|
</button>
|
||||||
<button
|
|
||||||
onClick={() => setActiveTab('regions')}
|
|
||||||
className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
|
|
||||||
activeTab === 'regions'
|
|
||||||
? 'bg-white dark:bg-neutral-700 text-neutral-900 dark:text-white shadow-sm'
|
|
||||||
: 'text-neutral-600 dark:text-neutral-400 hover:text-neutral-900 dark:hover:text-white'
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
Regions
|
|
||||||
</button>
|
|
||||||
<button
|
<button
|
||||||
onClick={() => setActiveTab('cities')}
|
onClick={() => setActiveTab('cities')}
|
||||||
className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
|
className={`px-3 py-1 text-xs font-medium rounded-md transition-colors ${
|
||||||
|
|||||||
Reference in New Issue
Block a user