Merge pull request #3 from plats-network/fe/pontem

Fe/pontem
plats-network · Oct 5, 2024 · 7835b33 · 7835b33
2 parents d41e15a + 89bdb25
commit 7835b33
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 87 deletions.
diff --git a/frontend/src/app/(auth)/logout/page.tsx b/frontend/src/app/(auth)/logout/page.tsx
@@ -0,0 +1,22 @@
+"use client";
+import authApiRequest from "@/apiRequest/auth";
+import { useRouter } from "next/navigation";
+import React, { useCallback, useEffect } from "react";
+
+const LogoutPage = () => {
+  const route = useRouter();
+
+  const handleLogout = useCallback(async () => {
+    await authApiRequest.logoutFromNextClientToNextServer(true).then((res) => {
+      console.log("logged out app");
+      route.push(`/login`);
+    });
+  }, [route]);
+
+  useEffect(() => {
+    handleLogout();
+  }, [handleLogout]);
+  return <div className="h-[100vh]"></div>;
+};
+
+export default LogoutPage;
diff --git a/frontend/src/app/(landing)/page.tsx b/frontend/src/app/(landing)/page.tsx
@@ -11,8 +11,10 @@ export default function Home() {
   const accessToken = cookieStore.get("accessToken");
   return (
     <>
-
-        <div className="relative h-[100vh] flex items-center justify-center">
+<Header/>
+{
+      !accessToken ? (
+<div className="relative h-[100vh] flex items-center justify-center">
           <div className="absolute bottom-0 left-0">
             <div className="relative md:w-[488px] w-[200px] md:h-[360px] h-[150px]">
               <Image
@@ -63,7 +65,10 @@ export default function Home() {
             {/* )} */}
           </div>
         </div>
-
+      ) : (
+        <ProfileView/>
+      )
+    }
     </>
   );
 }
diff --git a/frontend/src/components/ConnectAccountModal.tsx b/frontend/src/components/ConnectAccountModal.tsx
@@ -9,6 +9,7 @@ import WalletIcon from "@/assets/WalletIcom";
 import { LoadingButton } from "@/components/ui/loading-button";
 import { toast } from "@/hooks/use-toast";
 import useClickOutside from "@/hooks/useClickOutside";
+import { useWallet } from "@manahippo/aptos-wallet-adapter";
 import { useRouter } from "next/navigation";
 import React, { useRef, useState } from "react";
 
@@ -18,12 +19,13 @@ import React, { useRef, useState } from "react";
 const ConnectAccountModal = ({
   platId,
   listAddress,
-  currentPublicKey
+
 }: {
   platId: string;
   listAddress: any[];
-  currentPublicKey: any
+
 }) => {
+  const { account} = useWallet();
 
 
   const [isOpen, setIsOpen] = useState<boolean>(false);
@@ -56,12 +58,12 @@ const ConnectAccountModal = ({
   const handleAddNewWallet = async () => {
     try {
       setIsLoadingWallet(true);
-      console.log("publicKey", currentPublicKey?.toBase58());
+      console.log("currentAddress", account?.address);
       console.log("listAddress", listAddress);
 
-      if (!currentPublicKey) return;
+      if (!account?.address) return;
       if (
-        listAddress.some((address) => currentPublicKey?.toBase58() === address)
+        listAddress.some((address) => account?.address === address)
         // currentPublicKey === address
       ) {
         toast({
@@ -72,8 +74,8 @@ const ConnectAccountModal = ({
         return;
       }
       const data = {
-        public_key: Buffer.from(currentPublicKey.toBytes()).toString("base64"),
-        address: currentPublicKey?.toBase58(),
+        public_key: account?.publicKey,
+        address: account?.address,  
       };
       console.log("🚀 ~ handleAddNewWal ~ data:", data);
 
@@ -102,7 +104,7 @@ const ConnectAccountModal = ({
         className="bg-gradient-to-r from-[#8737E9] to-[#3AE7E7]  rounded-xl w-full py-4 text-base font-bold text-center text-white cursor-pointer flex items-center justify-center gap-2"
       >
         <AddIcon />
-        <p> Add New Account</p>
+        <p> Add New Account </p>
       </button>
 
       {/* Main modal */}

diff --git a/frontend/src/components/ProfileView/ConnectedAccount.tsx b/frontend/src/components/ProfileView/ConnectedAccount.tsx
@@ -7,6 +7,7 @@ import ConnectAccountModal from "@/components/ConnectAccountModal";
 import { sliceAddressWallet, sliceAddressWalletUser } from "@/lib/helper";
 
 
+
 import React, { useEffect, useState } from "react";
 
 const ConnectedAccount = ({
@@ -17,11 +18,12 @@ const ConnectedAccount = ({
   isFirstLoad: boolean;
 }) => {
 
- // Get the current public key from the wallet adapter
 
-  const [currentPublicKey, setCurrentPublicKey] = useState<any>(null)
 
 
+
+
+
   return (
     <div className="relative w-full z-10  lg:max-w-[455px]">
       <div
@@ -92,11 +94,12 @@ const ConnectedAccount = ({
             </p>
           </div>
         )}
+
 
         <ConnectAccountModal
           platId={user?.plat_id}
           listAddress={user?.address}
-          currentPublicKey={currentPublicKey}
+
         />
       </div>
     </div>

diff --git a/frontend/src/components/ProfileView/ConnectedPlatsApp.tsx b/frontend/src/components/ProfileView/ConnectedPlatsApp.tsx
@@ -34,8 +34,9 @@ const ConnectedPlatsApp = ({ platId }: { platId: string }) => {
         type: "entry_function_payload",
         function: ADD_PERMISSIONS_FUNCTION,
         arguments: [
-          "nhatnguyen1.ID",
-          ["be94da783e0ee11bbdb9de2f9c6745f15b1f9bfc3007dab7f77ec2eed2400b05"],
+          "0x998d7cca2dd5ebf2c0d1ff3000f5f0cd49d409a830ab488fb4436e7392480a29",
+          platId,
+          [appId],
         ],
         type_arguments: [],
       };
@@ -55,8 +56,9 @@ const ConnectedPlatsApp = ({ platId }: { platId: string }) => {
         type: "entry_function_payload",
         function: REVOKE_PERMISSIONS_FUNCTION,
         arguments: [
-          "nhatnguyen1.ID",
-          ["be94da783e0ee11bbdb9de2f9c6745f15b1f9bfc3007dab7f77ec2eed2400b05"],
+          "0x998d7cca2dd5ebf2c0d1ff3000f5f0cd49d409a830ab488fb4436e7392480a29",
+          platId,
+          [appId],
         ],
         type_arguments: [],
       };

diff --git a/frontend/src/components/RegisterIdForm.tsx b/frontend/src/components/RegisterIdForm.tsx
@@ -17,6 +17,7 @@ import authApiRequest from "@/apiRequest/auth";
 import { toast } from "@/hooks/use-toast";
 import { useState } from "react";
 import { LoadingButton } from "@/components/ui/loading-button";
+import { useWallet } from "@manahippo/aptos-wallet-adapter";
 
 
 
@@ -28,6 +29,7 @@ const formSchema = z.object({
 
 const RegisterIdForm = ({ authenToken }: { authenToken: string }) => {
   const router = useRouter();
+  const { connected, account, disconnect, wallets, select } = useWallet();
 
 
   const [isLoading, setIsLoading] = useState<boolean>(false);
@@ -43,53 +45,53 @@ const RegisterIdForm = ({ authenToken }: { authenToken: string }) => {
   // 2. Define a submit handler.
   function onSubmit(values: z.infer<typeof formSchema>) {
     console.log(values);
-    // handleRegister(values.platId);
+    handleRegister(values.platId);
   }
 
-  // const handleRegister = async (platId: string) => {
-  //   try {
-  //     setIsLoading(true)
-  //     if (!authenToken) return;
-  //     if (!publicKey) return;
+  const handleRegister = async (platId: string) => {
+    try {
+      setIsLoading(true)
+      if (!authenToken) return;
+      if (!account?.publicKey) return;
 
-  //     const data = {
-  //       eoa: publicKey?.toBase58(),
-  //       plat_id: platId+".ID",
-  //       public_key: Buffer.from(publicKey.toBytes()).toString("base64"),
-  //     };
-
-  //     const response = await authApiRequest.register(data, authenToken);
-
-  //     toast({
-  //       className: "z-50 text-white",
-  //       description: response.payload.msg,
-  //     });
-  //     if (response) {
-  //       const responseLogin = await authApiRequest.login(authenToken);
-  //       console.log("🚀 ~ handleRegister ~ responseLogin:", responseLogin)
+      const data = {
+        eoa: account.address,
+        plat_id: platId+".ID",
+        public_key: account?.publicKey,
+      };
+
+      const response = await authApiRequest.register(data, authenToken);
+
+      toast({
+        className: "z-50 text-white",
+        description: response.payload.msg,
+      });
+      if (response) {
+        const responseLogin = await authApiRequest.login(authenToken);
+        console.log("🚀 ~ handleRegister ~ responseLogin:", responseLogin)
 
 
-  //       await authApiRequest.auth({
-  //         accessToken: responseLogin.payload.data.access_token,
-  //       });
-  //       toast({
-  //         className: "z-50 text-white",
-  //         description: "Login successful",
-  //       });
-  //       router.push("/");
-  //       router.refresh();
-  //     }
-  //   } catch (error) {
-  //     setIsLoading(false)
-  //     console.log("🚀 ~ handleRegister ~ error:", error)
-  //     toast({
-  //       variant: "destructive",
-  //       className:"z-50 text-white",
-  //       description: "Connect wallet failed",
-  //     });
+        await authApiRequest.auth({
+          accessToken: responseLogin.payload.data.access_token,
+        });
+        toast({
+          className: "z-50 text-white",
+          description: "Login successful",
+        });
+        router.push("/");
+        router.refresh();
+      }
+    } catch (error) {
+      setIsLoading(false)
+      console.log("🚀 ~ handleRegister ~ error:", error)
+      toast({
+        variant: "destructive",
+        className:"z-50 text-white",
+        description: "Connect wallet failed",
+      });
 
-  //   } 
-  // };
+    } 
+  };
 
   return (
     <div className="w-full h-full text-center flex flex-col gap-[120px] items-center justify-center ">

diff --git a/frontend/src/components/shared/WalletButton.tsx b/frontend/src/components/shared/WalletButton.tsx
@@ -37,6 +37,11 @@ export default function WalletButton({
     } catch (error) {}
   };
 
+
+
+
+
+
   return (
     <>
       <LoadingButton

diff --git a/frontend/src/hooks/useLogin.ts b/frontend/src/hooks/useLogin.ts
@@ -38,13 +38,9 @@ const useLogin = () => {
       if (!account?.publicKey) return;
       console.log("currentPublicKey",account.publicKey)
       // Get nonce
-      const publicKeyWallet = Buffer.from(account.publicKey.toString()).toString(
-        "base64"
-      );
-
-      console.log("publickey get Nonce base 64", publicKeyWallet);
+
       const responseNonce = await authApiRequest.nonce(
-        encodeURIComponent(publicKeyWallet)
+        encodeURIComponent(account?.publicKey as string)
       );
       console.log("🚀 ~ handleGetNonce ~ responseNonce:", responseNonce)
 
@@ -114,8 +110,8 @@ const useLogin = () => {
       if (!account?.publicKey) return;
 
       const data = {
-        public_key: Buffer.from(account.publicKey.toString()).toString("base64"),
-        signature: Buffer.from(signature).toString("base64"),
+        public_key: account.publicKey,
+        signature: signature.toString(),
       };
 
       const responseVerify = await authApiRequest.verify(data);
@@ -125,25 +121,25 @@ const useLogin = () => {
         className: "z-50 text-white",
         description: responseVerify.payload.msg,
       });
-    //   if (responseVerify) {
-    //     const responseLogin = await authApiRequest.login(
-    //       responseVerify.payload.data.authen_token
-    //     );
-
-    //     if (responseLogin && responseLogin?.payload.code !== 400) {
-    //       await authApiRequest.auth({
-    //         accessToken: responseLogin.payload.data.access_token,
-    //       });
-    //       toast({
-    //         className: "z-50 text-white",
-    //         description: "Login successful",
-    //       });
-    //       router.push("/");
-    //       router.refresh();
-    //     } else {
-    //       setAuthenToken(responseVerify.payload.data.authen_token);
-    //     }
-    //   }
+      if (responseVerify) {
+        const responseLogin = await authApiRequest.login(
+          responseVerify.payload.data.authen_token
+        );
+
+        if (responseLogin && responseLogin?.payload.code !== 400) {
+          await authApiRequest.auth({
+            accessToken: responseLogin.payload.data.access_token,
+          });
+          toast({
+            className: "z-50 text-white",
+            description: "Login successful",
+          });
+          router.push("/");
+          router.refresh();
+        } else {
+          setAuthenToken(responseVerify.payload.data.authen_token);
+        }
+      }
     } catch (error) {
       console.log("🚀 ~ handleVerifySignature ~ error:", error);
       setIsLoading(false);

diff --git a/frontend/src/lib/helper.ts b/frontend/src/lib/helper.ts
@@ -27,6 +27,6 @@ export const sliceAddressWalletUser = (addressUser: string) => {
 export const sumBalances = (arr: any[]) => {
   return arr.reduce((total, num) => {
     const roundedNum = Number(num) < 0 ? 0 : Number(num);
-    return total + roundedNum;
+    return (total + roundedNum)/10**15;
   }, 0);
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,6 +37,11 @@ export default function WalletButton({ @@
         } catch (error) {}
       };
       return (
         <>
           <LoadingButton
@@ Expand Down @@