Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: feedback issues #40

Merged
merged 6 commits into from
Apr 28, 2024
Merged

feat: feedback issues #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f14dae1
feat: feedback issues
Another-DevX Feb 1, 2024
c319cd8
feat: feedback issues
Another-DevX Feb 5, 2024
206b4e7
chore: change sidebar color
Another-DevX Feb 5, 2024
1301eea
feat: add metadata
Another-DevX Feb 7, 2024
e5b1d95
feat: add snapshot
Another-DevX Feb 9, 2024
2cba068
Merge branch 'develop' into AnotherDev/ui-feedback
Another-DevX Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31,284 changes: 0 additions & 31,284 deletions src/assets/css/animations/Animación carga regenerativa.json
View file
Open in desktop

This file was deleted.

1,191 changes: 1,191 additions & 0 deletions src/assets/css/animations/RegenerativeButtonLoadingAnimation.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added src/assets/images/services/snapshot.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 18 additions & 6 deletions src/components/_global/BalBtn/BalBtn.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@

<script setup lang="ts">
import { Vue3Lottie } from 'vue3-lottie';
import BalLoadingIcon from '../BalLoadingIcon/BalLoadingIcon.vue';
import loadingAnimation from '@/assets/css/animations/RegenerativeButtonLoadingAnimation.json';

import {
background,
Expand All @@ -22,8 +24,6 @@ import {
hoverTo,
loadingBackground,
loadingDarkBackground,
loadingFrom,
loadingTo,
text,
} from 'button-options';

Expand Down Expand Up @@ -51,6 +51,7 @@ type Props = {
flat?: boolean;
rounded?: boolean;
loading?: boolean;
regenerativeLoading?: boolean;
loadingLabel?: string;
disabled?: boolean;
justifyContent?: 'start' | 'center' | 'end' | 'between';
Expand All @@ -67,6 +68,7 @@ const props = withDefaults(defineProps<Props>(), {
flat: false,
rounded: false,
loading: false,
regenerativeLoading: false,
loadingLabel: 'loading...',
disabled: false,
justifyContent: 'center',
Expand Down Expand Up @@ -119,9 +121,9 @@ const bgGradientClasses = computed(() => {
return `bg-complementary-b dark:complementary-b text-white `;
}
if (props.loading) {
return `bg-gradient-to-tr ${loadingFrom(fromColor)} ${loadingTo(toColor)}`;
return 'transition-colors button-gradient';
}
if (props.color === 'gradient') return 'transition-colors button-gradient ';
if (props.color === 'gradient') return 'transition-colors button-gradient';

return ` bg-gradient-to-tr ${gradientFrom(fromColor)} ${gradientTo(
toColor
Expand Down Expand Up @@ -242,8 +244,18 @@ const iconColor = computed(() => {
:class="['bal-btn', btnClasses]"
:disabled="disabled || loading"
>
<div v-if="loading" class="flex justify-center items-center">
<BalLoadingIcon :size="size" :color="iconColor" />
<div
v-if="loading || regenerativeLoading"
class="flex justify-center items-center"
>
<Vue3Lottie
v-if="regenerativeLoading"
:animationData="loadingAnimation"
:height="16"
:width="16"
/>

<BalLoadingIcon v-else :size="size" :color="iconColor" />
<span v-if="loadingLabel" class="ml-2">
{{ loadingLabel }}
</span>
Expand Down
125 changes: 101 additions & 24 deletions src/components/contextual/pages/dashboard/Cards/RefiProfileCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { NFTData as TNFTData } from '@/services/campaigns/campaigns.service';
import IsMintingNFTModal from '../Modals/IsMintingNFTModal.vue';
import IsUpgradingNFTModal from '../Modals/IsUpgradingNFTModal.vue';
import { ref, computed, watch } from 'vue';
import Snapshot from '@/assets/images/services/snapshot.png';
import RFP from '@/assets/images/icons/coins/RFP.svg';

const { startConnectWithInjectedProvider } = useWeb3();
const { isMobile, bp } = useBreakpoints();
Expand Down Expand Up @@ -94,25 +96,46 @@ function handleMintNFTClose() {
</h3>
<div class="flex justify-between items-center text-base">
<p>Voting Power</p>
<p v-if="NFTData">{{ NFTData.attributes[1].value }} Votes</p>
<p v-else>- Votes</p>
<div class="flex flex-row gap-2 items-center">
<p v-if="NFTData">
{{ NFTData.attributes[1].value }}
{{
parseInt(NFTData.attributes[1].value) === 1
? 'vote'
: 'votes'
}}
</p>
<p v-else>- Votes</p>
<a
target="_blank"
href="https://snapshot.org/#/regenerativefi.eth"
>
<img :src="Snapshot" class="w-4 h-4" />
</a>
</div>
</div>
</div>
<div class="w-full border-t-2" />
<div class="flex flex-col gap-1">
<div class="flex justify-between items-center text-base">
<p class="text-sm">My Points</p>
<p v-if="isLoading" class="text-sm">- RFP</p>
<p v-else class="text-sm">{{ NFTData?.points }} RFP</p>
<div class="flex flex-row gap-2">
<p v-if="isLoading" class="text-sm">- RFP</p>
<p v-else class="text-sm">{{ NFTData?.points }} RFP</p>
<img :src="RFP" class="w-5 h-5" />
</div>
</div>
<div
class="flex justify-between items-center text-base text-disabled"
>
<p class="text-sm">Next level</p>
<p v-if="NFTData" class="text-sm">
{{ NFTData.tresholds[NFTData?.tier] || 'Max' }} RFP
</p>
<p v-else class="text-sm">- RFP</p>
<div class="flex flex-row gap-2 items-center">
<p v-if="NFTData" class="text-sm">
{{ NFTData.tresholds[NFTData?.tier] || 'Max' }} RFP
</p>
<p v-else class="text-sm">- RFP</p>
<img :src="RFP" class="w-5 h-5" />
</div>
</div>
</div>
<BalBtn
Expand All @@ -128,6 +151,8 @@ function handleMintNFTClose() {
:disabled="!isAbleToUpgradeNFT"
:color="!isAbleToUpgradeNFT ? 'gray' : 'gradient-blue-light'"
class="self-end w-fit"
:regenerativeLoading="isUpgradingNFTStatus.loading"
loadingLabel="Upgrading NFT"
size="sm"
@click="() => UpgradeNFT(NFTData?.id as number)"
>Upgrade</BalBtn
Expand All @@ -136,6 +161,8 @@ function handleMintNFTClose() {
v-else
:color="isMintingNFTStatus.loading ? 'gray' : 'gradient-blue-light'"
:disabled="isMintingNFTStatus.loading"
:regenerativeLoading="isMintingNFTStatus.loading"
loadingLabel="Minting NFT"
class="self-end w-fit"
size="sm"
@click="() => MintNFT()"
Expand All @@ -162,25 +189,46 @@ function handleMintNFTClose() {
</h3>
<div class="flex justify-between items-center text-base">
<p>Voting Power</p>
<p v-if="NFTData">{{ NFTData.attributes[1].value }} Votes</p>
<p v-else>- Votes</p>
<div class="flex flex-row gap-2 items-center">
<p v-if="NFTData">
{{ NFTData.attributes[1].value }}
{{
parseInt(NFTData.attributes[1].value) === 1
? 'vote'
: 'votes'
}}
</p>
<p v-else>- Votes</p>
<a
target="_blank"
href="https://snapshot.org/#/regenerativefi.eth"
>
<img :src="Snapshot" class="w-4 h-4" />
</a>
</div>
</div>
</div>
<div class="w-full border-t-2" />
<div class="flex flex-col gap-1">
<div class="flex justify-between items-center text-base">
<p class="text-sm">My Points</p>
<p v-if="isLoading" class="text-sm">- RFP</p>
<p v-else class="text-sm">{{ NFTData?.points }} RFP</p>
<div class="flex flex-row gap-2">
<p v-if="isLoading" class="text-sm">- RFP</p>
<p v-else class="text-sm">{{ NFTData?.points }} RFP</p>
<img :src="RFP" class="w-5 h-5" />
</div>
</div>
<div
class="flex justify-between items-center text-base text-disabled"
>
<p class="text-sm">Next level</p>
<p v-if="NFTData" class="text-sm">
{{ NFTData.tresholds[NFTData?.tier] || 'Max' }} RFP
</p>
<p v-else class="text-sm">- RFP</p>
<div class="flex flex-row gap-2 items-center">
<p v-if="NFTData" class="text-sm">
{{ NFTData.tresholds[NFTData?.tier] || 'Max' }} RFP
</p>
<p v-else class="text-sm">- RFP</p>
<img :src="RFP" class="w-5 h-5" />
</div>
</div>
</div>
<BalBtn
Expand All @@ -196,6 +244,8 @@ function handleMintNFTClose() {
:disabled="!isAbleToUpgradeNFT"
:color="!isAbleToUpgradeNFT ? 'gray' : 'gradient-blue-light'"
class="self-end w-fit"
:regenerativeLoading="isUpgradingNFTStatus.loading"
loadingLabel="Upgrading NFT"
size="sm"
@click="() => UpgradeNFT(NFTData?.id as number)"
>Upgrade</BalBtn
Expand All @@ -204,6 +254,8 @@ function handleMintNFTClose() {
v-else
:color="isMintingNFTStatus.loading ? 'gray' : 'gradient-blue-light'"
:disabled="isMintingNFTStatus.loading"
:regenerativeLoading="isMintingNFTStatus.loading"
loadingLabel="Minting NFT"
class="self-end w-fit"
size="sm"
@click="() => MintNFT()"
Expand Down Expand Up @@ -233,25 +285,46 @@ function handleMintNFTClose() {
<h3 v-else class="self-start text-lg">Mint NFT</h3>
<div class="flex justify-between items-center text-base">
<p>Voting Power</p>
<p v-if="NFTData">{{ NFTData.attributes[1].value }} Votes</p>
<p v-else>- Votes</p>
<div class="flex flex-row gap-2 items-center">
<p v-if="NFTData">
{{ NFTData.attributes[1].value }}
{{
parseInt(NFTData.attributes[1].value) === 1
? 'vote'
: 'votes'
}}
</p>
<p v-else>- Votes</p>
<a
target="_blank"
href="https://snapshot.org/#/regenerativefi.eth"
>
<img :src="Snapshot" class="w-4 h-4" />
</a>
</div>
</div>
</div>
<div class="w-full border-t-2" />
<div class="flex flex-col gap-1">
<div class="flex justify-between items-center text-base">
<p class="text-sm">My Points</p>
<p v-if="isLoading" class="text-sm">- RFP</p>
<p v-else class="text-sm">{{ NFTData?.points }} RFP</p>
<div class="flex flex-row gap-2">
<p v-if="isLoading" class="text-sm">- RFP</p>
<p v-else class="text-sm">{{ NFTData?.points }} RFP</p>
<img :src="RFP" class="w-5 h-5" />
</div>
</div>
<div
class="flex justify-between items-center text-base text-disabled"
>
<p class="text-sm">Next level</p>
<p v-if="NFTData" class="text-sm">
{{ NFTData.tresholds[NFTData?.tier] || 'Max' }} RFP
</p>
<p v-else class="text-sm">- RFP</p>
<div class="flex flex-row gap-2 items-center">
<p v-if="NFTData" class="text-sm">
{{ NFTData.tresholds[NFTData?.tier] || 'Max' }} RFP
</p>
<p v-else class="text-sm">- RFP</p>
<img :src="RFP" class="w-5 h-5" />
</div>
</div>
</div>
<BalBtn
Expand All @@ -267,6 +340,8 @@ function handleMintNFTClose() {
:disabled="!isAbleToUpgradeNFT"
:color="!isAbleToUpgradeNFT ? 'gray' : 'gradient-blue-light'"
class="self-end w-fit"
:regenerativeLoading="isUpgradingNFTStatus.loading"
loadingLabel="Upgrading NFT"
size="sm"
@click="() => UpgradeNFT(NFTData?.id as number)"
>Upgrade</BalBtn
Expand All @@ -275,6 +350,8 @@ function handleMintNFTClose() {
v-else
:color="isMintingNFTStatus.loading ? 'gray' : 'gradient-blue-light'"
:disabled="isMintingNFTStatus.loading"
:regenerativeLoading="isMintingNFTStatus.loading"
loadingLabel="Minting NFT"
class="self-end w-fit"
size="sm"
@click="() => MintNFT()"
Expand Down
3 changes: 2 additions & 1 deletion src/components/contextual/pages/dashboard/Modals/MintNFTModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ function onImageLoad() {
<BalModal
:class="isImageLoaded ? 'visible' : 'invisible'"
:show="isOpenModal"
customBgColor="bg-refi-gray"
:fireworks="true"
@close="handleCloseModal"
>
<div class="flex flex-col gap-4 justify-center items-center">
<div class="flex flex-col gap-4 justify-center items-center text-white">
<div class="flex flex-col gap-2 justify-center items-center w-full">
<p>Here is your new NFT</p>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/components/contextual/pages/dashboard/Modals/UpgradeNFTModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ function onImageLoad() {
<BalModal
:class="isImageLoaded ? 'visible' : 'invisible'"
:show="isOpenModal"
customBgColor="bg-refi-gray"
:fireworks="true"
@close="handleCloseModal"
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/footer/Footer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const { openNpsModal } = useAppzi();
{{ $t('docs') }}
</BalLink>
<BalLink
:href="EXTERNAL_LINKS.RegenerativeFI.Docs"
:href="EXTERNAL_LINKS.RegenerativeFI.Support"
external
noStyle
class="group link link--external"
Expand Down
22 changes: 16 additions & 6 deletions src/components/heros/HomePageHero.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defineProps<Props>();
<div class="flex flex-col gap-4">
<div class="flex flex-row gap-4 justify-center items-center">
<div
class="py-2 px-3 w-full rounded-md border dark:border-gray-900 shadow-xl"
class="py-2 px-3 w-full rounded-md border dark:border-gray-900 card-shadow"
>
<h4
v-if="isPoolsVolumesLoading"
Expand All @@ -34,7 +34,7 @@ defineProps<Props>();
</h4>
</div>
<div
class="py-2 px-3 w-full rounded-md border dark:border-gray-900 shadow-xl"
class="py-2 px-3 w-full rounded-md border dark:border-gray-900 card-shadow"
>
<h4
v-if="isPoolsVolumesLoading"
Expand All @@ -47,7 +47,7 @@ defineProps<Props>();
</h4>
</div>
</div>
<p>
<p class="text-sm font-normal text-complementary">
There are currently {{ tokensAmount }} tokens listed.
<a
class="underline underline-offset-2"
Expand All @@ -63,15 +63,25 @@ defineProps<Props>();
</BalCard>
<BalCard growContent>
<div class="flex flex-col justify-between items-start w-full h-full">
<h4>How pools function</h4>
<p>
<h4 class="text-base font-medium">How pools function</h4>
<p class="text-sm font-normal text-complementary">
Liquidity Providers add It is a long established fact that a reader
will be distracted by the readable content of a page when looking at
its layout. The point of using Lorem Ipsum is that it has.
</p>
<a class="underline underline-offset-2" href="#">Learn more</a>
<a
class="text-sm font-normal text-complementary underline underline-offset-2"
href="#"
>Learn more</a
>
</div>
</BalCard>
</div>
</div>
</template>

<style scoped>
.card-shadow {
box-shadow: 1px 2px 6px 0 #00000024;
}
</style>
2 changes: 1 addition & 1 deletion src/components/navs/AppNav/AppSidebar/AppSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ watch(showSidebar, () => {
.sidebar-overlay {
z-index: 999999999;

@apply fixed top-0 left-0 h-screen w-full bg-black/80 cursor-pointer flex;
@apply fixed top-0 left-0 h-screen w-full bg-primary-refi cursor-pointer flex;

backdrop-filter: blur(5px);
}
Expand Down
Loading
Loading