Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…-frontend into feat/myPage-info
  • Loading branch information
hailey-hy committed Dec 17, 2024
2 parents a1f02ee + 12f3c53 commit e6f1b2f
Show file tree
Hide file tree
Showing 32 changed files with 15,112 additions and 2,778 deletions.
11,662 changes: 11,662 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"react-dom": "^18.3.1",
"react-gtm-module": "^2.0.11",
"react-hook-form": "^7.53.1",
"react-markdown": "^9.0.1",
"react-responsive": "^10.0.0",
"react-router-dom": "^6.26.0",
"react-slick": "^0.30.2",
Expand Down
18 changes: 9 additions & 9 deletions src/assets/svg/LogoNoLine.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,31 @@ const LogoNoLine = (props: SVGProps<SVGSVGElement>) => (
<g id="Group 2085664824">
<path
id="Subtract"
fill-rule="evenodd"
clip-rule="evenodd"
fillRule="evenodd"
clipRule="evenodd"
d="M34.5496 132.274L96.824 162.16C103.873 165.543 112.329 162.571 115.712 155.522L158.092 67.215C161.475 60.1662 158.503 51.7096 151.454 48.3267L133.348 39.6372L115.61 129.724C113.672 139.565 104.123 145.973 94.2817 144.035L34.5496 132.274ZM24.6554 126.244L95.0554 140.105C95.7458 140.241 96.4344 140.325 97.117 140.358C96.4345 140.325 95.7459 140.241 95.0556 140.105L24.6553 126.244C24.6554 126.244 24.6554 126.244 24.6554 126.244Z"
fill="white"
fill-opacity="0.6"
fillOpacity="0.6"
/>
<g id="Subtract_2">
<mask id="path-2-inside-1_2640_14278" fill="white">
<path
fill-rule="evenodd"
clip-rule="evenodd"
fillRule="evenodd"
clipRule="evenodd"
d="M24.1755 11.8902C25.6859 4.21887 33.1292 -0.775494 40.8005 0.734956L119.449 16.2205C127.12 17.7309 132.114 25.1742 130.604 32.8455L119.96 86.9044L119.944 86.9845L111.981 127.429C110.47 135.1 103.027 140.095 95.3555 138.584L16.7073 123.099C9.03602 121.588 4.04167 114.145 5.55212 106.474L16.1961 52.4149L16.2121 52.3348L24.1755 11.8902ZM104.96 77.7412C84.8191 73.0165 71.7591 53.4772 75.0394 32.976C70.3029 53.1905 50.8105 66.3203 30.3815 63.0569C50.5228 67.7817 63.5828 87.3209 60.3025 107.822C65.0389 87.6076 84.5313 74.4778 104.96 77.7412Z"
/>
</mask>
<path
fill-rule="evenodd"
clip-rule="evenodd"
fillRule="evenodd"
clipRule="evenodd"
d="M24.1755 11.8902C25.6859 4.21887 33.1292 -0.775494 40.8005 0.734956L119.449 16.2205C127.12 17.7309 132.114 25.1742 130.604 32.8455L119.96 86.9044L119.944 86.9845L111.981 127.429C110.47 135.1 103.027 140.095 95.3555 138.584L16.7073 123.099C9.03602 121.588 4.04167 114.145 5.55212 106.474L16.1961 52.4149L16.2121 52.3348L24.1755 11.8902ZM104.96 77.7412C84.8191 73.0165 71.7591 53.4772 75.0394 32.976C70.3029 53.1905 50.8105 66.3203 30.3815 63.0569C50.5228 67.7817 63.5828 87.3209 60.3025 107.822C65.0389 87.6076 84.5313 74.4778 104.96 77.7412Z"
fill="white"
fill-opacity="0.6"
fillOpacity="0.6"
/>
<path
d="M40.8005 0.734956L40.7636 0.92266L40.8005 0.734956ZM119.449 16.2205L119.486 16.0328L119.449 16.2205ZM119.96 86.9044L120.148 86.9419L120.148 86.9413L119.96 86.9044ZM119.944 86.9845L119.756 86.947L119.756 86.9475L119.944 86.9845ZM111.981 127.429L111.793 127.392L111.981 127.429ZM95.3555 138.584L95.3186 138.772L95.3555 138.584ZM16.7073 123.099L16.7443 122.911L16.7073 123.099ZM5.55212 106.474L5.36441 106.437L5.55212 106.474ZM16.1961 52.4149L16.0085 52.3774L16.0084 52.3779L16.1961 52.4149ZM16.2121 52.3348L16.3997 52.3723L16.3998 52.3718L16.2121 52.3348ZM75.0394 32.976L75.2283 33.0062L74.8531 32.9323L75.0394 32.976ZM104.96 77.7412L104.93 77.9301L105.004 77.555L104.96 77.7412ZM30.3815 63.0569L30.4117 62.868L30.3378 63.2432L30.3815 63.0569ZM60.3025 107.822L60.1136 107.792L60.4887 107.866L60.3025 107.822ZM40.8375 0.547251C33.0625 -0.983609 25.5186 4.07825 23.9878 11.8532L24.3632 11.9271C25.8532 4.3595 33.1959 -0.567378 40.7636 0.92266L40.8375 0.547251ZM119.486 16.0328L40.8375 0.547251L40.7636 0.92266L119.412 16.4082L119.486 16.0328ZM130.792 32.8825C132.322 25.1075 127.261 17.5636 119.486 16.0328L119.412 16.4082C126.979 17.8982 131.906 25.2409 130.416 32.8085L130.792 32.8825ZM120.148 86.9413L130.792 32.8825L130.416 32.8085L119.772 86.8674L120.148 86.9413ZM120.132 87.022L120.148 86.9419L119.772 86.8669L119.756 86.947L120.132 87.022ZM112.168 127.466L120.132 87.0215L119.756 86.9475L111.793 127.392L112.168 127.466ZM95.3186 138.772C103.094 140.303 110.637 135.241 112.168 127.466L111.793 127.392C110.303 134.96 102.96 139.887 95.3925 138.397L95.3186 138.772ZM16.6704 123.287L95.3186 138.772L95.3925 138.397L16.7443 122.911L16.6704 123.287ZM5.36441 106.437C3.83355 114.212 8.89539 121.756 16.6704 123.287L16.7443 122.911C9.17664 121.421 4.24979 114.078 5.73982 106.511L5.36441 106.437ZM16.0084 52.3779L5.36441 106.437L5.73982 106.511L16.3838 52.4518L16.0084 52.3779ZM16.0245 52.2973L16.0085 52.3774L16.3837 52.4524L16.3997 52.3723L16.0245 52.2973ZM23.9878 11.8532L16.0244 52.2979L16.3998 52.3718L24.3632 11.9271L23.9878 11.8532ZM74.8505 32.9458C71.5544 53.5455 84.6771 73.1797 104.917 77.9275L105.004 77.555C84.961 72.8533 71.9637 53.4089 75.2283 33.0062L74.8505 32.9458ZM30.3513 63.2458C50.88 66.5251 70.4664 53.3313 75.2256 33.0196L74.8531 32.9323C70.1394 53.0497 50.741 66.1155 30.4117 62.868L30.3513 63.2458ZM60.4914 107.852C63.7874 87.2527 50.6647 67.6185 30.4252 62.8707L30.3378 63.2432C50.3808 67.9449 63.3781 87.3892 60.1136 107.792L60.4914 107.852ZM104.991 77.5523C84.4618 74.273 64.8754 87.4669 60.1162 107.779L60.4887 107.866C65.2024 87.7484 84.6008 74.6826 104.93 77.9301L104.991 77.5523Z"
fill="white"
fill-opacity="0.6"
fillOpacity="0.6"
mask="url(#path-2-inside-1_2640_14278)"
/>
</g>
Expand Down
40 changes: 20 additions & 20 deletions src/assets/svg/extension/ArrowUpRight.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import type { SVGProps } from "react";

const ArrowUpRight = (props: SVGProps<SVGSVGElement>) => (
<svg viewBox="0 0 32 32" fill="none" {...props}>
<g id="arrow-up-right">
<path
id="Vector"
d="M9.33203 22.6667L22.6654 9.33337"
stroke="white"
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
/>
<path
id="Vector_2"
d="M9.33203 9.33337H22.6654V22.6667"
stroke="white"
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
/>
</g>
</svg>
<svg viewBox="0 0 32 32" fill="none" {...props}>
<g id="arrow-up-right">
<path
id="Vector"
d="M9.33203 22.6667L22.6654 9.33337"
stroke="white"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
id="Vector_2"
d="M9.33203 9.33337H22.6654V22.6667"
stroke="white"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
</g>
</svg>
);

export default ArrowUpRight;
18 changes: 9 additions & 9 deletions src/assets/svg/home/BookMark.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@ const BookMark = ({
id="Vector"
d="M14.0166 1.66699H5.98327C4.20827 1.66699 2.7666 3.11699 2.7666 4.88366V16.6253C2.7666 18.1253 3.8416 18.7587 5.15827 18.0337L9.22493 15.7753C9.65827 15.5337 10.3583 15.5337 10.7833 15.7753L14.8499 18.0337C16.1666 18.767 17.2416 18.1337 17.2416 16.6253V4.88366C17.2333 3.11699 15.7916 1.66699 14.0166 1.66699Z"
stroke={stroke}
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
id="Vector_2"
d="M14.0166 1.66699H5.98327C4.20827 1.66699 2.7666 3.11699 2.7666 4.88366V16.6253C2.7666 18.1253 3.8416 18.7587 5.15827 18.0337L9.22493 15.7753C9.65827 15.5337 10.3583 15.5337 10.7833 15.7753L14.8499 18.0337C16.1666 18.767 17.2416 18.1337 17.2416 16.6253V4.88366C17.2333 3.11699 15.7916 1.66699 14.0166 1.66699Z"
fill={fill}
stroke={fill}
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
id="Vector_3"
d="M7.70801 7.54199C9.19134 8.08366 10.808 8.08366 12.2913 7.54199"
stroke={stroke}
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
</g>
</g>
Expand Down
6 changes: 3 additions & 3 deletions src/assets/svg/home/Close.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ const Close = ({ stroke = "white", ...props }: SVGProps<SVGSVGElement>) => (
<path
d="M18 18L12 12M12 12L6 6M12 12L18 6M12 12L6 18"
stroke={stroke}
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
);
Expand Down
12 changes: 6 additions & 6 deletions src/assets/svg/home/Eye.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ const Eye = ({
id="Vector"
d="M12.9833 10.5C12.9833 12.15 11.6499 13.4833 9.99993 13.4833C8.34993 13.4833 7.0166 12.15 7.0166 10.5C7.0166 8.85 8.34993 7.51667 9.99993 7.51667C11.6499 7.51667 12.9833 8.85 12.9833 10.5Z"
stroke={stroke}
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
id="Vector_2"
d="M9.99987 17.3917C12.9415 17.3917 15.6832 15.6583 17.5915 12.6583C18.3415 11.4833 18.3415 9.50833 17.5915 8.33333C15.6832 5.33333 12.9415 3.6 9.99987 3.6C7.0582 3.6 4.31654 5.33333 2.4082 8.33333C1.6582 9.50833 1.6582 11.4833 2.4082 12.6583C4.31654 15.6583 7.0582 17.3917 9.99987 17.3917Z"
stroke={stroke}
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
</g>
</g>
Expand Down
8 changes: 4 additions & 4 deletions src/assets/svg/home/Play.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ const Play = ({
id="Vector"
d="M3.33301 10.5V7.53333C3.33301 3.85 5.94134 2.34167 9.13301 4.18333L11.708 5.66667L14.283 7.15C17.4747 8.99167 17.4747 12.0083 14.283 13.85L11.708 15.3333L9.13301 16.8167C5.94134 18.6583 3.33301 17.15 3.33301 13.4667V10.5Z"
stroke={stroke}
stroke-width="1.5"
stroke-miterlimit="10"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="1.5"
strokeMiterlimit="10"
strokeLinecap="round"
strokeLinejoin="round"
/>
</g>
</g>
Expand Down
12 changes: 6 additions & 6 deletions src/assets/svg/home/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ const Search = (props: SVGProps<SVGSVGElement>) => (
<path
d="M11.5 21C16.7467 21 21 16.7467 21 11.5C21 6.25329 16.7467 2 11.5 2C6.25329 2 2 6.25329 2 11.5C2 16.7467 6.25329 21 11.5 21Z"
stroke="#7580EA"
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M22 22L20 20"
stroke="#7580EA"
stroke-width="1.5"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="1.5"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
);
Expand Down
6 changes: 3 additions & 3 deletions src/assets/svg/home/Timer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ const Timer = (props: SVGProps<SVGSVGElement>) => (
<path
d="M22.8596 3H13.1396C7.49957 3 7.06457 8.07 10.1096 10.83L25.8896 25.17C28.9346 27.93 28.4996 33 22.8596 33H13.1396C7.49957 33 7.06457 27.93 10.1096 25.17L25.8896 10.83C28.9346 8.07 28.4996 3 22.8596 3Z"
stroke="white"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
);
Expand Down
6 changes: 5 additions & 1 deletion src/components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default function Header({ onOpen }: HeaderProps) {

<HeaderRightContainer>
{isUnderTablet ? (
<MenuOutlined onClick={onOpen} />
<StyledMenuIcon onClick={onOpen} />
) : userData.isLogin ? (
<User />
) : (
Expand Down Expand Up @@ -135,3 +135,7 @@ const HeaderRightContainer = styled.div`
${({ theme }) => theme.mixins.flexBox()};
gap: 10px;
`;

const StyledMenuIcon = styled(MenuOutlined)`
color: #3e4151 !important;
`;
4 changes: 3 additions & 1 deletion src/components/LNB/LNB.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ const LNB = ({ menuItems, button, initialMenu = "1" }: LNBtype) => {
{menuItems.map((item) => (
<button
onClick={() => {
setSelectedKey(item.key);
if (!item.disabled) {
setSelectedKey(item.key);
}
if (item.onClick) {
item.onClick();
}
Expand Down
8 changes: 4 additions & 4 deletions src/components/common/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function Button({
<StyledButton
width={width}
size={size}
hierarchy={hierarchy}
$hierarchy={hierarchy}
disabled={hierarchy === "disabled"}
{...props}
type="submit"
Expand All @@ -36,7 +36,7 @@ const StyledButton = styled.button<{
width?: string;
size: number;
disabled?: boolean;
hierarchy: string;
$hierarchy: string;
}>`
width: ${({ width }) => (width ? `${width}` : "auto")};
height: ${({ size }) => `${size}px`};
Expand All @@ -52,8 +52,8 @@ const StyledButton = styled.button<{
transition: all 0.2s;
${({ hierarchy, theme }) => {
switch (hierarchy) {
${({ $hierarchy, theme }) => {
switch ($hierarchy) {
case "primary":
return css`
background: ${theme.colors.primary};
Expand Down
Loading

0 comments on commit e6f1b2f

Please sign in to comment.