diff --git a/.vscode/settings.json b/.vscode/settings.json index e099821f1..1501146c5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,8 @@ { "editor.codeActionsOnSave": { - "source.fixAll.eslint": true, - "source.fixAll.prettier": true, - "source.fixAll.stylelint": true + "source.fixAll.eslint": "explicit", + "source.fixAll.prettier": "explicit", + "source.fixAll.stylelint": "explicit" }, "eslint.validate": ["javascript", "javascriptreact", "vue"], "eslint.format.enable": true, diff --git a/src/assets/images/icons/appLogoFooter.svg b/src/assets/images/icons/appLogoFooter.svg new file mode 100644 index 000000000..e69de29bb diff --git a/src/assets/images/icons/appLogoNavbar.svg b/src/assets/images/icons/appLogoNavbar.svg new file mode 100644 index 000000000..e69de29bb diff --git a/src/assets/images/icons/wallet.svg b/src/assets/images/icons/wallet.svg new file mode 100644 index 000000000..00664bed8 --- /dev/null +++ b/src/assets/images/icons/wallet.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/mocks/NFT.png b/src/assets/images/mocks/NFT.png new file mode 100644 index 000000000..8644bca2d Binary files /dev/null and b/src/assets/images/mocks/NFT.png differ diff --git a/src/components/_global/BalBtn/BalBtn.vue b/src/components/_global/BalBtn/BalBtn.vue index 59af526ce..d5b4f0f5b 100644 --- a/src/components/_global/BalBtn/BalBtn.vue +++ b/src/components/_global/BalBtn/BalBtn.vue @@ -111,7 +111,6 @@ const bgGradientClasses = computed(() => { fromColor = 'pink'; toColor = 'yellow'; } - if (props.disabled) { return `bg-gray-300 dark:bg-gray-700 text-white dark:text-gray-500`; } diff --git a/src/components/_global/icons/WalletIcon.vue b/src/components/_global/icons/WalletIcon.vue index 2b7c22dc1..1e7ad5949 100644 --- a/src/components/_global/icons/WalletIcon.vue +++ b/src/components/_global/icons/WalletIcon.vue @@ -1,48 +1,16 @@ diff --git a/src/components/contextual/pages/dashboard/Cards/RefiProfileCard.vue b/src/components/contextual/pages/dashboard/Cards/RefiProfileCard.vue new file mode 100644 index 000000000..7faa34ae0 --- /dev/null +++ b/src/components/contextual/pages/dashboard/Cards/RefiProfileCard.vue @@ -0,0 +1,120 @@ + + \ No newline at end of file diff --git a/src/components/contextual/pages/dashboard/Cards/WeeklyCard.vue b/src/components/contextual/pages/dashboard/Cards/WeeklyCard.vue new file mode 100644 index 000000000..04e5866d6 --- /dev/null +++ b/src/components/contextual/pages/dashboard/Cards/WeeklyCard.vue @@ -0,0 +1,145 @@ + + \ No newline at end of file diff --git a/src/components/contextual/pages/dashboard/DashboardTable/ClaimsTable.vue b/src/components/contextual/pages/dashboard/DashboardTable/ClaimsTable.vue new file mode 100644 index 000000000..989ad9c3a --- /dev/null +++ b/src/components/contextual/pages/dashboard/DashboardTable/ClaimsTable.vue @@ -0,0 +1,107 @@ + + + diff --git a/src/components/contextual/pages/dashboard/DashboardTable/LiquidityTable.vue b/src/components/contextual/pages/dashboard/DashboardTable/LiquidityTable.vue new file mode 100644 index 000000000..1ae2f2557 --- /dev/null +++ b/src/components/contextual/pages/dashboard/DashboardTable/LiquidityTable.vue @@ -0,0 +1,283 @@ + + + + + + + + + diff --git a/src/components/footer/Footer.vue b/src/components/footer/Footer.vue index ced5f7163..bf4face88 100644 --- a/src/components/footer/Footer.vue +++ b/src/components/footer/Footer.vue @@ -28,15 +28,7 @@ const { openNpsModal } = useAppzi(); class="font-medium link" :to="{ name: 'home', params: { networkSlug } }" > - +
@@ -173,7 +165,7 @@ const { openNpsModal } = useAppzi();

diff --git a/src/components/images/AppLogo.vue b/src/components/images/AppLogo.vue index 4bf9f8e7b..86592f85b 100644 --- a/src/components/images/AppLogo.vue +++ b/src/components/images/AppLogo.vue @@ -1,136 +1,57 @@ - - \ No newline at end of file diff --git a/src/components/images/_AppLogo.vue b/src/components/images/_AppLogo.vue new file mode 100644 index 000000000..e3986475b --- /dev/null +++ b/src/components/images/_AppLogo.vue @@ -0,0 +1,140 @@ + + + + + \ No newline at end of file diff --git a/src/components/navs/AppNav/AppNav.vue b/src/components/navs/AppNav/AppNav.vue index 3c5a19be6..9101b88ee 100644 --- a/src/components/navs/AppNav/AppNav.vue +++ b/src/components/navs/AppNav/AppNav.vue @@ -53,22 +53,21 @@ onUnmounted(() => {