Merge branch 'main' into prod

aukus-devs · Oct 4, 2024 · bf4cd54 · bf4cd54
2 parents cd45f17 + 63c7c33
commit bf4cd54
Show file tree

Hide file tree

Showing 5 changed files with 1,808 additions and 14 deletions.
diff --git a/src/pages/player/components/OldMoveCard.tsx b/src/pages/player/components/OldMoveCard.tsx
@@ -59,12 +59,7 @@ export default function OldMoveCard({ id, game }: Props) {
         <Box fontSize={'24px'} marginBottom={'10px'}>
           {game.title}
         </Box>
-        <Box
-          fontSize={'16px'}
-          fontWeight={400}
-          marginBottom={'25px'}
-          lineHeight={1.2}
-        >
+        <Box fontSize={'16px'} fontWeight={400} lineHeight={1.2}>
           {game.rating ? game.rating : '?/10'} — {game.review}
         </Box>
       </Box>

diff --git a/src/pages/player/components/PlayerContent.tsx b/src/pages/player/components/PlayerContent.tsx
@@ -6,11 +6,12 @@ import { Fragment, useState } from 'react'
 import { Link, useParams } from 'react-router-dom'
 import { fetchPlayerMoves, fetchPlayers } from 'utils/api'
 import { getPlayerColor } from 'utils/types'
-import { aukus1Games, aukus2Games } from '../data_aukus1'
+import { aukus1Games } from '../data_aukus1'
 import MoveCard, { formatDate } from './MoveCard'
 import StreamLink from './StreamLink'
 import { PlayerCanvasBackground } from 'components/PlayerCanvasBackground'
 import OldMoveCard from './OldMoveCard'
+import { aukus2Games } from '../data_aukus2'
 
 type Props = {}
 
@@ -98,7 +99,7 @@ export default function PlayerContent(props: Props) {
       </PlayerCanvasBackground>
 
       {aukus2games && (
-        <Box marginTop={10}>
+        <Box marginTop={'200px'}>
           <Typography fontSize={'24px'} fontWeight={600} align="center">
             <Link
               to={aukus2games.link}
@@ -111,7 +112,7 @@ export default function PlayerContent(props: Props) {
 
           <Box marginBottom={'50px'} />
 
-          {aukus1games.games.map((game, index) => (
+          {aukus2games.games.map((game, index) => (
             <Fragment key={index}>
               <OldMoveCard id={index + 1} game={game} />
             </Fragment>

diff --git a/src/pages/player/data_aukus1.ts b/src/pages/player/data_aukus1.ts
@@ -2,7 +2,7 @@ export type PreviousGame = {
   title: string
   rating: string
   review: string
-  status: 'completed' | 'drop' | 'movie'
+  status: 'completed' | 'drop' | 'movie' | 'reroll'
 }
 
 const SegallGamesAukus1: PreviousGame[] = [
@@ -499,7 +499,7 @@ const LasqaGamesAukus1: PreviousGame[] = [
   },
 ]
 
-type GamesItem = {
+export type GamesItem = {
   games: PreviousGame[]
   link: string
 }
@@ -514,5 +514,3 @@ export const aukus1Games: { [key: string]: GamesItem } = {
     link: 'https://docs.google.com/spreadsheets/d/1iGjS41dpxbgjtMTGODZ-j3OG9eMDaZh5kBRiWH-FPk0/edit?gid=1235582040#gid=1235582040',
   },
 }
-
-export const aukus2Games: { [key: string]: GamesItem } = {}