package upgrade (#336)

* tanstack/react-query package upgrade to v5.8.4 * package.json upgrade (with styling fixes for daisyui major version breaking changes) * tanstack upgrage breaking change fix
didx-xyz · Nov 22, 2023 · d8ab2e5 · d8ab2e5
1 parent 3cc0201
commit d8ab2e5
Show file tree

Hide file tree

Showing 36 changed files with 939 additions and 871 deletions.
diff --git a/src/web/package.json b/src/web/package.json
@@ -14,58 +14,58 @@
     "@fontsource/open-sans": "^5.0.17",
     "@hookform/resolvers": "^3.3.2",
     "@react-google-maps/api": "^2.19.2",
-    "@sentry/nextjs": "^7.77.0",
+    "@sentry/nextjs": "^7.81.1",
     "@t3-oss/env-nextjs": "^0.7.1",
-    "@tanstack/react-query": "^4.33.0",
-    "axios": "^1.6.0",
-    "daisyui": "^3.9.4",
-    "jotai": "^2.5.0",
+    "@tanstack/react-query": "^5.8.4",
+    "axios": "^1.6.2",
+    "daisyui": "^4.4.2",
+    "jotai": "^2.5.1",
     "moment": "^2.29.4",
-    "next": "^14.0.1",
-    "next-auth": "^4.24.4",
+    "next": "^14.0.3",
+    "next-auth": "^4.24.5",
     "next-themes": "^0.2.1",
     "react": "^18.2.0",
-    "react-datepicker": "^4.16.0",
+    "react-datepicker": "^4.23.0",
     "react-dom": "^18.2.0",
     "react-google-map-picker": "^1.2.3",
-    "react-hook-form": "^7.47.0",
-    "react-icons": "^4.11.0",
+    "react-hook-form": "^7.48.2",
+    "react-icons": "^4.12.0",
     "react-modal": "^3.16.1",
     "react-moment": "^1.1.3",
-    "react-select": "^5.7.7",
+    "react-select": "^5.8.0",
     "react-toastify": "^9.1.3",
     "sass": "^1.69.5",
     "sharp": "^0.32.6",
     "tailwindcss-animate": "^1.0.7",
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@next/bundle-analyzer": "^14.0.1",
-    "@types/eslint": "^8.44.6",
-    "@types/next-pwa": "^5.6.8",
-    "@types/node": "^20.8.10",
+    "@next/bundle-analyzer": "^14.0.3",
+    "@types/eslint": "^8.44.7",
+    "@types/next-pwa": "^5.6.9",
+    "@types/node": "^20.9.4",
     "@types/prettier": "^3.0.0",
-    "@types/react": "^18.2.34",
-    "@types/react-datepicker": "^4.19.0",
-    "@types/react-dom": "^18.2.14",
-    "@types/react-modal": "^3.16.2",
-    "@typescript-eslint/eslint-plugin": "6.9.1",
-    "@typescript-eslint/parser": "6.9.1",
+    "@types/react": "^18.2.38",
+    "@types/react-datepicker": "^4.19.3",
+    "@types/react-dom": "^18.2.17",
+    "@types/react-modal": "^3.16.3",
+    "@typescript-eslint/eslint-plugin": "6.12.0",
+    "@typescript-eslint/parser": "6.12.0",
     "autoprefixer": "^10.4.16",
     "cross-env": "^7.0.3",
-    "eslint": "^8.52.0",
-    "eslint-config-next": "^14.0.1",
+    "eslint": "^8.54.0",
+    "eslint-config-next": "^14.0.3",
     "filepond": "^4.30.4",
     "filepond-plugin-file-validate-type": "^1.2.8",
     "filepond-plugin-image-exif-orientation": "^1.0.11",
     "filepond-plugin-image-preview": "^4.6.11",
     "next-pwa": "^5.6.0",
     "postcss": "^8.4.31",
-    "prettier": "^3.0.3",
-    "prettier-plugin-tailwindcss": "^0.5.6",
+    "prettier": "^3.1.0",
+    "prettier-plugin-tailwindcss": "^0.5.7",
     "react-filepond": "^7.1.2",
     "tailwindcss": "^3.3.5",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   },
   "ct3aMetadata": {
     "initVersion": "7.16.0"

diff --git a/src/web/src/components/NavBar/SignInButton.tsx b/src/web/src/components/NavBar/SignInButton.tsx
@@ -28,7 +28,7 @@ export const SignInButton: React.FC = () => {
         <span className="loading loading-spinner loading-md mr-2 text-warning"></span>
       )}
       {!isButtonLoading && <IoMdFingerPrint className="h-8 w-8 text-white" />}
-      <p className="text-white">Sign In</p>
+      <p className="uppercase text-white">Sign In</p>
     </button>
   );
 };
diff --git a/src/web/src/components/NavBar/UserMenu.tsx b/src/web/src/components/NavBar/UserMenu.tsx
@@ -14,7 +14,7 @@ import {
   IoMdSettings,
 } from "react-icons/io";
 import ReactModal from "react-modal";
-import { ROLE_ADMIN, ROLE_ORG_ADMIN } from "~/lib/constants";
+import { ROLE_ADMIN } from "~/lib/constants";
 import { shimmer, toBase64 } from "~/lib/image";
 import {
   RoleView,

diff --git a/src/web/src/components/Opportunity/OpportunityCompletionEdit.tsx b/src/web/src/components/Opportunity/OpportunityCompletionEdit.tsx
@@ -323,7 +323,7 @@ export const OpportunityCompletionEdit: React.FC<InputProps> = ({
                       name="dateStart"
                       render={({ field: { onChange, value } }) => (
                         <DatePicker
-                          className="input input-bordered input-sm w-full"
+                          className="input input-bordered input-sm w-full rounded-md border-gray focus:border-gray focus:outline-none"
                           onChange={(date) =>
                             onChange(toISOStringForTimezone(date))
                           }
@@ -349,7 +349,7 @@ export const OpportunityCompletionEdit: React.FC<InputProps> = ({
                       name="dateEnd"
                       render={({ field: { onChange, value } }) => (
                         <DatePicker
-                          className="input input-bordered input-sm w-full"
+                          className="input input-bordered input-sm w-full rounded-md border-gray focus:border-gray focus:outline-none"
                           onChange={(date) =>
                             onChange(toISOStringForTimezone(date))
                           }

diff --git a/src/web/src/components/Opportunity/OpportunityFilterHorizontal.tsx b/src/web/src/components/Opportunity/OpportunityFilterHorizontal.tsx
@@ -204,7 +204,7 @@ export const OpportunityFilterHorizontal: React.FC<InputProps> = ({
               render={({ field: { onChange, value } }) => (
                 <Select
                   classNames={{
-                    control: () => "input input-bordered input-xs",
+                    control: () => "input input-xs",
                   }}
                   isMulti={true}
                   options={lookups_types.map((c) => ({
@@ -247,7 +247,7 @@ export const OpportunityFilterHorizontal: React.FC<InputProps> = ({
               render={({ field: { onChange, value } }) => (
                 <Select
                   classNames={{
-                    control: () => "input input-bordered input-xs",
+                    control: () => "input input-xs",
                   }}
                   isMulti={true}
                   options={lookups_countries.map((c) => ({
@@ -289,7 +289,7 @@ export const OpportunityFilterHorizontal: React.FC<InputProps> = ({
               render={({ field: { onChange, value } }) => (
                 <Select
                   classNames={{
-                    control: () => "input input-bordered input-xs",
+                    control: () => "input input-xs",
                   }}
                   isMulti={true}
                   options={lookups_languages.map((c) => ({
@@ -332,7 +332,7 @@ export const OpportunityFilterHorizontal: React.FC<InputProps> = ({
               render={({ field: { onChange, value } }) => (
                 <Select
                   classNames={{
-                    control: () => "input input-bordered input-xs",
+                    control: () => "input input-xs",
                   }}
                   isMulti={true}
                   options={lookups_organisations.map((c) => ({
@@ -376,7 +376,7 @@ export const OpportunityFilterHorizontal: React.FC<InputProps> = ({
               render={({ field: { onChange, value } }) => (
                 <Select
                   classNames={{
-                    control: () => "input input-bordered input-xs",
+                    control: () => "input input-xs",
                   }}
                   isMulti={true}
                   options={lookups_commitmentIntervals.map((c) => ({
@@ -419,7 +419,7 @@ export const OpportunityFilterHorizontal: React.FC<InputProps> = ({
               render={({ field: { onChange, value } }) => (
                 <Select
                   classNames={{
-                    control: () => "input input-bordered input-xs",
+                    control: () => "input input-xs",
                   }}
                   isMulti={true}
                   options={lookups_zltoRewardRanges.map((c) => ({

diff --git a/src/web/src/components/Opportunity/OpportunityFilterVertical.tsx b/src/web/src/components/Opportunity/OpportunityFilterVertical.tsx
@@ -104,7 +104,7 @@ export const OpportunityFilterVertical: React.FC<InputProps> = ({
         </div>
         <div className="flex flex-col bg-gray">
           <div className="join join-vertical w-full">
-            <div className="collapse join-item collapse-arrow border border-base-300">
+            <div className="collapse join-item collapse-arrow">
               <input type="radio" name="my-accordion-1" checked={true} />
               <div className="collapse-title text-xl font-medium">Topics</div>
               <div className="collapse-content">
@@ -199,7 +199,7 @@ export const OpportunityFilterVertical: React.FC<InputProps> = ({
                 )}
               </div>
             </div>
-            <div className="collapse join-item collapse-arrow border border-base-300">
+            <div className="collapse join-item collapse-arrow">
               <input type="radio" name="my-accordion-2" />
               <div className="collapse-title text-xl font-medium">
                 Opportunity type
@@ -241,7 +241,7 @@ export const OpportunityFilterVertical: React.FC<InputProps> = ({
                 )}
               </div>
             </div>
-            <div className="collapse join-item collapse-arrow border border-base-300">
+            <div className="collapse join-item collapse-arrow">
               <input type="radio" name="my-accordion-3" />
               <div className="collapse-title text-xl font-medium">Location</div>
               <div className="collapse-content">
@@ -281,7 +281,7 @@ export const OpportunityFilterVertical: React.FC<InputProps> = ({
                 )}
               </div>
             </div>
-            <div className="collapse join-item collapse-arrow border border-base-300">
+            <div className="collapse join-item collapse-arrow">
               <input type="radio" name="my-accordion-4" />
               <div className="collapse-title text-xl font-medium">Language</div>
               <div className="collapse-content">
@@ -321,7 +321,7 @@ export const OpportunityFilterVertical: React.FC<InputProps> = ({
                 )}
               </div>
             </div>
-            <div className="collapse join-item collapse-arrow border border-base-300">
+            <div className="collapse join-item collapse-arrow">
               <input type="radio" name="my-accordion-5" />
               <div className="collapse-title text-xl font-medium">
                 Organisation
@@ -363,7 +363,7 @@ export const OpportunityFilterVertical: React.FC<InputProps> = ({
                 )}
               </div>
             </div>
-            <div className="collapse join-item collapse-arrow border border-base-300">
+            <div className="collapse join-item collapse-arrow">
               <input type="radio" name="my-accordion-6" />
               <div className="collapse-title text-xl font-medium">Effort</div>
               <div className="collapse-content">
@@ -403,7 +403,7 @@ export const OpportunityFilterVertical: React.FC<InputProps> = ({
                 )}
               </div>
             </div>
-            <div className="collapse join-item collapse-arrow border border-base-300">
+            <div className="collapse join-item collapse-arrow">
               <input type="radio" name="my-accordion-7" />
               <div className="collapse-title text-xl font-medium">Reward</div>
               <div className="collapse-content">
@@ -444,7 +444,7 @@ export const OpportunityFilterVertical: React.FC<InputProps> = ({
               </div>
             </div>
             {session && (
-              <div className="collapse join-item collapse-arrow border border-base-300">
+              <div className="collapse join-item collapse-arrow">
                 <input type="radio" name="my-accordion-7" />
                 <div className="collapse-title text-xl font-medium">
                   Expired
@@ -483,7 +483,7 @@ export const OpportunityFilterVertical: React.FC<InputProps> = ({
         </div>
 
         {/* BUTTONS */}
-        <div className="my-4 flex items-center justify-center gap-2">
+        <div className="m-4 flex items-center justify-center gap-2">
           {onCancel && (
             <button
               type="button"