"Merge master + correctif session info"

1 year ago · 08b56ebe58
parent 3a1a5c87fe
commit 08b56ebe58
9 changed files with 23 additions and 254 deletions
--- a/cryptide_project/package-lock.json
+++ b/cryptide_project/package-lock.json
@ -27,10 +27,8 @@
        "jszip": "^3.10.1",
        "lodash": "^4.17.21",
        "nuka-carousel": "^7.0.0",
-        "pure-react-carousel": "^1.30.1",
        "react": "^18.2.0",
        "react-bootstrap": "^2.9.1",
-        "react-carousel": "^4.3.0",
        "react-country-flag": "^3.1.0",
        "react-dom": "^18.2.0",
        "react-icons": "^4.11.0",
@ -38,9 +36,7 @@
        "react-router-dom": "^6.18.0",
        "react-router-hash-link": "^2.4.3",
        "react-scripts": "5.0.1",
-        "react-slick": "^0.29.0",
        "react-switch": "^7.0.0",
-        "slick-carousel": "^1.8.1",
        "socket.io": "^4.7.2",
        "socket.io-client": "^4.7.2",
        "sqlite3": "^5.1.6",
@ -51,7 +47,6 @@
      "devDependencies": {
        "@types/file-saver": "^2.0.7",
        "@types/react-router-hash-link": "^2.4.9",
-        "@types/react-slick": "^0.23.12",
        "@types/uuid": "^9.0.7",
        "babel-jest": "^29.7.0",
        "depcheck": "^1.4.7"
@ -4661,15 +4656,6 @@
        "@types/react-router-dom": "^5.3.0"
      }
    },
-    "node_modules/@types/react-slick": {
-      "version": "0.23.12",
-      "resolved": "https://registry.npmjs.org/@types/react-slick/-/react-slick-0.23.12.tgz",
-      "integrity": "sha512-WjY/wIjzgXCh6gXRZL75OC9n/Hn4MwKWI7ZJ4iA2OxavN9eKvkV5MPFjSgH5sofabq78Ucrl6u3okiBUNNIrDQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/react": "*"
-      }
-    },
    "node_modules/@types/react-transition-group": {
      "version": "4.4.8",
      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.8.tgz",
@ -7536,11 +7522,6 @@
        "node": ">=10"
      }
    },
-    "node_modules/debounce": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
-      "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="
-    },
    "node_modules/debug": {
      "version": "4.3.4",
      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@ -7595,11 +7576,6 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
-    "node_modules/deep-freeze": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz",
-      "integrity": "sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg=="
-    },
    "node_modules/deep-is": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@ -8172,11 +8148,6 @@
        "node": ">=10.13.0"
      }
    },
-    "node_modules/enquire.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
-      "integrity": "sha512-/KujNpO+PT63F7Hlpu4h3pE3TokKRHN26JYmQpPyjkRD/N57R7bPDNojMXdi7uveAKjYB7yQnartCxZnFWr0Xw=="
-    },
    "node_modules/entities": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
@ -8194,14 +8165,6 @@
        "node": ">=6"
      }
    },
-    "node_modules/equals": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/equals/-/equals-1.0.5.tgz",
-      "integrity": "sha512-wI15a6ZoaaXPv+55+Vh2Kqn3+efKRv8QPtcGTjW5xmanMnQzESdAt566jevtMZyt3W/jwLDTzXpMph5ECDJ2zg==",
-      "dependencies": {
-        "jkroso-type": "1"
-      }
-    },
    "node_modules/err-code": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
@ -13009,17 +12972,6 @@
        "jiti": "bin/jiti.js"
      }
    },
-    "node_modules/jkroso-type": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/jkroso-type/-/jkroso-type-1.1.1.tgz",
-      "integrity": "sha512-zZgay+fPG6PgMUrpyFADmQmvLo39+AZa7Gc5pZhev2RhDxwANEq2etwD8d0e6rTg5NkwOIlQmaEmns3draC6Ng=="
-    },
-    "node_modules/jquery": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
-      "peer": true
-    },
    "node_modules/js-tokens": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@ -13118,14 +13070,6 @@
      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
    },
-    "node_modules/json2mq": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
-      "integrity": "sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==",
-      "dependencies": {
-        "string-convert": "^0.2.0"
-      }
-    },
    "node_modules/json5": {
      "version": "2.2.3",
      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
@ -16204,30 +16148,6 @@
        "node": ">=6"
      }
    },
-    "node_modules/pure-react-carousel": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/pure-react-carousel/-/pure-react-carousel-1.30.1.tgz",
-      "integrity": "sha512-B1qi62hZk0OFqRR4cTjtgIeOn/Ls5wo+HsLtrXT4jVf5et8ldBHSt+6LsYRJN86Or8dm+XbnJNEHy6WDJ0/DQw==",
-      "dependencies": {
-        "@babel/runtime": "^7.5.5",
-        "deep-freeze": "0.0.1",
-        "deepmerge": "^2.2.1",
-        "equals": "^1.0.5",
-        "prop-types": "^15.6.2"
-      },
-      "peerDependencies": {
-        "react": "15.x || 16.x || 17.x || 18.x",
-        "react-dom": "15.x || 16.x || 17.x || 18.x"
-      }
-    },
-    "node_modules/pure-react-carousel/node_modules/deepmerge": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
-      "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
    "node_modules/q": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
@ -16299,14 +16219,6 @@
        "safe-buffer": "^5.1.0"
      }
    },
-    "node_modules/range": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/range/-/range-0.0.3.tgz",
-      "integrity": "sha512-OxK2nY2bmeEB4NxoBraQIBOOeOIxoBvm6yt8MA1kLappgkG3SyLf173iOtT5woWycrtESDD2g0Nl2yt8YPoUnw==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
    "node_modules/range-parser": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@ -16409,18 +16321,6 @@
        }
      }
    },
-    "node_modules/react-carousel": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/react-carousel/-/react-carousel-4.3.0.tgz",
-      "integrity": "sha512-t8MfCK877KuOaQFAsO6NwzkWdhcJG8hxSN5zYR7/cSfTNI6DnM/HswvgvdfajtiETuoLZRMXXLZv6QRLGETKjw==",
-      "dependencies": {
-        "debounce": "^1.1.0",
-        "range": "0.0.3"
-      },
-      "engines": {
-        "node": ">4"
-      }
-    },
    "node_modules/react-country-flag": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/react-country-flag/-/react-country-flag-3.1.0.tgz",
@ -16730,22 +16630,6 @@
        "@babel/core": "^7.0.0"
      }
    },
-    "node_modules/react-slick": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/react-slick/-/react-slick-0.29.0.tgz",
-      "integrity": "sha512-TGdOKE+ZkJHHeC4aaoH85m8RnFyWqdqRfAGkhd6dirmATXMZWAxOpTLmw2Ll/jPTQ3eEG7ercFr/sbzdeYCJXA==",
-      "dependencies": {
-        "classnames": "^2.2.5",
-        "enquire.js": "^2.1.6",
-        "json2mq": "^0.2.0",
-        "lodash.debounce": "^4.0.8",
-        "resize-observer-polyfill": "^1.5.0"
-      },
-      "peerDependencies": {
-        "react": "^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
    "node_modules/react-switch": {
      "version": "7.0.0",
      "resolved": "https://registry.npmjs.org/react-switch/-/react-switch-7.0.0.tgz",
@ -16979,11 +16863,6 @@
      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
    },
-    "node_modules/resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
-    },
    "node_modules/resolve": {
      "version": "1.22.8",
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
@ -17678,14 +17557,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/slick-carousel": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/slick-carousel/-/slick-carousel-1.8.1.tgz",
-      "integrity": "sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==",
-      "peerDependencies": {
-        "jquery": ">=1.8.0"
-      }
-    },
    "node_modules/smart-buffer": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@ -18126,11 +17997,6 @@
        "safe-buffer": "~5.2.0"
      }
    },
-    "node_modules/string-convert": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
-      "integrity": "sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A=="
-    },
    "node_modules/string-length": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
--- a/cryptide_project/server/api/server.js
+++ b/cryptide_project/server/api/server.js
@ -14,7 +14,7 @@ const port = 3003;
 // Middleware
 app.use(cors(
  {
-    origin: ["http://172.20.10.4:3000", "http://172.20.10.4:3000"],
+    origin: ["http://172.20.10.4:3000", "http://localhost:3000"],
    credentials: true
  }
 ));                            // Autoriser les requêtes cross-origin
--- a/cryptide_project/src/AdressSetup.ts
+++ b/cryptide_project/src/AdressSetup.ts
@ -1,6 +1,8 @@
-const ADRESSE_WEBSERVER = "http://172.20.10.4:3002"
+// const ADRESSE_WEBSERVER = "http://172.20.10.4:3002"
+const ADRESSE_WEBSERVER = "http://localhost:3002"

-const ADRESSE_DBSERVER = "http://172.20.10.4:3003"
+// const ADRESSE_DBSERVER = "http://172.20.10.4:3003"
+const ADRESSE_DBSERVER = "http://localhost:3003"

 const tmp = ADRESSE_DBSERVER
 const tmp2 = ADRESSE_WEBSERVER
--- a/cryptide_project/src/Components/NavBar.tsx
+++ b/cryptide_project/src/Components/NavBar.tsx
@ -12,6 +12,7 @@ import { BsFillPersonPlusFill } from 'react-icons/bs';

 /* Images */
 import logo from '../res/img/logo2_preview_rev_1.png';
+import defaultImg from '../res/img/Person.png';

 /* Components */
 import LanguageNavItem from './LangNavItem';
@ -26,12 +27,14 @@ import { useAuth } from '../Contexts/AuthContext';
 import { useNavigate } from 'react-router-dom';

 import {basePath} from "../AdressSetup"
+import Player from '../model/Player';
+import { set } from 'lodash';

 // @ts-ignore
 function AppNavbar({changeLocale}) {
    const theme = useTheme();
    const navigate = useNavigate();
-    const {user, isLoggedIn, logout} = useAuth();
+    const {isLoggedIn, login, user, setUserData, manager } = useAuth();

    function navigateToProfile(){
        navigate(`${basePath}/profile`)
@ -71,7 +74,7 @@ function AppNavbar({changeLocale}) {
                                    {/* Boutou qui lors du clique nous redirige vers le profile */}
                                    <Nav.Link onClick={navigateToProfile} style={{ color: theme.colors.text }}>
                                        <span>
-                                            <img src={user?.profilePicture} height="50" width="50" alt="profile"/>
+                                            <img src={user? user.profilePicture : defaultImg} height="50" width="50" alt="profile"/>
                                            {user && user.pseudo}
                                        </span>
                                    </Nav.Link>
--- a/cryptide_project/src/Contexts/AuthContext.tsx
+++ b/cryptide_project/src/Contexts/AuthContext.tsx
@ -24,8 +24,6 @@ const AuthProvider: React.FC<{ children: ReactNode }> = ({ children }) => {

  const login = async () => {
    setIsLoggedIn(true);
-    const [u, bool] = await manager.userService.fetchUserInformation()
-    setUser(u)
  };

  const setUserData = (newPlayer: User) => {
--- a/cryptide_project/src/Pages/InfoPage.tsx
+++ b/cryptide_project/src/Pages/InfoPage.tsx
@ -34,12 +34,17 @@ function InfoPage({locale, changeLocale}) {

    useEffect(() => {
        if (user == null){
+            console.log(user)
            manager.userService.fetchUserInformation().then(([user, loggedIn]) =>{
+                console.log(user);
                if (user!=null){
                    if (loggedIn){
                        login()
                        setUserData(user)
                    }
+                    else{
+                        setUserData(user)
+                    }
                }
            })
        }
@ -76,10 +81,8 @@ function InfoPage({locale, changeLocale}) {

        <section id="composants-du-jeu">
            <h2><FormattedMessage id="info.pions"/> :</h2>
-                <h4>
-                    <FormattedMessage id="info.sommaire"/> 
-                </h4>
-                <h6><FormattedMessage id="info.composant.text"/></h6>
+            <h4><FormattedMessage id="info.sommaire"/></h4>
+            <h6><FormattedMessage id="info.composant.text"/></h6>
            <ul>
                <p>
                    <li><h5 className='h5title'><FormattedMessage id="info.composant.carre.title"/> : 🟪🟦🟩🟨🟥🟫</h5></li>
@ -88,7 +91,6 @@ function InfoPage({locale, changeLocale}) {
                    <li><h5 className='h5title'><FormattedMessage id="info.composant.rond.title"/> : 🟣🔵🟢🟡🔴🟤</h5></li>
                    <FormattedMessage id="info.composant.rond"/>
                </p>
-            </ul>
                <hr/>
                <h4>
                    <FormattedMessage id="info.car_perso"/>
@ -137,6 +139,7 @@ function InfoPage({locale, changeLocale}) {
                        </ul>
                        <FormattedMessage id="info.composant.sport.bis"/>                    
                </p>
+            </ul>
        </section>
        <hr/>
        <section id="objectif-du-jeu">
@ -285,7 +288,6 @@ function InfoPage({locale, changeLocale}) {
                <FormattedMessage id="info.indice-possible.voisin"/>
            </h4>
            <IndiceList instance={EdgesIndice} lang={locale}/>
-            <IndiceList instance={NbEdgesIndice} lang={locale}/>
            <hr/>
        </section>
    </div>
--- a/cryptide_project/src/Pages/LoginForm.tsx
+++ b/cryptide_project/src/Pages/LoginForm.tsx
@ -80,7 +80,7 @@ const SignIn = () => {
                    </button>
                </div>
                <p className="forgot-password text-right">
-                    <Link href={`${basePath}/signup`}>Pas encore inscrit ?</Link>
+                    <Link to={`${basePath}/signup`}>Pas encore inscrit ?</Link>
                </p>
            </form>

--- a/cryptide_project/src/Pages/Profile.tsx
+++ b/cryptide_project/src/Pages/Profile.tsx
@ -24,7 +24,6 @@ import Modal from 'react-bootstrap/Modal';
 import Form from 'react-bootstrap/Form';
 import ProgressBar from 'react-bootstrap/ProgressBar';

-
 import {basePath} from "../AdressSetup"

 //@ts-ignore
@ -49,7 +48,7 @@ const Profile = () => {

  const handleLogout = () => {
    logout();
-    navigate('/');
+    navigate(`${basePath}/`);
  };
  
  // @ts-ignore
--- a/cryptide_project/yarn.lock
+++ b/cryptide_project/yarn.lock
@ -2470,13 +2470,6 @@
    "@types/history" "^4.7.11"
    "@types/react" "*"

-"@types/react-slick@^0.23.12":
-  version "0.23.12"
-  resolved "https://registry.npmjs.org/@types/react-slick/-/react-slick-0.23.12.tgz"
-  integrity sha512-WjY/wIjzgXCh6gXRZL75OC9n/Hn4MwKWI7ZJ4iA2OxavN9eKvkV5MPFjSgH5sofabq78Ucrl6u3okiBUNNIrDQ==
-  dependencies:
-    "@types/react" "*"
-
 "@types/react-transition-group@^4.4.6":
  version "4.4.8"
  resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.8.tgz"
@ -3865,7 +3858,7 @@ cjs-module-lexer@^1.0.0:
  resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz"
  integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==

-classnames@^2.2.5, classnames@^2.3.2:
+classnames@^2.3.2:
  version "2.3.2"
  resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz"
  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
@ -4383,11 +4376,6 @@ data-urls@^2.0.0:
    whatwg-mimetype "^2.3.0"
    whatwg-url "^8.0.0"

-debounce@^1.1.0:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz"
-  integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
-
 debug@^2.6.0:
  version "2.6.9"
  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
@ -4450,21 +4438,11 @@ deep-equal@^2.0.5:
    which-collection "^1.0.1"
    which-typed-array "^1.1.9"

-deep-freeze@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz"
-  integrity sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg==
-
 deep-is@^0.1.3, deep-is@~0.1.3:
  version "0.1.4"
  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
  integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==

-deepmerge@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz"
-  integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
-
 deepmerge@^4.2.2:
  version "4.3.1"
  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz"
@ -4843,11 +4821,6 @@ enhanced-resolve@^5.15.0:
    graceful-fs "^4.2.4"
    tapable "^2.2.0"

-enquire.js@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz"
-  integrity sha512-/KujNpO+PT63F7Hlpu4h3pE3TokKRHN26JYmQpPyjkRD/N57R7bPDNojMXdi7uveAKjYB7yQnartCxZnFWr0Xw==
-
 entities@^2.0.0:
  version "2.2.0"
  resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"
@ -4858,13 +4831,6 @@ env-paths@^2.2.0:
  resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"
  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==

-equals@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/equals/-/equals-1.0.5.tgz"
-  integrity sha512-wI15a6ZoaaXPv+55+Vh2Kqn3+efKRv8QPtcGTjW5xmanMnQzESdAt566jevtMZyt3W/jwLDTzXpMph5ECDJ2zg==
-  dependencies:
-    jkroso-type "1"
-
 err-code@^2.0.2:
  version "2.0.3"
  resolved "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz"
@ -7232,16 +7198,6 @@ jiti@^1.19.1:
  resolved "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz"
  integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==

-jkroso-type@1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/jkroso-type/-/jkroso-type-1.1.1.tgz"
-  integrity sha512-zZgay+fPG6PgMUrpyFADmQmvLo39+AZa7Gc5pZhev2RhDxwANEq2etwD8d0e6rTg5NkwOIlQmaEmns3draC6Ng==
-
-jquery@>=1.8.0:
-  version "3.7.1"
-  resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz"
-  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
-
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
  version "4.0.0"
  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
@ -7335,13 +7291,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==

-json2mq@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz"
-  integrity sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==
-  dependencies:
-    string-convert "^0.2.0"
-
 json5@^1.0.2:
  version "1.0.2"
  resolved "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz"
@ -9111,17 +9060,6 @@ punycode@^2.1.0, punycode@^2.1.1:
  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"
  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==

-pure-react-carousel@^1.30.1:
-  version "1.30.1"
-  resolved "https://registry.npmjs.org/pure-react-carousel/-/pure-react-carousel-1.30.1.tgz"
-  integrity sha512-B1qi62hZk0OFqRR4cTjtgIeOn/Ls5wo+HsLtrXT4jVf5et8ldBHSt+6LsYRJN86Or8dm+XbnJNEHy6WDJ0/DQw==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    deep-freeze "0.0.1"
-    deepmerge "^2.2.1"
-    equals "^1.0.5"
-    prop-types "^15.6.2"
-
 q@^1.1.2:
  version "1.5.1"
  resolved "https://registry.npmjs.org/q/-/q-1.5.1.tgz"
@ -9168,11 +9106,6 @@ range-parser@^1.2.1, range-parser@~1.2.1:
  resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==

-range@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.npmjs.org/range/-/range-0.0.3.tgz"
-  integrity sha512-OxK2nY2bmeEB4NxoBraQIBOOeOIxoBvm6yt8MA1kLappgkG3SyLf173iOtT5woWycrtESDD2g0Nl2yt8YPoUnw==
-
 raw-body@2.5.1:
  version "2.5.1"
  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
@ -9223,14 +9156,6 @@ react-bootstrap@^2.9.1:
    uncontrollable "^7.2.1"
    warning "^4.0.3"

-react-carousel@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/react-carousel/-/react-carousel-4.3.0.tgz"
-  integrity sha512-t8MfCK877KuOaQFAsO6NwzkWdhcJG8hxSN5zYR7/cSfTNI6DnM/HswvgvdfajtiETuoLZRMXXLZv6QRLGETKjw==
-  dependencies:
-    debounce "^1.1.0"
-    range "0.0.3"
-
 react-country-flag@^3.1.0:
  version "3.1.0"
  resolved "https://registry.npmjs.org/react-country-flag/-/react-country-flag-3.1.0.tgz"
@ -9266,7 +9191,7 @@ react-dev-utils@^12.0.1:
    strip-ansi "^6.0.1"
    text-table "^0.2.0"

-"react-dom@^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react-dom@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", react-dom@^18.0.0, react-dom@^18.2.0, react-dom@>=16.14.0, react-dom@>=16.6.0, react-dom@>=16.8, react-dom@>=18.0.0, "react-dom@15.x || 16.x || 17.x || 18.x":
+"react-dom@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", react-dom@^18.0.0, react-dom@^18.2.0, react-dom@>=16.14.0, react-dom@>=16.6.0, react-dom@>=16.8, react-dom@>=18.0.0:
  version "18.2.0"
  resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz"
  integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
@ -9412,17 +9337,6 @@ react-scripts@5.0.1:
  optionalDependencies:
    fsevents "^2.3.2"

-react-slick@^0.29.0:
-  version "0.29.0"
-  resolved "https://registry.npmjs.org/react-slick/-/react-slick-0.29.0.tgz"
-  integrity sha512-TGdOKE+ZkJHHeC4aaoH85m8RnFyWqdqRfAGkhd6dirmATXMZWAxOpTLmw2Ll/jPTQ3eEG7ercFr/sbzdeYCJXA==
-  dependencies:
-    classnames "^2.2.5"
-    enquire.js "^2.1.6"
-    json2mq "^0.2.0"
-    lodash.debounce "^4.0.8"
-    resize-observer-polyfill "^1.5.0"
-
 react-switch@^7.0.0:
  version "7.0.0"
  resolved "https://registry.npmjs.org/react-switch/-/react-switch-7.0.0.tgz"
@ -9440,7 +9354,7 @@ react-transition-group@^4.4.5:
    loose-envify "^1.4.0"
    prop-types "^15.6.2"

-react@*, "react@^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || 17 || 18", "react@^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", react@^18.0.0, react@^18.2.0, "react@>= 16", react@>=0.14.0, react@>=15, react@>=15.0.0, react@>=16, react@>=16.14.0, react@>=16.3, react@>=16.6.0, react@>=16.8, react@>=16.8.0, react@>=18.0.0, "react@15.x || 16.x || 17.x || 18.x":
+react@*, "react@^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", "react@^16.6.0 || 17 || 18", "react@^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", react@^18.0.0, react@^18.2.0, "react@>= 16", react@>=0.14.0, react@>=15, react@>=15.0.0, react@>=16, react@>=16.14.0, react@>=16.3, react@>=16.6.0, react@>=16.8, react@>=16.8.0, react@>=18.0.0:
  version "18.2.0"
  resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz"
  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
@ -9626,11 +9540,6 @@ requires-port@^1.0.0:
  resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==

-resize-observer-polyfill@^1.5.0:
-  version "1.5.1"
-  resolved "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz"
-  integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
-
 resolve-cwd@^3.0.0:
  version "3.0.0"
  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"
@ -10030,11 +9939,6 @@ slash@^4.0.0:
  resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"
  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==

-slick-carousel@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.npmjs.org/slick-carousel/-/slick-carousel-1.8.1.tgz"
-  integrity sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==
-
 smart-buffer@^4.2.0:
  version "4.2.0"
  resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"
@ -10274,11 +10178,6 @@ string_decoder@~1.1.1:
  dependencies:
    safe-buffer "~5.1.0"

-string-convert@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz"
-  integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A==
-
 string-length@^4.0.1:
  version "4.0.2"
  resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz"