-
Notifications
You must be signed in to change notification settings - Fork 14
Next 정부광 sprint11 #78
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
Open
aha-hyeong
wants to merge
2
commits into
codeit-sprint-fullstack:next-정부광
Choose a base branch
from
aha-hyeong:next-정부광-sprint11
base: next-정부광
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
The head ref may contain hidden characters: "next-\uC815\uBD80\uAD11-sprint11"
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| # dependencies | ||
| /node_modules | ||
| 7-sprint-mission-fe/ | ||
| next-env.d.ts | ||
| *.log | ||
| .env | ||
|
|
||
|
|
||
|
|
||
| # production | ||
| /.next | ||
| /out | ||
|
|
||
| # misc | ||
| .DS_Store | ||
| npm-debug.log* | ||
| yarn-debug.log* | ||
| yarn-error.log* | ||
|
|
||
| # local env files | ||
| .env.local | ||
| .env.development.local | ||
| .env.test.local | ||
| .env.production.local |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| "use client"; | ||
|
|
||
| import { usePathname } from "next/navigation"; | ||
| import Header from "components/Header"; | ||
| import Footer from "components/Footer"; | ||
| import { ReactNode } from "react"; | ||
|
|
||
| export default function ConditionalLayout({ children }: { children: ReactNode }) { | ||
| const pathname = usePathname(); | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. usePathname을 사용하기 위해 클라이언트 컴포넌트를 사용한건가요? |
||
| const isAuthPage = pathname === "/login" || pathname === "/signUp"; | ||
|
|
||
| if (isAuthPage) { | ||
| return <>{children}</>; | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| <Header /> | ||
| {children} | ||
| <Footer /> | ||
| </> | ||
| ); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| .footer { | ||
| color: white; | ||
| background-color: #111827; | ||
| display: flex; | ||
| flex-direction: row; | ||
| height: 160px; | ||
| max-width: 1920px; | ||
| margin: 0 auto; | ||
| padding: 32px 200px; | ||
| justify-content: space-between; | ||
| } | ||
|
|
||
| .socialMedia { | ||
| display: flex; | ||
| flex-direction: row; | ||
| gap: 5px; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| import styles from "./Footer.module.css"; | ||
| import Link from "next/link"; | ||
| import Image from "next/image"; | ||
|
|
||
| export default function Footer() { | ||
| return ( | ||
| <footer className={styles.footer}> | ||
| <div>©codeit - 2024</div> | ||
| <div className={styles.footerMenu}> | ||
| <Link href="/privacy">Privacy Policy</Link> | ||
| <Link href="/faq">FAQ</Link> | ||
| </div> | ||
| <div className={styles.socialMedia}> | ||
| <Link | ||
| href="https://www.facebook.com/" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| <Image | ||
| src="/ic_facebook.svg" | ||
| alt="페이스북" | ||
| width={20} | ||
| height={20} | ||
| /> | ||
| </Link> | ||
| <Link | ||
| href="https://twitter.com/" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| <Image | ||
| src="/ic_twitter.svg" | ||
| alt="트위터" | ||
| width={20} | ||
| height={20} | ||
| /> | ||
| </Link> | ||
| <Link | ||
| href="https://www.youtube.com/" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| <Image | ||
| src="/ic_youtube.svg" | ||
| alt="유튜브" | ||
| width={20} | ||
| height={20} | ||
| /> | ||
| </Link> | ||
| <Link | ||
| href="https://www.instagram.com/" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| > | ||
| <Image | ||
| src="/ic_instagram.svg" | ||
| alt="인스타그램" | ||
| width={20} | ||
| height={20} | ||
| /> | ||
| </Link> | ||
| </div> | ||
| </footer> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| .container { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| max-width: 1920px; | ||
| margin: 0 auto; | ||
| padding: 0px 200px 9px 200px; | ||
| } | ||
|
|
||
| .loginBtn { | ||
| color: white; | ||
| padding: 12px 23px; | ||
| background-color: #3692ff; | ||
| border-radius: 8px; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import Link from "next/link"; | ||
| import styles from "./Header.module.css"; | ||
| import MainLogo from "./MainLogo"; | ||
|
|
||
| export default function Header() { | ||
| return ( | ||
| <header className={styles.container}> | ||
| <MainLogo | ||
| variant="header" | ||
| size="small" | ||
| /> | ||
|
|
||
| <Link | ||
| href={"/login"} | ||
| className={styles.loginBtn} | ||
| > | ||
| 로그인 | ||
| </Link> | ||
| </header> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| .mainLogo { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| gap: 8.5px; | ||
| } | ||
|
|
||
| .mainText { | ||
| color: #3692ff; | ||
| font-size: 25px; | ||
| margin-bottom: 20px; | ||
| } | ||
|
|
||
| .header .mainText { | ||
| font-size: 25px; | ||
| } | ||
|
|
||
| .auth .mainText { | ||
| font-size: 60px; | ||
| margin-top: 10px; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| import Link from "next/link"; | ||
| import Image from "next/image"; | ||
| import styles from "./MainLogo.module.css"; | ||
|
|
||
| interface MainLogoProps { | ||
| variant?: "header" | "auth"; | ||
| size?: "small" | "big"; | ||
| } | ||
|
|
||
| export default function MainLogo({ variant = "header", size = "small" }: MainLogoProps) { | ||
| const imageSize = size === "small" ? 40 : 80; | ||
|
|
||
| return ( | ||
| <div className={`${styles.mainLogoCon} ${styles[variant]}`}> | ||
| <Link | ||
| rel="homePage" | ||
| href={"/"} | ||
| className={styles.mainLogo} | ||
| > | ||
| <Image | ||
| src="/panda_face.svg" | ||
| alt="판다로고" | ||
| width={imageSize} | ||
| height={imageSize} | ||
| /> | ||
| <h1 className={styles.mainText}>판다마켓</h1> | ||
| </Link> | ||
| </div> | ||
| ); | ||
| } |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import styles from "./pagination.module.css"; | ||
|
|
||
| export default function Pagination() { | ||
| return ( | ||
| <div className={styles.container}> | ||
| <div>이거슨 페이지네이션</div> | ||
| </div> | ||
| ); | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use client을 어떨떄 써야하고 app router가 pages router랑 뭐가 다른지에 대해서 공부해보시면 좋을꺼같아요~