diff --git a/apps/web/package.json b/apps/web/package.json index 24c28064..ed602a9d 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -23,6 +23,7 @@ "react": "^19.0.0", "react-dom": "^19.0.0", "react-error-boundary": "^5.0.0", + "swiper": "^11.2.6", "zustand": "^4.5.2" }, "devDependencies": { diff --git a/apps/web/src/assets/icons/NoVoteIcon.tsx b/apps/web/src/assets/icons/NoVoteIcon.tsx new file mode 100644 index 00000000..a42c6cf3 --- /dev/null +++ b/apps/web/src/assets/icons/NoVoteIcon.tsx @@ -0,0 +1,96 @@ +export const NoVoteIcon = () => { + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; diff --git a/apps/web/src/assets/icons/SmallXIcon.tsx b/apps/web/src/assets/icons/SmallXIcon.tsx new file mode 100644 index 00000000..5f5ca86d --- /dev/null +++ b/apps/web/src/assets/icons/SmallXIcon.tsx @@ -0,0 +1,26 @@ +const SmallXIcon = () => { + return ( + + + + + ); +}; + +export default SmallXIcon; diff --git a/apps/web/src/assets/icons/XIcon.tsx b/apps/web/src/assets/icons/XIcon.tsx index 0bdc4705..a268aef2 100644 --- a/apps/web/src/assets/icons/XIcon.tsx +++ b/apps/web/src/assets/icons/XIcon.tsx @@ -1,25 +1,17 @@ -import React from "react"; - const XIcon = () => { return ( - ); diff --git a/apps/web/src/components/add-location-modal/style.css.ts b/apps/web/src/components/add-location-modal/style.css.ts index ba459ad3..e179e8ab 100644 --- a/apps/web/src/components/add-location-modal/style.css.ts +++ b/apps/web/src/components/add-location-modal/style.css.ts @@ -7,6 +7,7 @@ export const container = style({ width: "100%", height: "100%", backgroundColor: "#ffffff", + zIndex: zIndex.toast, }); export const searchSection = style({ diff --git a/apps/web/src/components/midpoint-result/molecules/styles.css.ts b/apps/web/src/components/midpoint-result/molecules/styles.css.ts index 7b701d9c..08df84d2 100644 --- a/apps/web/src/components/midpoint-result/molecules/styles.css.ts +++ b/apps/web/src/components/midpoint-result/molecules/styles.css.ts @@ -28,7 +28,7 @@ export const headerStyle = style({ width: "100%", maxWidth: "600px", height: "58px", - zIndex: zIndex.toast, + zIndex: zIndex.header, display: "flex", alignItems: "center", justifyContent: "center", diff --git a/apps/web/src/components/vote-finish/organism/PlaceItem.tsx b/apps/web/src/components/vote-finish/organism/PlaceItem.tsx index 5e98bd74..b8c749fd 100644 --- a/apps/web/src/components/vote-finish/organism/PlaceItem.tsx +++ b/apps/web/src/components/vote-finish/organism/PlaceItem.tsx @@ -3,6 +3,7 @@ import { Candidate } from "../templates/types"; import * as Style from "./PlaceItem.css"; import { theme } from "@repo/ui/tokens"; import Image from "next/image"; +import { NoVoteIcon } from "@/assets/icons/NoVoteIcon"; export function PlaceItem({ stationName, @@ -21,22 +22,36 @@ export function PlaceItem({ {stationName} -
- {members.map(({ id, imageUrl }) => ( - - ))} -
- - - {`${votedCount}명의 친구들이 찬성 중`} - + + {votedCount > 0 ? ( + <> +
+ {members.map(({ id, imageUrl }) => ( + + ))} +
+ + + {`${votedCount}명의 친구들이 찬성 중`} + + + ) : ( + <> + + + + 아무도 콕하지 않은 장소 + + + )} + {resultTag !== "NONE" && (
-
- {placeList.map((place) => ( - - ))} -
- +
+ + {placeList.map((place) => ( + + + + ))} + +
); } diff --git a/apps/web/src/components/vote-voting/atom/Tooltip.tsx b/apps/web/src/components/vote-voting/atom/Tooltip.tsx index 25c48ddb..ff1875f0 100644 --- a/apps/web/src/components/vote-voting/atom/Tooltip.tsx +++ b/apps/web/src/components/vote-voting/atom/Tooltip.tsx @@ -1,5 +1,4 @@ import { Flex, Text } from "@repo/ui/components"; -import XIcon from "@/assets/icons/XIcon"; import { Triangle } from "./Triangle"; import { floatingAnimation, @@ -8,6 +7,7 @@ import { import { theme } from "@repo/ui/tokens"; import { useState, useEffect } from "react"; import { motion } from "@repo/motion"; +import SmallXIcon from "@/assets/icons/SmallXIcon"; export const Tooltip = ({ view }: { view: "card" | "list" }) => { const [show, setShow] = useState(true); @@ -52,7 +52,7 @@ export const Tooltip = ({ view }: { view: "card" | "list" }) => { 역을 누르고 주변을 둘러보세요! - +
= 4.7.0'} + tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} @@ -12351,6 +12358,8 @@ snapshots: lower-case: 1.1.4 upper-case: 1.1.3 + swiper@11.2.6: {} + tapable@2.2.1: {} terser-webpack-plugin@5.3.11(esbuild@0.25.0)(webpack@5.98.0(esbuild@0.25.0)):