Skip to content

Commit 350c8a0

Browse files
authored
Merge pull request #1031 from bokeeeey/part3-김보경-week15
[김보경] week15
2 parents 454d4a1 + a78a5ae commit 350c8a0

33 files changed

+746
-136
lines changed

app/page.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
import Auth from "@/src/components/Auth/Auth";
12
import styles from "./page.module.scss";
2-
// import AuthLabel from "@/src/components/AuthForm/AuthLabel/AuthLabel";
33

44
export default function Home() {
55
return (
66
<>
7-
<div className={styles.input}>{/* <AuthLabel /> */}</div>
7+
<div className={styles.input}>
8+
<Auth />
9+
</div>
810
</>
911
);
1012
}

app/signin/page.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// import Auth from "@/src/components/Auth/Auth";
2+
// import AuthHookForm from "@/src/components/Auth/AuthHookForm";
3+
import SignInForm from "@/src/components/Auth/SignInForm/SignInForm";
4+
5+
export default function signinPage() {
6+
return (
7+
<>
8+
{/* <Auth /> */}
9+
{/* <AuthHookForm /> */}
10+
<SignInForm />
11+
</>
12+
);
13+
}

next.config.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ const nextConfig = {
7373
},
7474
],
7575
},
76+
77+
output: "standalone",
7678
};
7779

7880
export default nextConfig;

package-lock.json

Lines changed: 37 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
"dependencies": {
1212
"next": "14.1.4",
1313
"react": "^18",
14-
"react-dom": "^18"
14+
"react-dom": "^18",
15+
"react-hook-form": "^7.51.2",
16+
"usehooks-ts": "^3.1.0"
1517
},
1618
"devDependencies": {
1719
"@types/node": "^20",

src/asset/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ export { default as WhiteInstagramIcon } from "./svg/WhiteInstagramIcon";
33
export { default as WhiteTwitterIcon } from "./svg/WhiteTwitterIcon";
44
export { default as WhiteYoutubeIcon } from "./svg/WhiteYoutubeIcon";
55
export { default as WhiteFacebookIcon } from "./svg/WhiteFacebookIcon";
6-
export { default as LinkImageEmptyCaseIcon } from "./svg/LinkImageEmptyCaseIcon";
76
export { default as MagnifierIcon } from "./svg/MagnifierIcon";
87
export { default as XIcon } from "./svg/XIcon";
98
export { default as ChainIcon } from "./svg/ChainIcon";
10-
export { default as EyeIcon } from "./svg/EyeIcon";
9+
export { default as EyeOffIcon } from "./svg/EyeOffIcon";
10+
export { default as EyeOnIcon } from "./svg/EyeOnIcon";

src/asset/svg/EyeIcon.tsx

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/asset/svg/EyeOffIcon.tsx

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
export default function EyeOffIcon() {
2+
return (
3+
<svg
4+
xmlns="http://www.w3.org/2000/svg"
5+
width="16"
6+
height="16"
7+
viewBox="0 0 16 16"
8+
fill="none"
9+
>
10+
<rect width="16" height="16" fill="white" />
11+
<path
12+
d="M7.87636 5.36364L10.1818 7.66182C10.1818 7.62545 10.1818 7.58182 10.1818 7.54545C10.1818 6.9668 9.95195 6.41185 9.54278 6.00268C9.13361 5.59351 8.57865 5.36364 8 5.36364C7.95636 5.36364 7.92 5.36364 7.87636 5.36364ZM4.74909 5.94545L5.87636 7.07273C5.84 7.22545 5.81818 7.37818 5.81818 7.54545C5.81818 8.12411 6.04805 8.67906 6.45722 9.08823C6.86639 9.4974 7.42135 9.72727 8 9.72727C8.16 9.72727 8.32 9.70545 8.47273 9.66909L9.6 10.7964C9.11273 11.0364 8.57455 11.1818 8 11.1818C7.03558 11.1818 6.11065 10.7987 5.4287 10.1168C4.74675 9.4348 4.36364 8.50988 4.36364 7.54545C4.36364 6.97091 4.50909 6.43273 4.74909 5.94545ZM0.727273 1.92364L2.38545 3.58182L2.71273 3.90909C1.51273 4.85455 0.567273 6.09091 0 7.54545C1.25818 10.7382 4.36364 13 8 13C9.12727 13 10.2036 12.7818 11.1855 12.3891L11.4982 12.6945L13.6218 14.8182L14.5455 13.8945L1.65091 1M8 3.90909C8.96442 3.90909 9.88935 4.29221 10.5713 4.97416C11.2532 5.65611 11.6364 6.58103 11.6364 7.54545C11.6364 8.01091 11.5418 8.46182 11.3745 8.86909L13.5055 11C14.5964 10.0909 15.4691 8.89818 16 7.54545C14.7418 4.35273 11.6364 2.09091 8 2.09091C6.98182 2.09091 6.00727 2.27273 5.09091 2.6L6.66909 4.16364C7.08364 4.00364 7.52727 3.90909 8 3.90909Z"
13+
fill="#373740"
14+
/>
15+
</svg>
16+
);
17+
}

src/asset/svg/EyeOnIcon.tsx

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
export default function EyeOnIcon() {
2+
return (
3+
<svg
4+
xmlns="http://www.w3.org/2000/svg"
5+
width="16"
6+
height="16"
7+
viewBox="0 0 16 16"
8+
fill="none"
9+
>
10+
<rect width="16" height="16" fill="white" />
11+
<path
12+
d="M8 6.27273C7.42135 6.27273 6.86639 6.5026 6.45722 6.91177C6.04805 7.32094 5.81818 7.87589 5.81818 8.45455C5.81818 9.0332 6.04805 9.58815 6.45722 9.99732C6.86639 10.4065 7.42135 10.6364 8 10.6364C8.57865 10.6364 9.13361 10.4065 9.54278 9.99732C9.95195 9.58815 10.1818 9.0332 10.1818 8.45455C10.1818 7.87589 9.95195 7.32094 9.54278 6.91177C9.13361 6.5026 8.57865 6.27273 8 6.27273ZM8 12.0909C7.03558 12.0909 6.11065 11.7078 5.4287 11.0258C4.74675 10.3439 4.36364 9.41897 4.36364 8.45455C4.36364 7.49012 4.74675 6.5652 5.4287 5.88325C6.11065 5.2013 7.03558 4.81818 8 4.81818C8.96442 4.81818 9.88935 5.2013 10.5713 5.88325C11.2532 6.5652 11.6364 7.49012 11.6364 8.45455C11.6364 9.41897 11.2532 10.3439 10.5713 11.0258C9.88935 11.7078 8.96442 12.0909 8 12.0909ZM8 3C4.36364 3 1.25818 5.26182 0 8.45455C1.25818 11.6473 4.36364 13.9091 8 13.9091C11.6364 13.9091 14.7418 11.6473 16 8.45455C14.7418 5.26182 11.6364 3 8 3Z"
13+
fill="#373740"
14+
/>
15+
</svg>
16+
);
17+
}

src/asset/svg/LinkImageEmptyCaseIcon.tsx

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)