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] 마이페이지 구매내역의 상세보기 isModal 변경 #228

Merged
merged 7 commits into from
Apr 20, 2023
412 changes: 389 additions & 23 deletions client/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"@types/node": "^18.15.11",
"@types/react": "^18.0.33",
"@types/react-dom": "^18.0.11",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "^5.57.1",
"avvvatars-react": "^0.4.2",
"axios": "^1.1.3",
Expand Down Expand Up @@ -56,6 +55,7 @@
"devDependencies": {
"@types/react-router-dom": "^5.3.3",
"@types/styled-components": "^5.1.26",
"@typescript-eslint/eslint-plugin": "^5.59.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-strict-null-checks": "^0.0.21",
Expand Down
2 changes: 1 addition & 1 deletion client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { lazy, Suspense, useState } from "react";
import GlobalStyles from "./styles/GlobalStyles";
import { BrowserRouter, Route, Routes } from "react-router-dom";
import styled from "styled-components/macro";
import ScrollToTop from "./components/ScrollToTop";
import ScrollToTop from "./components/common/ScrollToTop";
import Button from "./components/Button";
import LoadingIcon from "./components/LoadingIcon";

Expand Down
3 changes: 2 additions & 1 deletion client/src/components/mypages/PostReview.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { BsStarFill } from "react-icons/bs";
import { BtnSelectAlert, Alert } from "../../components/Alert";
import noImg from "../../imgs/noImg.gif";

function PostReview({ clickModal, filterData, filteReview }) {
function PostReview({ clickModal, filterData, filteReview, modalRef }) {
const dispatch = useDispatch();
const [userWriteImg, setUserWriteImg] = useState("");
const [userWriteContent, setUserWriteContent] = useState(filteReview ? filteReview[0].content : filterData[0].content);
Expand Down Expand Up @@ -105,6 +105,7 @@ function PostReview({ clickModal, filterData, filteReview }) {
onClick={(e) => {
e.stopPropagation();
}}
ref={modalRef}
>
<PostReviewTopSpace>
{filterData === undefined ? (
Expand Down
Loading