From 43c94fc996925f5dc2fcea05030f59788db67f9c Mon Sep 17 00:00:00 2001 From: MarcoMandar Date: Fri, 12 Jul 2024 19:08:41 +0100 Subject: [PATCH 01/17] view contracts, contracts modal, footer, report issue Signed-off-by: MarcoMandar --- components/DashboardFooter.vue | 76 +++++++++++++++++------------- components/DashboardHeader.vue | 13 +++-- components/DashboardMobileMenu.vue | 5 +- layouts/default.vue | 15 +++--- pages/index.vue | 2 - 5 files changed, 67 insertions(+), 44 deletions(-) diff --git a/components/DashboardFooter.vue b/components/DashboardFooter.vue index a6f9897..c938be7 100755 --- a/components/DashboardFooter.vue +++ b/components/DashboardFooter.vue @@ -58,46 +58,58 @@ const isOpen = ref(false); @@ -62,11 +69,11 @@ nav ul li { } .dark .router-link-active .nav-button { - background-color: #000; - color: white; + background-color: #141313; + color: #d6d6d6; } .router-link-active .nav-button { - background-color: #fff; + background-color: transparent; color: #000; } diff --git a/components/DashboardMobileMenu.vue b/components/DashboardMobileMenu.vue index cd38f4b..297937f 100755 --- a/components/DashboardMobileMenu.vue +++ b/components/DashboardMobileMenu.vue @@ -3,6 +3,7 @@ import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'; import ButtonConnect from './ui-kit/ButtonConnect.vue'; import GlowEffect from './ui-kit/GlowEffect.vue'; import ButtonThemeToggle from './ui-kit/ButtonThemeToggle.vue'; +import ReportIssueButton from './ui-kit/ReportIssueButton.vue'; const breakpoints = useBreakpoints(breakpointsTailwind); const lgAndLarger = breakpoints.greaterOrEqual('lg'); @@ -28,7 +29,9 @@ router.beforeEach(async () => { - +
+ +
diff --git a/layouts/default.vue b/layouts/default.vue index b525c8c..a616969 100755 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -10,27 +10,30 @@ onMounted(() => { diff --git a/pages/index.vue b/pages/index.vue index c848ab2..935bd69 100755 --- a/pages/index.vue +++ b/pages/index.vue @@ -11,7 +11,6 @@

Current balance for the connected wallet:

-
@@ -123,7 +122,6 @@
- From 70a011105eeaa95183de6315308eec40872150f6 Mon Sep 17 00:00:00 2001 From: SuchJitter Date: Fri, 12 Jul 2024 21:09:02 +0200 Subject: [PATCH 02/17] fixed register button --- .../DataTableMyRelays/DataTableMyRelays.vue | 25 ++++++---------- nuxt.config.ts | 6 ++++ pages/index.vue | 25 ++++++++++------ pages/relays.vue | 29 ++++++++++++++++--- 4 files changed, 56 insertions(+), 29 deletions(-) diff --git a/components/DataTableMyRelays/DataTableMyRelays.vue b/components/DataTableMyRelays/DataTableMyRelays.vue index aa422ce..4434627 100755 --- a/components/DataTableMyRelays/DataTableMyRelays.vue +++ b/components/DataTableMyRelays/DataTableMyRelays.vue @@ -20,6 +20,11 @@ import { useRegistrator } from '@/composables/registrator'; import { useRegistratorStore } from '@/stores/useRegistratorStore'; import { ethers } from 'ethers'; import { watchAccount } from '@wagmi/core'; +import { defineProps } from 'vue'; + +const props = defineProps<{ + currentTab: RelayTabType; +}>(); const toast = useToast(); const userStore = useUserStore(); @@ -30,7 +35,6 @@ const facilitatorStore = useFacilitatorStore(); const { allRelays, claimableRelays } = storeToRefs(userStore); const { address } = useAccount({ config }); -const currentTab = ref('all'); const registerModalOpen = ref(false); const unwatch = watchAccount(config, { @@ -187,8 +191,10 @@ const rules = { required: (value: string) => !!value || 'Required', }; +const emits = defineEmits(['update:currentTab']); + const handleTabChange = (key: string) => { - currentTab.value = key as RelayTabType; + emits('update:currentTab', key); }; const handleLockRelay = async (fingerprint: string) => { @@ -383,20 +389,7 @@ const handleUnlockClick = async (fingerprint: string) => { color="red" variant="subtle" /> - -
- -
- -
-
+

- Current balance for the connected wallet: + The connected wallet shows the following balance:

+
-
+
+ > +

Account balance

+
-
+
+

+ + Locked +

{{ formatEther(registratorStore.totalLockedTokens || '0') }} @@ -28,10 +34,6 @@ --
-

- - Locked -

@@ -122,6 +124,7 @@
+ @@ -156,7 +159,10 @@ const progressLoading = ref(0); const toast = useToast(); +const isLoading = ref(true); + onMounted(async () => { + isLoading.value = false; await userStore.getTokenBalance(); facilitatorStore.pendingClaim = getRedeemProcessSessionStorage( @@ -168,6 +174,7 @@ onMounted(async () => { initRegistrator(); initToken(); initDistribution(); + isLoading.value = false; }); watch( diff --git a/pages/relays.vue b/pages/relays.vue index 1793052..d3a1e20 100755 --- a/pages/relays.vue +++ b/pages/relays.vue @@ -1,7 +1,21 @@ + +const handleTabChange = (key: RelayTabType) => { + currentTab.value = key; +}; + \ No newline at end of file From c139c45dd695723cf95bb44f43f1f44844d8bd7d Mon Sep 17 00:00:00 2001 From: SuchJitter Date: Fri, 12 Jul 2024 21:17:23 +0200 Subject: [PATCH 03/17] added note for register for someone else function --- .../DataTableMyRelays/DataTableMyRelays.vue | 1 + pages/relays.vue | 86 +++++++++++++++++-- 2 files changed, 80 insertions(+), 7 deletions(-) diff --git a/components/DataTableMyRelays/DataTableMyRelays.vue b/components/DataTableMyRelays/DataTableMyRelays.vue index 4434627..6029b66 100755 --- a/components/DataTableMyRelays/DataTableMyRelays.vue +++ b/components/DataTableMyRelays/DataTableMyRelays.vue @@ -24,6 +24,7 @@ import { defineProps } from 'vue'; const props = defineProps<{ currentTab: RelayTabType; + registerModalOpen: boolean; }>(); const toast = useToast(); diff --git a/pages/relays.vue b/pages/relays.vue index d3a1e20..3de2fe4 100755 --- a/pages/relays.vue +++ b/pages/relays.vue @@ -1,6 +1,6 @@ \ No newline at end of file From 45695675570f5ed2685e1b7e22ec4729440d2c49 Mon Sep 17 00:00:00 2001 From: MarcoMandar Date: Fri, 12 Jul 2024 20:40:35 +0100 Subject: [PATCH 04/17] update logo and buttons Signed-off-by: MarcoMandar --- components/DashboardHeader.vue | 10 +++++++--- components/ui-kit/TitleAndLogo.vue | 7 +++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/components/DashboardHeader.vue b/components/DashboardHeader.vue index e45db9a..c9777bf 100755 --- a/components/DashboardHeader.vue +++ b/components/DashboardHeader.vue @@ -26,15 +26,19 @@ const menuStore = useMenuStore();