feat: 사이드바 추가중 (#66)

Yapp-17th · Nov 29, 2020 · 8d2e3f9 · 8d2e3f9
1 parent 26f6cfc
commit 8d2e3f9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/src/index.scss b/src/index.scss
@@ -41,6 +41,7 @@
 
 body {
   font-family: 'AppleSDGothicNeoM00';
+  margin: 0;
 }
 
 ::-webkit-scrollbar       {

diff --git a/src/pages/QuestionListPage/QuestionListPage.js b/src/pages/QuestionListPage/QuestionListPage.js
@@ -6,6 +6,16 @@ import NoList from './NoList';
 import IsQuestionList from './IsQuestionList';
 import { get } from '../../utils/snippet';
 import ProfileMenuContiner from '../../components/ProfileMenuContainer';
+import Sidebar from '../../components/Sidebar';
+
+const PageWrapper = styled.div`
+  
+  display: flex;
+`;
+
+const ContentWrapper = styled.div`
+  width: 100%;
+`;
 
 const ProfileWrapper = styled.div`
     float: right;
@@ -61,21 +71,24 @@ export default function QuestionListPage() {
     <>
       {loading
         && (
-        <>
-          <ProfileWrapper>
-            <ProfileMenuContiner name={authSelector.name} />
-          </ProfileWrapper>
-          <Wrapper>
-            <Title>
-              {authSelector.name}
-              님이 등록한 질문 리스트입니다.
-            </Title>
-            <Select>연습하고 싶은 질문 리스트를 선택해주세요.</Select>
-            {questionList && questionList.length === 0
-              ? <NoList />
-              : <IsQuestionList questionList={questionList} />}
-          </Wrapper>
-        </>
+        <PageWrapper>
+          <Sidebar />
+          <ContentWrapper>
+            <ProfileWrapper>
+              <ProfileMenuContiner name={authSelector.name} />
+            </ProfileWrapper>
+            <Wrapper>
+              <Title>
+                {authSelector.name}
+                님이 등록한 질문 리스트입니다.
+              </Title>
+              <Select>연습하고 싶은 질문 리스트를 선택해주세요.</Select>
+              {questionList && questionList.length === 0
+                ? <NoList />
+                : <IsQuestionList questionList={questionList} />}
+            </Wrapper>
+          </ContentWrapper>
+        </PageWrapper>
         )}
     </>
   );
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ @@
     body {
       font-family: 'AppleSDGothicNeoM00';
+      margin: 0;
     }
     ::-webkit-scrollbar       {
@@ Expand Down @@