Refactor teams and extract TeamsHead
This commit is contained in:
parent
9e3f15c286
commit
73de22cbbc
2 changed files with 143 additions and 88 deletions
37
components/TeamsHead/index.tsx
Normal file
37
components/TeamsHead/index.tsx
Normal file
|
|
@ -0,0 +1,37 @@
|
||||||
|
import React from 'react'
|
||||||
|
import Head from 'next/head'
|
||||||
|
import { useTranslation } from 'next-i18next'
|
||||||
|
|
||||||
|
const TeamsHead = () => {
|
||||||
|
// Import translations
|
||||||
|
const { t } = useTranslation('common')
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Head>
|
||||||
|
{/* HTML */}
|
||||||
|
<title>{t('page.titles.discover')}</title>
|
||||||
|
<meta name="description" content={t('page.descriptions.discover')} />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
|
||||||
|
{/* OpenGraph */}
|
||||||
|
<meta property="og:title" content={t('page.titles.discover')} />
|
||||||
|
<meta
|
||||||
|
property="og:description"
|
||||||
|
content={t('page.descriptions.discover')}
|
||||||
|
/>
|
||||||
|
<meta property="og:url" content="https://app.granblue.team/teams" />
|
||||||
|
<meta property="og:type" content="website" />
|
||||||
|
|
||||||
|
{/* Twitter */}
|
||||||
|
<meta name="twitter:card" content="summary_large_image" />
|
||||||
|
<meta property="twitter:domain" content="app.granblue.team" />
|
||||||
|
<meta name="twitter:title" content={t('page.titles.discover')} />
|
||||||
|
<meta
|
||||||
|
name="twitter:description"
|
||||||
|
content={t('page.descriptions.discover')}
|
||||||
|
/>
|
||||||
|
</Head>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default TeamsHead
|
||||||
120
pages/teams.tsx
120
pages/teams.tsx
|
|
@ -1,11 +1,8 @@
|
||||||
import React, { useCallback, useEffect, useState } from 'react'
|
import React, { useCallback, useEffect, useState } from 'react'
|
||||||
import Head from 'next/head'
|
import InfiniteScroll from 'react-infinite-scroll-component'
|
||||||
|
|
||||||
import { queryTypes, useQueryState } from 'next-usequerystate'
|
import { queryTypes, useQueryState } from 'next-usequerystate'
|
||||||
import { useRouter } from 'next/router'
|
import { useRouter } from 'next/router'
|
||||||
import { useTranslation } from 'next-i18next'
|
import { useTranslation } from 'next-i18next'
|
||||||
import InfiniteScroll from 'react-infinite-scroll-component'
|
|
||||||
|
|
||||||
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
|
import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
|
||||||
import clonedeep from 'lodash.clonedeep'
|
import clonedeep from 'lodash.clonedeep'
|
||||||
|
|
||||||
|
|
@ -18,23 +15,35 @@ import useDidMountEffect from '~utils/useDidMountEffect'
|
||||||
import { appState } from '~utils/appState'
|
import { appState } from '~utils/appState'
|
||||||
import { elements, allElement } from '~data/elements'
|
import { elements, allElement } from '~data/elements'
|
||||||
import { emptyPaginationObject } from '~utils/emptyStates'
|
import { emptyPaginationObject } from '~utils/emptyStates'
|
||||||
import { printError } from '~utils/reportError'
|
|
||||||
|
|
||||||
|
import ErrorSection from '~components/ErrorSection'
|
||||||
import GridRep from '~components/GridRep'
|
import GridRep from '~components/GridRep'
|
||||||
import GridRepCollection from '~components/GridRepCollection'
|
import GridRepCollection from '~components/GridRepCollection'
|
||||||
import FilterBar from '~components/FilterBar'
|
import FilterBar from '~components/FilterBar'
|
||||||
|
import TeamsHead from '~components/TeamsHead'
|
||||||
|
|
||||||
|
import type { AxiosError } from 'axios'
|
||||||
import type { NextApiRequest, NextApiResponse } from 'next'
|
import type { NextApiRequest, NextApiResponse } from 'next'
|
||||||
import type { FilterObject, PaginationObject } from '~types'
|
import type {
|
||||||
|
FilterObject,
|
||||||
|
PageContextObj,
|
||||||
|
PaginationObject,
|
||||||
|
ResponseStatus,
|
||||||
|
} from '~types'
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
teams?: Party[]
|
context?: PageContextObj
|
||||||
meta: PaginationObject
|
|
||||||
sortedRaids: Raid[][]
|
|
||||||
version: AppUpdate
|
version: AppUpdate
|
||||||
|
error: boolean
|
||||||
|
status?: ResponseStatus
|
||||||
}
|
}
|
||||||
|
|
||||||
const TeamsRoute: React.FC<Props> = (props: Props) => {
|
const TeamsRoute: React.FC<Props> = ({
|
||||||
|
context,
|
||||||
|
version,
|
||||||
|
error,
|
||||||
|
status,
|
||||||
|
}: Props) => {
|
||||||
// Set up router
|
// Set up router
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
|
|
@ -96,11 +105,11 @@ const TeamsRoute: React.FC<Props> = (props: Props) => {
|
||||||
|
|
||||||
// Set the initial parties from props
|
// Set the initial parties from props
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (props.teams) {
|
if (context && context.teams && context.pagination) {
|
||||||
setTotalPages(props.meta.totalPages)
|
setTotalPages(context.pagination.totalPages)
|
||||||
setRecordCount(props.meta.count)
|
setRecordCount(context.pagination.count)
|
||||||
replaceResults(props.meta.count, props.teams)
|
replaceResults(context.pagination.count, context.teams)
|
||||||
appState.version = props.version
|
appState.version = version
|
||||||
}
|
}
|
||||||
setCurrentPage(1)
|
setCurrentPage(1)
|
||||||
}, [])
|
}, [])
|
||||||
|
|
@ -268,6 +277,16 @@ const TeamsRoute: React.FC<Props> = (props: Props) => {
|
||||||
router.push(`/p/${shortcode}`)
|
router.push(`/p/${shortcode}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Methods: Page component rendering
|
||||||
|
function pageHead() {
|
||||||
|
if (context && context.user) return <TeamsHead />
|
||||||
|
}
|
||||||
|
|
||||||
|
function pageError() {
|
||||||
|
if (status) return <ErrorSection status={status} />
|
||||||
|
else return <div />
|
||||||
|
}
|
||||||
|
|
||||||
function renderParties() {
|
function renderParties() {
|
||||||
return parties.map((party, i) => {
|
return parties.map((party, i) => {
|
||||||
return (
|
return (
|
||||||
|
|
@ -290,33 +309,10 @@ const TeamsRoute: React.FC<Props> = (props: Props) => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (context) {
|
||||||
return (
|
return (
|
||||||
<div id="Teams">
|
<div id="Teams">
|
||||||
<Head>
|
{pageHead()}
|
||||||
{/* HTML */}
|
|
||||||
<title>{t('page.titles.discover')}</title>
|
|
||||||
<meta name="description" content={t('page.descriptions.discover')} />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
|
|
||||||
{/* OpenGraph */}
|
|
||||||
<meta property="og:title" content={t('page.titles.discover')} />
|
|
||||||
<meta
|
|
||||||
property="og:description"
|
|
||||||
content={t('page.descriptions.discover')}
|
|
||||||
/>
|
|
||||||
<meta property="og:url" content="https://app.granblue.team/teams" />
|
|
||||||
<meta property="og:type" content="website" />
|
|
||||||
|
|
||||||
{/* Twitter */}
|
|
||||||
<meta name="twitter:card" content="summary_large_image" />
|
|
||||||
<meta property="twitter:domain" content="app.granblue.team" />
|
|
||||||
<meta name="twitter:title" content={t('page.titles.discover')} />
|
|
||||||
<meta
|
|
||||||
name="twitter:description"
|
|
||||||
content={t('page.descriptions.discover')}
|
|
||||||
/>
|
|
||||||
</Head>
|
|
||||||
|
|
||||||
<FilterBar
|
<FilterBar
|
||||||
onFilter={receiveFilters}
|
onFilter={receiveFilters}
|
||||||
scrolled={scrolled}
|
scrolled={scrolled}
|
||||||
|
|
@ -351,6 +347,7 @@ const TeamsRoute: React.FC<Props> = (props: Props) => {
|
||||||
</section>
|
</section>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
} else return pageError()
|
||||||
}
|
}
|
||||||
|
|
||||||
export const getServerSidePaths = async () => {
|
export const getServerSidePaths = async () => {
|
||||||
|
|
@ -368,10 +365,10 @@ export const getServerSideProps = async ({ req, res, locale, query }: { req: Nex
|
||||||
// Set headers for server-side requests
|
// Set headers for server-side requests
|
||||||
setUserToken(req, res)
|
setUserToken(req, res)
|
||||||
|
|
||||||
try {
|
|
||||||
// Fetch latest version
|
// Fetch latest version
|
||||||
const version = await fetchLatestVersion()
|
const version = await fetchLatestVersion()
|
||||||
|
|
||||||
|
try {
|
||||||
// Fetch and organize raids
|
// Fetch and organize raids
|
||||||
let { raids, sortedRaids } = await api.endpoints.raids
|
let { raids, sortedRaids } = await api.endpoints.raids
|
||||||
.getAll()
|
.getAll()
|
||||||
|
|
@ -384,31 +381,52 @@ export const getServerSideProps = async ({ req, res, locale, query }: { req: Nex
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set up empty variables
|
// Set up empty variables
|
||||||
let teams: Party[] | null = null
|
let teams: Party[] | undefined = undefined
|
||||||
let meta: PaginationObject = emptyPaginationObject
|
let pagination: PaginationObject = emptyPaginationObject
|
||||||
|
|
||||||
// Fetch initial set of parties
|
// Fetch initial set of parties
|
||||||
const response = await api.endpoints.parties.getAll(params)
|
const response = await api.endpoints.parties.getAll(params)
|
||||||
|
|
||||||
// Assign values to pass to props
|
// Assign values to pass to props
|
||||||
teams = response.data.results
|
teams = response.data.results
|
||||||
meta.count = response.data.meta.count
|
pagination.count = response.data.meta.count
|
||||||
meta.totalPages = response.data.meta.total_pages
|
pagination.totalPages = response.data.meta.total_pages
|
||||||
meta.perPage = response.data.meta.per_page
|
pagination.perPage = response.data.meta.per_page
|
||||||
|
|
||||||
return {
|
// Consolidate data into context object
|
||||||
props: {
|
const context: PageContextObj = {
|
||||||
teams: teams,
|
teams: teams,
|
||||||
meta: meta,
|
|
||||||
raids: raids,
|
raids: raids,
|
||||||
sortedRaids: sortedRaids,
|
sortedRaids: sortedRaids,
|
||||||
|
pagination: pagination,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pass to the page component as props
|
||||||
|
return {
|
||||||
|
props: {
|
||||||
|
context: context,
|
||||||
version: version,
|
version: version,
|
||||||
|
error: false,
|
||||||
...(await serverSideTranslations(locale, ['common', 'roadmap'])),
|
...(await serverSideTranslations(locale, ['common', 'roadmap'])),
|
||||||
// Will be passed to the page component as props
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
printError(error, 'axios')
|
// Extract the underlying Axios error
|
||||||
|
const axiosError = error as AxiosError
|
||||||
|
const response = axiosError.response
|
||||||
|
|
||||||
|
// Pass to the page component as props
|
||||||
|
return {
|
||||||
|
props: {
|
||||||
|
context: null,
|
||||||
|
error: true,
|
||||||
|
status: {
|
||||||
|
code: response?.status,
|
||||||
|
text: response?.statusText,
|
||||||
|
},
|
||||||
|
...(await serverSideTranslations(locale, ['common', 'roadmap'])),
|
||||||
|
},
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue