Restructure layout

This commit is contained in:
Sakura Knoll
2022-03-06 16:27:45 +09:00 Unverified
parent dc1cc4029c
commit 3d8f4f34fe
19 changed files with 204 additions and 309 deletions
@@ -17,7 +17,6 @@ import SecondaryLabel from '../../../components/atoms/SecondaryLabel'
import TypeLabel from '../../../components/atoms/TypeLabel'
import ValkyrieLabel from '../../../components/atoms/ValkyrieLabel'
import Breadcrumb from '../../../components/organisms/Breadcrumb'
import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
import {
BattlesuitData,
battlesuitFeatures,
@@ -35,6 +34,7 @@ import { useRouter } from 'next/router'
import Head from '../../../components/atoms/Head'
import { capitalize } from '../../../lib/string'
import { assetsBucketBaseUrl } from '../../../lib/consts'
import Honkai3rdLayout from '../../../components/layouts/Honkai3rdLayout'
interface BattlesuitShowPageProps {
battlesuit: BattlesuitData
@@ -68,7 +68,7 @@ const BattlesuitShowPage = ({ battlesuit }: BattlesuitShowPageProps) => {
: capitalize(battlesuit.type)
return (
<Box>
<Honkai3rdLayout>
<Head
title={`${t('breadcrumb.honkai-3rd')}: ${battlesuitName} - ${t(
'nav.abyss-lab'
@@ -90,7 +90,6 @@ const BattlesuitShowPage = ({ battlesuit }: BattlesuitShowPageProps) => {
})
.join(', ')}`}
/>
<Honkai3rdNavigator />
<Box p={3}>
<Breadcrumb
@@ -215,7 +214,7 @@ const BattlesuitShowPage = ({ battlesuit }: BattlesuitShowPageProps) => {
/>
)}
</Box>
</Box>
</Honkai3rdLayout>
)
}
+3 -4
View File
@@ -4,7 +4,6 @@ import { pick } from 'ramda'
import { useCallback, useMemo, useState } from 'react'
import FilterButton from '../../../components/atoms/FilterButton'
import Breadcrumb from '../../../components/organisms/Breadcrumb'
import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
import { listBattlesuits } from '../../../server/data/honkai3rd/battlesuits'
import {
BattlesuitData,
@@ -18,6 +17,7 @@ import { NextPageContext } from 'next'
import { getI18NProps } from '../../../server/i18n'
import { translate, useTranslation } from '../../../lib/i18n'
import Head from '../../../components/atoms/Head'
import Honkai3rdLayout from '../../../components/layouts/Honkai3rdLayout'
type BattlesuitListItemData = Pick<
BattlesuitData,
@@ -77,14 +77,13 @@ const BattlesuitListPage = ({ battlesuits }: BattlesuitListPageProps) => {
}, [battlesuits, filter])
return (
<Box>
<Honkai3rdLayout>
<Head
title={`${t('breadcrumb.honkai-3rd')}: ${t(
'breadcrumb.battlesuits'
)} - ${t('nav.abyss-lab')}`}
description={t('battlesuits-list.description')}
/>
<Honkai3rdNavigator />
<Box p={3}>
<Breadcrumb
@@ -163,7 +162,7 @@ const BattlesuitListPage = ({ battlesuits }: BattlesuitListPageProps) => {
{battlesuitList}
</Flex>
</Box>
</Box>
</Honkai3rdLayout>
)
}