diff --git a/src/components/layouts/Honkai3rdLayout.tsx b/src/components/layouts/Honkai3rdLayout.tsx
new file mode 100644
index 00000000..07e0f974
--- /dev/null
+++ b/src/components/layouts/Honkai3rdLayout.tsx
@@ -0,0 +1,60 @@
+/** @jsxImportSource theme-ui */
+
+import { mdiMenu } from '@mdi/js'
+import Icon from '@mdi/react'
+import React, { useCallback, useState } from 'react'
+import { Box, Flex, IconButton } from 'theme-ui'
+import Honkai3rdNavigator from '../organisms/Honkai3rdNavigator'
+
+const Honkai3rdLayout: React.FC = ({ children }) => {
+ const [hiddenMobileNav, setHiddenMobileNav] = useState(true)
+
+ const close = useCallback(() => {
+ setHiddenMobileNav(true)
+ }, [])
+
+ return (
+
+
+
+
+
+
+ setHiddenMobileNav(false)}
+ >
+
+
+
+
+ {children}
+
+
+ )
+}
+
+export default Honkai3rdLayout
diff --git a/src/components/organisms/Honkai3rdNavigator.tsx b/src/components/organisms/Honkai3rdNavigator.tsx
index a173a4bd..3a321d56 100644
--- a/src/components/organisms/Honkai3rdNavigator.tsx
+++ b/src/components/organisms/Honkai3rdNavigator.tsx
@@ -1,159 +1,87 @@
/** @jsxImportSource theme-ui */
-import { mdiClose, mdiMenu, mdiMenuRight, mdiMenuSwap } from '@mdi/js'
+import { mdiClose, mdiMenuSwap } from '@mdi/js'
import Icon from '@mdi/react'
import {
NavLink,
Heading,
- Flex,
Text,
Box,
+ Flex,
IconButton,
- Link,
} from '@theme-ui/components'
import NextLink from 'next/link'
import { useRouter } from 'next/router'
-import { useCallback, useState } from 'react'
import { assetsBucketBaseUrl } from '../../lib/consts'
import { useTranslation } from '../../lib/i18n'
-import PageLink from '../atoms/PageLink'
import SquareImageBox from '../atoms/SquareImageBox'
-const Honkai3rdNavigator = () => {
+interface Honkai3rdNavigatorProps {
+ close: () => void
+}
+
+const Honkai3rdNavigator = ({ close }: Honkai3rdNavigatorProps) => {
const router = useRouter()
const { pathname, asPath, query, locale } = router
const { t } = useTranslation()
-
- const [hiddenMobileNav, setHiddenMobileNav] = useState(true)
-
- const close = useCallback(() => {
- setHiddenMobileNav(true)
- }, [])
-
return (
-
-
-
- Abyss Lab
-
- :
-
- {t('nav.honkai-3rd')}
-
-
-
-
-
- setHiddenMobileNav(false)}
- >
-
+
+
-
+ Abyss Lab
+
+
+
+ {t('nav.honkai-3rd')}
+
+
+
+
+
+
+
+
+
+
+
+
-
- setHiddenMobileNav(true)}
- >
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {locale === 'en-US' ? (
- 'πΊπΈ'
- ) : (
- <>
- π°π· (νκΈν μμ
μ€)
- >
- )}
-
-
-
-
-
-
-
+ {locale === 'en-US' ? 'πΊπΈ English(US)' : 'π°π· νκ΅μ΄'}
+
+
+
+
)
}
@@ -168,16 +96,16 @@ const NavItem = ({ target }: NavItemProps) => {
return (
@@ -194,91 +122,3 @@ const NavItem = ({ target }: NavItemProps) => {
)
}
-
-interface Honkai3rdNavMobileItemProps {
- target: 'versions' | 'battlesuits' | 'stigmata' | 'weapons' | 'elfs'
- close: () => void
-}
-
-const Honkai3rdNavMobileItem = ({
- target,
- close,
-}: Honkai3rdNavMobileItemProps) => {
- const { push } = useRouter()
- const { t } = useTranslation()
- const href = `/honkai3rd/${target}`
- return (
- {
- event.preventDefault()
- close()
- push(href)
- }}
- >
-
-
- {t(`nav.${target}`)}
-
-
- )
-}
-
-interface NavMobileItemProps {
- href: string
- label: string
- close: () => void
-}
-
-const NavMobileItem = ({ href, label, close }: NavMobileItemProps) => {
- const { push } = useRouter()
- return (
- {
- event.preventDefault()
- close()
- push(href)
- }}
- >
-
-
-
- {label}
-
- )
-}
diff --git a/src/components/pages/SingleStigmataPage.tsx b/src/components/pages/SingleStigmataPage.tsx
index 1f319620..b605319b 100644
--- a/src/components/pages/SingleStigmataPage.tsx
+++ b/src/components/pages/SingleStigmataPage.tsx
@@ -11,12 +11,12 @@ import {
import PageLink from '../../components/atoms/PageLink'
import StigmataCard from '../../components/molecules/StigmataCard'
import Breadcrumb from '../../components/organisms/Breadcrumb'
-import Honkai3rdNavigator from '../../components/organisms/Honkai3rdNavigator'
import SecondaryLabel from '../atoms/SecondaryLabel'
import { useRouter } from 'next/router'
import { translate, useTranslation } from '../../lib/i18n'
import Head from '../atoms/Head'
import { assetsBucketBaseUrl } from '../../lib/consts'
+import Honkai3rdLayout from '../layouts/Honkai3rdLayout'
export interface SingleStigmataPageProps {
type: 'single'
@@ -48,7 +48,7 @@ const SingleStigmataPage = ({
)
return (
-
+
-
)}
-
+
)
}
diff --git a/src/components/pages/StigmataSetPage.tsx b/src/components/pages/StigmataSetPage.tsx
index 8e15a80b..28114dfb 100644
--- a/src/components/pages/StigmataSetPage.tsx
+++ b/src/components/pages/StigmataSetPage.tsx
@@ -4,12 +4,12 @@ import React from 'react'
import PageLink from '../../components/atoms/PageLink'
import StigmataCard from '../../components/molecules/StigmataCard'
import Breadcrumb from '../../components/organisms/Breadcrumb'
-import Honkai3rdNavigator from '../../components/organisms/Honkai3rdNavigator'
import { StigmataData, StigmataSet } from '../../lib/honkai3rd/stigmata'
import SecondaryLabel from '../atoms/SecondaryLabel'
import { translate, useTranslation } from '../../lib/i18n'
import { useRouter } from 'next/router'
import Head from '../atoms/Head'
+import Honkai3rdLayout from '../layouts/Honkai3rdLayout'
export interface StigmataSetProps {
type: 'set'
@@ -36,7 +36,7 @@ const StigmataSetPage = ({
)
return (
-
+
-
-
+
)
}
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 8a2fa619..f2e44f6c 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -5,7 +5,8 @@ import { ThemeProvider } from 'theme-ui'
import { theme } from '../lib/theme'
import NProgress from 'nprogress'
import { useRouter } from 'next/router'
-import '../../public/assets/nprogress.css'
+import '../styles/nprogress.css'
+import '../styles/nextjs.css'
function MyApp({ Component, pageProps }: AppProps) {
const router = useRouter()
diff --git a/src/pages/honkai3rd/battlesuits/[battlesuitId].tsx b/src/pages/honkai3rd/battlesuits/[battlesuitId].tsx
index e0751caf..ddaf45d0 100644
--- a/src/pages/honkai3rd/battlesuits/[battlesuitId].tsx
+++ b/src/pages/honkai3rd/battlesuits/[battlesuitId].tsx
@@ -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 (
-
+
{
})
.join(', ')}`}
/>
-
{
/>
)}
-
+
)
}
diff --git a/src/pages/honkai3rd/battlesuits/index.tsx b/src/pages/honkai3rd/battlesuits/index.tsx
index af33246c..a10980e7 100644
--- a/src/pages/honkai3rd/battlesuits/index.tsx
+++ b/src/pages/honkai3rd/battlesuits/index.tsx
@@ -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 (
-
+
-
{
{battlesuitList}
-
+
)
}
diff --git a/src/pages/honkai3rd/elfs/[elfId].tsx b/src/pages/honkai3rd/elfs/[elfId].tsx
index 22551271..05f3da96 100644
--- a/src/pages/honkai3rd/elfs/[elfId].tsx
+++ b/src/pages/honkai3rd/elfs/[elfId].tsx
@@ -12,7 +12,6 @@ import React from 'react'
import BattlesuitFeatureLabel from '../../../components/atoms/BattlesuitFeatureLabel'
import SecondaryLabel from '../../../components/atoms/SecondaryLabel'
import Breadcrumb from '../../../components/organisms/Breadcrumb'
-import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
import { ElfData } from '../../../lib/honkai3rd/elfs'
import { getElfById, listElfs } from '../../../server/data/honkai3rd/elfs'
import { generateI18NPaths, getI18NProps } from '../../../server/i18n'
@@ -21,6 +20,7 @@ import { useRouter } from 'next/router'
import Head from '../../../components/atoms/Head'
import { battlesuitFeatures } from '../../../lib/honkai3rd/battlesuits'
import { assetsBucketBaseUrl } from '../../../lib/consts'
+import Honkai3rdLayout from '../../../components/layouts/Honkai3rdLayout'
interface ElfShowPageProps {
elf: ElfData
@@ -33,7 +33,7 @@ const ElfShowPage = ({ elf }: ElfShowPageProps) => {
const elfName = translate(locale, { 'ko-KR': elf.krName }, elf.name)
return (
-
+
{
})
.join(', ')}`}
/>
-
{
)
})}
-
+
)
}
diff --git a/src/pages/honkai3rd/elfs/index.tsx b/src/pages/honkai3rd/elfs/index.tsx
index 3108042f..bbc8a8e4 100644
--- a/src/pages/honkai3rd/elfs/index.tsx
+++ b/src/pages/honkai3rd/elfs/index.tsx
@@ -4,12 +4,12 @@ import { NextPageContext } from 'next'
import { pick } from 'ramda'
import ElfCard from '../../../components/molecules/ElfCard'
import Breadcrumb from '../../../components/organisms/Breadcrumb'
-import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
import { ElfData } from '../../../lib/honkai3rd/elfs'
import { getI18NProps } from '../../../server/i18n'
import { listElfs } from '../../../server/data/honkai3rd/elfs'
import { useTranslation } from '../../../lib/i18n'
import Head from '../../../components/atoms/Head'
+import Honkai3rdLayout from '../../../components/layouts/Honkai3rdLayout'
interface ElfListPageProps {
elfs: Pick[]
@@ -19,16 +19,13 @@ const ElfListPage = ({ elfs }: ElfListPageProps) => {
const { t } = useTranslation()
return (
-
+
-
-
-
{
})}
-
+
)
}
diff --git a/src/pages/honkai3rd/enemies/index.tsx b/src/pages/honkai3rd/enemies/index.tsx
index c8c61c6f..342d5bb9 100644
--- a/src/pages/honkai3rd/enemies/index.tsx
+++ b/src/pages/honkai3rd/enemies/index.tsx
@@ -1,13 +1,13 @@
/** @jsxImportSource theme-ui */
import { Box, Heading } from '@theme-ui/components'
import Breadcrumb from '../../../components/organisms/Breadcrumb'
-import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
import { NextPageContext } from 'next'
import { getI18NProps } from '../../../server/i18n'
import { useTranslation } from '../../../lib/i18n'
import Head from '../../../components/atoms/Head'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { times } from 'ramda'
+import Honkai3rdLayout from '../../../components/layouts/Honkai3rdLayout'
const enemyIdList = [
...times((i) => i + 0, 1000).map((i) => {
@@ -110,12 +110,11 @@ const Honkai3rdIndexPage = () => {
}, [validList])
return (
-
+
-
{
)
})}
-
+
)
}
diff --git a/src/pages/honkai3rd/index.tsx b/src/pages/honkai3rd/index.tsx
index 5d157da6..52ecdf00 100644
--- a/src/pages/honkai3rd/index.tsx
+++ b/src/pages/honkai3rd/index.tsx
@@ -2,7 +2,6 @@
import { Box, Heading, Text, Flex, Link } from '@theme-ui/components'
import { useCallback, useEffect, useState } from 'react'
import Breadcrumb from '../../components/organisms/Breadcrumb'
-import Honkai3rdNavigator from '../../components/organisms/Honkai3rdNavigator'
import { NextPageContext } from 'next'
import { getI18NProps } from '../../server/i18n'
import { useTranslation } from '../../lib/i18n'
@@ -12,6 +11,7 @@ import { mdiGithub } from '@mdi/js'
import { Icon } from '@mdi/react'
import Head from '../../components/atoms/Head'
import { assetsBucketBaseUrl } from '../../lib/consts'
+import Honkai3rdLayout from '../../components/layouts/Honkai3rdLayout'
const bannerValkyries = [
'kiana',
@@ -44,12 +44,11 @@ const Honkai3rdIndexPage = () => {
}, [bannerIndex, switchBanner])
return (
-
+
-
{
-
+
)
}
diff --git a/src/pages/honkai3rd/stigmata/index.tsx b/src/pages/honkai3rd/stigmata/index.tsx
index a384c50a..ee9e15e2 100644
--- a/src/pages/honkai3rd/stigmata/index.tsx
+++ b/src/pages/honkai3rd/stigmata/index.tsx
@@ -8,7 +8,6 @@ import PageLink from '../../../components/atoms/PageLink'
import StigmataCard from '../../../components/molecules/StigmataCard'
import StigmataSetCard from '../../../components/molecules/StigmataSetCard'
import Breadcrumb from '../../../components/organisms/Breadcrumb'
-import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
import { StigmataData, StigmataSet } from '../../../lib/honkai3rd/stigmata'
import { getI18NProps } from '../../../server/i18n'
import {
@@ -17,6 +16,7 @@ import {
} from '../../../server/data/honkai3rd/stigmata'
import { useTranslation } from 'next-i18next'
import Head from '../../../components/atoms/Head'
+import Honkai3rdLayout from '../../../components/layouts/Honkai3rdLayout'
interface StigmataListPageProps {
stigmataDataList: Pick[]
@@ -38,14 +38,13 @@ const StigmataListPage = ({
}, [query])
return (
-
+
-
-
+
)
}
diff --git a/src/pages/honkai3rd/versions/[versionId].tsx b/src/pages/honkai3rd/versions/[versionId].tsx
index 4df1d21c..0df4bc31 100644
--- a/src/pages/honkai3rd/versions/[versionId].tsx
+++ b/src/pages/honkai3rd/versions/[versionId].tsx
@@ -3,7 +3,6 @@ import { Box, Heading, Link, Flex, Text, Paragraph } from '@theme-ui/components'
import { NextPageContext } from 'next'
import Breadcrumb from '../../../components/organisms/Breadcrumb'
import GanttChart from '../../../components/organisms/GanttChart'
-import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
import {
getVersion,
listVersionData,
@@ -26,6 +25,7 @@ import { useRouter } from 'next/router'
import Head from '../../../components/atoms/Head'
import PageLink from '../../../components/atoms/PageLink'
import { assetsBucketBaseUrl } from '../../../lib/consts'
+import Honkai3rdLayout from '../../../components/layouts/Honkai3rdLayout'
interface VersionShowPageProps {
versionData: VersionData
@@ -44,7 +44,7 @@ const VersionShowPage = ({
const { locale } = useRouter()
return (
-
+
-
{t('versions.supply-events-disclaimer')}
-
+
)
}
diff --git a/src/pages/honkai3rd/versions/index.tsx b/src/pages/honkai3rd/versions/index.tsx
index 3509df26..28a154a4 100644
--- a/src/pages/honkai3rd/versions/index.tsx
+++ b/src/pages/honkai3rd/versions/index.tsx
@@ -4,7 +4,6 @@ import NextLink from 'next/link'
import SquareImageBox from '../../../components/atoms/SquareImageBox'
import Breadcrumb from '../../../components/organisms/Breadcrumb'
import GanttChart from '../../../components/organisms/GanttChart'
-import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
import { getBattlesuitById } from '../../../server/data/honkai3rd/battlesuits'
import { listSupplyEventsByVersion } from '../../../server/data/honkai3rd/supplyEvents'
import {
@@ -26,6 +25,7 @@ import { useRouter } from 'next/router'
import Head from '../../../components/atoms/Head'
import PageLink from '../../../components/atoms/PageLink'
import { assetsBucketBaseUrl } from '../../../lib/consts'
+import Honkai3rdLayout from '../../../components/layouts/Honkai3rdLayout'
interface VersionIndexPageProps {
versionDataList: VersionData[]
@@ -46,7 +46,7 @@ const VersionIndexPage = ({
const { locale } = useRouter()
return (
-
+
-
-
-
+
)
}
diff --git a/src/pages/honkai3rd/weapons/[weaponId].tsx b/src/pages/honkai3rd/weapons/[weaponId].tsx
index 5d3e3f7e..f8abfe05 100644
--- a/src/pages/honkai3rd/weapons/[weaponId].tsx
+++ b/src/pages/honkai3rd/weapons/[weaponId].tsx
@@ -3,7 +3,6 @@ import { Box, Card, Heading, Paragraph } from '@theme-ui/components'
import { NextPageContext } from 'next'
import SquareImageBox from '../../../components/atoms/SquareImageBox'
import Breadcrumb from '../../../components/organisms/Breadcrumb'
-import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
import { WeaponData } from '../../../lib/honkai3rd/weapons'
import { generateI18NPaths, getI18NProps } from '../../../server/i18n'
import {
@@ -15,6 +14,7 @@ import { useTranslation, translate } from '../../../lib/i18n'
import Head from '../../../components/atoms/Head'
import PageLink from '../../../components/atoms/PageLink'
import { assetsBucketBaseUrl } from '../../../lib/consts'
+import Honkai3rdLayout from '../../../components/layouts/Honkai3rdLayout'
interface WeaponShowPageProps {
weapon: WeaponData
@@ -28,7 +28,7 @@ const WeaponShowPage = ({ weapon }: WeaponShowPageProps) => {
const weaponCategory = t(`weapons-show.${weapon.category}`)
return (
-
+
{
weapon.atk
} / CRT : ${weapon.crt}`}
/>
-
{
})}
-
+
)
}
diff --git a/src/pages/honkai3rd/weapons/index.tsx b/src/pages/honkai3rd/weapons/index.tsx
index 2028bc36..868b3146 100644
--- a/src/pages/honkai3rd/weapons/index.tsx
+++ b/src/pages/honkai3rd/weapons/index.tsx
@@ -1,7 +1,6 @@
/** @jsxImportSource theme-ui */
import { Box, Heading, Flex } from '@theme-ui/components'
import Breadcrumb from '../../../components/organisms/Breadcrumb'
-import Honkai3rdNavigator from '../../../components/organisms/Honkai3rdNavigator'
import { listWeapons } from '../../../server/data/honkai3rd/weapons'
import { pick } from 'ramda'
import { useMemo } from 'react'
@@ -13,6 +12,7 @@ import { getI18NProps } from '../../../server/i18n'
import { NextPageContext } from 'next'
import { useTranslation, translate } from '../../../lib/i18n'
import Head from '../../../components/atoms/Head'
+import Honkai3rdLayout from '../../../components/layouts/Honkai3rdLayout'
type WeaponListItemData = Pick<
WeaponData,
@@ -57,50 +57,51 @@ const WeaponListPage = ({ weaponDataList }: WeaponListPageProps) => {
}, [weaponDataList, filter])
return (
-
-
-
-
-
-
+
+
- {t('weapons-list.weapons')}
-
- {t('weapons-list.filter-by-category')}
-
- {weaponFilterOptions.map(({ value, label, krLabel }) => {
- return (
-
- )
- })}
+
+
+
+ {t('weapons-list.weapons')}
+
+ {t('weapons-list.filter-by-category')}
+
+ {weaponFilterOptions.map(({ value, label, krLabel }) => {
+ return (
+
+ )
+ })}
+
+
+
+ {weaponList}
-
- {weaponList}
-
-
+
)
}
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index ad65e666..432ad735 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -3,6 +3,7 @@ import { Box, Text, Image } from '@theme-ui/components'
import PageLink from '../components/atoms/PageLink'
import RootNavigator from '../components/organisms/RootNavigator'
import Head from '../components/atoms/Head'
+import { assetsBucketBaseUrl } from '../lib/consts'
const IndexPage = () => {
return (
@@ -15,7 +16,7 @@ const IndexPage = () => {
diff --git a/src/styles/nextjs.css b/src/styles/nextjs.css
new file mode 100644
index 00000000..5b126844
--- /dev/null
+++ b/src/styles/nextjs.css
@@ -0,0 +1,7 @@
+body {
+ height: 100vh;
+}
+
+#__next {
+ height: 100%;
+}
diff --git a/public/assets/nprogress.css b/src/styles/nprogress.css
similarity index 100%
rename from public/assets/nprogress.css
rename to src/styles/nprogress.css