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.

Sign up for GitHub

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

Jump to bottom

Home view 순서 변경 #346

Merged
merged 2 commits into from
Mar 9, 2024
Merged

Home view 순서 변경 #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aef47e
chore/change order of global navigation bar
GuruneLee Mar 9, 2024
3b8715a
chore/change order of homoe petition list
GuruneLee Mar 9, 2024
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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,7 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
_yarn.lock
_yarn.lock

# jetbrain
/.idea/
8 changes: 4 additions & 4 deletions src/components/NavBar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,22 @@ const NavBar = (): JSX.Element => {
<div onClick={closeMenu}>
<ListItem>
<ItemName>
<Link to="/guide">{t('about')}</Link>
<Link to="/answer">{t('answered')}</Link>
</ItemName>
</ListItem>
<ListItem>
<ItemName>
<Link to={writePathname}>{t('petition')}</Link>
<Link to="/guide">{t('about')}</Link>
</ItemName>
</ListItem>
<ListItem>
<ItemName>
<Link to="/petitions">{t('all')}</Link>
<Link to={writePathname}>{t('petition')}</Link>
</ItemName>
</ListItem>
<ListItem>
<ItemName>
<Link to="/answer">{t('answered')}</Link>
<Link to="/petitions">{t('all')}</Link>
</ItemName>
</ListItem>
<ListItem>
Expand Down
16 changes: 8 additions & 8 deletions src/pages/Home/MainPetitions/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ const MainPetitions = (): JSX.Element => {
return (
<PetitionsSection>
<Inner>
<div className="petitions_title">
<span>{t('recent')}</span>
</div>
<PetitionList
getPetitions={() =>
getAnsweredByQuery({ size: 5, sort: 'createdAt,desc' })
}
></PetitionList>
<div className="petitions_title">
<span>{t('consented')}</span>
</div>
Expand All @@ -37,14 +45,6 @@ const MainPetitions = (): JSX.Element => {
})
}
></PetitionList>
<div className="petitions_title">
<span>{t('recent')}</span>
</div>
<PetitionList
getPetitions={() =>
getAnsweredByQuery({ size: 5, sort: 'createdAt,desc' })
}
></PetitionList>
<div className="petitions_title">
<span>{t('reject')}</span>
</div>
Expand Down
Loading