diff --git a/client/src/asset/CentralSectionMenu-BookmarkOff.png b/client/src/asset/CentralSectionMenu-BookmarkOff.png deleted file mode 100644 index 1f3bec98..00000000 Binary files a/client/src/asset/CentralSectionMenu-BookmarkOff.png and /dev/null differ diff --git a/client/src/asset/CentralSectionMenu-BookmarkOn.png.png b/client/src/asset/CentralSectionMenu-BookmarkOn.png.png deleted file mode 100644 index af97fcf3..00000000 Binary files a/client/src/asset/CentralSectionMenu-BookmarkOn.png.png and /dev/null differ diff --git a/client/src/asset/CentralSectionMenu-dummyImg.png b/client/src/asset/CentralSectionMenu-dummyImg.png deleted file mode 100644 index 808ee025..00000000 Binary files a/client/src/asset/CentralSectionMenu-dummyImg.png and /dev/null differ diff --git a/client/src/asset/CompareChartSection-SearchIcon.png b/client/src/asset/CompareChartSection-SearchIcon.png deleted file mode 100644 index 8e3e2eed..00000000 Binary files a/client/src/asset/CompareChartSection-SearchIcon.png and /dev/null differ diff --git a/client/src/asset/images/Alarm.png b/client/src/asset/icon/Alarm.png similarity index 100% rename from client/src/asset/images/Alarm.png rename to client/src/asset/icon/Alarm.png diff --git a/client/src/asset/CentralSectionMenu-compareChart.png b/client/src/asset/icon/CentralSectionMenu-compareChart.png similarity index 100% rename from client/src/asset/CentralSectionMenu-compareChart.png rename to client/src/asset/icon/CentralSectionMenu-compareChart.png diff --git a/client/src/asset/images/StockHolmImage.png b/client/src/asset/icon/StockHolmImage.png similarity index 100% rename from client/src/asset/images/StockHolmImage.png rename to client/src/asset/icon/StockHolmImage.png diff --git a/client/src/asset/images/menu.png b/client/src/asset/icon/menu.png similarity index 100% rename from client/src/asset/images/menu.png rename to client/src/asset/icon/menu.png diff --git a/client/src/asset/images/ProfileSample.png b/client/src/asset/images/ProfileSample.png deleted file mode 100644 index 782bf061..00000000 Binary files a/client/src/asset/images/ProfileSample.png and /dev/null differ diff --git a/client/src/asset/images/GoogleLogo.svg b/client/src/asset/logos/GoogleLogo.svg similarity index 100% rename from client/src/asset/images/GoogleLogo.svg rename to client/src/asset/logos/GoogleLogo.svg diff --git a/client/src/asset/images/KakaoLogo.svg b/client/src/asset/logos/KakaoLogo.svg similarity index 100% rename from client/src/asset/images/KakaoLogo.svg rename to client/src/asset/logos/KakaoLogo.svg diff --git a/client/src/asset/images/StockHolmLogo.png b/client/src/asset/logos/StockHolmLogo.png similarity index 100% rename from client/src/asset/images/StockHolmLogo.png rename to client/src/asset/logos/StockHolmLogo.png diff --git a/client/src/components/CentralChart/CompareChartBtn.tsx b/client/src/components/CentralChart/CompareChartBtn.tsx index f88e2a3f..335bdc72 100644 --- a/client/src/components/CentralChart/CompareChartBtn.tsx +++ b/client/src/components/CentralChart/CompareChartBtn.tsx @@ -2,7 +2,7 @@ import { useState } from "react"; import { styled } from "styled-components"; import useCompanyData from "../../hooks/useCompanyData"; import CompareList from "./CompareList"; -import IconImg from "../../asset/CentralSectionMenu-compareChart.png"; +import IconImg from "../../asset/icon/CentralSectionMenu-compareChart.png"; const buttonText: string = "비교종목"; diff --git a/client/src/components/CentralChart/CompareList.tsx b/client/src/components/CentralChart/CompareList.tsx index d8db7e47..4345ab3e 100644 --- a/client/src/components/CentralChart/CompareList.tsx +++ b/client/src/components/CentralChart/CompareList.tsx @@ -1,5 +1,5 @@ import { useSelector, useDispatch } from "react-redux"; -import { setCompareStock } from "../../reducer/CompareChart-Reducer"; +import { setCompareStock } from "../../reducer/compareChart-Reducer"; import { StateProps } from "../../models/stateProps"; import { styled } from "styled-components"; diff --git a/client/src/components/CentralChartMenu/ExpandScreenBtn.tsx b/client/src/components/CentralChartMenu/ExpandScreenBtn.tsx index 02d68334..bf1b5dc6 100644 --- a/client/src/components/CentralChartMenu/ExpandScreenBtn.tsx +++ b/client/src/components/CentralChartMenu/ExpandScreenBtn.tsx @@ -1,7 +1,7 @@ import { useState } from "react"; import { useSelector, useDispatch } from "react-redux"; import { styled } from "styled-components"; -import { changeLeftScreen, changeRightScreen } from "../../reducer/ExpandScreen-Reducer"; +import { changeLeftScreen, changeRightScreen } from "../../reducer/expandScreen-Reducer"; import { StateProps } from "../../models/stateProps"; const ExpandScreenBtn = (props: OwnProps) => { diff --git a/client/src/components/CentralChartMenu/StockOrderBtn.tsx b/client/src/components/CentralChartMenu/StockOrderBtn.tsx index 287e664e..60fdde9a 100644 --- a/client/src/components/CentralChartMenu/StockOrderBtn.tsx +++ b/client/src/components/CentralChartMenu/StockOrderBtn.tsx @@ -1,7 +1,7 @@ import { useDispatch } from "react-redux"; import { styled } from "styled-components"; -import { stockOrderOpen } from "../../reducer/StockOrderSet-Reducer"; -import { orderTypeBuying, orderTypeSelling } from "../../reducer/StockOrderType-Reducer"; +import { stockOrderOpen } from "../../reducer/stockOrderSet-Reducer"; +import { orderTypeBuying, orderTypeSelling } from "../../reducer/stockOrderType-Reducer"; const StockOrderBtn = (props: OwnProps) => { const { type } = props; diff --git a/client/src/components/EntireList/Header.tsx b/client/src/components/EntireList/Header.tsx index b542631e..a503440b 100644 --- a/client/src/components/EntireList/Header.tsx +++ b/client/src/components/EntireList/Header.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import Menu_icon from "../../asset/images/menu.png"; +import Menu_icon from "../../asset/icon/menu.png"; const ALL_LIST = "전체종목"; const INTEREST_LIST = "관심종목"; @@ -76,7 +76,7 @@ const HeaderText = styled.span` `; const SlideMenu = styled.div` - z-index:30; + z-index: 30; position: absolute; top: 100%; left: 0; diff --git a/client/src/components/EntireList/StockItem.tsx b/client/src/components/EntireList/StockItem.tsx index 24567e49..68c75762 100644 --- a/client/src/components/EntireList/StockItem.tsx +++ b/client/src/components/EntireList/StockItem.tsx @@ -2,9 +2,9 @@ import React, { useState } from "react"; import styled from "styled-components"; import { useDispatch } from "react-redux"; -import { changeCompanyId } from "../../reducer/CompanyId-Reducer"; +import { changeCompanyId } from "../../reducer/companyId-Reducer"; -import logo from "../../asset/images/StockHolmImage.png"; +import logo from "../../asset/icon/StockHolmImage.png"; import star_icon from "../../asset/icon/star_icon.png"; import star_filled_icon from "../../asset/icon/star_filled_icon.png"; diff --git a/client/src/components/Headers/LoginHeader.tsx b/client/src/components/Headers/LoginHeader.tsx index ecf17c7e..39cf20f1 100644 --- a/client/src/components/Headers/LoginHeader.tsx +++ b/client/src/components/Headers/LoginHeader.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import styled from "styled-components"; -import StockHolmLogo from "../../asset/images/StockHolmLogo.png"; +import StockHolmLogo from "../../asset/logos/StockHolmLogo.png"; // import SampleProfile from "../../asset/images/ProfileSample.png"; import ProfileModal from "../Profile/ProfileModal"; import StockSearchComponent from "./StockSearchComponent"; diff --git a/client/src/components/Headers/LogoutHeader.tsx b/client/src/components/Headers/LogoutHeader.tsx index 6b27acfb..63f61122 100644 --- a/client/src/components/Headers/LogoutHeader.tsx +++ b/client/src/components/Headers/LogoutHeader.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import StockHolmLogo from "../../asset/images/StockHolmLogo.png"; +import StockHolmLogo from "../../asset/logos/StockHolmLogo.png"; import StockSearchComponent from "./StockSearchComponent"; diff --git a/client/src/components/Headers/stockSearchComponent.tsx b/client/src/components/Headers/stockSearchComponent.tsx index 50152972..9738f5f8 100644 --- a/client/src/components/Headers/stockSearchComponent.tsx +++ b/client/src/components/Headers/stockSearchComponent.tsx @@ -2,7 +2,7 @@ import React, { useState } from "react"; import { useDispatch } from "react-redux"; import styled from "styled-components"; import { toast } from "react-toastify"; -import { changeCompanyId } from "../../reducer/CompanyId-Reducer"; +import { changeCompanyId } from "../../reducer/companyId-Reducer"; import useGetCompanyList from "../../hooks/useGetCompanyList"; const stockSearch = "종목 검색"; @@ -27,41 +27,41 @@ const StockSearchComponent: React.FC = () => { const handleSearchCompany = () => { let searchResult: string = noExistCompany; - + if (searchWord === "") { return; } - + // 영어 -> 한글 변환 const translateToKorean = (word: string) => { const translations: { [key: string]: string } = { samsung: "삼성전자", eco: "에코프로", ecopro: "에코프로", - ecoprobm:"에코프로비엠", - ecoprob:"에코프로비엠", - posco:"POSCO홀딩스", + ecoprobm: "에코프로비엠", + ecoprob: "에코프로비엠", + posco: "POSCO홀딩스", kia: "기아", hyundai: "현대차", - hyundaicar:"현대차", + hyundaicar: "현대차", dy: "디와이", kuckoo: "쿠쿠홀딩스", - kuckooholdings:"쿠쿠홀딩스", - hansemk:"한세엠케이", + kuckooholdings: "쿠쿠홀딩스", + hansemk: "한세엠케이", hanse: "한세엠케이", - lgchemical:"LG화학", - lgelectronic:"LG화학", + lgchemical: "LG화학", + lgelectronic: "LG화학", lgchem: "LG화학", lgelec: "LG전자", - celltrion:"셀트리온", + celltrion: "셀트리온", cell: "셀트리온", - kakaobank:"카카오뱅크", + kakaobank: "카카오뱅크", kakao: "카카오뱅크", // 추가적인 회사 이름을 여기에 추가할 수 있습니다. }; return translations[word.toLowerCase()] || word; }; - + const translateToEnglish = (word: string) => { const translations: { [key: string]: string } = { 엘지화학: "LG화학", @@ -73,10 +73,10 @@ const StockSearchComponent: React.FC = () => { }; return translations[word] || word; }; - + let translatedWord = translateToKorean(searchWord); translatedWord = translateToEnglish(translatedWord); // 이 부분이 추가되었습니다. - + companyList.forEach((company: CompanyProps) => { // 부분 문자열 검색 if (company.korName.includes(translatedWord)) { @@ -84,7 +84,7 @@ const StockSearchComponent: React.FC = () => { dispatch(changeCompanyId(company.companyId)); } }); - + if (searchResult === noExistCompany) { toast.error("존재하지 않는 종목입니다", { style: toastStyle, diff --git a/client/src/components/HoldingList/Header.tsx b/client/src/components/HoldingList/Header.tsx index 0e60be2e..1c6bb986 100644 --- a/client/src/components/HoldingList/Header.tsx +++ b/client/src/components/HoldingList/Header.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import Menu_icon from "../../asset/images/menu.png"; +import Menu_icon from "../../asset/icon/menu.png"; const ALL_LIST = "전체종목"; const INTEREST_LIST = "관심종목"; @@ -73,7 +73,7 @@ const HeaderText = styled.span` `; const SlideMenu = styled.div` - z-index:30; + z-index: 30; position: absolute; top: 100%; left: 0; diff --git a/client/src/components/HoldingList/StockItem.tsx b/client/src/components/HoldingList/StockItem.tsx index b15c10b5..9efa2c63 100644 --- a/client/src/components/HoldingList/StockItem.tsx +++ b/client/src/components/HoldingList/StockItem.tsx @@ -1,8 +1,8 @@ import React, { useState } from "react"; import styled from "styled-components"; -import logo from "../../asset/images/StockHolmImage.png"; +import logo from "../../asset/icon/StockHolmImage.png"; import { useDispatch } from "react-redux"; -import { changeCompanyId } from "../../reducer/CompanyId-Reducer"; +import { changeCompanyId } from "../../reducer/companyId-Reducer"; import star_icon from "../../asset/icon/star_icon.png"; import star_filled_icon from "../../asset/icon/star_filled_icon.png"; diff --git a/client/src/components/Logins/GoogleLoginButton.tsx b/client/src/components/Logins/GoogleLoginButton.tsx index 7ac0df58..17cdeb7e 100644 --- a/client/src/components/Logins/GoogleLoginButton.tsx +++ b/client/src/components/Logins/GoogleLoginButton.tsx @@ -1,9 +1,8 @@ -import React from 'react'; -import styled from 'styled-components'; -import googleLogo from '../../asset/images/GoogleLogo.svg'; +import React from "react"; +import styled from "styled-components"; +import googleLogo from "../../asset/logos/GoogleLogo.svg"; const GoogleLoginButton: React.FC = ({ backendURL }) => { - const buttonText = "구글로 로그인"; const handleLoginClick = () => { @@ -16,7 +15,7 @@ const GoogleLoginButton: React.FC = ({ backendURL }) => { {buttonText} ); -} +}; export default GoogleLoginButton; @@ -28,7 +27,7 @@ interface Props { const GoogleButton = styled.button` margin: 10px 0; padding: 10px 20px; - background-color: #FFFFFF; + background-color: #ffffff; border: 1px solid lightgray; border-radius: 5px; cursor: pointer; @@ -37,9 +36,8 @@ const GoogleButton = styled.button` align-items: center; justify-content: center; - &:hover { - background-color: #f2f2f2; // Light gray color on hover + background-color: #f2f2f2; // Light gray color on hover } `; @@ -49,5 +47,3 @@ const LogoImage = styled.img` width: 60px; height: auto; `; - - diff --git a/client/src/components/Logins/KakaoLoginButton.tsx b/client/src/components/Logins/KakaoLoginButton.tsx index bbbdaaa8..fdf59c70 100644 --- a/client/src/components/Logins/KakaoLoginButton.tsx +++ b/client/src/components/Logins/KakaoLoginButton.tsx @@ -1,9 +1,8 @@ -import React from 'react'; -import styled from 'styled-components'; -import kakaoLogo from '../../asset/images/KakaoLogo.svg'; +import React from "react"; +import styled from "styled-components"; +import kakaoLogo from "../../asset/logos/KakaoLogo.svg"; const KakaoLoginButton: React.FC = ({ backendURL }) => { - const buttonText = "카카오로 로그인"; // 버튼 클릭시 로그인 페이지로 리다이렉트 @@ -17,7 +16,7 @@ const KakaoLoginButton: React.FC = ({ backendURL }) => { {buttonText} ); -} +}; export default KakaoLoginButton; @@ -30,7 +29,7 @@ interface Props { const KakaoButton = styled.button` margin: 10px 0; padding: 10px 20px; - background-color: #FFFFFF; + background-color: #ffffff; border: 1px solid lightgray; border-radius: 5px; cursor: pointer; @@ -40,7 +39,7 @@ const KakaoButton = styled.button` justify-content: center; &:hover { - background-color: #f2f2f2; // 호버 시 밝은 회색 배경 적용 + background-color: #f2f2f2; // 호버 시 밝은 회색 배경 적용 } `; @@ -50,5 +49,3 @@ const LogoImage = styled.img` width: 60px; height: auto; `; - - diff --git a/client/src/components/Logins/LoginConfirmatationModal.tsx b/client/src/components/Logins/LoginConfirmatationModal.tsx index 2c2be20d..517ba841 100644 --- a/client/src/components/Logins/LoginConfirmatationModal.tsx +++ b/client/src/components/Logins/LoginConfirmatationModal.tsx @@ -1,13 +1,13 @@ import React from "react"; import styled from "styled-components"; -import StockHolmLogo from "../../asset/images/StockHolmLogo.png"; +import StockHolmLogo from "../../asset/logos/StockHolmLogo.png"; const LoginConfirmationModal: React.FC = ({ onClose }) => { const messageText = "로그인이 성공적으로 완료되었습니다!"; const confirmText = "확인"; const handleKeyDown = (event: React.KeyboardEvent) => { - if (event.key === 'Enter') { + if (event.key === "Enter") { onClose(); } }; diff --git a/client/src/components/MarketComponents/MarketStockList.tsx b/client/src/components/MarketComponents/MarketStockList.tsx index 2900dc40..c07d65f2 100644 --- a/client/src/components/MarketComponents/MarketStockList.tsx +++ b/client/src/components/MarketComponents/MarketStockList.tsx @@ -2,8 +2,8 @@ import axios from "axios"; import { useState, useEffect } from "react"; import styled from "styled-components"; import { useDispatch } from "react-redux"; -import { changeCompanyId } from "../../reducer/CompanyId-Reducer"; -import logo from "../../asset/images/StockHolmImage.png"; +import { changeCompanyId } from "../../reducer/companyId-Reducer"; +import logo from "../../asset/icon/StockHolmImage.png"; import kia from "../../asset/logos/기아.svg"; import dy from "../../asset/logos/디와이.jpeg"; @@ -29,8 +29,7 @@ interface StockInfo { }; code: string; } -const MarketServerUrl = - "http://ec2-13-125-246-160.ap-northeast-2.compute.amazonaws.com:8080/companies"; +const MarketServerUrl = "http://ec2-13-125-246-160.ap-northeast-2.compute.amazonaws.com:8080/companies"; const MarketStockList: React.FC = () => { const [marketStockList, setMarketStockList] = useState([]); @@ -82,33 +81,21 @@ const MarketStockList: React.FC = () => { const SortPrice = () => { const sortedList = [...marketStockList]; - sortedList.sort( - (a, b) => - parseFloat(b.stockInfResponseDto.stck_prpr) - - parseFloat(a.stockInfResponseDto.stck_prpr) - ); + sortedList.sort((a, b) => parseFloat(b.stockInfResponseDto.stck_prpr) - parseFloat(a.stockInfResponseDto.stck_prpr)); setMarketStockList(sortedList); setSelectedSort("price"); }; const SortRate = () => { const sortedList = [...marketStockList]; - sortedList.sort( - (a, b) => - parseFloat(b.stockInfResponseDto.prdy_ctrt) - - parseFloat(a.stockInfResponseDto.prdy_ctrt) - ); + sortedList.sort((a, b) => parseFloat(b.stockInfResponseDto.prdy_ctrt) - parseFloat(a.stockInfResponseDto.prdy_ctrt)); setMarketStockList(sortedList); setSelectedSort("rate"); }; const SortTrade = () => { const sortedList = [...marketStockList]; - sortedList.sort( - (a, b) => - parseFloat(b.stockInfResponseDto.acml_vol) - - parseFloat(a.stockInfResponseDto.acml_vol) - ); + sortedList.sort((a, b) => parseFloat(b.stockInfResponseDto.acml_vol) - parseFloat(a.stockInfResponseDto.acml_vol)); setMarketStockList(sortedList); setSelectedSort("trade"); }; @@ -121,19 +108,13 @@ const MarketStockList: React.FC = () => { {MarketStockLists.stockName} - + {MarketStockLists.stockPrice} {MarketStockLists.stockRate} - + {MarketStockLists.stockTrade} @@ -151,9 +132,7 @@ const MarketStockList: React.FC = () => { return (
- dispatch(changeCompanyId(el.companyId))} - > + dispatch(changeCompanyId(el.companyId))}> {isLoading === true ? (
{MarketStockLists.isLoading}
) : ( @@ -166,28 +145,11 @@ const MarketStockList: React.FC = () => { - - {numberWithCommas( - parseFloat(el.stockInfResponseDto.stck_prpr) - )} - - 0 - ? "positive" - : parseFloat(el.stockInfResponseDto.prdy_ctrt) < 0 - ? "negative" - : "neutral" - } - > + {numberWithCommas(parseFloat(el.stockInfResponseDto.stck_prpr))} + 0 ? "positive" : parseFloat(el.stockInfResponseDto.prdy_ctrt) < 0 ? "negative" : "neutral"}> {el.stockInfResponseDto.prdy_ctrt} - - {numberWithCommas( - parseFloat(el.stockInfResponseDto.acml_vol) - )} - + {numberWithCommas(parseFloat(el.stockInfResponseDto.acml_vol))} diff --git a/client/src/components/Profile/profileModal.tsx b/client/src/components/Profile/profileModal.tsx index 7921becc..2a32fb66 100644 --- a/client/src/components/Profile/profileModal.tsx +++ b/client/src/components/Profile/profileModal.tsx @@ -1,8 +1,8 @@ import React, { useState, useCallback } from 'react'; import styled from 'styled-components'; -import MemberInfoModal from './memberInfoModal'; -import MemberWithdrawalModal from './memberWithdrawalModal'; -import CashModal from './cashModal'; +import MemberInfoModal from './MemberInfoModal'; +import MemberWithdrawalModal from './MemberWithdrawalModal'; +import CashModal from './CashModal'; const ProfileModal: React.FC = ({ onClose }) => { const memberInfoText = "회원정보"; diff --git a/client/src/components/Signups/Welcome.tsx b/client/src/components/Signups/Welcome.tsx index a6208042..041813ba 100644 --- a/client/src/components/Signups/Welcome.tsx +++ b/client/src/components/Signups/Welcome.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import { useSelector } from "react-redux"; -import StockHolmLogo from "../../asset/images/StockHolmLogo.png"; +import StockHolmLogo from "../../asset/logos/StockHolmLogo.png"; // Constants for the text strings const WELCOME_TEXT = "환영합니다, "; @@ -9,12 +9,11 @@ const START_TEXT = "시작하기"; const JOINED_DATE_TEXT = "가입일: "; const Welcome: React.FC = ({ onClose }) => { - //스토어에서 유저정보 불러오기 const memberInfo = useSelector((state: RootState) => state.memberInfo.memberInfo); // 엔터키를 눌렀을 때의 핸들러 const handleKeyPress = (event: React.KeyboardEvent) => { - if (event.key === 'Enter') { + if (event.key === "Enter") { onClose(); } }; @@ -22,17 +21,14 @@ const Welcome: React.FC = ({ onClose }) => { const formatDate = (dateString: string) => { const date = new Date(dateString); const year = date.getFullYear(); - const month = String(date.getMonth() + 1).padStart(2, '0'); // 월은 0부터 시작하므로 1을 더함 - const day = String(date.getDate()).padStart(2, '0'); - const hours = String(date.getHours()).padStart(2, '0'); - const minutes = String(date.getMinutes()).padStart(2, '0'); - + const month = String(date.getMonth() + 1).padStart(2, "0"); // 월은 0부터 시작하므로 1을 더함 + const day = String(date.getDate()).padStart(2, "0"); + const hours = String(date.getHours()).padStart(2, "0"); + const minutes = String(date.getMinutes()).padStart(2, "0"); + return `${year}년 ${month}월 ${day}일 ${hours}:${minutes}`; }; - - - return ( diff --git a/client/src/components/StockOrderSection/Index.tsx b/client/src/components/StockOrderSection/Index.tsx index 09dbed81..cc563d75 100644 --- a/client/src/components/StockOrderSection/Index.tsx +++ b/client/src/components/StockOrderSection/Index.tsx @@ -6,7 +6,7 @@ import useGetCash from "../../hooks/useGetCash"; import useGetStockOrderRecord from "../../hooks/useGetStockOrderRecord"; import useGetHoldingStock from "../../hooks/useGetHoldingStock"; import useGetCompanyList from "../../hooks/useGetCompanyList"; -import { stockOrderClose } from "../../reducer/StockOrderSet-Reducer"; +import { stockOrderClose } from "../../reducer/stockOrderSet-Reducer"; import { StateProps } from "../../models/stateProps"; import { dummyLogo } from "../../dummy/dummyLogo"; import StockOrder from "./StockOrder"; diff --git a/client/src/components/StockOrderSection/OrderDecisionBtn.tsx b/client/src/components/StockOrderSection/OrderDecisionBtn.tsx index 9474a28e..fd99a706 100644 --- a/client/src/components/StockOrderSection/OrderDecisionBtn.tsx +++ b/client/src/components/StockOrderSection/OrderDecisionBtn.tsx @@ -4,8 +4,8 @@ import { styled } from "styled-components"; import useGetCash from "../../hooks/useGetCash"; import { StateProps } from "../../models/stateProps"; import { OrderTypeProps } from "../../models/orderTypeProps"; -import { setStockOrderVolume } from "../../reducer/StockOrderVolume-Reducer"; -import { openDecisionWindow } from "../../reducer/SetDecisionWindow-Reducer"; +import { setStockOrderVolume } from "../../reducer/stockOrderVolume-Reducer"; +import { openDecisionWindow } from "../../reducer/setDecisionWindow-Reducer"; const availableMoneyText01: string = "최대"; const availableMoneyText02: string = "원"; diff --git a/client/src/components/StockOrderSection/PriceSetting.tsx b/client/src/components/StockOrderSection/PriceSetting.tsx index fe9a3f1e..d99423e3 100644 --- a/client/src/components/StockOrderSection/PriceSetting.tsx +++ b/client/src/components/StockOrderSection/PriceSetting.tsx @@ -1,7 +1,7 @@ import { useState, useEffect } from "react"; import { useSelector, useDispatch } from "react-redux"; import { styled } from "styled-components"; -import { setStockOrderPrice, plusStockOrderPrice, minusStockOrderPrice } from "../../reducer/StockOrderPrice-Reducer"; +import { setStockOrderPrice, plusStockOrderPrice, minusStockOrderPrice } from "../../reducer/stockOrderPrice-Reducer"; import { StateProps } from "../../models/stateProps"; import { StockInfoProps } from "../../models/stockInfoProps"; diff --git a/client/src/components/StockOrderSection/StockOrder.tsx b/client/src/components/StockOrderSection/StockOrder.tsx index 86765034..b729b58e 100644 --- a/client/src/components/StockOrderSection/StockOrder.tsx +++ b/client/src/components/StockOrderSection/StockOrder.tsx @@ -1,7 +1,7 @@ import { useSelector, useDispatch } from "react-redux"; import { isHoliday } from "@hyunbinseo/holidays-kr"; -import { setStockOrderVolume } from "../../reducer/StockOrderVolume-Reducer"; -import { closeDecisionWindow } from "../../reducer/SetDecisionWindow-Reducer"; +import { setStockOrderVolume } from "../../reducer/stockOrderVolume-Reducer"; +import { closeDecisionWindow } from "../../reducer/setDecisionWindow-Reducer"; import { styled } from "styled-components"; import { toast } from "react-toastify"; import { StateProps } from "../../models/stateProps"; diff --git a/client/src/components/StockOrderSection/StockOrderSetting.tsx b/client/src/components/StockOrderSection/StockOrderSetting.tsx index 514300cb..e930abc9 100644 --- a/client/src/components/StockOrderSection/StockOrderSetting.tsx +++ b/client/src/components/StockOrderSection/StockOrderSetting.tsx @@ -1,6 +1,6 @@ import { useSelector, useDispatch } from "react-redux"; import useGetStockInfo from "../../hooks/useGetStockInfo"; -import { orderTypeBuying, orderTypeSelling } from "../../reducer/StockOrderType-Reducer"; +import { orderTypeBuying, orderTypeSelling } from "../../reducer/stockOrderType-Reducer"; import { styled } from "styled-components"; import { StateProps } from "../../models/stateProps"; import { OrderTypeProps } from "../../models/orderTypeProps"; diff --git a/client/src/components/StockOrderSection/StockPrice.tsx b/client/src/components/StockOrderSection/StockPrice.tsx index 1b7ae47a..b8015a3e 100644 --- a/client/src/components/StockOrderSection/StockPrice.tsx +++ b/client/src/components/StockOrderSection/StockPrice.tsx @@ -1,7 +1,7 @@ import { useState, useEffect, useRef } from "react"; import { useSelector, useDispatch } from "react-redux"; import { styled } from "styled-components"; -import { setStockOrderPrice } from "../../reducer/StockOrderPrice-Reducer"; +import { setStockOrderPrice } from "../../reducer/stockOrderPrice-Reducer"; import { StateProps } from "../../models/stateProps"; const changeRateUnit = `%`; diff --git a/client/src/components/StockOrderSection/VolumeSetteing.tsx b/client/src/components/StockOrderSection/VolumeSetteing.tsx index 33381e0f..71853fd8 100644 --- a/client/src/components/StockOrderSection/VolumeSetteing.tsx +++ b/client/src/components/StockOrderSection/VolumeSetteing.tsx @@ -5,7 +5,7 @@ import useGetCash from "../../hooks/useGetCash"; import useGetHoldingStock from "../../hooks/useGetHoldingStock"; import { StateProps } from "../../models/stateProps"; import { HoldingStockProps } from "../../models/stockProps"; -import { setStockOrderVolume, plusStockOrderVolume, minusStockOrderVolume } from "../../reducer/StockOrderVolume-Reducer"; +import { setStockOrderVolume, plusStockOrderVolume, minusStockOrderVolume } from "../../reducer/stockOrderVolume-Reducer"; const volumeSettingTitle: string = "수량"; const maximumVolumeText01: string = "최대"; diff --git a/client/src/components/stockinfoComponents/index.tsx b/client/src/components/stockinfoComponents/index.tsx index 4104626b..4877c577 100644 --- a/client/src/components/stockinfoComponents/index.tsx +++ b/client/src/components/stockinfoComponents/index.tsx @@ -2,7 +2,7 @@ import styled from "styled-components"; import { useState } from "react"; import { useSelector } from "react-redux"; import { RootState } from "../../store/config"; -import PortFolioChart from "./stockinfoChart"; +import PortFolioChart from "./StockinfoChart"; const DetailStockInformation: React.FC = () => { // Redux의 companyId 상태를 구독합니다. diff --git a/client/src/components/watchlist/Header.tsx b/client/src/components/watchlist/Header.tsx index ead7f4e7..9c3ef001 100644 --- a/client/src/components/watchlist/Header.tsx +++ b/client/src/components/watchlist/Header.tsx @@ -1,6 +1,6 @@ import React from "react"; import styled from "styled-components"; -import Menu_icon from "../../asset/images/menu.png"; +import Menu_icon from "../../asset/icon/menu.png"; const ALL_LIST = "전체종목"; const INTEREST_LIST = "관심종목"; @@ -70,7 +70,7 @@ const HeaderText = styled.span` font-size: 18px; `; const SlideMenu = styled.div` - z-index:30; + z-index: 30; position: absolute; top: 100%; left: 0; diff --git a/client/src/components/watchlist/StockItem.tsx b/client/src/components/watchlist/StockItem.tsx index 8aa29539..186c298e 100644 --- a/client/src/components/watchlist/StockItem.tsx +++ b/client/src/components/watchlist/StockItem.tsx @@ -1,10 +1,10 @@ import React, { useState } from "react"; import styled from "styled-components"; -import logo from "../../asset/images/StockHolmImage.png"; +import logo from "../../asset/icon/StockHolmImage.png"; import deleteIcon from "../../asset/icon/delete_icon.png"; import useDeleteStar from "../../hooks/stars/useDeletestars"; import { useDispatch } from "react-redux"; -import { changeCompanyId } from "../../reducer/CompanyId-Reducer"; +import { changeCompanyId } from "../../reducer/companyId-Reducer"; import kia from "../../asset/logos/기아.svg"; import dy from "../../asset/logos/디와이.jpeg"; diff --git a/client/src/components/watchlist/StockSearchComponent.tsx b/client/src/components/watchlist/StockSearchComponent.tsx index 128898fd..7a2c2fb6 100644 --- a/client/src/components/watchlist/StockSearchComponent.tsx +++ b/client/src/components/watchlist/StockSearchComponent.tsx @@ -1,7 +1,7 @@ -import React, { useState } from 'react'; +import React, { useState } from "react"; import { useDispatch } from "react-redux"; import styled from "styled-components"; -import { changeCompanyId } from "../../reducer/CompanyId-Reducer"; +import { changeCompanyId } from "../../reducer/companyId-Reducer"; import useGetCompanyList from "../../hooks/useGetCompanyList"; const stockSearch = "종목 검색"; @@ -20,7 +20,7 @@ const StockSearchComponent: React.FC = () => { const handleSearchCompany = () => { let searchResult: string = noExistCompany; - + if (searchWord === "") { return; } @@ -30,24 +30,24 @@ const StockSearchComponent: React.FC = () => { samsung: "삼성전자", eco: "에코프로", ecopro: "에코프로", - ecoprobm:"에코프로비엠", - ecoprob:"에코프로비엠", - posco:"POSCO홀딩스", + ecoprobm: "에코프로비엠", + ecoprob: "에코프로비엠", + posco: "POSCO홀딩스", kia: "기아", hyundai: "현대차", - hyundaicar:"현대차", + hyundaicar: "현대차", dy: "디와이", kuckoo: "쿠쿠홀딩스", - kuckooholdings:"쿠쿠홀딩스", - hansemk:"한세엠케이", + kuckooholdings: "쿠쿠홀딩스", + hansemk: "한세엠케이", hanse: "한세엠케이", - lgchemical:"LG화학", - lgelectronic:"LG화학", + lgchemical: "LG화학", + lgelectronic: "LG화학", lgchem: "LG화학", lgelec: "LG전자", - celltrion:"셀트리온", + celltrion: "셀트리온", cell: "셀트리온", - kakaobank:"카카오뱅크", + kakaobank: "카카오뱅크", kakao: "카카오뱅크", // 추가적인 회사 이름을 여기에 추가할 수 있습니다. }; @@ -89,12 +89,7 @@ const StockSearchComponent: React.FC = () => { return ( - + {search} ); @@ -103,11 +98,11 @@ const StockSearchComponent: React.FC = () => { export default StockSearchComponent; interface CompanyProps { - companyId: number; - code: string; - korName: string; - stockAsBiResponseDto: null; - stockInfResponseDto: null; + companyId: number; + code: string; + korName: string; + stockAsBiResponseDto: null; + stockInfResponseDto: null; } // 스타일 정의 @@ -128,7 +123,7 @@ const StyledSearchInput = styled.input.attrs({ border: 1px solid #ccc; border-radius: 5px; flex: 1; - margin-left:8px; + margin-left: 8px; `; const StyledSearchButton = styled.button` diff --git a/client/src/page/TabPages/MarketInfoPage.tsx b/client/src/page/TabPages/MarketInfoPage.tsx index 75d5947b..28ef51e4 100644 --- a/client/src/page/TabPages/MarketInfoPage.tsx +++ b/client/src/page/TabPages/MarketInfoPage.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import React, { useState } from "react"; -import MarketSummary from "../../components/MarketComponents/index"; +import MarketSummary from "../../components/MarketComponents/Index"; import MarketStockList from "../../components/MarketComponents/MarketStockList"; interface Props {} diff --git a/client/src/reducer/LeftStockList-Reducer.ts b/client/src/reducer/LeftStockList-Reducer.ts deleted file mode 100644 index ab8a3295..00000000 --- a/client/src/reducer/LeftStockList-Reducer.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { createSlice } from "@reduxjs/toolkit"; - -const initialState = 0; - -const leftStockListSlice = createSlice({ - name: "leftStockListType", - initialState: initialState, - reducers: { - setStockListType: (state, action) => { - state = action.payload; - return state; - }, - }, -}); - -export const { setStockListType } = leftStockListSlice.actions; -export const leftStockListReducer = leftStockListSlice.reducer; diff --git a/client/src/reducer/starSlice.ts b/client/src/reducer/starSlice.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/client/src/store/config.ts b/client/src/store/config.ts index e10d18cd..e5c6e30d 100644 --- a/client/src/store/config.ts +++ b/client/src/store/config.ts @@ -1,16 +1,15 @@ import { configureStore } from "@reduxjs/toolkit"; -import { stockOrderTypeReducer } from "../reducer/StockOrderType-Reducer"; -import { stockOrderPriceReducer } from "../reducer/StockOrderPrice-Reducer"; -import { expandScreenReducer } from "../reducer/ExpandScreen-Reducer"; -import { stockOrderSetReducer } from "../reducer/StockOrderSet-Reducer"; -import { companyIdReducer } from "../reducer/CompanyId-Reducer"; +import { stockOrderTypeReducer } from "../reducer/stockOrderType-Reducer"; +import { stockOrderPriceReducer } from "../reducer/stockOrderPrice-Reducer"; +import { expandScreenReducer } from "../reducer/expandScreen-Reducer"; +import { stockOrderSetReducer } from "../reducer/stockOrderSet-Reducer"; +import { companyIdReducer } from "../reducer/companyId-Reducer"; import { loginReducer } from "../reducer/member/loginSlice"; import cashSlice from "../reducer/cash/cashSlice"; import memberInfoReducer from "../reducer/member/memberInfoSlice"; -import { stockOrderVolumeReducer } from "../reducer/StockOrderVolume-Reducer"; -import { setDecisionWindowReducer } from "../reducer/SetDecisionWindow-Reducer"; -import { compareChartReducer } from "../reducer/CompareChart-Reducer"; -import { leftStockListReducer } from "../reducer/LeftStockList-Reducer"; +import { stockOrderVolumeReducer } from "../reducer/stockOrderVolume-Reducer"; +import { setDecisionWindowReducer } from "../reducer/setDecisionWindow-Reducer"; +import { compareChartReducer } from "../reducer/compareChart-Reducer"; const store = configureStore({ reducer: { @@ -25,7 +24,6 @@ const store = configureStore({ stockOrderVolume: stockOrderVolumeReducer, decisionWindow: setDecisionWindowReducer, compareChart: compareChartReducer, - leftStockListType: leftStockListReducer, }, });