Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FE]오른쪽 탭 디자인 변경 및 OAuth로그인 에러 해결Dev client#19/watch list #125

Merged
merged 3 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added client/src/asset/logos/Chosun_IIbo_Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5,503 changes: 5,503 additions & 0 deletions client/src/asset/logos/JTBC로고.ai

Large diffs are not rendered by default.

Binary file added client/src/asset/logos/daum_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/asset/logos/donga_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/asset/logos/jtbc_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/src/asset/logos/jtbc_logo.webp
Binary file not shown.
Binary file added client/src/asset/logos/naver_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions client/src/components/EntireList/StockItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ const StockPrice = styled.span<{ change: string }>`
const StockChange = styled.span<{ change: string }>`
color: ${(props) => props.change};
cursor: pointer;

font-size: 13px;
`;

Expand Down
3 changes: 1 addition & 2 deletions client/src/components/Logins/OAuthLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import GoogleLoginButton from './GoogleLoginButton';
import KakaoLoginButton from './KakaoLoginButton';
import { useSelector } from 'react-redux';
import { RootState } from '../../store/config';
import TokenHandler from './TokenHandler';


const OAuthLoginModal: React.FC<LoginModalProps> = ({ onClose, onEmailLoginClick, onEmailSignupClick, onLoginSuccess }) => {
const titleText = "로그인";
Expand All @@ -30,7 +30,6 @@ const OAuthLoginModal: React.FC<LoginModalProps> = ({ onClose, onEmailLoginClick
return (
<ModalBackground>
<ModalContainer>
<TokenHandler />
<CloseButton onClick={onClose}>&times;</CloseButton>
<Title>{titleText}</Title>
<GoogleLoginButton backendURL={GOOGLE_BACKEND_URL} />
Expand Down
28 changes: 0 additions & 28 deletions client/src/components/Logins/TokenHandler.tsx

This file was deleted.

32 changes: 17 additions & 15 deletions client/src/components/MarketComponents/MarketKospiChart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const MarketkospiChart = () => {
myChart.setOption({
title: {
text: "Kospi",
left: "center",
},
tooltip: {
trigger: "axis",
Expand All @@ -41,18 +42,18 @@ const MarketkospiChart = () => {
type: "category",
boundaryGap: true,
data: kospiData.map((kospi: KospiProps) => {
const year = kospi.stck_bsop_date.slice(0, 4);
// const year = kospi.stck_bsop_date.slice(0, 4);
const month = kospi.stck_bsop_date.slice(4, 6);
const period = `${year}년 ${month}월`;
const period = ` ${month}월`;
return period;
}),
},
yAxis: [
{
type: "value",
boundaryGap: [0, "10%"],
boundaryGap: [10, '10%'],
position: "left",
interval: 100,
interval: 200,
min: 2000,
splitLine: {
show: true,
Expand All @@ -77,22 +78,22 @@ const MarketkospiChart = () => {
symbol: "none",
sampling: "lttb",
itemStyle: {
color: function (params: any) {
color: function (params: { data: number[] }) {
// 주식 상승이면 빨간색, 하락이면 파란색 반환
return params.data[1] >= params.data[0]
? "rgb(255, 0, 0)"
: "rgb(0, 0, 255)";
? "#f87369"
: "#5a99f8";
},
},
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
{
offset: 0,
color: "rgb(0,0, 200)",
color: "#5a99f8",
},
{
offset: 1,
color: "rgb(250, 0, 0)",
color: 'white',
},
]),
},
Expand All @@ -108,8 +109,8 @@ const MarketkospiChart = () => {
// 현재 가격과 이전 가격을 비교하여 색상 설정
const color =
currentPrice > previousPrice
? "rgb(255, 0, 0)"
: "rgb(0, 0, 255)";
? "#f87369"
: "#5a99f8";

return {
value: currentPrice,
Expand All @@ -122,10 +123,10 @@ const MarketkospiChart = () => {
},
],
grid: {
left: "10%",
right: "15%",
left: "15%",
right: "10%",
top: "20%",
bottom: "40%",
bottom: "20%",
},
});
}
Expand All @@ -146,10 +147,11 @@ interface KospiProps {
bstp_nmix_prpr: string;
mod_yn: string;
stck_bsop_date: string;
param: string;
}

const KospiChartStyle = styled.div`
margin-top: 30px;
margin: 0px;
width: 100%;
height: 200px;
`;
Loading