-
Notifications
You must be signed in to change notification settings - Fork 51
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
[손지은] week13 #501
Merged
llucas93
merged 17 commits into
codeit-bootcamp-frontend:part3-손지은
from
wise-Ag:part3-손지은-week13
Dec 6, 2023
The head ref may contain hidden characters: "part3-\uC190\uC9C0\uC740-week13"
Merged
[손지은] week13 #501
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
93a0e93
chore: 머지 후 브랜치 삭제 github action 추가
withyj-codeit b2e37bd
reset
hanseulhee 6f8bbb0
Merge branch 'codeit-bootcamp-frontend:main' into main
hanseulhee e11e25f
fix: 머지 후 브랜치 삭제 github action 수정
hanseulhee 212e864
env: workflows 폴더로 이동
hanseulhee 4dc5dd0
Merge pull request #237 from hanseulhee/fix-github-actions
withyj-codeit 9aeb8c7
초기설정
wise-Ag 8ee4f60
part3브랜치 만들고 upstream pull
wise-Ag b5d4039
기존 프로젝트 next.js로 변환
wise-Ag 4a7d6f7
feat : 로그인 컴포넌트 생성
wise-Ag 993093b
deploy test
wise-Ag ce51868
Merge branch 'codeit-bootcamp-frontend:main' into part3-손지은-week13
wise-Ag dda2340
style(shared.jsx) : css 수정
wise-Ag deb86f9
feat : signin, signup page
wise-Ag 56e3307
Merge branch 'part3-손지은-week13' of https://github.com/wise-Ag/1-Weekl…
wise-Ag 9b34223
feat(sign page) : placeholder추가
wise-Ag b5ee9e5
rename(handleSignError) : 함수 적절한 이름으로 변경
wise-Ag 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
Binary file not shown.
This file contains 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 @@ | ||
REACT_APP_KAKAO_KEY = "b95afa4b872322082f58d1e2ca1623f2" |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
This file contains 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 |
---|---|---|
@@ -1,6 +1,14 @@ | ||
import '@/styles/globals.css' | ||
import type { AppProps } from 'next/app' | ||
import "@/src/assets/global.css"; | ||
import type { AppProps } from "next/app"; | ||
import Head from "next/head"; | ||
|
||
export default function App({ Component, pageProps }: AppProps) { | ||
return <Component {...pageProps} /> | ||
return ( | ||
<> | ||
<Head> | ||
<title>linkbrary</title> | ||
</Head> | ||
<Component {...pageProps} />; | ||
</> | ||
); | ||
} |
This file contains 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 |
---|---|---|
@@ -1,13 +1,13 @@ | ||
import { Html, Head, Main, NextScript } from 'next/document' | ||
import { Html, Head, Main, NextScript } from "next/document"; | ||
|
||
export default function Document() { | ||
return ( | ||
<Html lang="en"> | ||
<Html lang="ko"> | ||
<Head /> | ||
<body> | ||
<Main /> | ||
<NextScript /> | ||
</body> | ||
</Html> | ||
) | ||
); | ||
} |
This file contains 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,42 @@ | ||
.root { | ||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
padding: 4rem 3.2rem; | ||
} | ||
.addLink { | ||
display: flex; | ||
justify-content: center; | ||
padding: 6rem 3.2rem 9rem 3.2rem; | ||
background: var(--linkbrary-bg, #f0f6ff); | ||
|
||
@media (max-width: 767px) { | ||
padding-top: 2.4rem; | ||
padding-bottom: 4rem; | ||
} | ||
} | ||
.section { | ||
display: flex; | ||
flex-direction: column; | ||
align-items: start; | ||
gap: 4rem; | ||
} | ||
.folderSection { | ||
width: 100%; | ||
display: flex; | ||
flex-direction: column; | ||
gap: 2.4rem; | ||
} | ||
.emptyLink { | ||
width: 106rem; | ||
padding: 4.1rem 0 3.5rem; | ||
text-align: center; | ||
font-size: 1.6rem; | ||
@media (max-width: 1124px) { | ||
width: 100%; | ||
} | ||
@media (max-width: 767px) { | ||
width: 100%; | ||
font-size: 1.4rem; | ||
} | ||
} |
This file contains 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,69 @@ | ||
import { createContext, useEffect, useState } from "react"; | ||
import AddLink from "@/src/components/AddLink/AddLink"; | ||
import FolderPageCards from "@/src/components/Cards/FolderPageCards"; | ||
import FolderList from "@/src/components/FolderList/FolderList"; | ||
import Search from "@/src/components/Search/Search"; | ||
// import useAsync from "../hooks/useAsync"; | ||
import { Nav, Footer } from "@/src/containers"; | ||
import { Link, getLink } from "@/src/api/getLink"; | ||
import { Folder, getFolder } from "@/src/api/getFolder"; | ||
import style from "./folder.module.css"; | ||
import { useSearchParams } from "next/navigation"; | ||
import CurrentFolder from "@/src/components/CurrentFolder/CurrentFolder"; | ||
|
||
export const FolderPageContext = createContext<Folder[]>([]); | ||
|
||
function FolderPage() { | ||
const [links, setLinks] = useState<Link[]>([]); | ||
const [folders, setFolders] = useState<Folder[]>([]); | ||
// const { wrappedFunction:getLinkAsync} = useAsync(getLink); | ||
// const {wrappedFunction:getFolderAsync} = useAsync(getFolder); | ||
const searchParams = useSearchParams(); | ||
const folderParam = searchParams.get("folderId"); | ||
|
||
useEffect(() => { | ||
const handleLinkLoad = async () => { | ||
const links = await getLink({ | ||
id: 1, | ||
folderId: folderParam || "", | ||
}); | ||
setLinks([...links]); | ||
}; | ||
handleLinkLoad(); | ||
}, [folderParam]); | ||
|
||
useEffect(() => { | ||
const handleFolderLoad = async () => { | ||
const folders = await getFolder({ id: 1 }); | ||
setFolders([...folders]); | ||
}; | ||
handleFolderLoad(); | ||
}, []); | ||
return ( | ||
<> | ||
<Nav /> | ||
<div className={style.addLink}> | ||
<AddLink folders={folders} /> | ||
</div> | ||
<div className={style.root}> | ||
<div className={style.section}> | ||
<Search /> | ||
<div className={style.folderSection}> | ||
<FolderList folders={folders} /> | ||
<CurrentFolder folderId={folderParam} folders={folders} /> | ||
<FolderPageContext.Provider value={folders}> | ||
{links.length ? ( | ||
<FolderPageCards cards={links} /> | ||
) : ( | ||
<span className={style.emptyLink}>저장된 링크가 없습니다.</span> | ||
)} | ||
</FolderPageContext.Provider> | ||
</div> | ||
</div> | ||
</div> | ||
<Footer /> | ||
</> | ||
); | ||
} | ||
|
||
export default FolderPage; |
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.
next에서는 폴더를 기준으로 라우팅이 동작됩니다.
pages/folder/index.tsx 처럼 구분해주시는게 좋아보여요 👍
Routing 참고링크