granblue.team/hensei-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update FilterBar location and more

Browse source 
* Updates FilterBar import location
* Extracts user info into UserInfo component
This commit is contained in:
Justin Edmund 2023-06-30 22:20:50 -07:00
parent d09d53fba9
commit 316785614b
3 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pages/[username].tsx
View file

@ -19,8 +19,9 @@ import { emptyPaginationObject } from '~utils/emptyStates'
import GridRep from '~components/GridRep' import GridRep from '~components/GridRep'
import GridRepCollection from '~components/GridRepCollection' import GridRepCollection from '~components/GridRepCollection'
import ErrorSection from '~components/ErrorSection' import ErrorSection from '~components/ErrorSection'
import FilterBar from '~components/FilterBar' import FilterBar from '~components/filters/FilterBar'
import ProfileHead from '~components/head/ProfileHead' import ProfileHead from '~components/head/ProfileHead'
import UserInfo from '~components/filters/UserInfo'
import type { AxiosError } from 'axios' import type { AxiosError } from 'axios'
import type { NextApiRequest, NextApiResponse } from 'next' import type { NextApiRequest, NextApiResponse } from 'next'
@ -269,6 +270,7 @@ const ProfileRoute: React.FC<Props> = ({
createdAt={new Date(party.created_at)} createdAt={new Date(party.created_at)}
raid={party.raid} raid={party.raid}
grid={party.weapons} grid={party.weapons}
user={party.user}
favorited={party.favorited} favorited={party.favorited}
fullAuto={party.full_auto} fullAuto={party.full_auto}
autoGuard={party.auto_guard} autoGuard={party.auto_guard}
@ -290,16 +292,7 @@ const ProfileRoute: React.FC<Props> = ({
raidSlug={raidSlug ? raidSlug : undefined} raidSlug={raidSlug ? raidSlug : undefined}
recency={recency} recency={recency}
> >
<div className="UserInfo"> <UserInfo user={context.user!} />
<img
alt={context.user?.avatar.picture}
className={`profile ${context.user?.avatar.element}`}
srcSet={`/profile/${context.user?.avatar.picture}.png,
/profile/${context.user?.avatar.picture}@2x.png 2x`}
src={`/profile/${context.user?.avatar.picture}.png`}
/>
<h1>{context.user?.username}</h1>
</div>
</FilterBar> </FilterBar>
<section> <section>

3
pages/saved.tsx
View file

@ -20,7 +20,7 @@ import { emptyPaginationObject } from '~utils/emptyStates'
import ErrorSection from '~components/ErrorSection' 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/filters/FilterBar'
import SavedHead from '~components/head/SavedHead' import SavedHead from '~components/head/SavedHead'
import type { AxiosError } from 'axios' import type { AxiosError } from 'axios'
@ -314,7 +314,6 @@ const SavedRoute: React.FC<Props> = ({
fullAuto={party.full_auto} fullAuto={party.full_auto}
autoGuard={party.auto_guard} autoGuard={party.auto_guard}
key={`party-${i}`} key={`party-${i}`}
displayUser={true}
onClick={goTo} onClick={goTo}
onSave={toggleFavorite} onSave={toggleFavorite}
/> />

3
pages/teams.tsx
View file

@ -20,7 +20,7 @@ import { emptyPaginationObject } from '~utils/emptyStates'
import ErrorSection from '~components/ErrorSection' 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/filters/FilterBar'
import TeamsHead from '~components/head/TeamsHead' import TeamsHead from '~components/head/TeamsHead'
import type { AxiosError } from 'axios' import type { AxiosError } from 'axios'
@ -315,7 +315,6 @@ const TeamsRoute: React.FC<Props> = ({
fullAuto={party.full_auto} fullAuto={party.full_auto}
autoGuard={party.auto_guard} autoGuard={party.auto_guard}
key={`party-${i}`} key={`party-${i}`}
displayUser={true}
onClick={goTo} onClick={goTo}
onSave={toggleFavorite} onSave={toggleFavorite}
/> />