diff --git a/src/components/AccountsChartPanel.vue b/src/components/AccountsChartPanel.vue index a5a82e366..c9af5186f 100644 --- a/src/components/AccountsChartPanel.vue +++ b/src/components/AccountsChartPanel.vue @@ -8,16 +8,16 @@ + :interval="range.interval"/> @@ -26,12 +26,20 @@ import { storeToRefs } from 'pinia' import { chartsHints } from '@/utils/hints/chartsHints' import { useChartsStore } from '@/stores/charts' +import { CHART_INTERVALS_PRESETS_OPTIONS } from '~/utils/constants' const chartsStore = useChartsStore() const { accountsStatistics } = storeToRefs(chartsStore) const { fetchAccountsStatistics } = chartsStore -const selectedRange = ref(CHART_INTERVALS_PRESETS_OPTIONS[4]) +const props = defineProps({ + preselectedRange: { + type: Object, + default: CHART_INTERVALS_PRESETS_OPTIONS[4], + }, +}) + +const range = ref(props.preselectedRange) await useAsyncData(async() => { await loadHashrateStatistics() @@ -39,16 +47,16 @@ await useAsyncData(async() => { }) if (process.client) { - watch([selectedRange], async() => { + watch([range], async() => { await loadHashrateStatistics() }) } async function loadHashrateStatistics() { await fetchAccountsStatistics( - selectedRange.value.interval, - selectedRange.value.limit, - selectedRange.value.customInterval) + range.value.interval, + range.value.limit, + range.value.customInterval) } diff --git a/src/components/ContractsChartPanel.vue b/src/components/ContractsChartPanel.vue index c2dac87bf..f134faa1e 100644 --- a/src/components/ContractsChartPanel.vue +++ b/src/components/ContractsChartPanel.vue @@ -5,16 +5,16 @@ + :interval="range.interval"/> @@ -23,12 +23,20 @@ import { storeToRefs } from 'pinia' import { useChartsStore } from '@/stores/charts' import LineChart from '@/components/LineChart' +import { CHART_INTERVALS_PRESETS_OPTIONS } from '~/utils/constants' const chartsStore = useChartsStore() const { contractsStatistics } = storeToRefs(chartsStore) const { fetchContractsStatistics } = chartsStore -const selectedRange = ref(CHART_INTERVALS_PRESETS_OPTIONS[4]) +const props = defineProps({ + preselectedRange: { + type: Object, + default: CHART_INTERVALS_PRESETS_OPTIONS[4], + }, +}) + +const range = ref(props.preselectedRange) await useAsyncData(async() => { await loadContractsStatistics() @@ -36,16 +44,16 @@ await useAsyncData(async() => { }) if (process.client) { - watch(selectedRange, async() => { + watch(range, async() => { await loadContractsStatistics() }) } async function loadContractsStatistics() { await fetchContractsStatistics( - selectedRange.value.interval, - selectedRange.value.limit, - selectedRange.value.customInterval) + range.value.interval, + range.value.limit, + range.value.customInterval) } diff --git a/src/components/DifficultyChartPanel.vue b/src/components/DifficultyChartPanel.vue index d94b3fdb4..b54c22ff3 100644 --- a/src/components/DifficultyChartPanel.vue +++ b/src/components/DifficultyChartPanel.vue @@ -5,16 +5,16 @@ + :interval="range.interval"/> @@ -28,14 +28,7 @@ const chartsStore = useChartsStore() const { difficultyStatistics } = storeToRefs(chartsStore) const { fetchDifficultyStatistics } = chartsStore -const props = defineProps({ - range: { - required: true, - type: Object, - }, -}) - -const selectedRange = ref(CHART_INTERVALS_PRESETS_OPTIONS[4]) +const range = ref(CHART_INTERVALS_PRESETS_OPTIONS[4]) await useAsyncData(async() => { await loadDifficultytatistics() @@ -43,16 +36,16 @@ await useAsyncData(async() => { }) if (process.client) { - watch([selectedRange], async() => { + watch([range], async() => { await loadDifficultytatistics() }) } async function loadDifficultytatistics() { await fetchDifficultyStatistics( - selectedRange.value.interval, - selectedRange.value.limit, - selectedRange.value.customInterval) + range.value.interval, + range.value.limit, + range.value.customInterval) } diff --git a/src/components/HashrateChartPanel.vue b/src/components/HashrateChartPanel.vue index a006828c2..91f236b20 100644 --- a/src/components/HashrateChartPanel.vue +++ b/src/components/HashrateChartPanel.vue @@ -5,16 +5,16 @@ + :interval="range.interval"/> @@ -27,7 +27,7 @@ const chartsStore = useChartsStore() const { hashrateStatistics } = storeToRefs(chartsStore) const { fetchHashrateStatistics } = chartsStore -const selectedRange = ref(CHART_INTERVALS_PRESETS_OPTIONS[4]) +const range = ref(CHART_INTERVALS_PRESETS_OPTIONS[4]) await useAsyncData(async() => { await loadHashratetatistics() @@ -35,16 +35,16 @@ await useAsyncData(async() => { }) if (process.client) { - watch([selectedRange], async() => { + watch([range], async() => { await loadHashratetatistics() }) } async function loadHashratetatistics() { await fetchHashrateStatistics( - selectedRange.value.interval, - selectedRange.value.limit, - selectedRange.value.customInterval) + range.value.interval, + range.value.limit, + range.value.customInterval) } diff --git a/src/components/KeyblocksChartPanel.vue b/src/components/KeyblocksChartPanel.vue index 0f758184b..527552df6 100644 --- a/src/components/KeyblocksChartPanel.vue +++ b/src/components/KeyblocksChartPanel.vue @@ -5,16 +5,16 @@ + :interval="range.interval"/> @@ -28,7 +28,7 @@ const chartsStore = useChartsStore() const { keyblocksStatistics } = storeToRefs(chartsStore) const { fetchKeyblocksStatistics } = chartsStore -const selectedRange = ref(CHART_INTERVALS_PRESETS_OPTIONS[4]) +const range = ref(CHART_INTERVALS_PRESETS_OPTIONS[4]) await useAsyncData(async() => { await loadKeyblockStatistics() @@ -36,16 +36,16 @@ await useAsyncData(async() => { }) if (process.client) { - watch(selectedRange, async() => { + watch(range, async() => { await loadKeyblockStatistics() }) } async function loadKeyblockStatistics() { await fetchKeyblocksStatistics( - selectedRange.value.interval, - selectedRange.value.limit, - selectedRange.value.customInterval) + range.value.interval, + range.value.limit, + range.value.customInterval) } diff --git a/src/components/NamesChartPanel.vue b/src/components/NamesChartPanel.vue index e4f79e376..191397519 100644 --- a/src/components/NamesChartPanel.vue +++ b/src/components/NamesChartPanel.vue @@ -5,16 +5,16 @@ + :interval="range.interval"/> @@ -28,7 +28,18 @@ const chartsStore = useChartsStore() const { namesStatistics } = storeToRefs(chartsStore) const { fetchNamesStatistics } = chartsStore -const selectedRange = ref(CHART_INTERVALS_PRESETS_OPTIONS[4]) +const props = defineProps({ + hasSelect: { + required: true, + type: Boolean, + }, + preselectedRange: { + type: Object, + default: CHART_INTERVALS_PRESETS_OPTIONS[4], + }, +}) + +const range = ref(props.preselectedRange) await useAsyncData(async() => { await loadNamesStatistics() @@ -36,16 +47,16 @@ await useAsyncData(async() => { }) if (process.client) { - watch(selectedRange, async() => { + watch(range, async() => { await loadNamesStatistics() }) } async function loadNamesStatistics() { await fetchNamesStatistics( - selectedRange.value.interval, - selectedRange.value.limit, - selectedRange.value.customInterval) + range.value.interval, + range.value.limit, + range.value.customInterval) } diff --git a/src/components/TransactionsChartPanel.vue b/src/components/TransactionsChartPanel.vue index e092e8b73..ec4f549e1 100644 --- a/src/components/TransactionsChartPanel.vue +++ b/src/components/TransactionsChartPanel.vue @@ -6,28 +6,28 @@ + :interval="range.interval"/> @@ -35,6 +35,7 @@ diff --git a/src/pages/accounts/index.vue b/src/pages/accounts/index.vue index 5d082774f..be6e09581 100644 --- a/src/pages/accounts/index.vue +++ b/src/pages/accounts/index.vue @@ -11,7 +11,9 @@ - + diff --git a/src/pages/charts/transactions.vue b/src/pages/charts/transactions.vue index ff4b6ef72..645469be9 100644 --- a/src/pages/charts/transactions.vue +++ b/src/pages/charts/transactions.vue @@ -15,9 +15,7 @@ diff --git a/src/pages/contracts/index.vue b/src/pages/contracts/index.vue index 6453e1516..d7cb016e0 100644 --- a/src/pages/contracts/index.vue +++ b/src/pages/contracts/index.vue @@ -18,7 +18,7 @@ diff --git a/src/pages/names/index.vue b/src/pages/names/index.vue index ff9d50cfd..d3b4ca5ad 100644 --- a/src/pages/names/index.vue +++ b/src/pages/names/index.vue @@ -17,7 +17,7 @@