Merge pull request #38 from depromeet/feat/1/EssentialAddition

폰트 · 오픈 그래프 기본 태그 추가
depromeet · Jul 16, 2024 · ee1521d · ee1521d
2 parents 1ea0202 + 4597094
commit ee1521d
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 14 deletions.
diff --git a/index.html b/index.html
@@ -2,9 +2,31 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <!-- FIXME: 추후 디자인 팀 OG 로고 요청 후 수정 -->
+    <link rel="icon" type="image/svg+xml" href="/layer.png" />
+    <link rel="stylesheet" as="style" crossorigin href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/variable/pretendardvariable-dynamic-subset.min.css" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <meta property="og:type" content="website" />
+    <meta property="og:url" content="https://layerapp.io/" />
+    <meta property="og:title" content="layer" />
+    <!-- FIXME: 추후 디자인 팀 OG 이미지 요청 후 수정 -->
+    <meta
+            property="og:image"
+            content=""
+    />
+    <meta
+            property="og:description"
+            content="layer description"
+    />
+    <meta
+            property="og:site_name"
+            content="layer"
+    />
+    <meta property="og:locale" content="ko_KR" />
+    <meta property="og:image:width" content="1200" />
+    <meta property="og:image:height" content="630" />
+    <meta name="description" content="layer description" />
+    <title>layer</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/public/layer.png b/public/layer.png
diff --git a/src/app/MainPage.tsx b/src/app/MainPage.tsx
@@ -1,7 +1,7 @@
 /*NOTE - 해당 파일은 루트 router를 위한 임시 페이지입니다. 실제 페이지 작성 후 지워주세요! */
 import { useAtom } from "jotai";
 
-import Button from "@/component/Button/Button";
+import { Button } from "@/component/common/button";
 import { Modal } from "@/component/common/Modal";
 import { Toast } from "@/component/common/Toast";
 import { useModal } from "@/hooks/useModal";

diff --git a/src/app/test/Staging.tsx b/src/app/test/Staging.tsx
@@ -1,17 +1,11 @@
 import { Fragment, useEffect } from "react";
 
 import { BottomSheet } from "@/component/BottomSheet";
-import Button from "@/component/Button/Button.tsx";
-import { ButtonProvider } from "@/component/Button/ButtonProvider.tsx";
-import CheckBox from "@/component/common/CheckBox/CheckBox";
-import CheckBoxGroup from "@/component/common/CheckBox/CheckBoxGroup";
-import { Input, InputLabelContainer, Label } from "@/component/common/Input";
-import Radio from "@/component/common/RadioButton/Radio";
-import RadioButtonGroup from "@/component/common/RadioButton/RadioButtonGroup";
-import { useBottomSheet } from "@/hooks/useBottomSheet.ts";
+import { Button, ButtonProvider } from "@/component/common/button";
 import { CheckBox, CheckBoxGroup } from "@/component/common/checkBox";
 import { Input, InputLabelContainer, Label } from "@/component/common/input";
 import { Radio, RadioButtonGroup } from "@/component/common/radioButton";
+import { useBottomSheet } from "@/hooks/useBottomSheet.ts";
 import { useCheckBox } from "@/hooks/useCheckBox";
 import { useInput } from "@/hooks/useInput";
 import { useRadioButton } from "@/hooks/useRadioButton";

diff --git a/src/component/BottomSheet/component/BottomSheetHeader.tsx b/src/component/BottomSheet/component/BottomSheetHeader.tsx
@@ -1,7 +1,7 @@
 import { css } from "@emotion/react";
 
 import { BottomSheetType } from "@/component/BottomSheet/BottomSheet.tsx";
-import Icon from "@/component/common/Icon/Icon.tsx";
+import { Icon } from "@/component/common/Icon";
 import { useBottomSheet } from "@/hooks/useBottomSheet.ts";
 
 export function BottomSheetHeader({ title, handler }: Pick<BottomSheetType, "title" | "handler">) {

diff --git a/src/component/Button/Button.tsx → src/component/common/button/Button.tsx b/src/component/Button/Button.tsx → src/component/common/button/Button.tsx
@@ -6,7 +6,7 @@ export type ButtonProps = {
   disabled?: boolean;
 } & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, "type">;
 
-export default function Button({ children, colorSchema = "primary", disabled = false, ...props }: PropsWithChildren<ButtonProps>) {
+export function Button({ children, colorSchema = "primary", disabled = false, ...props }: PropsWithChildren<ButtonProps>) {
   return (
     <button
       css={css`

diff --git a/src/component/Button/ButtonProvider.tsx → ...omponent/common/button/ButtonProvider.tsx b/src/component/Button/ButtonProvider.tsx → ...omponent/common/button/ButtonProvider.tsx
@@ -1,7 +1,7 @@
 import { css } from "@emotion/react";
 import { Children, cloneElement, isValidElement, PropsWithChildren } from "react";
 
-import Button, { ButtonProps } from "@/component/Button/Button.tsx";
+import { Button, ButtonProps } from "@/component/common/button/Button.tsx";
 
 const Primary = ({ ...props }) => {
   return <Button colorSchema={"primary"} {...props} />;

diff --git a/src/component/common/button/index.ts b/src/component/common/button/index.ts
@@ -0,0 +1,2 @@
+export { Button } from "./Button.tsx";
+export { ButtonProvider } from "./ButtonProvider";
diff --git a/src/style/global.css b/src/style/global.css
@@ -1,5 +1,21 @@
 * {
   box-sizing: border-box;
+  font-family:
+    "Pretendard Variable",
+    Pretendard,
+    -apple-system,
+    BlinkMacSystemFont,
+    system-ui,
+    Roboto,
+    "Helvetica Neue",
+    "Segoe UI",
+    "Apple SD Gothic Neo",
+    "Noto Sans KR",
+    "Malgun Gothic",
+    "Apple Color Emoji",
+    "Segoe UI Emoji",
+    "Segoe UI Symbol",
+    sans-serif;
 }
 
 html {