Skip to content

Hide rewards #424

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

Merged
shrinathprabhu merged 2 commits into from
Apr 26, 2024
Merged

Hide rewards #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1134bee
Merge pull request #423 from arcana-network/shrinath/debug-and-fix-hi…
shrinathprabhu Apr 25, 2024
138f76c
Hide rewards and xp related stuff
shrinathprabhu Apr 26, 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
58 changes: 29 additions & 29 deletions src/components/layout/AppHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script setup lang="ts">
import { computed, ref, defineAsyncComponent } from "vue";
import { ref, defineAsyncComponent } from "vue";

import navMenu from "@/constants/navMenu.ts";
import { useClickOutside } from "@/use/clickOutside";
import useUserStore from "@/stores/user";
// import useUserStore from "@/stores/user";
// import useRewardsStore from "@/stores/rewards";
import useNotificationStore from "@/stores/notification";
import AppInvite from "@/components/AppInvite.vue";
Expand All @@ -25,7 +25,7 @@ type HeaderProps = {
const props = defineProps<HeaderProps>();
const route = useRoute();

const userStore = useUserStore();
// const userStore = useUserStore();
// const rewardsStore = useRewardsStore();
const notificationStore = useNotificationStore();

Expand Down Expand Up @@ -75,26 +75,26 @@ function handleInvite() {
showProfile.value = false;
}

const stats = computed(() => {
return [
{
label: "Global Rank",
value: userStore.rank,
},
{
label: "Total XP",
value: userStore.points,
},
{
label: "Referral XP",
value: userStore.xpBreakdown?.referreePoints ?? 0,
},
// {
// label: "My Rewards",
// value: rewardsStore.rewards.length,
// },
];
});
// const stats = computed(() => {
// return [
// {
// label: "Global Rank",
// value: userStore.rank,
// },
// {
// label: "Total XP",
// value: userStore.points,
// },
// {
// label: "Referral XP",
// value: userStore.xpBreakdown?.referreePoints ?? 0,
// },
// // {
// // label: "My Rewards",
// // value: rewardsStore.rewards.length,
// // },
// ];
// });
</script>

<template>
Expand Down Expand Up @@ -127,15 +127,15 @@ const stats = computed(() => {
{{ menu.label }}
</router-link>
</nav>
<router-link
<!-- <router-link
v-if="!props.hideNav"
:to="{ name: 'Airdrop' }"
class="text-cornflower-blue text-xs font-normal bg-[#293c5f] rounded-[5px] p-1"
>Airdrop Live!</router-link
>
> -->
</div>
<div v-if="!props.hideNav" class="flex items-center gap-5">
<div class="flex gap-3 max-md:hidden">
<!-- <div class="flex gap-3 max-md:hidden">
<div
class="flex items-center gap-2 p-2.5 border-1 border-jet rounded-xl"
v-for="stat in stats"
Expand All @@ -144,7 +144,7 @@ const stats = computed(() => {
<span class="text-xs">{{ stat.label }}</span>
<span class="text-xl">{{ stat.value }}</span>
</div>
</div>
</div> -->
<div class="gap-3 flex items-center">
<a href="mailto:support@arcana.network">Help</a>
<button class="relative" @click.stop="toggleNotifications">
Expand Down Expand Up @@ -203,7 +203,7 @@ const stats = computed(() => {
</div>
</div>
</header>
<div
<!-- <div
v-if="!props.hideUserData"
class="border-b-1 border-jet md:hidden py-2 flex justify-center"
>
Expand All @@ -217,7 +217,7 @@ const stats = computed(() => {
<span class="text-xl">{{ stat.value }}</span>
</div>
</div>
</div>
</div> -->
<AppInvite v-if="showInvitePopup" @close="showInvitePopup = false" />
</div>
</template>
11 changes: 5 additions & 6 deletions src/pages/private/rewards/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,24 @@ const route = useRoute();
<div class="flex flex-col p-8">
<span class="text-3.5xl">Rewards</span>
<span class="text-sm text-philippine-gray max-w-[540px]"
>Find all your rewards below. Earn more XP to increase your leaderboard
rank. Testnet transactions are worth ⅕ XP of mainnet transactions.</span
>Find all your rewards below.</span
>
<span class="text-sm text-philippine-gray max-w-[720px] mt-4"
<!-- <span class="text-sm text-philippine-gray max-w-[720px] mt-4"
><strong
>* Note: Earn Send XP for up to 50 transactions daily; no limits on
10% bonus XP.</strong
></span
>
> -->
</div>
<div
class="flex mx-8 my-0 bg-eerie-black max-w-max flex-wrap py-1 px-2 border border-jet rounded-[10px] text-philippine-gray text-sm"
>
<router-link
<!-- <router-link
class="px-2 py-1 cursor-pointer rounded-[5px]"
:class="{ 'bg-[#141414] text-white': route.name === 'Earn XP' }"
:to="{ name: 'Earn XP' }"
>Earn XP</router-link
>
> -->
<router-link
class="px-2 py-1 cursor-pointer rounded-[5px]"
:class="{ 'bg-[#141414] text-white': route.name === 'My Rewards' }"
Expand Down
60 changes: 30 additions & 30 deletions src/pages/private/transaction/request/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<script setup lang="ts">
import "vue3-carousel/dist/carousel.css";
import { ref, onBeforeMount, computed, onBeforeUnmount } from "vue";
import { ref, onBeforeMount, onBeforeUnmount } from "vue";
import RequestForm from "@/components/request/requestForm.vue";
import useRequestStore from "@/stores/request";
import RequestSuccess from "@/components/request/success.vue";
import { EARN_XP, MONDAY_REWARDS, TUESDAY_REWARDS } from "@/constants/rewards";
import RewardsCard from "@/components/rewards-card.vue";
// import { EARN_XP, MONDAY_REWARDS, TUESDAY_REWARDS } from "@/constants/rewards";
// import RewardsCard from "@/components/rewards-card.vue";
import AppInvite from "@/components/AppInvite.vue";
import useUserStore from "@/stores/user";
import TwitterFollowVerify from "@/components/TwitterFollowVerify.vue";
import { Carousel, Slide, Navigation } from "vue3-carousel";
// import { Carousel, Slide, Navigation } from "vue3-carousel";
import { hexlify } from "ethers";
import dayjs from "dayjs";
// import dayjs from "dayjs";

const requestStore = useRequestStore();
const showSuccessMessage = ref(false);
Expand All @@ -26,21 +26,21 @@ const showFollowVerify = ref({
type: "",
});
const userStore = useUserStore();
const rewardCards = ref([] as typeof EARN_XP);
// const rewardCards = ref([] as typeof EARN_XP);
const requestSymbol = ref("");
const requestAmount = ref("");
const rewardsInterval = ref(null as any);
const currentDayOfWeek = ref(dayjs().day());
// const currentDayOfWeek = ref(dayjs().day());

const displayableRewards = computed(() => {
if ([1, 3].includes(currentDayOfWeek.value)) {
return [...MONDAY_REWARDS, ...rewardCards.value];
} else if ([2, 4].includes(currentDayOfWeek.value)) {
return [...TUESDAY_REWARDS, ...rewardCards.value];
} else {
return [...rewardCards.value];
}
});
// const displayableRewards = computed(() => {
// if ([1, 3].includes(currentDayOfWeek.value)) {
// return [...MONDAY_REWARDS, ...rewardCards.value];
// } else if ([2, 4].includes(currentDayOfWeek.value)) {
// return [...TUESDAY_REWARDS, ...rewardCards.value];
// } else {
// return [...rewardCards.value];
// }
// });

function handleTxSuccess(data) {
showSuccessMessage.value = true;
Expand All @@ -63,19 +63,19 @@ async function handleSuccessModalClose() {
resetUserInput();
}

function OpenVerifyFollow() {
showFollowVerify.value.show = true;
showFollowVerify.value.type = "twitter";
}
// function OpenVerifyFollow() {
// showFollowVerify.value.show = true;
// showFollowVerify.value.type = "twitter";
// }

onBeforeMount(async () => {
await userStore.fetchUserPointsAndRank();
rewardCards.value = EARN_XP.filter((item) =>
userStore.followedOnTwitter ? item.medium !== "twitter" : true
);
rewardsInterval.value = setInterval(() => {
currentDayOfWeek.value = dayjs().day();
}, 1000 * 60);
// rewardCards.value = EARN_XP.filter((item) =>
// userStore.followedOnTwitter ? item.medium !== "twitter" : true
// );
// rewardsInterval.value = setInterval(() => {
// currentDayOfWeek.value = dayjs().day();
// }, 1000 * 60);
});

onBeforeUnmount(() => {
Expand Down Expand Up @@ -103,7 +103,7 @@ onBeforeUnmount(() => {
>
<RequestForm @transaction-successful="handleTxSuccess" />
</div>
<Carousel
<!-- <Carousel
wrap-around
pause-autoplay-on-hover
:autoplay="3000"
Expand All @@ -121,9 +121,9 @@ onBeforeUnmount(() => {
<template #addons>
<Navigation />
</template>
</Carousel>
<span class="text-xs text-philippine-gray max-w-[720px] mb-5 px-4 mx-auto"
</Carousel> -->
<!-- <span class="text-xs text-philippine-gray max-w-[720px] mb-5 px-4 mx-auto"
>* Note: Earn Send XP for up to 50 transactions daily; no limits on 10%
bonus XP.</span
>
> -->
</template>
60 changes: 30 additions & 30 deletions src/pages/private/transaction/send/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<script setup lang="ts">
import "vue3-carousel/dist/carousel.css";
import { ref, onBeforeMount, computed, onBeforeUnmount } from "vue";
import { ref, onBeforeMount, onBeforeUnmount } from "vue";
import SendForm from "@/components/send/sendForm.vue";
import useSendStore from "@/stores/send";
import SendSuccess from "@/components/send/success.vue";
import RequestSendSuccess from "@/components/send/requestSuccess.vue";
import TweetVerify from "@/components/TweetVerify.vue";
import { composeAndSendTweet } from "@/utils/tweet";
import { EARN_XP, MONDAY_REWARDS, TUESDAY_REWARDS } from "@/constants/rewards";
import RewardsCard from "@/components/rewards-card.vue";
// import { EARN_XP, MONDAY_REWARDS, TUESDAY_REWARDS } from "@/constants/rewards";
// import RewardsCard from "@/components/rewards-card.vue";
import AppInvite from "@/components/AppInvite.vue";
import useUserStore from "@/stores/user";
import generateSenditUrl from "@/utils/generateSenditUrl";
import { normaliseTwitterHandle } from "@/utils/normalise";
import TwitterFollowVerify from "@/components/TwitterFollowVerify.vue";
import { Carousel, Slide, Navigation } from "vue3-carousel";
// import { Carousel, Slide, Navigation } from "vue3-carousel";
import { useRoute } from "vue-router";
import RequestSendForm from "@/components/send/requestForm.vue";
import dayjs from "dayjs";
// import dayjs from "dayjs";

const sendStore = useSendStore();
const showSuccessMessage = ref(false);
Expand All @@ -39,20 +39,20 @@ const verifier = ref("");
const amount = ref("");
const token = ref("");
const chain = ref("");
const rewardCards = ref([] as typeof EARN_XP);
// const rewardCards = ref([] as typeof EARN_XP);
const route = useRoute();
const rewardsInterval = ref(null as any);
const currentDayOfWeek = ref(dayjs().day());
// const currentDayOfWeek = ref(dayjs().day());

const displayableRewards = computed(() => {
if ([1, 3].includes(currentDayOfWeek.value)) {
return [...MONDAY_REWARDS, ...rewardCards.value];
} else if ([2, 4].includes(currentDayOfWeek.value)) {
return [...TUESDAY_REWARDS, ...rewardCards.value];
} else {
return [...rewardCards.value];
}
});
// const displayableRewards = computed(() => {
// if ([1, 3].includes(currentDayOfWeek.value)) {
// return [...MONDAY_REWARDS, ...rewardCards.value];
// } else if ([2, 4].includes(currentDayOfWeek.value)) {
// return [...TUESDAY_REWARDS, ...rewardCards.value];
// } else {
// return [...rewardCards.value];
// }
// });

function handleTxSuccess(data) {
showSuccessMessage.value = true;
Expand Down Expand Up @@ -107,19 +107,19 @@ function getToValue(verifier, verifier_human) {
} else return `an email address`;
}

function OpenVerifyFollow() {
showFollowVerify.value.show = true;
showFollowVerify.value.type = "twitter";
}
// function OpenVerifyFollow() {
// showFollowVerify.value.show = true;
// showFollowVerify.value.type = "twitter";
// }

onBeforeMount(async () => {
await userStore.fetchUserPointsAndRank();
rewardCards.value = EARN_XP.filter((item) =>
userStore.followedOnTwitter ? item.medium !== "twitter" : true
);
rewardsInterval.value = setInterval(() => {
currentDayOfWeek.value = dayjs().day();
}, 1000 * 60);
// rewardCards.value = EARN_XP.filter((item) =>
// userStore.followedOnTwitter ? item.medium !== "twitter" : true
// );
// rewardsInterval.value = setInterval(() => {
// currentDayOfWeek.value = dayjs().day();
// }, 1000 * 60);
});

onBeforeUnmount(() => {
Expand Down Expand Up @@ -175,7 +175,7 @@ onBeforeUnmount(() => {
/>
<SendForm v-else @transaction-successful="handleTxSuccess" />
</div>
<Carousel
<!-- <Carousel
wrap-around
pause-autoplay-on-hover
:autoplay="3000"
Expand All @@ -193,9 +193,9 @@ onBeforeUnmount(() => {
<template #addons>
<Navigation />
</template>
</Carousel>
<span class="text-xs text-philippine-gray max-w-[720px] mb-5 px-4 mx-auto"
</Carousel> -->
<!-- <span class="text-xs text-philippine-gray max-w-[720px] mb-5 px-4 mx-auto"
>* Note: Earn Send XP for up to 50 transactions daily; no limits on 10%
bonus XP.</span
>
> -->
</template>
14 changes: 7 additions & 7 deletions src/router/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,20 @@ const routes: RouteRecordRaw[] = [
name: "Rewards",
path: "rewards",
component: () => import("@/pages/private/rewards/index.vue"),
redirect: { name: "Earn XP" },
redirect: { name: "My Rewards" },
children: [
{
name: "My Rewards",
path: "owned",
component: () =>
import("@/pages/private/rewards/my-rewards/index.vue"),
},
{
name: "Earn XP",
path: "earn",
component: () =>
import("@/pages/private/rewards/earn/index.vue"),
},
// {
// name: "Earn XP",
// path: "earn",
// component: () =>
// import("@/pages/private/rewards/earn/index.vue"),
// },
{
name: "Airdrop",
path: "airdrop",
Expand Down