Merge branch 'master' into issue-404

Sanchitbajaj02 · Jul 29, 2024 · fe21723 · fe21723
2 parents b96c31e + caa525b
commit fe21723
Show file tree

Hide file tree

Showing 13 changed files with 354 additions and 223 deletions.
diff --git a/package.json b/package.json
@@ -49,6 +49,7 @@
     "eslint-config-next": "13.4.13",
     "framer-motion": "10.18.0",
     "html-react-parser": "5.1.1",
+    "lenis": "^1.1.6",
     "lucide-react": "0.316.0",
     "next": "13.5.4",
     "next-themes": "0.2.1",

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -8,6 +8,7 @@ import AnimatedCursor from "react-animated-cursor";
 import ScrollToTop from "@/components/ScrollToTop/scrolltotop";
 
 import { Providers } from "./providers";
+import LenisWrapper from "@/helper/leniswrapper";
 
 const poppinsFont = Poppins({
   subsets: ["latin"],
@@ -49,6 +50,7 @@ export const metadata: Metadata = {
 
 export default async function RootLayout({ children }: { children: React.ReactNode }) {
   return (
+    <LenisWrapper>
     <html
       lang="en"
       className={`${poppinsFont.className} scrollbar-thin scrollbar-thumb-primary scrollbar-track-secondary-light scrollbar-track-rounded-full`}
@@ -90,5 +92,6 @@ export default async function RootLayout({ children }: { children: React.ReactNo
         <ScrollToTop />
       </body>
     </html>
+    </LenisWrapper>
   );
 }
diff --git a/src/backend/auth.api.ts b/src/backend/auth.api.ts
@@ -74,7 +74,7 @@ const register = async (userData: {
 
 const verifyUser = async (accountId: string, secret: string) => {
   try {
-    console.log("data:", accountId, secret);
+    // console.log("data:", accountId, secret);
 
     const verifyResponse = await account.updateVerification(accountId, secret);
 
@@ -259,7 +259,7 @@ const saveDataToDatabase = async (session: any) => {
     if (!resp) {
       throw new Error("Database not working");
     }
-    console.log(resp);
+    // console.log(resp);
     return resp;
   } catch (error: any) {
     console.log(error.message);
@@ -330,7 +330,7 @@ const saveDataToDatabaseForOauth = async (session: Models.User<Models.Preference
     if (!resp) {
       throw new Error("Database not working");
     }
-    console.log(resp);
+    // console.log(resp);
     return resp;
   } catch (error: any) {
     console.log(error.message);

diff --git a/src/backend/bookmarks.api.ts b/src/backend/bookmarks.api.ts
@@ -33,7 +33,7 @@ const getBookmarks = async (userId: string) => {
 const saveBookmark = async (userId: string, postId: string) => {
   try {
     const getSavedBookmarkData = await getBookmarks(userId);
-    console.log(getSavedBookmarkData);
+    // console.log(getSavedBookmarkData);
     if (!getSavedBookmarkData) {
       throw new Error("Account does not exist");
     }

diff --git a/src/backend/updateProfile.api.ts b/src/backend/updateProfile.api.ts
@@ -39,7 +39,7 @@ const saveImage = async (image: File) => {
     const resp = await storage.createFile(userBucketStorage, ID.unique(), image);
 
     if (!resp) {
-      console.log(resp);
+      // console.log(resp);
       throw new Error("Photo cannot be uploaded");
     }
     return resp;
@@ -50,7 +50,7 @@ const saveImage = async (image: File) => {
 
 const updateImageURL = async (userId: string, image: string, isBanner: boolean) => {
   try {
-    console.log(image);
+    // console.log(image);
 
     if (isBanner) {
       const result01 = await db.updateDocument(palettegramDB, usersCollection, userId, {

diff --git a/src/components/Editor/EditorMenuBar.tsx b/src/components/Editor/EditorMenuBar.tsx
@@ -163,7 +163,7 @@ const EditorMenubar = ({ editor }: { editor: Editor }) => {
               onClick={(e) => {
                 e.preventDefault();
                 menu.onFunction();
-                console.log("cick");
+                // console.log("cick");
               }}
               disabled={!menu.offFunction}
               className={

diff --git a/src/components/core/createPost/index.tsx b/src/components/core/createPost/index.tsx
@@ -78,7 +78,7 @@ const CreatePost = () => {
       if (!savetoDb) {
         throw new Error();
       }
-      console.log(savetoDb, "svaetoDB");
+      // console.log(savetoDb, "svaetoDB");
       dispatch(addPost(finalDataToUpload));
       toastify("Post uploaded successfully", "success");
 

diff --git a/src/components/core/navbar/index.tsx b/src/components/core/navbar/index.tsx
@@ -95,7 +95,7 @@ const Navbar = ({ starCount }: { starCount?: number }) => {
     }
 
     return () => {
-      console.log("cleanup");
+      // console.log("cleanup");
     };
   }, [currentUser, getBookmarksFromDatabase, getPostsFromDatabase, userIdFromCookies]);
 

diff --git a/src/components/core/newsletter/index.tsx b/src/components/core/newsletter/index.tsx
@@ -23,7 +23,7 @@ const Newsletter: React.FC = () => {
 
     emailjs.send("service_7lb51ka","template_njg2wcp",templateParams,"-OBmWZjadmE1odXKm")
     .then((response)=>{
-      console.log("email sent",response)
+      // console.log("email sent",response)
       setSubscriberEmail("");
     })
     .catch((err)=>{

diff --git a/src/components/pages/user/userPosts/index.tsx b/src/components/pages/user/userPosts/index.tsx
@@ -34,7 +34,7 @@ export default function UserPosts({ userId }: { userId: string }) {
   useEffect(() => {
     getAllUserPosts(userId)
       .then((allPosts: any | undefined) => {
-        console.log("posts inside api", allPosts);
+        // console.log("posts inside api", allPosts);
         if (allPosts && allPosts.length > 0) {
           setUserPosts(allPosts);
         }
@@ -45,11 +45,11 @@ export default function UserPosts({ userId }: { userId: string }) {
       });
 
     return () => {
-      console.log("cleanup");
+      // console.log("cleanup");
     };
   }, [userId]);
 
-  console.log("all user posts:", userPosts);
+  // console.log("all user posts:", userPosts);
 
   return (
     <>

diff --git a/src/helper/leniswrapper.tsx b/src/helper/leniswrapper.tsx
@@ -0,0 +1,18 @@
+// src/components/LenisWrapper.tsx
+'use client';
+
+import React, { ReactNode } from 'react';
+import useLenis from './useLenis';
+
+
+interface LenisWrapperProps {
+  children: ReactNode;
+}
+
+const LenisWrapper: React.FC<LenisWrapperProps> = ({ children }) => {
+  useLenis();
+
+  return <>{children}</>;
+};
+
+export default LenisWrapper;
diff --git a/src/helper/useLenis.ts b/src/helper/useLenis.ts
@@ -0,0 +1,18 @@
+'use client'
+import { useEffect } from 'react';
+import Lenis from 'lenis';
+
+const useLenis = () => {
+  useEffect(() => {
+    const lenis = new Lenis();
+
+    function raf(time:any) {
+      lenis.raf(time);
+      requestAnimationFrame(raf);
+    }
+
+    requestAnimationFrame(raf);
+  }, []);
+};
+
+export default useLenis;