Skip to content

Commit

Permalink
Merge pull request #196 from 100-hours-a-week/feature/elle
Browse files Browse the repository at this point in the history
Feature/elle
  • Loading branch information
lucy726j authored Sep 11, 2024
2 parents a90d467 + fdd9374 commit 1e75737
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 23 deletions.
31 changes: 16 additions & 15 deletions src/Component/Button/DeleteButton2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@ import React from "react";
import "./DeleteButtonStyle.css";

interface AnimatedButtonProps {
onClick: () => void;
onClick: () => void;
}

const DeleteButton2: React.FC<AnimatedButtonProps> = ({ onClick }) => {
return (
<div
className="delete"
onClick={onClick}
style={{
left: "410px",
cursor: "pointer",
top: "-2px",
}}
>
<div className="top"></div>
<div className="bottom"></div>
</div>
);
return (
<div
className="delete"
onClick={onClick}
style={{
left: "410px",
cursor: "pointer",
top: "-2px",
marginRight: "2.5rem",
}}
>
<div className="top"></div>
<div className="bottom"></div>
</div>
);
};

export default DeleteButton2;
4 changes: 2 additions & 2 deletions src/Component/Chart/chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ const Chart = ({ data }: CandleData) => {
newsHtml += `<li style="padding-top:1rem; padding-bottom:0.5rem; padding-left:0.5rem; list-style:none; border-bottom:1px solid rgba(209, 209, 214, 0.3);" onmouseover="this.style.backgroundColor='#E6E5FF';"
onmouseout="this.style.backgroundColor='';"><a href=${newItem.url} target="_blank" rel="noopener noreferrer nofollow"
style="text-decoration:none; color: black; font-size:15px; font-family:SCDream2; transition: background-color 0.3s ease;">
${newItem.title}</a>
</li>`;
${newItem.title}</a></li>`;
});
}

Expand Down
4 changes: 2 additions & 2 deletions src/Component/Chart/chartStyle.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import styled from "styled-components";

export const ChartStyle = styled.div`
width: 90%;
width: 100%;
margin-bottom: 30px;
`;

export const ChartDate = styled.p`
font-family: "SCDream9";
`;
`;
5 changes: 2 additions & 3 deletions src/Component/Modal/addStock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ const AddOrEditModal: React.FC<AddOrEditModalProps> = ({
const location = useLocation();
const id = location.pathname.split("/")[2];

const changeStatus = usePortfolioStore((state) => state.change);
const changeCheck = usePortfolioStore((state) => state.setChange);
const { change, setChange } = usePortfolioStore();

const handleChangeQuantity = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = parseFloat(e.target.value);
Expand Down Expand Up @@ -77,7 +76,7 @@ const AddOrEditModal: React.FC<AddOrEditModalProps> = ({
});
onConfirm(quantity, price);
onClose();
changeCheck(!changeStatus);
setChange(!change);
}
})
.catch((error) => {
Expand Down
1 change: 0 additions & 1 deletion src/Component/Portfolio/PortfolioDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const TitleDiv = styled.div`
justify-content: space-between;
@media (max-width: 768px) {
width: 100%;
padding-right: 2rem;
}
`;

Expand Down

0 comments on commit 1e75737

Please sign in to comment.