Skip to content

Commit 1d13e48

Browse files
committed
merge
2 parents 57fc627 + 2bbfba8 commit 1d13e48

File tree

139 files changed

+4346
-925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+4346
-925
lines changed

app.vue

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ import { fetchHead } from "@/services/api/main"
1717
import { fetchLatestBlocks } from "@/services/api/block"
1818
1919
/** Store */
20-
import { useNodeStore } from "@/store/node"
21-
import { useAppStore } from "@/store/app"
22-
import { useBookmarksStore } from "@/store/bookmarks"
23-
import { useSettingsStore } from "@/store/settings"
24-
import { useEnumStore } from "@/store/enums"
25-
import { useLegalStore } from "@/store/legal"
26-
import { useNotificationsStore } from "@/store/notifications"
27-
import { useRollupsRankingStore } from "@/store/rollupsrank"
20+
import { useNodeStore } from "@/store/node.store"
21+
import { useAppStore } from "@/store/app.store"
22+
import { useBookmarksStore } from "@/store/bookmarks.store"
23+
import { useSettingsStore } from "@/store/settings.store"
24+
import { useEnumStore } from "@/store/enums.store"
25+
import { useLegalStore } from "@/store/legal.store"
26+
import { useNotificationsStore } from "@/store/notifications.store"
27+
import { useActivityStore } from "@/store/activity.store"
2828
const nodeStore = useNodeStore()
2929
const appStore = useAppStore()
3030
const bookmarksStore = useBookmarksStore()
3131
const settingsStore = useSettingsStore()
3232
const enumStore = useEnumStore()
3333
const legalStore = useLegalStore()
3434
const notificationsStore = useNotificationsStore()
35-
const rollupsRankingStore = useRollupsRankingStore()
35+
const activityStore = useActivityStore()
3636
3737
bookmarksStore.$subscribe((mutation, state) => {
3838
localStorage.setItem("bookmarks", JSON.stringify(state.bookmarks))
@@ -43,10 +43,12 @@ settingsStore.$subscribe((mutation, state) => {
4343
legalStore.$subscribe((mutation, state) => {
4444
localStorage.setItem("legal", JSON.stringify(state.legal))
4545
})
46-
rollupsRankingStore.$subscribe((mutation, state) => {
46+
activityStore.$subscribe((mutation, state) => {
4747
localStorage.setItem("rollups_ranking", JSON.stringify(state.rollups_ranking))
4848
})
4949
50+
appStore.initConstants()
51+
5052
let watchInterval = null
5153
5254
onMounted(async () => {
@@ -96,7 +98,7 @@ onMounted(async () => {
9698
}
9799
98100
settingsStore.init()
99-
rollupsRankingStore.init()
101+
activityStore.init()
100102
101103
const runtimeConfig = useRuntimeConfig()
102104
amp.init(runtimeConfig.public.AMP)

assets/icons.json

Lines changed: 6 additions & 0 deletions
Large diffs are not rendered by default.

assets/styles/base.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ $grayscale: (
3333

3434
/* General */
3535
--brand: #18d2a5;
36+
--brand-rgb: 24, 210, 165;
3637
--blue: #379bff;
38+
--blue-rgb: 55, 155, 255;
3739
--red: #eb5757;
40+
--red-rgb: 235, 87, 87;
3841
--dark-red: #592121;
3942
--orange: #ff5a17;
4043
--light-orange: #ff8351;

components/ActionBar.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,20 @@ import Search from "@/components/modules/navigation/Search.vue"
1111
import { isMobile } from "@/services/utils"
1212
1313
/** Store */
14-
import { useAppStore } from "@/store/app"
14+
import { useAppStore } from "@/store/app.store"
1515
const appStore = useAppStore()
1616
</script>
1717

1818
<template>
1919
<Flex wide align="center" justify="between" gap="24" :class="$style.wrapper">
2020
<Flex wide align="center" gap="12">
21-
<Button v-if="isMobile()" @click="appStore.showSidebar = !appStore.showSidebar" type="secondary" size="medium" :class="$style.menu_btn">
21+
<Button
22+
v-if="isMobile()"
23+
@click="appStore.showSidebar = !appStore.showSidebar"
24+
type="secondary"
25+
size="medium"
26+
:class="$style.menu_btn"
27+
>
2228
<Icon name="menu" size="16" color="primary" />
2329
</Button>
2430

components/AddressBadge.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ const props = defineProps({
66
},
77
color: {
88
type: String,
9-
default: "primary"
9+
default: "primary",
1010
},
1111
})
1212
1313
const alias = computed(() => {
1414
const { $getDisplayName } = useNuxtApp()
15-
16-
return $getDisplayName('addresses', "", props.account)
15+
return $getDisplayName("addresses", "", props.account)
1716
})
1817
</script>
1918

@@ -23,4 +22,4 @@ const alias = computed(() => {
2322
<Text size="13" weight="600" :color="color"> {{ alias }} </Text>
2423
</Flex>
2524
</NuxtLink>
26-
</template>
25+
</template>

components/AmountInCurrency.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { amountToString } from "@/services/utils"
66
import Tooltip from "@/components/ui/Tooltip.vue"
77
88
/** Store */
9-
import { useAppStore } from "@/store/app"
9+
import { useAppStore } from "@/store/app.store"
1010
const appStore = useAppStore()
1111
1212
const currentPrice = computed(() => appStore.currentPrice)
@@ -74,12 +74,12 @@ const calculatedAmount = computed(() => {
7474
...defaultCurrencyStyle,
7575
...props.styles.currency,
7676
},
77-
}
77+
},
7878
}
7979
8080
let tiaDisplay
8181
let tiaExchange
82-
if (finalAmount.amount.unit === 'utia') {
82+
if (finalAmount.amount.unit === "utia") {
8383
tiaExchange = finalAmount.amount.value / 1_000_000
8484
8585
if (finalAmount.amount.currency === "TIA") {

components/BadgeValue.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import { space } from "@/services/utils"
66
77
/** Store */
8-
import { useNotificationsStore } from "@/store/notifications"
8+
import { useNotificationsStore } from "@/store/notifications.store"
99
const notificationsStore = useNotificationsStore()
1010
1111
const props = defineProps({

components/BookmarkButton.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import Button from "@/components/ui/Button.vue"
66
import { capitilize } from "@/services/utils"
77
88
/** Store */
9-
import { useBookmarksStore } from "@/store/bookmarks"
10-
import { useCacheStore } from "@/store/cache"
11-
import { useModalsStore } from "@/store/modals"
12-
import { useNotificationsStore } from "@/store/notifications"
9+
import { useBookmarksStore } from "@/store/bookmarks.store"
10+
import { useCacheStore } from "@/store/cache.store"
11+
import { useModalsStore } from "@/store/modals.store"
12+
import { useNotificationsStore } from "@/store/notifications.store"
1313
const bookmarksStore = useBookmarksStore()
1414
const cacheStore = useCacheStore()
1515
const modalsStore = useModalsStore()

components/Connection.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import { disconnect } from "@/services/wallet"
99
import { arabica, mainnet, mammoth, mocha } from "@/services/chains"
1010
1111
/** Store */
12-
import { useAppStore } from "@/store/app"
13-
import { useModalsStore } from "@/store/modals"
14-
import { useNotificationsStore } from "@/store/notifications"
12+
import { useAppStore } from "@/store/app.store"
13+
import { useModalsStore } from "@/store/modals.store"
14+
import { useNotificationsStore } from "@/store/notifications.store"
1515
const appStore = useAppStore()
1616
const modalsStore = useModalsStore()
1717
const notificationsStore = useNotificationsStore()

components/CopyButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup>
22
/** Store */
3-
import { useNotificationsStore } from "@/store/notifications"
3+
import { useNotificationsStore } from "@/store/notifications.store"
44
const notificationsStore = useNotificationsStore()
55
66
const props = defineProps({

0 commit comments

Comments
 (0)