From 5a3bc3824d30ceb8bd9a615e938ce2cda687b316 Mon Sep 17 00:00:00 2001 From: 27Lia Date: Tue, 15 Aug 2023 00:26:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?style:css=EC=9E=91=EC=97=85=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/App.js | 8 +- client/src/images/facebook-icon.svg | 1 + client/src/images/github-icon.svg | 2 + client/src/images/google-icon.svg | 11 ++ client/src/images/small-logo.svg | 19 +++ client/src/pages/AskQuestionPage.js | 7 + client/src/pages/LoginPage.js | 248 ++++++++++++++++++++++++++++ 7 files changed, 290 insertions(+), 6 deletions(-) create mode 100644 client/src/images/facebook-icon.svg create mode 100644 client/src/images/github-icon.svg create mode 100644 client/src/images/google-icon.svg create mode 100644 client/src/images/small-logo.svg create mode 100644 client/src/pages/LoginPage.js diff --git a/client/src/App.js b/client/src/App.js index 1b6ac1eb..796dc4d3 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -1,15 +1,11 @@ import './App.css'; -import Sidebar from './components/sidebar'; -import Header from './components/Header'; -import Footer from './components/Footer'; +import LoginPage from './pages/LoginPage'; function App() { return (
-
- -
+
); } diff --git a/client/src/images/facebook-icon.svg b/client/src/images/facebook-icon.svg new file mode 100644 index 00000000..fd46c08d --- /dev/null +++ b/client/src/images/facebook-icon.svg @@ -0,0 +1 @@ + diff --git a/client/src/images/github-icon.svg b/client/src/images/github-icon.svg new file mode 100644 index 00000000..ffbaa01f --- /dev/null +++ b/client/src/images/github-icon.svg @@ -0,0 +1,2 @@ + + diff --git a/client/src/images/google-icon.svg b/client/src/images/google-icon.svg new file mode 100644 index 00000000..d567bc20 --- /dev/null +++ b/client/src/images/google-icon.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/client/src/images/small-logo.svg b/client/src/images/small-logo.svg new file mode 100644 index 00000000..2cbf6ae5 --- /dev/null +++ b/client/src/images/small-logo.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/client/src/pages/AskQuestionPage.js b/client/src/pages/AskQuestionPage.js index 7c85789c..e38f7fd8 100644 --- a/client/src/pages/AskQuestionPage.js +++ b/client/src/pages/AskQuestionPage.js @@ -2,12 +2,16 @@ import { styled } from 'styled-components'; import Editor5 from '../components/Editor5'; import { useState, useRef } from 'react'; import QuestionPageDropdown from '../components/QuestionPageDropdown'; +import Header from '../components/Header'; +import Footer from '../components/Footer'; const StyleAskPage = styled.div` background-color: #f8f9f9; display: flex; flex-direction: column; align-items: center; + height: 100vh; + margin-top: 56px; // 사이드 여백 조정 .inner { @@ -208,6 +212,8 @@ function AskQuestionPage() { return ( +
+ {/* header 넣을자리 */}
{/* 질문 헤더 부분 */} @@ -367,6 +373,7 @@ function AskQuestionPage() {
+