Merge branch 'dev' of https://github.com/LikeLion-KNU/knufest into dev

LikeLion-KNU · May 12, 2024 · ecf87ac · ecf87ac
2 parents e92c3c5 + 0ef3614
commit ecf87ac
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
     "version": "0.0.0",
     "type": "module",
     "scripts": {
-        "dev": "vite",
+        "dev": "vite --host",
         "build": "tsc && vite build",
         "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
         "preview": "vite preview",

diff --git a/src/components/display/Countdown.styled.ts b/src/components/display/Countdown.styled.ts
@@ -8,7 +8,7 @@ export const CountdownContainer = styled.div`
     font-size: 2rem;
     color: #333;
     text-align: center;
-    padding: 30px 60px;
+    padding: 40px 20px;
 
     span {
         margin-bottom: 1rem;

diff --git a/src/components/display/Countdown.tsx b/src/components/display/Countdown.tsx
@@ -31,7 +31,7 @@ export const Countdown: React.FC<ICountdown> = ({ targetDate }) => {
             <Text size="xl" weight="bold" variant="lightpurple">
                 {displayTime}
             </Text>
-            <Text size="m" weight="normal" variant="darkpurple">
+            <Text size="xs" weight="normal" variant="darkpurple">
                 UTC+9 | {targetDate.toLocaleDateString("ko-KR", dateOptions)}{" "}
                 {targetDate.toLocaleTimeString("en-US", timeOptions)}
             </Text>

diff --git a/src/components/layout/Footer.styled.ts b/src/components/layout/Footer.styled.ts
@@ -11,7 +11,7 @@ export const TopBorder = styled.div`
     height: 1px;
     background-color: #d0d0d0;
     width: 70%;
-    margin: 0 auto 20px;
+    margin: 0 auto 50px;
 `;
 
 export const Logo = styled.img`
@@ -20,7 +20,7 @@ export const Logo = styled.img`
 `;
 
 export const EventName = styled.h3`
-    margin: 30px 0;
+    margin: 20px 0 10px 0;
 `;
 
 export const LegalLinks = styled.div``;

diff --git a/src/components/layout/Footer.tsx b/src/components/layout/Footer.tsx
@@ -11,20 +11,14 @@ const Footer: React.FC = () => {
             <TopBorder />
             <Logo src={logo} alt="Event Logo" />
             <EventName>
-                <Text size="l" weight="normal" variant="purple">
+                <Text size="m" weight="bold" variant="purple">
                     2024 경북대학교 대동제
                 </Text>
             </EventName>
             <LegalLinks>
                 <LegalText>
                     <Text size="s" weight="normal" variant="lightpurple">
-                        © 2024 LikeLion
-                    </Text>
-                    <Text size="xs" weight="normal" variant="purple">
-                        &nbsp;|&nbsp;
-                    </Text>
-                    <Text size="s" weight="normal" variant="lightpurple">
-                        All Rights Reserved
+                        © 2024 LikeLion, All Rights Reserved.
                     </Text>
                 </LegalText>
                 <LegalText>

diff --git a/src/components/navigation/Navigation.styled.ts b/src/components/navigation/Navigation.styled.ts
@@ -44,9 +44,7 @@ export const NavHeader = styled.div`
     gap: 100px;
 `;
 
-export const Hapuruna = styled.h3`
-    color: black;
-`;
+export const Hapuruna = styled.img``;
 
 export const MenuIcon = styled.div`
     cursor: pointer;

diff --git a/src/components/navigation/Navigation.tsx b/src/components/navigation/Navigation.tsx
@@ -1,7 +1,10 @@
 import React, { useState } from "react";
+import { useNavigate } from "react-router-dom";
 
 import { motion, Variants } from "framer-motion";
 
+import HapurunaIcon from "@/assets/hapuruna.png";
+
 import { StyledNav, NavHeader, Hapuruna, MenuIcon, MenuBar, NavItem, NavLink } from "./Navigation.styled";
 
 const listVariants: Variants = {
@@ -31,11 +34,12 @@ const itemVariants: Variants = {
 
 const Navigation: React.FC = () => {
     const [show, setShow] = useState(false);
+    const navigate = useNavigate();
 
     return (
         <StyledNav>
             <NavHeader>
-                <Hapuruna>하푸르나</Hapuruna>
+                <Hapuruna src={HapurunaIcon} width={60} onClick={() => navigate("/")} />
                 <MenuIcon onClick={() => setShow(!show)}>
                     <MenuBar />
                     <MenuBar />
@@ -44,16 +48,16 @@ const Navigation: React.FC = () => {
             </NavHeader>
             <motion.ul initial="closed" animate={show ? "open" : "closed"} variants={listVariants}>
                 <NavItem variants={itemVariants}>
-                    <NavLink href="#">부스 별 지도</NavLink>
+                    <NavLink href="/booth">부스 별 지도</NavLink>
                 </NavItem>
                 <NavItem variants={itemVariants}>
-                    <NavLink href="#">Special Guest</NavLink>
+                    <NavLink href="/guests">Special Guest</NavLink>
                 </NavItem>
                 <NavItem variants={itemVariants}>
-                    <NavLink href="#">이벤트 일정</NavLink>
+                    <NavLink href="/timetable">이벤트 일정</NavLink>
                 </NavItem>
                 <NavItem variants={itemVariants}>
-                    <NavLink href="#">만든이들</NavLink>
+                    <NavLink href="/contributors">만든이들</NavLink>
                 </NavItem>
             </motion.ul>
         </StyledNav>

diff --git a/src/components/typography/Text.tsx b/src/components/typography/Text.tsx
@@ -20,7 +20,7 @@ export const Text = styled.span<IText>`
             case "l":
                 return "22px";
             case "xl":
-                return "56px";
+                return "40px";
             default:
                 return props.size;
         }

diff --git a/src/pages/HomePage.styled.ts b/src/pages/HomePage.styled.ts
@@ -37,7 +37,7 @@ export const StyledImage = styled.div`
 `;
 
 export const ElementContainer = styled.div`
-    width: 80%;
+    width: 85%;
     margin: 2rem;
 
     div {