From d36b1e06fd1c0e4a1cadc2140101ae17917f5372 Mon Sep 17 00:00:00 2001 From: junyeokk Date: Sun, 12 May 2024 19:28:23 +0900 Subject: [PATCH 1/7] =?UTF-8?q?feat:=20fingerprint=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 417fbc4..402605c 100644 --- 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/pnpm-lock.yaml b/pnpm-lock.yaml index 937d62e..395e3f7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,6 +5,9 @@ settings: excludeLinksFromLockfile: false dependencies: + '@fingerprintjs/fingerprintjs': + specifier: ^4.3.0 + version: 4.3.0 '@reduxjs/toolkit': specifier: ^2.2.4 version: 2.2.4(react-redux@9.1.2)(react@18.3.1) @@ -439,6 +442,12 @@ packages: resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@fingerprintjs/fingerprintjs@4.3.0: + resolution: {integrity: sha512-eZYh6XVvMp5iyoT9y+/llGxqoACr01JeBTfy6NAMaQ6K2a3nZmyPKoYv5V89QNN8jUqzgXeTOICClEUtktLdtw==} + dependencies: + tslib: 2.6.2 + dev: false + /@humanwhocodes/config-array@0.11.14: resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} engines: {node: '>=10.10.0'} @@ -2044,7 +2053,6 @@ packages: /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} - dev: true /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} From d78f9e049a995a9239d2dc8e65965a4f74302c8c Mon Sep 17 00:00:00 2001 From: junyeokk Date: Sun, 12 May 2024 19:29:41 +0900 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=EC=B9=B4=EC=9A=B4=ED=8A=B8=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=20=EA=B8=80=EC=9E=90=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/typography/Text.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/typography/Text.tsx b/src/components/typography/Text.tsx index a7ecf2a..6c48ae9 100644 --- a/src/components/typography/Text.tsx +++ b/src/components/typography/Text.tsx @@ -20,7 +20,7 @@ export const Text = styled.span` case "l": return "22px"; case "xl": - return "56px"; + return "40px"; default: return props.size; } From 1c3db405d8f6f5eb3b8175b19a099171faf5d012 Mon Sep 17 00:00:00 2001 From: junyeokk Date: Sun, 12 May 2024 19:30:18 +0900 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=EC=B9=B4=EC=9A=B4=ED=8A=B8=EB=8B=A4?= =?UTF-8?q?=EC=9A=B4=20container=20padding=20=EC=A1=B0=EC=A0=95=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/display/Countdown.styled.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/display/Countdown.styled.ts b/src/components/display/Countdown.styled.ts index a9656fe..bf02c0f 100644 --- 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; From c765c32c3d440bcd0fe085081ab3aa4389cf7ad8 Mon Sep 17 00:00:00 2001 From: junyeokk Date: Sun, 12 May 2024 19:31:29 +0900 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20Navigation=20Bar=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=88=98=EC=A0=95,=20=ED=81=B4=EB=A6=AD?= =?UTF-8?q?=20=EC=8B=9C=20=EB=A3=A8=ED=8A=B8=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= =?UTF-8?q?,=20=EC=97=98=EB=A6=AC=EB=A8=BC=ED=8A=B8=20=ED=81=B4=EB=A6=AD?= =?UTF-8?q?=20=EC=8B=9C=20=EB=A7=81=ED=81=AC=20=EC=9D=B4=EB=8F=99=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/navigation/Navigation.styled.ts | 4 +--- src/components/navigation/Navigation.tsx | 14 +++++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/navigation/Navigation.styled.ts b/src/components/navigation/Navigation.styled.ts index 2e8eb90..fe286e6 100644 --- 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 index b147676..8df2f76 100644 --- 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 ( - 하푸르나 + navigate("/")} /> setShow(!show)}> @@ -44,16 +48,16 @@ const Navigation: React.FC = () => { - 부스 별 지도 + 부스 별 지도 - Special Guest + Special Guest - 이벤트 일정 + 이벤트 일정 - 만든이들 + 만든이들 From c54450fb2f7c60929f2f945271b861def0593b6a Mon Sep 17 00:00:00 2001 From: junyeokk Date: Sun, 12 May 2024 19:31:59 +0900 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=EB=A9=94=EC=9D=B8=20=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=BB=A8=ED=85=8C=EC=9D=B4=EB=84=88=20wid?= =?UTF-8?q?th=20=EC=A1=B0=EC=A0=95=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/HomePage.styled.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/HomePage.styled.ts b/src/pages/HomePage.styled.ts index 311a8b3..67a04fa 100644 --- 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 { From cf3513a97cd8b2ed5ef7567a3f1763cfaa99accd Mon Sep 17 00:00:00 2001 From: junyeokk Date: Sun, 12 May 2024 19:32:27 +0900 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=ED=91=B8=ED=84=B0=20=EB=82=B4=20?= =?UTF-8?q?=EA=B8=80=EC=9E=90=20=EB=B0=8F=20=EC=97=AC=EB=B0=B1=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EC=A1=B0=EC=A0=95=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layout/Footer.styled.ts | 4 ++-- src/components/layout/Footer.tsx | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/components/layout/Footer.styled.ts b/src/components/layout/Footer.styled.ts index f828a83..c1b4a4d 100644 --- 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 index 2b3e85b..9711d64 100644 --- a/src/components/layout/Footer.tsx +++ b/src/components/layout/Footer.tsx @@ -11,20 +11,14 @@ const Footer: React.FC = () => { - + 2024 경북대학교 대동제 - © 2024 LikeLion - - -  |  - - - All Rights Reserved + © 2024 LikeLion, All Rights Reserved. From 142969f2e8695dd3abe37d688d2d5697ad83332d Mon Sep 17 00:00:00 2001 From: junyeokk Date: Sun, 12 May 2024 19:32:52 +0900 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=EC=B6=95=EC=A0=9C=20=EC=8B=9C?= =?UTF-8?q?=EC=9E=91=20=EB=82=A0=EC=A7=9C=20=ED=81=AC=EA=B8=B0=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/display/Countdown.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/display/Countdown.tsx b/src/components/display/Countdown.tsx index e8bd290..f1b3be4 100644 --- a/src/components/display/Countdown.tsx +++ b/src/components/display/Countdown.tsx @@ -31,7 +31,7 @@ export const Countdown: React.FC = ({ targetDate }) => { {displayTime} - + UTC+9 | {targetDate.toLocaleDateString("ko-KR", dateOptions)}{" "} {targetDate.toLocaleTimeString("en-US", timeOptions)}