Skip to content

Commit

Permalink
Merge pull request #21 from LikeLion-KNU/feature/#10
Browse files Browse the repository at this point in the history
Feature/#10 맵 컴포넌트 구현
  • Loading branch information
toothlessdev authored May 16, 2024
2 parents a452768 + 904e516 commit 5e7c850
Show file tree
Hide file tree
Showing 18 changed files with 1,887 additions and 85 deletions.
559 changes: 504 additions & 55 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"react-dom": "^18.2.0",
"react-icons": "^5.2.0",
"react-redux": "^9.1.2",
"react-zoom-pan-pinch": "^3.4.4",
"react-router-dom": "^6.23.1",
"styled-components": "^6.1.8",
"vite-plugin-html": "^3.2.2",
Expand Down
10 changes: 5 additions & 5 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { Route, Routes } from "react-router-dom";

import { MainLayout } from "@/components/layout/MainLayout";

import BoothDetailPage from "@/pages/BoothDetailPage";
import BoothListPage from "@/pages/BoothListPage";
import ContributorPage from "@/pages/ContributorPage";
import HomePage from "@/pages/HomePage";
import SpecialGuestPage from "@/pages/SpecialGuestPage";
import TimeTablePage from "@/pages/TimeTablePage";

import BoothDetailPage from "./pages/BoothDetailPage";
import BoothListPage from "./pages/BoothListPage";
import ContributorPage from "./pages/ContributorPage";
import SpecialGuestPage from "./pages/SpecialGuestPage";
import TimeTablePage from "./pages/TimeTablePage";
import { GlobalStyle } from "./styles/globals";
import { store } from "@/store/store";

Expand Down
138 changes: 138 additions & 0 deletions src/assets/map.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file removed src/components/display/.gitkeep
Empty file.
35 changes: 21 additions & 14 deletions src/components/display/Booth.styled.ts
Original file line number Diff line number Diff line change
@@ -1,37 +1,44 @@
import { motion } from "framer-motion";
import styled from "styled-components";

export const BoothList = styled(motion.li)`
height: 40px;
padding: 20px 25px;
export const BoothListItem = styled(motion.li)`
height: 70px;
padding: 0px 25px;
margin: 12px 0;
border-radius: 25px;
background-color: #e9e9fb;
align-content: center;
`;

export const BoothLink = styled.a`
position: relative;
text-decoration: none;
width: 100%;
height: 100%;
display: flex;
justify-content: space-between;
align-items: center;
text-decoration: none;
span {
position: absolute;
left: 50px;
display: flex;
align-items: center;
width: 100%;
padding-left: 20px;
}
`;

export const Index = styled.div`
position: absolute;
left: 0;
flex-shrink: 0;
width: 30px;
height: 30px;
border-radius: 10px;
align-content: center;
text-align: center;
font-weight: bolder;
font-size: 20px;
display: flex;
justify-content: center;
align-items: center;
color: #fff;
background-color: #9874ff;
Expand Down
6 changes: 3 additions & 3 deletions src/components/display/Booth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Variants } from "framer-motion";

import { Text } from "@/components/typography/Text";

import { BoothList, BoothLink, Index } from "./Booth.styled";
import { BoothLink, Index, BoothListItem } from "./Booth.styled";
import { Heart } from "./Heart";

interface IBooth {
Expand All @@ -18,14 +18,14 @@ const itemVariants: Variants = {

export const Booth: React.FC<IBooth> = ({ index, name, num, likable }) => {
return (
<BoothList variants={itemVariants}>
<BoothListItem variants={itemVariants}>
<BoothLink href={`booth/${index + 1}`}>
<Index>{index + 1}</Index>
<Text size="m" weight="bold" variant="#5D5A88">
{name}
</Text>
<Heart num={num} likable={likable} />
</BoothLink>
</BoothList>
</BoothListItem>
);
};
2 changes: 0 additions & 2 deletions src/components/display/Heart.styled.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ interface IHeart {
likable: boolean;
}
export const HeartWrapper = styled.div<IHeart>`
position: absolute;
right: 0;
width: 40px;
height: 40px;
border-radius: 50%;
Expand Down
Loading

0 comments on commit 5e7c850

Please sign in to comment.