suggestions improvements

This commit is contained in:
Kalle
2021-02-25 20:27:00 +02:00
parent 5b93dfbcc7
commit 3258ddfd2c
8 changed files with 35 additions and 52 deletions

View File

@@ -1,21 +1,19 @@
import { Button } from "@chakra-ui/button";
import { Box, Center, Divider, Flex, Stack } from "@chakra-ui/layout";
import { Radio, RadioGroup } from "@chakra-ui/react";
import { Trans } from "@lingui/macro";
import MyLink from "components/common/MyLink";
import SubText from "components/common/SubText";
import UserAvatar from "components/common/UserAvatar";
import { useUser } from "hooks/common";
import { usePlus } from "hooks/plus";
import useMutation from "hooks/useMutation";
import { getFullUsername } from "lib/strings";
import { Fragment } from "react";
import { Suggestions } from "services/plus";
import Suggestion from "./Suggestion";
import SuggestionVouchModal from "./SuggestionVouchModal";
export interface PlusHomePageProps {}
export interface PlusHomePageProps {
suggestions: Suggestions;
}
const PlusHomePage: React.FC<PlusHomePageProps> = () => {
const PlusHomePage: React.FC<PlusHomePageProps> = ({ suggestions }) => {
const [user] = useUser();
const {
plusStatusData,
@@ -24,7 +22,7 @@ const PlusHomePage: React.FC<PlusHomePageProps> = () => {
suggestionsLoading,
suggestionCounts,
setSuggestionsFilter,
} = usePlus();
} = usePlus(suggestions);
return (
<>

View File

@@ -12,6 +12,7 @@ import { Trans } from "@lingui/macro";
import MyLink from "components/common/MyLink";
import SubText from "components/common/SubText";
import UserAvatar from "components/common/UserAvatar";
import { useMyTheme } from "hooks/common";
import useMutation from "hooks/useMutation";
import { getFullUsername } from "lib/strings";
import { Unpacked } from "lib/types";
@@ -33,6 +34,7 @@ const Suggestion = ({
suggestion: Unpacked<Suggestions>;
canSuggest: boolean;
}) => {
const { gray } = useMyTheme();
const [showTextarea, setShowTextarea] = useState(false);
const { handleSubmit, errors, register, watch } = useForm<FormData>({
resolver: zodResolver(resuggestionSchema),
@@ -57,7 +59,10 @@ const Suggestion = ({
{getFullUsername(suggestion.suggestedUser)}
</MyLink>
</Flex>
<Box ml={2}>
<Box>
<Box fontSize="sm" color={gray}>
{new Date(suggestion.createdAt).toLocaleString()}
</Box>
<SubText mt={2}>+{suggestion.tier}</SubText>
<Box mt={4} fontSize="sm">
"{suggestion.description}" -{" "}