Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix leaderboard viewer #184

Merged
merged 1 commit into from
Jan 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion lux-eye-s2/src/pages/home/HomePage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Container, Stack, Text } from '@mantine/core';
import { Navigate } from 'react-router-dom';
import { useCallback, useEffect } from 'react';
import { Navigate, useNavigate } from 'react-router-dom';
import { useStore } from '../../store';
import { notifyError } from '../../utils/notifications';
import { HomeCard } from './HomeCard';
Expand All @@ -13,10 +14,39 @@ declare global {
}
}

let hasData = false;

export function HomePage(): JSX.Element {
const episode = useStore(state => state.episode);
const load = useStore(state => state.load);

const navigate = useNavigate();

const onWindowMessage = useCallback((event: MessageEvent<any>) => {
if (hasData) {
return;
}

if (event.data && event.data.environment) {
hasData = true;

try {
load(event.data.environment);
navigate('/leaderboard');
} catch (err: any) {
console.error(err);
notifyError('Cannot load episode from Kaggle', err.message);
}
}
}, []);

useEffect(() => {
window.addEventListener('message', onWindowMessage);
return () => {
window.removeEventListener('message', onWindowMessage);
};
});

if (episode === null && window.episode !== undefined) {
try {
load(window.episode);
Expand Down
55 changes: 3 additions & 52 deletions lux-eye-s2/src/pages/leaderboard/LeaderboardPage.tsx
Original file line number Diff line number Diff line change
@@ -1,69 +1,20 @@
import { Button, Center, Container, Grid, Loader, Paper, SimpleGrid, Space, Stack, Text, Title } from '@mantine/core';
import { Button, Center, Container, Grid, Paper, SimpleGrid, Space, Stack } from '@mantine/core';
import { useElementSize } from '@mantine/hooks';
import { useCallback, useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { Navigate } from 'react-router-dom';
import { useStore } from '../../store';
import { notifyError } from '../../utils/notifications';
import { Board } from '../visualizer/Board';
import { TeamBanner } from '../visualizer/TeamBanner';
import { TeamCard } from '../visualizer/TeamCard';
import { TurnControl } from '../visualizer/TurnControl';

let hasData = false;

export function LeaderboardPage(): JSX.Element {
const episode = useStore(state => state.episode);
const load = useStore(state => state.load);
const openInNewTab = useStore(state => state.openInNewTab);

const { ref: boardContainerRef, width: maxBoardWidth } = useElementSize();

const [seconds, setSeconds] = useState(0);
const navigate = useNavigate();

const onWindowMessage = useCallback((event: MessageEvent<any>) => {
if (hasData) {
return;
}

if (event.data && event.data.environment) {
hasData = true;

try {
load(event.data.environment);
} catch (err: any) {
console.error(err);
notifyError('Cannot load episode from Kaggle', err.message);
navigate('/');
}
}
}, []);

useEffect(() => {
window.addEventListener('message', onWindowMessage);
return () => {
window.removeEventListener('message', onWindowMessage);
};
});

useEffect(() => {
const interval = setInterval(() => {
setSeconds(s => s + 1);
}, 1000);

return () => clearInterval(interval);
}, []);

if (episode === null) {
return (
<Center style={{ height: '100vh' }}>
<div style={{ textAlign: 'center' }}>
<Loader />
<Title>Waiting for episode data</Title>
{seconds >= 3 && <Text>This is taking longer than expected, please reopen the replay.</Text>}
</div>
</Center>
);
return <Navigate to="/" />;
}

const tabHeight = 350;
Expand Down