Skip to content
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

[add] guide page #67

Merged
merged 1 commit into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import ShowEventResult from './Pages/ShowEventResult'
import EditGroupInfo from './Pages/EditGroupInfoPage'
import SelectMembers from './Pages/CreateEventPage/SelectMembers'
import ShowResult from './Pages/ShowResult'
import UserGuideline from './Pages/Guide/UserGuideline'
import { AuthProvider } from './context/AuthContext'
import { useMediaQuery } from 'react-responsive'

Expand All @@ -35,6 +36,7 @@ function App() {
<div className="App">
<Routes>
<Route path="/" element={<MainPage />} />
<Route path="/guide" element={<UserGuideline />} />
<Route path="/group/*" element={<GroupRoutes />} />
</Routes>
</div>
Expand All @@ -52,6 +54,7 @@ function GroupRoutes() {
<StyledLayout>
<Routes>
<Route path="/" element={<ShowGroupList />} />

<Route path="/createGroup" element={<CreateGroup />} />
<Route path="/:id/*" element={<GroupRoutesWithSidebar />} />
</Routes>
Expand Down
4 changes: 4 additions & 0 deletions src/Components/NavBar/NavBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ const NavBar = ({ isopen }) => {
</StyledLinkBox>
),
},
{
key: 'intro',
label: <Link to="/guide">소개</Link>
},
{
key: 'myGroups',
label: <Link to="/group">나의 모임</Link>,
Expand Down
Binary file added src/IMG/guide.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/IMG/guide3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/Pages/Guide/UserGuideline.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'
import guideTest from '../../IMG/guide3.png'

const UserGuideline = () => {
return (
<div>
<img src={guideTest} alt="background" style={{ marginLeft: '350px' }} />
</div>
)
}

export default UserGuideline
11 changes: 10 additions & 1 deletion src/Pages/MainPage/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ const MainPage = () => {
else navigate('/group')
}

const onClickIntroHandler = () => {
navigate('/guide')
}

return (
<StyledLayoutMain>
{contextHolder}
Expand Down Expand Up @@ -64,7 +68,12 @@ const MainPage = () => {
님 환영합니다.
</StyledContent>
)}
<StyledButtonStart onClick={onClickHandler}>sumtime 시작하기</StyledButtonStart>
{user ? (
<StyledButtonStart onClick={onClickHandler}>sumtime 시작하기</StyledButtonStart>
) : (
<StyledButtonStart onClick={onClickIntroHandler}>sumtime 소개</StyledButtonStart>
)}

{user ? (
<>
<LogoutKakao />
Expand Down
Loading