Merge pull request #1 from ParminCloud/update-dependencies

♻️ Refactor Code to support Chakra v3
ParminCloud · Nov 30, 2024 · e387c0e · e387c0e
2 parents 8fca4a5 + 27c896b
commit e387c0e
Show file tree

Hide file tree

Showing 67 changed files with 6,182 additions and 3,613 deletions.
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-v20.14.0
+v22.8.0
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v20.14.0
+v22.8.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM node:20.14.0-bookworm AS base
+FROM node:22-bookworm AS base
 
 # Install dependencies only when needed
 FROM base AS deps

diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Check out [deployments](./deployments/README.md)
 
 * [ ] Pagination
 * [ ] Save credentials in browser
-* [ ] Creating and Using more reusable components (specially Modals in page)
+* [ ] Creating and Using more reusable components (specially Dialogs in page)
 * [x] More Docs (Screenshot, Deployment)
 
 ## Contributing

diff --git a/next.config.mjs b/next.config.mjs
@@ -1,6 +1,9 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  output: "standalone"
+  output: "standalone",
+  experimental: {
+    optimizePackageImports: ["@chakra-ui/react"],
+  },
 };
 
 export default nextConfig;
diff --git a/package.json b/package.json
@@ -3,31 +3,29 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev",
+    "dev": "NODE_OPTIONS='--inspect' next dev",
     "build": "next build",
     "start": "next start",
     "lint": "next lint"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.590.0",
-    "@chakra-ui/icons": "^2.1.1",
-    "@chakra-ui/next-js": "^2.2.0",
-    "@chakra-ui/react": "^2.8.2",
-    "@emotion/react": "^11.11.4",
-    "@emotion/styled": "^11.11.5",
-    "framer-motion": "^11.2.10",
+    "@aws-sdk/client-s3": "^3.701.0",
+    "@chakra-ui/react": "^3.2.1",
+    "@emotion/react": "^11.13.5",
+    "@smithy/types": "^3.7.1",
     "moment": "^2.30.1",
-    "next": "14.2.3",
-    "react": "^18",
-    "react-dom": "^18",
-    "react-icons": "^5.2.1"
+    "next": "15.0.3",
+    "next-themes": "^0.4.3",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-icons": "^5.3.0"
   },
   "devDependencies": {
-    "@types/node": "^20",
-    "@types/react": "^18",
-    "@types/react-dom": "^18",
-    "eslint": "^8",
-    "eslint-config-next": "14.2.3",
-    "typescript": "^5"
+    "@types/node": "^22.10.1",
+    "@types/react": "^18.3.12",
+    "@types/react-dom": "^18.3.1",
+    "eslint": "^9.15.0",
+    "eslint-config-next": "15.0.3",
+    "typescript": "^5.7.2"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/deleteObject.tsx b/src/app/deleteObject.tsx
@@ -1,90 +1,93 @@
+import { Field } from "@/components/ui/field"
+import {
+  DialogBody,
+  DialogCloseTrigger,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogRoot,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog"
+import { Toaster, toaster } from "@/components/ui/toaster"
 import {
-  AlertDialog,
-  AlertDialogOverlay,
-  AlertDialogContent,
-  AlertDialogHeader,
-  AlertDialogBody,
-  AlertDialogFooter,
   Button,
   Input,
-  FormLabel,
-  FormControl,
   Code,
-  useToast
 } from "@chakra-ui/react";
 import { setValueFromEvent } from "./utils";
 import { useState } from "react";
 
 const DeleteObject = ({
-  isOpen,
+  open,
   onOpen,
   onClose,
   cancelRef,
   objectKey,
   action
 }: {
-  isOpen: boolean;
+  open: boolean;
   onOpen: () => void;
   onClose: () => void;
   cancelRef: React.MutableRefObject<any>;
   action: () => void;
   objectKey: string;
 }) => {
   const [key, setKey] = useState("");
-  const toast = useToast();
 
   return (
-    <AlertDialog
-      isOpen={isOpen}
-      leastDestructiveRef={cancelRef}
-      onClose={onClose}
-    >
-      <AlertDialogOverlay>
-        <AlertDialogContent>
-          <AlertDialogHeader fontSize="lg" fontWeight="bold">
-            Delete Object
-          </AlertDialogHeader>
+    <>
+      <Toaster />
+
+      <DialogRoot
+        open={open}
+        onExitComplete={onClose}
+        role="alertdialog"
+      >
+        <DialogContent>
+          <DialogHeader fontSize="lg" fontWeight="bold">
+            <DialogTitle>Delete Object</DialogTitle>
+          </DialogHeader>
 
-          <AlertDialogBody>
+          <DialogBody>
             Are you sure? You will not be able to undo this action afterwards.
             Enter Object Key <Code>{objectKey}</Code> to confirm object removal
-            <FormControl mt={4}>
-              <FormLabel>Object Key</FormLabel>
+            <Field label="Object Key" mt={4}>
               <Input
                 onChange={(ev) => setValueFromEvent(ev, setKey)}
                 placeholder="Object Key"
               />
-            </FormControl>
-          </AlertDialogBody>
+            </Field>
+          </DialogBody>
 
-          <AlertDialogFooter>
+          <DialogFooter>
             <Button ref={cancelRef} onClick={onClose}>
               Cancel
             </Button>
             <Button
-              colorScheme="red"
+              colorPalette="red"
               onClick={() => {
                 if (key === objectKey) {
                   action();
                   onClose();
                 } else {
-                  toast({
+                  toaster.create({
                     title: "Wrong Input",
                     description: "Input must be the same as object key",
-                    status: "error",
+                    type: "error",
                     duration: 5000,
-                    isClosable: true
                   });
                 }
               }}
               ml={3}
             >
               Delete
             </Button>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialogOverlay>
-    </AlertDialog>
+          </DialogFooter>
+          <DialogCloseTrigger />
+        </DialogContent>
+      </DialogRoot>
+    </>
   );
 };
 

diff --git a/src/app/header.tsx b/src/app/header.tsx
@@ -4,79 +4,77 @@ import {
   Stack,
   Heading,
   Flex,
-  Button,
   useDisclosure,
-  useColorMode,
   IconButton,
   Icon
 } from "@chakra-ui/react";
-import { HamburgerIcon, MoonIcon, SunIcon } from "@chakra-ui/icons";
-import LoginModal from "./loginModal";
+import { IoMoon, IoSunnyOutline } from "react-icons/io5";
+import { RxHamburgerMenu } from "react-icons/rx";
+import LoginDialog from "./loginDialog";
 import { S3Client } from "@aws-sdk/client-s3";
 import { MdStorage } from "react-icons/md";
-
+import { useTheme } from 'next-themes'
+import { Button } from "@/components/ui/button"
 const Header = ({
   onLogin,
   user
 }: {
   onLogin: ({ client, bucket }: { client: S3Client; bucket: string }) => void;
   user: S3Client | null;
 }) => {
-  const { isOpen, onOpen, onClose } = useDisclosure();
+  const { open, onOpen, onClose } = useDisclosure();
   const [loading, setLoading] = useState(false);
   const {
-    isOpen: isModalOpen,
-    onOpen: onModalOpen,
-    onClose: onModalClose
+    open: isDialogOpen,
+    onOpen: onDialogOpen,
+    onClose: onDialogClose
   } = useDisclosure();
-  const handleToggle = () => (isOpen ? onClose() : onOpen());
-  const { colorMode, toggleColorMode } = useColorMode();
+  const handleToggle = () => (open ? onClose() : onOpen());
+  const { theme, setTheme } = useTheme();
   const onLoginFormOpen = () => {
     setLoading(true);
-    onModalOpen();
+    onDialogOpen();
   };
   return (
     <Flex
-      as="nav"
       align="center"
       justify="space-between"
       wrap="wrap"
       padding={6}
     >
       <Flex align="center" mr={5}>
         <Heading as="h1" size="lg" letterSpacing={"tighter"}>
-          <Icon as={MdStorage} /> Storage Browser
+          <div><Icon><MdStorage /></Icon> Storage Browser</div>
         </Heading>
       </Flex>
 
       <Box display={{ base: "block", md: "none" }} onClick={handleToggle}>
-        <HamburgerIcon />
+        <RxHamburgerMenu />
       </Box>
       <Stack
         direction={{ base: "column", md: "row" }}
-        display={{ base: isOpen ? "block" : "none", md: "flex" }}
+        display={{ base: open ? "block" : "none", md: "flex" }}
         width={{ base: "full", md: "auto" }}
         mt={{ base: 4, md: 0 }}
       >
         <Button
           disabled={user !== null}
-          isLoading={loading}
+          loading={loading}
           onClick={onLoginFormOpen}
         >
           {user ? "Logged in" : "Login"}
         </Button>
         <IconButton
-          onClick={toggleColorMode}
+          onClick={() => setTheme(theme === "dark" && "light" || "dark")}
           variant={"ghost"}
           aria-label="Color Mode"
-          icon={colorMode === "light" ? <MoonIcon /> : <SunIcon />}
-        />
-        <LoginModal
+        >{theme === "light" ? <IoMoon /> : <IoSunnyOutline />}</IconButton>
+        <LoginDialog
           onLogin={onLogin}
-          isOpen={isModalOpen}
+          open={isDialogOpen}
           onOpen={onLoginFormOpen}
           onClose={() => {
-            onModalClose();
+            onDialogClose();
             setTimeout(() => setLoading(false), 1500);
           }}
         />

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,18 +1,16 @@
-import { Providers } from "./providers";
+import Provider from "./provider"
 
 export default function RootLayout({
-  children
+  children,
 }: {
-  children: React.ReactNode;
+  children: React.ReactNode
 }) {
   return (
-    <html lang="en">
-      <head>
-        <title>ParminCloud Storage Browser</title>
-      </head>
+    <html suppressHydrationWarning>
+      <head />
       <body>
-        <Providers>{children}</Providers>
+        <Provider>{children}</Provider>
       </body>
     </html>
-  );
+  )
 }