Skip to content

Commit

Permalink
fix(all): page title
Browse files Browse the repository at this point in the history
  • Loading branch information
cjtim committed Oct 16, 2022
1 parent 5385eb0 commit b20e32b
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 15 deletions.
5 changes: 3 additions & 2 deletions pages/pets/new.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Center } from '@chakra-ui/react'
import { Center, Heading } from '@chakra-ui/react'
import { AxiosResponse } from 'axios'
import Navbar from 'components/global/Navbar'
import PageLayout from 'components/global/PageLayout'
Expand Down Expand Up @@ -38,7 +38,8 @@ const PetNewPage: NextPage<UserProps & Props> = ({ user, tags }) => {
return (
<PageLayout title="New pet">
<Navbar user={user} />
<Center>
<Center flexDir="column" gap={2} p={4}>
<Heading>ลงทะเบียนสัตว์เลี้ยง</Heading>
<PetRegisterCard onSubmitRegister={onSubmit} tags={tags} />
</Center>
</PageLayout>
Expand Down
22 changes: 11 additions & 11 deletions pages/shelters/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Center, Container, Flex, Heading, Switch, Text } from '@chakra-ui/react'
import { Center, Container, Heading } from '@chakra-ui/react'
import Navbar from 'components/global/Navbar'
import PageLayout from 'components/global/PageLayout'
import { config } from 'config'
Expand All @@ -21,14 +21,14 @@ const SheltersPage: NextPage<Props> = ({ user, shelters }) => {
const includeUser = router.query.include_user
const title = includeUser ? 'สถานสงเคราะห์สัตว์ และผู้ใข้ทั่วไป' : 'สถานสงเคราะห์สัตว์'

const toggleIncludeUser = (newIncludeUser: boolean) => {
if (newIncludeUser) {
router.query.include_user = 'true'
} else {
delete router.query.include_user
}
router.push(router)
}
// const toggleIncludeUser = (newIncludeUser: boolean) => {
// if (newIncludeUser) {
// router.query.include_user = 'true'
// } else {
// delete router.query.include_user
// }
// router.push(router)
// }

return (
<PageLayout title={title}>
Expand All @@ -37,13 +37,13 @@ const SheltersPage: NextPage<Props> = ({ user, shelters }) => {
<Container minW="container.lg">
<Center py={2} gap={2} flexDir="column">
<Heading>{title}</Heading>
<Flex gap={2} alignItems="center">
{/* <Flex gap={2} alignItems="center">
<Text>แสดงบัญชีผู้ใช้ทั่วไป</Text>
<Switch
onChange={e => toggleIncludeUser(e.target.checked)}
isChecked={Boolean(router.query.include_user)}
/>
</Flex>
</Flex> */}
</Center>
<ShelterTableList shelters={shelters} />
</Container>
Expand Down
6 changes: 5 additions & 1 deletion pages/user/interested.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Center, Heading } from '@chakra-ui/react'
import Navbar from 'components/global/Navbar'
import PageLayout from 'components/global/PageLayout'
import { config } from 'config'
Expand All @@ -18,7 +19,10 @@ const UserInterestedPage: NextPage<UserProps & Props> = ({ user, pets }) => (
<PageLayout title="Interested pets">
<Navbar user={user} />

<InterestedTable pets={pets} />
<Center flexDir="column" gap={2} p={4}>
<Heading>สัตว์ที่รับอุปการะ</Heading>
<InterestedTable pets={pets} />
</Center>
</PageLayout>
)

Expand Down
7 changes: 6 additions & 1 deletion pages/user/liked.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Center, Heading } from '@chakra-ui/react'
import Navbar from 'components/global/Navbar'
import PageLayout from 'components/global/PageLayout'
import { config } from 'config'
Expand Down Expand Up @@ -26,7 +27,11 @@ const UserLikedPage: NextPage<UserProps & Props> = ({ user, pets }) => {
return (
<PageLayout title="Liked pets">
<Navbar user={user} />
<PetsStatusTable pets={pets} onClickUnlike={onClickUnlike} />

<Center flexDir="column" gap={2} p={4}>
<Heading>สัตว์ที่ถูกใจ</Heading>
<PetsStatusTable pets={pets} onClickUnlike={onClickUnlike} />
</Center>
</PageLayout>
)
}
Expand Down

0 comments on commit b20e32b

Please sign in to comment.