From 6aef47e6dd574191caf9a2152e54740653953175 Mon Sep 17 00:00:00 2001 From: ChangHa Lee Date: Sat, 9 Mar 2024 17:51:54 +0900 Subject: [PATCH 1/2] chore/change order of global navigation bar --- .gitignore | 5 ++++- src/components/NavBar/index.tsx | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 098cde55..ffb1ae07 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,7 @@ npm-debug.log* yarn-debug.log* yarn-error.log* -_yarn.lock \ No newline at end of file +_yarn.lock + +# jetbrain +/.idea/ diff --git a/src/components/NavBar/index.tsx b/src/components/NavBar/index.tsx index a67f20b4..178f8de6 100644 --- a/src/components/NavBar/index.tsx +++ b/src/components/NavBar/index.tsx @@ -43,22 +43,22 @@ const NavBar = (): JSX.Element => {
- {t('about')} + {t('answered')} - {t('petition')} + {t('about')} - {t('all')} + {t('petition')} - {t('answered')} + {t('all')} From 3b8715a9ff45e844e0aac8c12ed060fe81e49f23 Mon Sep 17 00:00:00 2001 From: ChangHa Lee Date: Sat, 9 Mar 2024 18:09:57 +0900 Subject: [PATCH 2/2] chore/change order of homoe petition list --- src/pages/Home/MainPetitions/index.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/Home/MainPetitions/index.tsx b/src/pages/Home/MainPetitions/index.tsx index 1a2f33b0..c83566e0 100644 --- a/src/pages/Home/MainPetitions/index.tsx +++ b/src/pages/Home/MainPetitions/index.tsx @@ -15,6 +15,14 @@ const MainPetitions = (): JSX.Element => { return ( +
+ {t('recent')} +
+ + getAnsweredByQuery({ size: 5, sort: 'createdAt,desc' }) + } + >
{t('consented')}
@@ -37,14 +45,6 @@ const MainPetitions = (): JSX.Element => { }) } > -
- {t('recent')} -
- - getAnsweredByQuery({ size: 5, sort: 'createdAt,desc' }) - } - >
{t('reject')}