Skip to content
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 removed public/assets/img/img-graphic-logo-blur.png
Binary file not shown.
Binary file added public/assets/img/img-graphic-logo-blur.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/img/img-graphic-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 removed public/assets/img/img-style-cute-circle.png
Binary file not shown.
Binary file added public/assets/img/img-style-cute-circle.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/img/img-style-cute.png
Binary file not shown.
Binary file added public/assets/img/img-style-cute.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/img/img-style-friendly-circle.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/img/img-style-friendly.png
Binary file not shown.
Binary file added public/assets/img/img-style-friendly.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/img/img-style-trust-circle.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/assets/img/img-style-trust.png
Binary file not shown.
Binary file added public/assets/img/img-style-trust.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions src/components/Home/Home.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@
margin-top: 3.75rem;

& > img {
width: 22.5rem;
height: 22.5rem;
width: 14.375rem;
height: 14.375rem;
box-shadow: 0px 0px 2.5rem 0.625rem #fff;
border-radius: 100%;
}
}

Expand Down
8 changes: 7 additions & 1 deletion src/components/ReceiptEdit/ReceiptEdit.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,19 @@
padding-bottom: 2.5rem;
height: calc(100vh - 2.75rem);
overflow: hidden;
overflow-y: auto;
position: relative;
display: flex;
flex-direction: column;
justify-content: space-between;
background: var(--color-bg-gradient);

overflow-y: scroll;
&::-webkit-scrollbar {
display: none;
}
-ms-overflow-style: none;
scrollbar-width: none;

&::before {
content: "";
background: url("/src/assets/svg/img-graphic-main.svg") center no-repeat;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
background: var(--color-bg-gradient);

.Title {
padding-top: 5rem;
padding-bottom: 1.25rem;
padding-top: 3.75rem;

display: flex;
flex-direction: column;
Expand Down
8 changes: 4 additions & 4 deletions src/components/SelectStyle/SelectStyle.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
margin-top: 2.5rem;

& > h2 {
margin-top: 0.625rem;
margin-top: 0.5rem;
}
}

Expand All @@ -54,16 +54,16 @@
z-index: 1;

& > img {
width: 13.125rem;
height: 13.125rem;
width: 17.5rem;
height: 17.5rem;
}
}

.Bottom {
z-index: 1;

button {
margin-top: 2.5rem;
margin-top: 1.875rem;
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/components/SelectStyle/SelectStyle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ interface StyleProps {
}

const IMG_STYLE_DATA = [
{ name: "친근한 말투", image: "/assets/img/img-style-friendly.png" },
{ name: "믿음직한 말투", image: "/assets/img/img-style-trust.png" },
{ name: "유쾌한 말투", image: "/assets/img/img-style-cute.png" },
{ name: "친근한 말투", image: "/assets/img/img-style-friendly.webp" },
{ name: "믿음직한 말투", image: "/assets/img/img-style-trust.webp" },
{ name: "귀여운 말투", image: "/assets/img/img-style-cute.webp" },
];

const STYLE_NAME_MAPPING: { [key: string]: string } = {
"친근한 말투": "FRIENDLY",
"유쾌한 말투": "CUTE",
"믿음직한 말투": "PROFESSIONAL",
"귀여운 말투": "PROFESSIONAL",
};

const SelectStyle = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/Toast/Toast.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.Toast {
width: 100%;
height: 3.25rem;
z-index: 1;
z-index: 2;
border-radius: 0.75rem;
background-color: white;
padding: 0.875rem 1.125rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
}

.Image {
margin-top: 6.25rem;
display: flex;
justify-content: center;
align-items: center;

& > img {
width: 22.5rem;
height: 22.5rem;
width: 20rem;
height: 20rem;
}
}
23 changes: 19 additions & 4 deletions src/pages/CreateReviewFailPage/CreateReviewFailPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,24 @@ import { useRoute } from "@/hooks/common/useRoute";

import styles from "@/pages/CreateReviewFailPage/CreateReviewFailPage.module.scss";

import { useGenerateReviewStore } from "@/store/useGenerateReviewStore";
import { useCreateReviewStore } from "@/store/useReviewStore";
import { useScanDataStore } from "@/store/useScanDataStore";

const CreateReviewFailPage = () => {
const { navigateToHome } = useRoute();

const { resetGenerateReviewData } = useGenerateReviewStore();
const { resetCreateReviewData } = useCreateReviewStore();
const { resetScanData } = useScanDataStore();

const handleNavigateHome = () => {
resetGenerateReviewData();
resetCreateReviewData();
resetScanData();
navigateToHome();
};

return (
<div className={styles.CreateReviewFail}>
<div className={styles.Top}>
Expand All @@ -17,12 +32,12 @@ const CreateReviewFailPage = () => {
<Text color="secondary" variant="bodyLg" align="center" as="h2">
{`네트워크 오류로 인해 리뷰 생성에\n실패했어요. 다시 시도해주세요.`}
</Text>
</div>

<div className={styles.Image}>
<img src="/assets/img/img-graphic-logo-blur.png" alt="createReviewFailImg" />
</div>
<div className={styles.Image}>
<img src="/assets/img/img-graphic-logo-blur.webp" alt="createReviewFailImg" />
</div>
<Button text="홈으로 가기" onClick={navigateToHome} />
<Button text="홈으로 가기" onClick={handleNavigateHome} />
</div>
);
};
Expand Down
18 changes: 13 additions & 5 deletions src/pages/ReviewResultPage/ReviewResultPage.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.ReviewResult {
padding: 3.75rem 1.25rem 2.5rem;
padding: 2.5rem 1.25rem;
height: 100vh;
overflow: hidden;
position: relative;
Expand All @@ -8,6 +8,13 @@
background: var(--color-bg-gradient);
justify-content: space-between;

overflow-y: scroll;
&::-webkit-scrollbar {
display: none;
}
-ms-overflow-style: none;
scrollbar-width: none;

&::before {
content: "";
background: url("/src/assets/svg/img-graphic-main.svg") center no-repeat;
Expand All @@ -28,7 +35,7 @@
.TitleBox {
display: flex;
justify-content: center;
margin: 1.875rem 0;
margin: 1.25rem 0;
}
}

Expand All @@ -44,17 +51,18 @@
z-index: 1;
display: grid;
grid-template-columns: 30% 1fr;
margin-top: 1.25rem;
}

.ReceiptImage {
.Image {
display: flex;
justify-content: center;
align-items: center;
z-index: 1;

& > img {
width: 7.5rem;
height: 7.5rem;
width: 10rem;
height: 10rem;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/pages/ReviewResultPage/ReviewResultPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ export default function ReviewResultPage() {
return (
<div className={styles.ReviewResult}>
<div className={styles.Top}>
<div className={styles.ReceiptImage}>
<img src="/assets/img/img-style-cute-circle.png" alt="mainLogo" />
<div className={styles.Image}>
<img src="/assets/img/img-style-friendly-circle.webp" alt="mainLogo" />
</div>
<div className={styles.TitleBox}>
<Text variant="titleM" color="gradient" as="h1" truncated>
Expand Down