Skip to content

Commit

Permalink
기타 소소한 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
happyGyu committed Oct 3, 2024
1 parent 18d1a1e commit 36b9591
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
Binary file added src/assets/gem.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/pages/my-pick-detail/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import GEM from "@/assets/ic22_dia.svg?react";
import GemImage from "@/assets/gem.png";
import { BackButton } from "@/components/common/BackButton";
import { Header } from "@/components/common/Header";
import Image from "@/components/common/Image";
import { useGetCurrentCoin } from "@/generated/coin/coin";
import type { ReceivedPickDetail } from "@/generated/model";
import { getGetPickDetailQueryOptions } from "@/generated/pick/pick";
Expand Down Expand Up @@ -77,9 +78,8 @@ export const MyPickDetailPage: ActivityComponentType<MyPickDetailPageProps> = ({
title={isIntersecting ? "" : question.questionContent}
left={<BackButton />}
right={
// TODO: GEM 개수 API 연동
<div className="flex space-x-[2px] items-center">
<GEM />
<div className="flex gap-1 items-center">
<Image src={GemImage} className="w-[18px] h-[18px]" />
<span className="t-h6-sb-15">{coin ?? "-"}</span>
</div>
}
Expand Down
8 changes: 1 addition & 7 deletions src/pages/vote/VotePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,7 @@ function VoteQuestions({
</div>
<div className="flex justify-between align-middle w-full mt-auto">
<ShuffleButton disabled={isShuffleDisabled} onClick={handleShuffle} />
<SkipButton
disabled={isShuffleDisabled}
onClick={() => makePick({ pickId: "", skip: true })}
/>
<SkipButton onClick={() => makePick({ pickId: "", skip: true })} />
</div>
</>
);
Expand All @@ -214,16 +211,13 @@ function ShuffleButton({
}

function SkipButton({
disabled,
onClick,
}: {
disabled: boolean;
onClick: () => void;
}) {
return (
<button
className=" group flex gap-1 items-center py-2 px-4 rounded-10 bg-offWhite010/30 disabled:text-gray040"
disabled={disabled}
type="button"
onClick={onClick}
>
Expand Down

0 comments on commit 36b9591

Please sign in to comment.