[Feat] 브랜치 병합

- 로그인/로그아웃 관련 컴포넌트 구현으로 인한 브랜치 병합 Issues #12
codestates-seb · Sep 1, 2023 · 36335b9 · 36335b9
2 parents 323b525 + bf3a81c
commit 36335b9
Show file tree

Hide file tree

Showing 30 changed files with 1,570 additions and 33 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -10,6 +10,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "axios": "^1.5.0",
+    "echarts": "^5.4.3",
+    "echarts-for-react": "^3.0.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "styled-components": "^6.0.7"

diff --git a/client/src/asset/CentralSectionMenu-BookmarkOff.png b/client/src/asset/CentralSectionMenu-BookmarkOff.png
diff --git a/client/src/asset/CentralSectionMenu-BookmarkOn.png.png b/client/src/asset/CentralSectionMenu-BookmarkOn.png.png
diff --git a/client/src/asset/CentralSectionMenu-compareChart.png b/client/src/asset/CentralSectionMenu-compareChart.png
diff --git a/client/src/asset/images/GoogleLogo.svg b/client/src/asset/images/GoogleLogo.svg
diff --git a/client/src/asset/images/KakaoLogo.svg b/client/src/asset/images/KakaoLogo.svg
diff --git a/client/src/components/CentralChartSection/Index.tsx b/client/src/components/CentralChartSection/Index.tsx
@@ -0,0 +1,24 @@
+import { styled } from "styled-components";
+
+import UpperMenuBar from "../CentralSectionMenu/Index";
+import StockChart from "./StockChart";
+
+const CentralChartSection = () => {
+  return (
+    <Container>
+      <UpperMenuBar />
+      <StockChart />
+    </Container>
+  );
+};
+
+export default CentralChartSection;
+
+const Container = styled.div`
+  flex: 6.7 0 0;
+  min-width: 630px;
+  height: 100%;
+
+  display: flex;
+  flex-direction: column;
+`;