From fe347395f95d63e1c427a81311afc37e979d775c Mon Sep 17 00:00:00 2001 From: bcho892 Date: Tue, 5 Mar 2024 16:51:03 +1300 Subject: [PATCH] add sweet state to front end --- client/package.json | 1 + .../src/components/AdminBookings/AdminBookings.tsx | 2 +- client/src/services/FetchClient.ts | 2 +- yarn.lock | 12 ++++++++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/client/package.json b/client/package.json index b4a6b8e22..082ba8f9a 100644 --- a/client/package.json +++ b/client/package.json @@ -29,6 +29,7 @@ "react-dom": "^18.2.0", "react-firebase-hooks": "^5.1.1", "react-router-dom": "^6.10.0", + "react-sweet-state": "^2.7.1", "stripe": "^13.7.0", "vite": "^5.0.11", "vite-tsconfig-paths": "^4.2.3", diff --git a/client/src/components/AdminBookings/AdminBookings.tsx b/client/src/components/AdminBookings/AdminBookings.tsx index 97162c056..3e00d0e96 100644 --- a/client/src/components/AdminBookings/AdminBookings.tsx +++ b/client/src/components/AdminBookings/AdminBookings.tsx @@ -9,7 +9,7 @@ import { import { ArrowForwardIos, ArrowBackIos } from "@mui/icons-material" import "pages/Admin.css" import { useNavigate } from "react-router-dom" -import React, { useState, useEffect } from "react" +import { useState, useEffect } from "react" import { collection, getDocs } from "firebase/firestore" import { db } from "firebase" diff --git a/client/src/services/FetchClient.ts b/client/src/services/FetchClient.ts index 58675e817..cd302d404 100644 --- a/client/src/services/FetchClient.ts +++ b/client/src/services/FetchClient.ts @@ -2,7 +2,7 @@ import createClient from "openapi-fetch" import type { paths } from "models/__generated__/schema" const fetchClient = createClient({ - baseUrl: process.env.BACKEND_BASE_URL + baseUrl: import.meta.env.VITE_BACKEND_BASE_URL }) export default fetchClient diff --git a/yarn.lock b/yarn.lock index 3dabc63c2..ef9eeab8f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11427,6 +11427,13 @@ react-style-singleton@^2.2.1: invariant "^2.2.4" tslib "^2.0.0" +react-sweet-state@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/react-sweet-state/-/react-sweet-state-2.7.1.tgz#0ac72bd1728e299df0a6d32c49eec639e387d40b" + integrity sha512-TCZxdl5Ek7KNUNF/ETeZC12VqWPRhIVi7l4nSs0KAfv4YktxhKxqfhBJyUFQd+oanMjQSWdWvS3FtJxcoi29YQ== + dependencies: + use-sync-external-store "^1.0.0" + react-transition-group@^4.4.5: version "4.4.5" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1" @@ -13267,6 +13274,11 @@ use-sidecar@^1.1.2: detect-node-es "^1.1.0" tslib "^2.0.0" +use-sync-external-store@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" + integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== + util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"