[Feat] 브랜치 병합

- Tap 페이지관련 변경사항 발생으로 인한 브랜치 병합 Issues #14
codestates-seb · Sep 7, 2023 · 113ae9c · 113ae9c
2 parents a2a6cb7 + 84e7f4b
commit 113ae9c
Show file tree

Hide file tree

Showing 13 changed files with 536 additions and 64 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@reduxjs/toolkit": "^1.9.5",
     "axios": "^1.5.0",
+    "boxicons": "^2.1.4",
     "echarts": "^5.4.3",
     "echarts-for-react": "^3.0.2",
     "react": "^18.2.0",

diff --git a/client/src/components/MarketComponents/MarketStockList.tsx b/client/src/components/MarketComponents/MarketStockList.tsx
@@ -33,20 +33,20 @@ const MarketStockList: React.FC = () => {
   return (
     <div>
       <StockListTitle>
-        <StockListDetail>#종목명</StockListDetail>
-        <StockListDetail>#현재가</StockListDetail>
-        <StockListDetail>#변동률</StockListDetail>
-        <StockListDetail>#거래량</StockListDetail>
+        <StockListDetail onClick={SortName}>
+          {MarketStockLists.stockName}
+        </StockListDetail>
+        <StockListDetail>{MarketStockLists.stockPrice}</StockListDetail>
+        <StockListDetail>{MarketStockLists.stockRate}</StockListDetail>
+        <StockListDetail>{MarketStockLists.stockTrade}</StockListDetail>
       </StockListTitle>
 
       {marketStockList.map((el) => (
         <div>
           {isLoading === true ? (
-            <div>isLoading...</div>
+            <div>{MarketStockLists.isLoading}</div>
           ) : (
-            <StockName onClick={SortName} key={el.korName}>
-              {el.korName}
-            </StockName>
+            <StockName key={el.korName}>{el.korName}</StockName>
           )}
           <StockCode key={el.code}>{el.code}</StockCode>
           <br />
@@ -59,6 +59,13 @@ const MarketStockList: React.FC = () => {
 
 export default MarketStockList;
 
+const MarketStockLists = {
+  stockName: "#종목명",
+  stockPrice: "#현재가",
+  stockRate: "#변동률",
+  stockTrade: "#거래량",
+  isLoading: "isLoading...",
+};
 const StockListTitle = styled.div`
   display: flex;
   justify-content: space-around;