Merge pull request #103 from daithihearn/disable-pull-to-refresh

Disabling pull to refresh

Author: daithihearn

package.json

@@ -44,7 +44,6 @@
         "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",

src/pages/Game/Game.tsx

@@ -2,7 +2,7 @@ import React, { useCallback, 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 PullToRefresh from "react-simple-pull-to-refresh"
 
 import { withAuthenticationRequired } from "@auth0/auth0-react"
 
@@ -13,7 +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 RefreshingData from "../../components/icons/RefreshingData"
 import parseError from "../../utils/ErrorUtils"
 
 const Game = () => {
@@ -45,17 +45,17 @@ const Game = () => {
     }, [id])
 
     return (
-        <PullToRefresh
-            onRefresh={fetchData}
-            refreshingContent={<RefreshingData />}>
-            <div className="app carpet">
-                <div className="game_wrap">
-                    <div className="game_container">
-                        {isGameActive ? <GameWrapper /> : <GameOver />}
-                    </div>
+        // <PullToRefresh
+        //     onRefresh={fetchData}
+        //     refreshingContent={<RefreshingData />}>
+        <div className="app carpet">
+            <div className="game_wrap">
+                <div className="game_container">
+                    {isGameActive ? <GameWrapper /> : <GameOver />}
                 </div>
             </div>
-        </PullToRefresh>
+        </div>
+        // </PullToRefresh>
     )
 }
 

src/pages/Home/Home.tsx

@@ -6,7 +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 PullToRefresh from "react-simple-pull-to-refresh"
 
 import { useAppDispatch, useAppSelector } from "../../caches/hooks"
 import { getMyProfile } from "../../caches/MyProfileSlice"
@@ -40,43 +40,43 @@ const Home = () => {
     }, [])
 
     return (
-        <PullToRefresh
-            onRefresh={fetchData}
-            refreshingContent={<RefreshingData />}>
-            <div className="app carpet">
-                <div className="game_wrap">
-                    <div className="game_container">
-                        {!myProfile.isPlayer && !myProfile.isAdmin ? (
-                            <CardGroup>
-                                <Card className="p-6">
-                                    <CardHeader tag="h2">
-                                        You are successfully logged in but don't
-                                        yet have any access permissions. Please
-                                        contact Daithi to get access.
-                                    </CardHeader>
-                                </Card>
-                            </CardGroup>
-                        ) : (
-                            <div>
-                                {myProfile.isPlayer ? (
-                                    <>
-                                        <MyGames />
-                                        <Divider />
-                                        <Divider />
-                                        <Divider />
-                                        <GameStats />
-                                        <Divider />
-                                        <Divider />
-                                        <Divider />
-                                    </>
-                                ) : null}
-                                {myProfile.isAdmin ? <StartNewGame /> : null}
-                            </div>
-                        )}
-                    </div>
+        // <PullToRefresh
+        //     onRefresh={fetchData}
+        //     refreshingContent={<RefreshingData />}>
+        <div className="app carpet">
+            <div className="game_wrap">
+                <div className="game_container">
+                    {!myProfile.isPlayer && !myProfile.isAdmin ? (
+                        <CardGroup>
+                            <Card className="p-6">
+                                <CardHeader tag="h2">
+                                    You are successfully logged in but don't yet
+                                    have any access permissions. Please contact
+                                    Daithi to get access.
+                                </CardHeader>
+                            </Card>
+                        </CardGroup>
+                    ) : (
+                        <div>
+                            {myProfile.isPlayer ? (
+                                <>
+                                    <MyGames />
+                                    <Divider />
+                                    <Divider />
+                                    <Divider />
+                                    <GameStats />
+                                    <Divider />
+                                    <Divider />
+                                    <Divider />
+                                </>
+                            ) : null}
+                            {myProfile.isAdmin ? <StartNewGame /> : null}
+                        </div>
+                    )}
                 </div>
             </div>
-        </PullToRefresh>
+        </div>
+        // </PullToRefresh>
     )
 }