Skip to content

Commit 0073780

Browse files
GusevPMGusevPM
committed
Fixiki
1 parent 395018c commit 0073780

4 files changed

Lines changed: 59 additions & 45 deletions

File tree

‎components/modules/gas/GasFeeCalculator.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const gasFee = computed(() => {
6666
<Flex justify="between">
6767
<Flex direction="column" gap="6">
6868
<Flex align="center" gap="6">
69-
<Icon name="gas_fast" size="12" color="green" />
69+
<Icon name="gas_fast" size="12" color="brand" />
7070
<Text size="11" weight="600" color="secondary">Fast</Text>
7171
</Flex>
7272

‎components/modules/namespace/NamespaceCharts.vue‎

Lines changed: 48 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const props = defineProps({
2828
})
2929
3030
/** Chart settings */
31-
const selectedPeriodIdx = ref(1)
31+
const selectedPeriodIdx = ref(2)
3232
const periods = ref([
3333
{
3434
title: "Last 24 hours",
@@ -45,6 +45,11 @@ const periods = ref([
4545
value: 30,
4646
timeframe: "day",
4747
},
48+
{
49+
title: "Last 12 months",
50+
value: 12,
51+
timeframe: "month",
52+
},
4853
])
4954
const selectedPeriod = computed(() => periods.value[selectedPeriodIdx.value])
5055
const chartView = ref("line")
@@ -442,67 +447,75 @@ const buildBarChart = (chartEl, data, onEnter, onLeave, metric) => {
442447
chartEl.append(svg.node())
443448
}
444449
445-
const getSizeSeries = async () => {
446-
sizeSeries.value = []
447-
448-
const sizeSeriesRawData = await fetchNamespaceSeries({
450+
const fetchData = async (metric, from) => {
451+
const data = await fetchNamespaceSeries({
449452
id: props.id,
450-
name: "size",
453+
name: metric,
451454
timeframe: selectedPeriod.value.timeframe,
452-
from: parseInt(
455+
from: from ? from : parseInt(
453456
DateTime.now().minus({
454457
days: selectedPeriod.value.timeframe === "day" ? selectedPeriod.value.value : 0,
455458
hours: selectedPeriod.value.timeframe === "hour" ? selectedPeriod.value.value : 0,
459+
months: selectedPeriod.value.timeframe === "month" ? selectedPeriod.value.value : 0,
456460
}).ts / 1_000,
457461
),
458462
})
459463
464+
return data
465+
}
466+
const getSizeSeries = async () => {
467+
sizeSeries.value = []
468+
469+
const sizeSeriesRawData = await fetchData("size")
470+
460471
const sizeSeriesMap = {}
461472
sizeSeriesRawData.forEach((item) => {
462-
sizeSeriesMap[DateTime.fromISO(item.time).toFormat(selectedPeriod.value.timeframe === "day" ? "y-LL-dd" : "y-LL-dd-HH")] =
463-
item.value
473+
sizeSeriesMap[DateTime.fromISO(item.time).toFormat(["day", "month"].includes(selectedPeriod.value.timeframe) ? "y-LL-dd" : "y-LL-dd-HH")] = item.value
464474
})
465475
466476
for (let i = 1; i < selectedPeriod.value.value + 1; i++) {
467-
const dt = DateTime.now().minus({
468-
days: selectedPeriod.value.timeframe === "day" ? selectedPeriod.value.value - i : 0,
469-
hours: selectedPeriod.value.timeframe === "hour" ? selectedPeriod.value.value - i : 0,
470-
})
477+
let dt
478+
if (selectedPeriod.value.timeframe === "month") {
479+
dt = DateTime.now().startOf('month').minus({
480+
months: selectedPeriod.value.timeframe === "month" ? selectedPeriod.value.value - i : 0,
481+
})
482+
} else {
483+
dt = DateTime.now().minus({
484+
days: selectedPeriod.value.timeframe === "day" ? selectedPeriod.value.value - i : 0,
485+
hours: selectedPeriod.value.timeframe === "hour" ? selectedPeriod.value.value - i : 0,
486+
})
487+
}
471488
sizeSeries.value.push({
472489
date: dt.toJSDate(),
473-
value: parseInt(sizeSeriesMap[dt.toFormat(selectedPeriod.value.timeframe === "day" ? "y-LL-dd" : "y-LL-dd-HH")]) || 0,
490+
value: parseInt(sizeSeriesMap[dt.toFormat(["day", "month"].includes(selectedPeriod.value.timeframe) ? "y-LL-dd" : "y-LL-dd-HH")]) || 0,
474491
})
475-
}
476-
}
492+
}}
477493
478494
const getPfbSeries = async () => {
479495
pfbSeries.value = []
480496
481-
const pfbSeriesRawData = await fetchNamespaceSeries({
482-
id: props.id,
483-
name: "pfb_count",
484-
timeframe: selectedPeriod.value.timeframe,
485-
from: parseInt(
486-
DateTime.now().minus({
487-
days: selectedPeriod.value.timeframe === "day" ? selectedPeriod.value.value : 0,
488-
hours: selectedPeriod.value.timeframe === "hour" ? selectedPeriod.value.value : 0,
489-
}).ts / 1_000,
490-
),
491-
})
497+
const pfbSeriesRawData = await fetchData("pfb_count")
492498
493499
const pfbSeriesMap = {}
494500
pfbSeriesRawData.forEach((item) => {
495-
pfbSeriesMap[DateTime.fromISO(item.time).toFormat(selectedPeriod.value.timeframe === "day" ? "y-LL-dd" : "y-LL-dd-HH")] = item.value
501+
pfbSeriesMap[DateTime.fromISO(item.time).toFormat(["day", "month"].includes(selectedPeriod.value.timeframe) ? "y-LL-dd" : "y-LL-dd-HH")] = item.value
496502
})
497503
498504
for (let i = 1; i < selectedPeriod.value.value + 1; i++) {
499-
const dt = DateTime.now().minus({
500-
days: selectedPeriod.value.timeframe === "day" ? selectedPeriod.value.value - i : 0,
501-
hours: selectedPeriod.value.timeframe === "hour" ? selectedPeriod.value.value - i : 0,
502-
})
505+
let dt
506+
if (selectedPeriod.value.timeframe === "month") {
507+
dt = DateTime.now().startOf('month').minus({
508+
months: selectedPeriod.value.timeframe === "month" ? selectedPeriod.value.value - i : 0,
509+
})
510+
} else {
511+
dt = DateTime.now().minus({
512+
days: selectedPeriod.value.timeframe === "day" ? selectedPeriod.value.value - i : 0,
513+
hours: selectedPeriod.value.timeframe === "hour" ? selectedPeriod.value.value - i : 0,
514+
})
515+
}
503516
pfbSeries.value.push({
504517
date: dt.toJSDate(),
505-
value: parseInt(pfbSeriesMap[dt.toFormat(selectedPeriod.value.timeframe === "day" ? "y-LL-dd" : "y-LL-dd-HH")]) || 0,
518+
value: parseInt(pfbSeriesMap[dt.toFormat(["day", "month"].includes(selectedPeriod.value.timeframe) ? "y-LL-dd" : "y-LL-dd-HH")]) || 0,
506519
})
507520
}
508521
}
@@ -572,8 +585,8 @@ const debouncedRedraw = useDebounceFn((e) => {
572585
onBeforeMount(() => {
573586
isLoading.value = true
574587
const settings = JSON.parse(localStorage.getItem("settings"))
575-
chartView.value = settings?.chart?.view || "line"
576-
loadLastValue.value = settings?.chart?.loadLastValue
588+
chartView.value = settings?.chart?.view || "bar"
589+
loadLastValue.value = settings?.chart?.view ? settings.chart.loadLastValue : true
577590
})
578591
579592
onMounted(async () => {

‎components/modules/rollup/RollupCharts.vue‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const props = defineProps({
3131
})
3232
3333
/** Chart settings */
34-
const selectedPeriodIdx = ref(0)
34+
const selectedPeriodIdx = ref(2)
3535
const periods = ref([
3636
{
3737
title: "Last 24 hours",
@@ -521,7 +521,8 @@ const getSizeSeries = async () => {
521521
days: selectedPeriod.value.timeframe === "day" ? selectedPeriod.value.value - i : 0,
522522
hours: selectedPeriod.value.timeframe === "hour" ? selectedPeriod.value.value - i : 0,
523523
})
524-
} sizeSeries.value.push({
524+
}
525+
sizeSeries.value.push({
525526
date: dt.toJSDate(),
526527
value: parseInt(sizeSeriesMap[dt.toFormat(["day", "month"].includes(selectedPeriod.value.timeframe) ? "y-LL-dd" : "y-LL-dd-HH")]) || 0,
527528
})
@@ -788,8 +789,8 @@ const debouncedRedraw = useDebounceFn((e) => {
788789
onBeforeMount(() => {
789790
isLoading.value = true
790791
const settings = JSON.parse(localStorage.getItem("settings"))
791-
chartView.value = settings?.chart?.view || "line"
792-
loadLastValue.value = settings?.chart?.loadLastValue
792+
chartView.value = settings?.chart?.view || "bar"
793+
loadLastValue.value = settings?.chart?.view ? settings.chart.loadLastValue : true
793794
})
794795
795796
onMounted(async () => {
@@ -1155,8 +1156,8 @@ onBeforeUnmount(() => {
11551156
color="tertiary"
11561157
:style="{ opacity: Math.max(...tvlSeries.map((d) => d.value)) ? 1 : 0 }"
11571158
>
1158-
{{ Math.max(...tvlSeries.map((d) => d.value)) > 1
1159-
? abbreviate(Math.max(...tvlSeries.map((d) => d.value)))
1159+
{{ Math.max(...tvlSeries.map((d) => d.value)) < 1_000_000
1160+
? abbreviate(Math.max(...tvlSeries.map((d) => d.value)), 0)
11601161
: abbreviate(Math.max(...tvlSeries.map((d) => d.value))) }} $
11611162
</Text>
11621163
<Skeleton v-else-if="!tvlSeries.length" w="32" h="12" />
@@ -1173,8 +1174,8 @@ onBeforeUnmount(() => {
11731174
: 0,
11741175
}"
11751176
>
1176-
{{ Math.round(Math.max(...tvlSeries.map((d) => d.value)) / 2)
1177-
? abbreviate(Math.round(Math.max(...tvlSeries.map((d) => d.value)) / 2))
1177+
{{ Math.round(Math.max(...tvlSeries.map((d) => d.value)) / 2) < 1_000_000
1178+
? abbreviate(Math.round(Math.max(...tvlSeries.map((d) => d.value)) / 2), 0)
11781179
: abbreviate(Math.round(Math.max(...tvlSeries.map((d) => d.value)) / 2)) }} $
11791180
</Text>
11801181
<Skeleton v-else-if="!tvlSeries.length" w="24" h="12" />

‎store/settings.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const useSettingsStore = defineStore("settings", () => {
1515
})
1616

1717
const chart = ref({
18-
view: "line",
18+
view: "bar",
1919
loadPrevData: true,
2020
loadLastValue: true,
2121
})

0 commit comments

Comments
 (0)