From 823ee599304f36ebb0d05f88fa24054db2dd92d4 Mon Sep 17 00:00:00 2001 From: parkyejin Date: Tue, 5 Mar 2024 21:31:22 +0900 Subject: [PATCH 1/8] =?UTF-8?q?docs(#11):=20footer=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/footer/Footer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/footer/Footer.tsx b/src/components/footer/Footer.tsx index 964f3d4..c8b918e 100644 --- a/src/components/footer/Footer.tsx +++ b/src/components/footer/Footer.tsx @@ -1,6 +1,6 @@ "use client"; -import { footerFirstData, footerSecondData } from "@/lib/footer/FooterData"; +import { footerFirstData, footerSecondData } from "@/lib/footer/footerData"; import { styled } from "styled-components"; import NOSSR from "../common/NOSSR"; From 8a7fe2b11a7fa30b0c1c26c4dc4b9405f37561cf Mon Sep 17 00:00:00 2001 From: parkyejin Date: Wed, 6 Mar 2024 04:19:56 +0900 Subject: [PATCH 2/8] =?UTF-8?q?chore(#11):=20theme=20=EC=A0=84=EC=97=AD=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/theme.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/styles/theme.ts b/src/styles/theme.ts index 12eb228..f9282ce 100644 --- a/src/styles/theme.ts +++ b/src/styles/theme.ts @@ -16,8 +16,10 @@ export const colors = { greyTypeMain: "#B4B4B4", background: "#1A1A1A", grey1: "#7f7f7f", + grey2: "#B4B4B4", grey3: "#cecece", grey4: "#efefef", + grey5: "#F4F4F4", } as const; interface Font { From 5c7b471a169a637ce0f858ae6ecfe34d8db95865 Mon Sep 17 00:00:00 2001 From: parkyejin Date: Wed, 6 Mar 2024 04:20:13 +0900 Subject: [PATCH 3/8] =?UTF-8?q?design(#11):=20Container=20=EA=B3=B5?= =?UTF-8?q?=ED=86=B5=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Container.tsx | 27 +++++++++++++++++++++++++++ src/styles/animation.ts | 9 +++++++++ 2 files changed, 36 insertions(+) create mode 100644 src/components/common/Container.tsx create mode 100644 src/styles/animation.ts diff --git a/src/components/common/Container.tsx b/src/components/common/Container.tsx new file mode 100644 index 0000000..8f9d26a --- /dev/null +++ b/src/components/common/Container.tsx @@ -0,0 +1,27 @@ +"use client"; + +import { ContainerAnimation } from "@/styles/animation"; +import { motion } from "framer-motion"; +import styled from "styled-components"; + +interface ContainerProps { + children: React.ReactNode; +} + +const Container = ({ children }: ContainerProps) => { + return ( + {children} + ); +}; + +export default Container; + +const ContainerStyle = styled(motion.div)` + margin-top: 10rem; // 임시로 + width: 100%; + height: 100%; + padding: 2rem; + background: #212121; + border-radius: 30px; + color: ${({ theme }) => theme.colors.white}; +`; diff --git a/src/styles/animation.ts b/src/styles/animation.ts new file mode 100644 index 0000000..9b02de0 --- /dev/null +++ b/src/styles/animation.ts @@ -0,0 +1,9 @@ +export const ContainerAnimation = { + hidden: { opacity: 0 }, + visible: { + opacity: 1, + transition: { + duration: 1, + }, + }, +}; From c38d773974386b6c4302f8e2188df0e8e6521291 Mon Sep 17 00:00:00 2001 From: parkyejin Date: Wed, 6 Mar 2024 04:20:26 +0900 Subject: [PATCH 4/8] =?UTF-8?q?feat(#11):=20=EC=97=B0=EB=A0=B9=EB=B3=84=20?= =?UTF-8?q?=EA=B2=80=EC=83=89=EB=9F=89=20TOP3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/layout.tsx | 20 ++++++++++------ src/app/trend/page.tsx | 12 ++++++++++ src/components/trend/AgeSearch.tsx | 38 ++++++++++++++++++++++++++++++ src/components/trend/TrendPage.tsx | 9 +++++++ 4 files changed, 72 insertions(+), 7 deletions(-) create mode 100644 src/app/trend/page.tsx create mode 100644 src/components/trend/AgeSearch.tsx create mode 100644 src/components/trend/TrendPage.tsx diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 57442a2..9916b33 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,19 +1,23 @@ +"use client"; + import type { Metadata } from "next"; import "./globals.css"; import { Noto_Sans_KR } from "@next/font/google"; import Footer from "@/components/footer/Footer"; import Navbar from "@/components/navbar/Navbar"; import RecoilContextProvider from "@/context/recoilContext"; +import { ThemeProvider } from "styled-components"; +import { theme } from "@/styles/theme"; const notoSansKR = Noto_Sans_KR({ weight: ["400", "500", "700"], subsets: [], }); -export const metadata: Metadata = { - title: "Kobaco AISAC", - description: "Kobaco Ai analysis System for Ad Creation", -}; +// export const metadata: Metadata = { +// title: "Kobaco AISAC", +// description: "Kobaco Ai analysis System for Ad Creation", +// }; export default function RootLayout({ children, @@ -25,9 +29,11 @@ export default function RootLayout({ - - {children} -