Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-10-01 15:48:23 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

don't show sugg button front if voting has started

Browse Source
This commit is contained in:
Kalle (Sendou)
2021-03-19 12:24:08 +02:00
parent 0ce08bf00a
commit d895542abb
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/plus/components/PlusHomePage.tsx
View File

@@ -12,6 +12,7 @@ import MyHead from "components/common/MyHead";
import SubText from "components/common/SubText";
import { useUser } from "hooks/common";
import { Fragment } from "react";
import { getVotingRange } from "utils/plus";
import { getFullUsername } from "utils/strings";
import Suggestion from "./Suggestion";
import SuggestionModal from "./SuggestionModal";
@@ -35,16 +36,22 @@ const PlusHomePage = () => {
<Box fontSize="sm" mb={4}>
<VotingInfoHeader isMember={!!plusStatusData?.membershipTier} />
</Box>
{plusStatusData && plusStatusData.membershipTier && !ownSuggestion && (
<SuggestionModal
userPlusMembershipTier={plusStatusData.membershipTier}
/>
{!getVotingRange().isHappening && (
<>
{plusStatusData &&
plusStatusData.membershipTier &&
!ownSuggestion && (
<SuggestionModal
userPlusMembershipTier={plusStatusData.membershipTier}
/>
)}
{plusStatusData &&
plusStatusData.canVouchFor &&
!plusStatusData.canVouchAgainAfter && (
<VouchModal canVouchFor={plusStatusData.canVouchFor} />
)}
</>
)}
{plusStatusData &&
plusStatusData.canVouchFor &&
!plusStatusData.canVouchAgainAfter && (
<VouchModal canVouchFor={plusStatusData.canVouchFor} />
)}
{plusStatusData &&
(plusStatusData.canVouchAgainAfter ||
plusStatusData.voucher ||

3
app/plus/components/Suggestion.tsx
View File

@@ -18,6 +18,7 @@ import { useMyTheme } from "hooks/common";
import { useState } from "react";
import { useForm } from "react-hook-form";
import { getToastOptions } from "utils/getToastOptions";
import { getVotingRange } from "utils/plus";
import { getFullUsername } from "utils/strings";
import { trpc } from "utils/trpc";
import { Unpacked } from "utils/types";
@@ -95,7 +96,7 @@ const Suggestion = ({
</Box>
);
})}
{canSuggest && !showTextarea && (
{canSuggest && !showTextarea && !getVotingRange().isHappening && (
<Button
variant="outline"
size="sm"