Skip to content

Commit

Permalink
Merge pull request #101 from SOPT-all/feat/#94/newCompleteView
Browse files Browse the repository at this point in the history
[Feat/#94] ์ด๋ฏธ์ง€ ์ฒจ๋ถ€๋œ ์™„๋ฃŒ ๋ทฐ ๊ตฌํ˜„
  • Loading branch information
yarimu authored Jan 18, 2025
2 parents 562e496 + 5c79dfc commit 2c4458e
Show file tree
Hide file tree
Showing 7 changed files with 134 additions and 14 deletions.
Binary file added src/asset/image/beforeRegisterGraphic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions src/asset/svg/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export { default as IcoSkeleton } from "./IcoSkeleton";
export { default as IcEllipse57 } from "./IcEllipse57";
export { default as IcImagePlus } from "./IcImagePlus";
export { default as IcNormal } from "./IcNormal";
export { default as IcRight } from "./IcRight";
export { default as IcRightIcon } from "./IcRightIcon";
export { default as IcShape } from "./IcShape";
export { default as IcChevronLeft } from "./IcChevronLeft";
Expand All @@ -14,9 +15,9 @@ export { default as IcDelete } from "./IcDelete";
export { default as IcDeleteBlack } from "./IcDeleteBlack";
export { default as IcDeleteWhite } from "./IcDeleteWhite";
export { default as IcEditPen } from "./IcEditPen";
export { default as IcLogo } from "./IcLogo";
export { default as IcEllipses } from "./IcEllipses";
export { default as IcLeftarrow } from "./IcLeftarrow";
export { default as IcLogo } from "./IcLogo";
export { default as IcMessage } from "./IcMessage";
export { default as IcOut } from "./IcOut";
export { default as IcPlus } from "./IcPlus";
Expand All @@ -25,12 +26,11 @@ export { default as IcRightArror } from "./IcRightArror";
export { default as IcSearch } from "./IcSearch";
export { default as IcSearchFillter } from "./IcSearchFillter";
export { default as IcSearchFillterBlue } from "./IcSearchFillterBlue";

export { default as IcUp } from "./IcUp";
export { default as IcTemporary } from "./IcTemporary";
export { default as IcSettings } from "./IcSettings";
export { default as IcTest } from "./IcTest";
export { default as IcToastError } from "./IcToastError";
export { default as IcUp } from "./IcUp";
export { default as IcTemporary } from "./IcTemporary";
export { default as Plus } from "./Plus";
export { default as React } from "./React";
export { default as Vite } from "./Vite";
export { default as Vite } from "./Vite";
2 changes: 2 additions & 0 deletions src/page/community/component/Tag/Tag.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { tagContainer } from "@page/community/component/Tag/Tag.css.ts";
import { IcRight } from "@asset/svg";

Check failure on line 2 in src/page/community/component/Tag/Tag.tsx

View workflow job for this annotation

GitHub Actions / build

Duplicate identifier 'IcRight'.
import React from "react";
import { color } from "@style/styles.css.ts";
import IcRight from "@asset/svg/IcRight.tsx";

Check failure on line 5 in src/page/community/component/Tag/Tag.tsx

View workflow job for this annotation

GitHub Actions / build

Duplicate identifier 'IcRight'.
Expand All @@ -12,6 +13,7 @@ interface tagType {

const Tag = ({ placeholder, value, onClick, isActive }: tagType) => {
return (

<button className={tagContainer({ active: isActive })} onClick={onClick}>
{value === "" ? placeholder : value}
<IcRight
Expand Down
33 changes: 33 additions & 0 deletions src/page/onboarding/complete/Complete.css.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { style } from "@vanilla-extract/css";

export const backGround = style({
height: "100vh",
background: "linear-gradient(180deg, #DEFEFF 0%, #FFF 36.13%)",
});

export const layout = style({
display: "flex",
flexDirection: "column",
alignItems: "center",
gap: "3.2rem",
padding: "7.2rem 2rem 6rem 2rem",
});
export const titleWrapper = style({
display: "flex",
flexDirection: "column",
justifyContent: "center",
alignItems: "center",
textAlign: "center",
gap: "0.8rem",
});
export const btnWrapper = style({
maxWidth: "76.8rem",
width: "100%",
position: "fixed",
bottom: 0,
display: "grid",
gridTemplateColumns: "repeat(2, 1fr)",
gap: "1.2rem",
whiteSpace: "nowrap",
padding: "1.2rem 2rem 3.2rem 2rem",
});
39 changes: 35 additions & 4 deletions src/page/onboarding/complete/Complete.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,39 @@
import * as styles from "./Complete.css";
import { useNavigate } from "react-router-dom";
import Docs from "../index/common/docs/Docs";
import Title from "../index/common/title/Title";
import { Button } from "@common/component/Button";
import img from "@asset/image/beforeRegisterGraphic.png";
import { PATH } from "@route/path";

const Complete = () => {
const navigate = useNavigate();
const handleSkip = () => {
navigate(PATH.MAIN);
};

const handleNext = () => {
navigate(PATH.REGISTER_PET.ROOT);
};

return (
<div>Complete</div>
)
}
<div className={styles.backGround}>
<div className={styles.layout}>
<div className={styles.titleWrapper}>
<div>
<Title text={"@@@๋‹˜"} />
<Title text={"๋ฐ˜๋ ค๋™๋ฌผ์„ ๋“ฑ๋กํ•ด ์ฃผ์„ธ์š”"} />
</div>
<Docs text={"์ž‘์€ ์ •๋ณด๊ฐ€ ์šฐ๋ฆฌ ์•„์ด์˜ ๊ฑด๊ฐ•์„ ์ง€์ผœ์š”"} />
</div>
<img src={img} alt="onboarding-character" width={296} height={325} />
</div>
<div className={styles.btnWrapper}>
<Button label="๊ฑด๋„ˆ๋›ฐ๊ธฐ" size="large" variant="solidNeutral" onClick={handleSkip} />
<Button label="๋“ฑ๋กํ•˜๊ธฐ" size="large" variant="solidPrimary" onClick={handleNext} />
</div>
</div>
);
};

export default Complete
export default Complete;
30 changes: 30 additions & 0 deletions src/page/registerPet/complete/Complete.css.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { style } from "@vanilla-extract/css";

export const backGround = style({
height: "100vh",
background: "linear-gradient(180deg, #DEFEFF 0%, #FFF 36.13%)",
});

export const layout = style({
display: "flex",
flexDirection: "column",
alignItems: "center",
gap: "3.2rem",
padding: "7.2rem 2rem 0 2rem",
});
export const titleWrapper = style({
display: "flex",
flexDirection: "column",
justifyContent: "center",
alignItems: "center",
textAlign: "center",
gap: "0.8rem",
});
export const btnWrapper = style({
maxWidth: "76.8rem",
width: "100%",
position: "fixed",
bottom: 0,
whiteSpace: "nowrap",
padding: "1.2rem 2rem 3.2rem 2rem",
});
34 changes: 29 additions & 5 deletions src/page/registerPet/complete/Complete.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,34 @@
import * as styles from "./Complete.css";
import { useNavigate } from "react-router-dom";
import Docs from "@page/onboarding/index/common/docs/Docs";
import Title from "@page/onboarding/index/common/title/Title";
import { Button } from "@common/component/Button";
import img from "@asset/image/beforeRegisterGraphic.png";

const Complete = () => {
const navigate = useNavigate();
const handleSkip = () => {
navigate("/main");
};

return (
<div>
๋ฐ˜๋ ค๋™๋ฌผ ์ปดํ”Œ๋ฆฌํŠธ
<div className={styles.backGround}>
<div className={styles.layout}>
<div className={styles.titleWrapper}>
<div>
<Title text={"@@@๋‹˜"} />
<Title text={"๋“ฑ๋ก์ด ์™„๋ฃŒ๋˜์—ˆ์Šต๋‹ˆ๋‹ค"} />
</div>
<Docs text={"๋ฐ˜๋ ค๋™๋ฌผ๊ณผ ํ•จ๊ป˜ํ•˜๋Š” ๊ธด ์‹œ๊ฐ„, ๋” ์ž˜ ๋Œ๋ด๋“œ๋ฆด๊ฒŒ์š”"} />
</div>
<img src={img} alt="onboarding-character" width={296} height={325} />
</div>

<div className={styles.btnWrapper}>
<Button label="๋™๋ฌผ ๋“ฑ๋ก ๋๋‚ด๊ธฐ" size="large" variant="solidPrimary" onClick={handleSkip} />
</div>
</div>
)
}
);
};

export default Complete
export default Complete;

0 comments on commit 2c4458e

Please sign in to comment.