From b600f69eee4bc175f804db669ce1467c5079989c Mon Sep 17 00:00:00 2001 From: sayyyho <323psh@naver.com> Date: Wed, 30 Oct 2024 18:49:34 +0900 Subject: [PATCH 01/20] =?UTF-8?q?[Fix]=20-=20build.sh=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 14fc7ed..dd61cb3 100644 --- a/build.sh +++ b/build.sh @@ -4,4 +4,6 @@ cd ../ mkdir -p output -cp -R ./F4_Front/* ./output \ No newline at end of file +cp -R ./F4_Front/* ./output + +cp -R ./output ./F4_Front \ No newline at end of file From 1bb662cb834a454097d3d1b7f131dfc78328e76a Mon Sep 17 00:00:00 2001 From: gracekim527 Date: Fri, 1 Nov 2024 18:32:17 +0900 Subject: [PATCH 02/20] =?UTF-8?q?:sparkles:=20Feat:=20Router=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Router.tsx | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/Router.tsx diff --git a/src/Router.tsx b/src/Router.tsx new file mode 100644 index 0000000..40e8ca2 --- /dev/null +++ b/src/Router.tsx @@ -0,0 +1,15 @@ +// Router.tsx +import { BrowserRouter, Route, Routes } from "react-router-dom"; +import Login from "./pages/login/Login"; + +const Router: React.FC = () => { + return ( + + + } /> + + + ); +}; + +export default Router; From b04999d9a8169bd2f8ecb99ea7f27805e585240b Mon Sep 17 00:00:00 2001 From: gracekim527 Date: Fri, 1 Nov 2024 18:32:42 +0900 Subject: [PATCH 03/20] =?UTF-8?q?:package:=20Chore:=20package.json=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 73 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 ++ 2 files changed, 75 insertions(+) diff --git a/package-lock.json b/package-lock.json index 0c9ff49..c8cc238 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "path": "^0.12.7", "react": "^18.3.1", "react-dom": "^18.3.1", + "react-router-dom": "^6.27.0", "styled-components": "^6.1.13", "url": "^0.11.4" }, @@ -19,6 +20,7 @@ "@types/node": "^22.8.4", "@types/react": "^18.3.11", "@types/react-dom": "^18.3.1", + "@types/react-router-dom": "^5.3.3", "@vitejs/plugin-react": "^4.3.3", "eslint": "^9.13.0", "eslint-plugin-react-hooks": "^5.0.0", @@ -1017,6 +1019,15 @@ "node": ">= 8" } }, + "node_modules/@remix-run/router": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz", + "integrity": "sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.24.3", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.3.tgz", @@ -1321,6 +1332,13 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/history": { + "version": "4.7.11", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz", + "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -1366,6 +1384,29 @@ "@types/react": "*" } }, + "node_modules/@types/react-router": { + "version": "5.1.20", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.20.tgz", + "integrity": "sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/history": "^4.7.11", + "@types/react": "*" + } + }, + "node_modules/@types/react-router-dom": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz", + "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/history": "^4.7.11", + "@types/react": "*", + "@types/react-router": "*" + } + }, "node_modules/@types/stylis": { "version": "4.2.5", "resolved": "https://registry.npmjs.org/@types/stylis/-/stylis-4.2.5.tgz", @@ -3056,6 +3097,38 @@ "node": ">=0.10.0" } }, + "node_modules/react-router": { + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.27.0.tgz", + "integrity": "sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==", + "license": "MIT", + "dependencies": { + "@remix-run/router": "1.20.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8" + } + }, + "node_modules/react-router-dom": { + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.27.0.tgz", + "integrity": "sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==", + "license": "MIT", + "dependencies": { + "@remix-run/router": "1.20.0", + "react-router": "6.27.0" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", diff --git a/package.json b/package.json index 53d3b22..8b745e2 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "path": "^0.12.7", "react": "^18.3.1", "react-dom": "^18.3.1", + "react-router-dom": "^6.27.0", "styled-components": "^6.1.13", "url": "^0.11.4" }, @@ -21,6 +22,7 @@ "@types/node": "^22.8.4", "@types/react": "^18.3.11", "@types/react-dom": "^18.3.1", + "@types/react-router-dom": "^5.3.3", "@vitejs/plugin-react": "^4.3.3", "eslint": "^9.13.0", "eslint-plugin-react-hooks": "^5.0.0", From 344356fea16d63107a7fdabac0487f6c3c0d58e1 Mon Sep 17 00:00:00 2001 From: gracekim527 Date: Fri, 1 Nov 2024 18:32:55 +0900 Subject: [PATCH 04/20] =?UTF-8?q?:lipstick:=20Style:=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20UI=20=EA=B5=AC=ED=98=84=20(#1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 2 + src/components/button/Button.tsx | 44 ++++++++++++++++++ src/components/input/DateInput.tsx | 28 ++++++++++++ src/components/input/Input.tsx | 32 +++++++++++++ src/components/input/style.ts | 72 ++++++++++++++++++++++++++++++ src/components/login/HintText.tsx | 39 ++++++++++++++++ src/pages/login/Login.tsx | 46 +++++++++++++++++++ 7 files changed, 263 insertions(+) create mode 100644 src/components/button/Button.tsx create mode 100644 src/components/input/DateInput.tsx create mode 100644 src/components/input/Input.tsx create mode 100644 src/components/input/style.ts create mode 100644 src/components/login/HintText.tsx create mode 100644 src/pages/login/Login.tsx diff --git a/src/App.tsx b/src/App.tsx index 7654d85..47ea1eb 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -2,11 +2,13 @@ import { ThemeProvider } from "styled-components"; import theme from "@styles/theme"; import GlobalStyle from "@styles/global"; +import Router from "./Router"; function App() { return ( + ); } diff --git a/src/components/button/Button.tsx b/src/components/button/Button.tsx new file mode 100644 index 0000000..fb67757 --- /dev/null +++ b/src/components/button/Button.tsx @@ -0,0 +1,44 @@ +// Button.tsx + +import React from "react"; +import styled from "styled-components"; + +const Btn = styled.button` + width: 350px; + height: 60px; + display: flex; + justify-content: center; + align-items: center; + color: #343a40; + text-align: center; + font-size: 20px; + font-style: normal; + font-weight: 500; + line-height: 20px; + letter-spacing: -0.5px; + border-radius: 10px; + background: #99bc85; + cursor: pointer; + border: none; + margin: 10px auto; +`; + +interface ButtonProps { + link: string; + name: string; + type: string; +} + +const Button: React.FC = ({ link, name, type }) => { + const handleClick = () => { + window.location.href = link; + }; + + return ( + + {name} + + ); +}; + +export default Button; diff --git a/src/components/input/DateInput.tsx b/src/components/input/DateInput.tsx new file mode 100644 index 0000000..bab66c6 --- /dev/null +++ b/src/components/input/DateInput.tsx @@ -0,0 +1,28 @@ +// DateInput.tsx +import React from "react"; +import * as S from "./style"; + +const DateInput: React.FC = () => { + return ( + + + 생년월일 + * + + + + + + + + + + + + + + + ); +}; + +export default DateInput; diff --git a/src/components/input/Input.tsx b/src/components/input/Input.tsx new file mode 100644 index 0000000..076363e --- /dev/null +++ b/src/components/input/Input.tsx @@ -0,0 +1,32 @@ +// Input.tsx +import React from "react"; +import * as S from "./style"; + +interface InputProps { + width?: string; + label: string; + essential: boolean; + hint: string; +} + +const Input: React.FC = ({ + width = "340px", + label, + essential = true, + hint, +}) => { + return ( + + + {label} + {essential && *} + + {hint && {hint}} + + + + + ); +}; + +export default Input; diff --git a/src/components/input/style.ts b/src/components/input/style.ts new file mode 100644 index 0000000..b12efe4 --- /dev/null +++ b/src/components/input/style.ts @@ -0,0 +1,72 @@ +import styled from "styled-components"; + +interface InputWrapProps { + width?: string; +} + +export const InputContainer = styled.div` + display: flex; + flex-direction: column; +`; + +export const InputTitleWrapper = styled.div` + display: flex; + align-items: center; + gap: 5px; +`; + +export const InputTitle = styled.label` + color: #343a40; + + font-size: 12px; + font-style: normal; + font-weight: 500; + line-height: 22px; + letter-spacing: -0.1px; +`; + +export const EssentialIcon = styled.span` + color: #f5535e; + + font-size: 12px; + font-style: normal; + font-weight: 400; + line-height: 18px; + letter-spacing: -0.1px; +`; + +export const InputHint = styled.p` + color: #868e96; + + font-size: 10px; + font-style: normal; + font-weight: 500; + line-height: 18px; + letter-spacing: -0.1px; +`; + +export const InputWrap = styled.div` + width: ${({ width }) => width || "340px"}; + height: 40px; + border-radius: 8px; + border: 1px solid #ced4da; + background: #fff; +`; + +export const TextInput = styled.input` + width: 100%; + color: #495057; + font-size: 12px; + font-style: normal; + font-weight: 500; + letter-spacing: -0.1px; + outline: none; + padding: 10px 12px; + border-radius: 8px; +`; + +// DateInput.tsx +export const DateInputWrap = styled.div` + display: flex; + gap: 17px; +`; diff --git a/src/components/login/HintText.tsx b/src/components/login/HintText.tsx new file mode 100644 index 0000000..ff73c49 --- /dev/null +++ b/src/components/login/HintText.tsx @@ -0,0 +1,39 @@ +import styled from "styled-components"; + +const HintTextWrapper = styled.div` + width: 100%; + display: flex; + flex-direction: column; + gap: 10px; +`; + +const HintTextHeadline2 = styled.h2` + color: #343a40; + text-align: center; + font-family: Pretendard; + font-size: 28px; + font-style: normal; + font-weight: 600; + line-height: 40px; + letter-spacing: -0.5px; +`; + +const HintTextP1 = styled.p` + color: #868e96; + text-align: center; + font-family: Pretendard; + font-size: 14px; + font-style: normal; + font-weight: 500; + line-height: 22px; /* 157.143% */ + letter-spacing: -0.1px; +`; + +export default function HintText() { + return ( + + 당신의 정보를 입력해주세요. + 팀을 참가할 때 간단한 정보를 입력받아요. + + ); +} diff --git a/src/pages/login/Login.tsx b/src/pages/login/Login.tsx new file mode 100644 index 0000000..926e161 --- /dev/null +++ b/src/pages/login/Login.tsx @@ -0,0 +1,46 @@ +// Login.tsx +import Input from "@components/input/Input"; +import DateInput from "@components/input/DateInput"; +import HintText from "@components/login/HintText"; +import React from "react"; +import styled from "styled-components"; +import Button from "@components/button/Button"; + +const Container = styled.div` + height: calc(100vh - 80px); + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 60px; +`; + +const InputForm = styled.form` + display: flex; + flex-direction: column; + gap: 16px; +`; + +const ButtonLayout = styled.div` + position: relative; + bottom: 10px; +`; + +const Login: React.FC = () => { + return ( + <> + + + + + + + + +