diff --git a/package.json b/package.json index f732b70..44738da 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "react-router": "^6.6.2", "react-router-config": "^5.1.1", "react-router-dom": "^6.6.2", + "react-simple-pull-to-refresh": "^1.3.3", "react-stomp-hooks": "2.1.0", "react-viewer": "^3.2.2", "reactstrap": "9.1.5", diff --git a/src/pages/Game/Game.tsx b/src/pages/Game/Game.tsx index 7ad7337..8538d7c 100644 --- a/src/pages/Game/Game.tsx +++ b/src/pages/Game/Game.tsx @@ -2,6 +2,7 @@ import React, { useEffect } from "react" import GameWrapper from "../../components/Game/GameWrapper" import GameOver from "../../components/Game/GameOver" import GameService from "../../services/GameService" +import PullToRefresh from "react-simple-pull-to-refresh" import { withAuthenticationRequired } from "@auth0/auth0-react" @@ -12,6 +13,7 @@ import { useSnackbar } from "notistack" import { getIsGameActive, resetGame } from "../../caches/GameSlice" import { clearAutoPlay } from "../../caches/AutoPlaySlice" import { clearMyCards } from "../../caches/MyCardsSlice" +import RefreshingData from "../../components/icons/RefreshingData" import parseError from "../../utils/ErrorUtils" const Game = () => { @@ -43,13 +45,17 @@ const Game = () => { }, [id]) return ( -
-
-
- {isGameActive ? : } + }> +
+
+
+ {isGameActive ? : } +
-
+ ) } diff --git a/src/pages/Home/Home.tsx b/src/pages/Home/Home.tsx index 8ce2e18..30aa732 100644 --- a/src/pages/Home/Home.tsx +++ b/src/pages/Home/Home.tsx @@ -6,6 +6,7 @@ import StartNewGame from "../../components/StartNewGame/StartNewGame" import MyGames from "../../components/MyGames/MyGames" import GameStats from "../../components/GameStats/GameStats" import { withAuthenticationRequired } from "@auth0/auth0-react" +import PullToRefresh from "react-simple-pull-to-refresh" import { useAppDispatch, useAppSelector } from "../../caches/hooks" import { getMyProfile } from "../../caches/MyProfileSlice" @@ -14,6 +15,7 @@ import { useSnackbar } from "notistack" import StatsService from "../../services/StatsService" import { Divider } from "@mui/material" import parseError from "../../utils/ErrorUtils" +import RefreshingData from "../../components/icons/RefreshingData" const Home = () => { const dispatch = useAppDispatch() @@ -38,39 +40,43 @@ const Home = () => { }, []) return ( -
-
-
- {!myProfile.isPlayer && !myProfile.isAdmin ? ( - - - - You are successfully logged in but don't yet - have any access permissions. Please contact - Daithi to get access. - - - - ) : ( -
- {myProfile.isPlayer ? ( - <> - - - - - - - - - - ) : null} - {myProfile.isAdmin ? : null} -
- )} + }> +
+
+
+ {!myProfile.isPlayer && !myProfile.isAdmin ? ( + + + + You are successfully logged in but don't + yet have any access permissions. Please + contact Daithi to get access. + + + + ) : ( +
+ {myProfile.isPlayer ? ( + <> + + + + + + + + + + ) : null} + {myProfile.isAdmin ? : null} +
+ )} +
-
+ ) }