From 8cd7a5663ab9bda647b718b5636fde2832b34542 Mon Sep 17 00:00:00 2001
From: Sujoy Paul <freelancersujoy@gmail.com>
Date: Fri, 17 Feb 2023 02:22:45 +0600
Subject: [PATCH 1/5] fixing the self error of jodit-react

---
 components/Dashboard/UserComps/PrivacyPolicy.js | 14 ++++++++++++--
 components/Shared/Navbar/Navbar.js              |  3 +++
 components/hooks/privateRoute.js                | 12 ++++++------
 package-lock.json                               | 14 +++++++-------
 package.json                                    |  2 +-
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/components/Dashboard/UserComps/PrivacyPolicy.js b/components/Dashboard/UserComps/PrivacyPolicy.js
index 9d1c80f..4ebf474 100644
--- a/components/Dashboard/UserComps/PrivacyPolicy.js
+++ b/components/Dashboard/UserComps/PrivacyPolicy.js
@@ -1,7 +1,17 @@
-import React, { useEffect, useRef, useState } from 'react';
-import JoditEditor from 'jodit-react';
+
+import dynamic from 'next/dynamic';
+import React, { useEffect, useRef, useState, useMemo } from 'react';
+
+const JoditEditor = dynamic(() => {
+  if (typeof window !== 'undefined') {
+    // Load jodit-react on the client-side
+    return import('jodit-react');
+  }
+  return null;
+}, { ssr: false });
 
 const PrivacyPolicy = () => {
+
   const editor = useRef(null);
   const [privacyContent, setPrivacyContent] = useState('');
   const [termsContent, setTermsContent] = useState('');
diff --git a/components/Shared/Navbar/Navbar.js b/components/Shared/Navbar/Navbar.js
index 3665aab..4440e19 100644
--- a/components/Shared/Navbar/Navbar.js
+++ b/components/Shared/Navbar/Navbar.js
@@ -207,6 +207,9 @@ const Navbar = () => {
                             <li>
                               <Link href="/dashboard">Dashboard</Link>
                             </li>
+                            <li>
+                              <Link href="/helpsupport">Live Session</Link>
+                            </li>
                             <li>
                               {' '}
                               <button
diff --git a/components/hooks/privateRoute.js b/components/hooks/privateRoute.js
index 26ef0b0..f3be6f5 100644
--- a/components/hooks/privateRoute.js
+++ b/components/hooks/privateRoute.js
@@ -3,13 +3,13 @@ import auth from '../../firebase.init';
 import useSingleUser from './useSingleUser';
 
 const PrivateRoute = ({children}) => {
-    const [user, error] = useAuthState(auth);
-    const [singleUser] = useSingleUser();
+    // const [user, error] = useAuthState(auth);
+    // const [singleUser] = useSingleUser();
 
-    if (!singleUser.email || user.email) {
-        return window.location.href = '/signin';
-    }
-    return {children}
+    // if (!singleUser.email || user.email) {
+    //     return window.location.href = '/signin';
+    // }
+    // return {children}
 };
 
 export default PrivateRoute;
diff --git a/package-lock.json b/package-lock.json
index 77e72fb..0e089e1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "firebase": "^9.15.0",
         "firebase-admin": "^11.5.0",
         "jest": "^29.4.2",
-        "jodit-react": "^1.3.35",
+        "jodit-react": "^1.3.36",
         "js-cookie": "^3.0.1",
         "lottie-react": "^2.3.1",
         "next": "13.1.1",
@@ -6512,9 +6512,9 @@
       }
     },
     "node_modules/jodit-react": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/jodit-react/-/jodit-react-1.3.35.tgz",
-      "integrity": "sha512-Mn7ykdAIinShBDMZ61HRqx92D0CaRFPw3++gBaIWLeUfsIOT6p01LZL7/w0oJGP6ZiHtpOCxy84fjGMmXt3HwQ==",
+      "version": "1.3.36",
+      "resolved": "https://registry.npmjs.org/jodit-react/-/jodit-react-1.3.36.tgz",
+      "integrity": "sha512-lnOTSfh/W5pVHfylGs0YDINaxLuXy2WhJ55Adb+hLVisnXxGMWTsJVmK4XyMk90UsRPtp0fhHMUJgh1Vl5BEaQ==",
       "dependencies": {
         "jodit": "^3.20.2"
       },
@@ -14371,9 +14371,9 @@
       }
     },
     "jodit-react": {
-      "version": "1.3.35",
-      "resolved": "https://registry.npmjs.org/jodit-react/-/jodit-react-1.3.35.tgz",
-      "integrity": "sha512-Mn7ykdAIinShBDMZ61HRqx92D0CaRFPw3++gBaIWLeUfsIOT6p01LZL7/w0oJGP6ZiHtpOCxy84fjGMmXt3HwQ==",
+      "version": "1.3.36",
+      "resolved": "https://registry.npmjs.org/jodit-react/-/jodit-react-1.3.36.tgz",
+      "integrity": "sha512-lnOTSfh/W5pVHfylGs0YDINaxLuXy2WhJ55Adb+hLVisnXxGMWTsJVmK4XyMk90UsRPtp0fhHMUJgh1Vl5BEaQ==",
       "requires": {
         "jodit": "^3.20.2"
       }
diff --git a/package.json b/package.json
index 5343058..9dd1b98 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "firebase": "^9.15.0",
     "firebase-admin": "^11.5.0",
     "jest": "^29.4.2",
-    "jodit-react": "^1.3.35",
+    "jodit-react": "^1.3.36",
     "js-cookie": "^3.0.1",
     "lottie-react": "^2.3.1",
     "next": "13.1.1",

From e5e518a54818b034f19f01e3fb46313de6ab1f33 Mon Sep 17 00:00:00 2001
From: Sujoy Paul <freelancersujoy@gmail.com>
Date: Fri, 17 Feb 2023 02:30:02 +0600
Subject: [PATCH 2/5] self error fixing and change on my profile

---
 pages/dashboard/myprofile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/dashboard/myprofile.js b/pages/dashboard/myprofile.js
index 432f249..b12e327 100644
--- a/pages/dashboard/myprofile.js
+++ b/pages/dashboard/myprofile.js
@@ -18,7 +18,7 @@ const Myprofile = () => {
         <Navbar></Navbar>
         <div className='grid  lg:md:grid-cols-[300px_minmax(900px,_1fr)]'>
                 <DashSidebar />
-                git add<MyProfile/>
+                <MyProfile/>
             </div>
       
       </div>

From 9fa70b509613a508207b5d121149989c4c4680a5 Mon Sep 17 00:00:00 2001
From: Sujoy Paul <freelancersujoy@gmail.com>
Date: Sun, 19 Feb 2023 20:33:12 +0600
Subject: [PATCH 3/5] add teacher problem fix of my profile button

---
 pages/dashboard/applyteacher.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pages/dashboard/applyteacher.js b/pages/dashboard/applyteacher.js
index ef16981..abb3987 100644
--- a/pages/dashboard/applyteacher.js
+++ b/pages/dashboard/applyteacher.js
@@ -1,3 +1,4 @@
+import Head from 'next/head';
 import React from 'react';
 import DashSidebar from '../../components/Dashboard/DashSidebar';
 import ApplyTeacher from '../../components/Dashboard/UserComps/ApplyTeacher';
@@ -6,11 +7,16 @@ import Navbar from '../../components/Shared/Navbar/Navbar';
 const applyteacher = () => {
     return (
         <div>
-            <Navbar />
-            <div className='grid  lg:md:grid-cols-[300px_minmax(900px,_1fr)]'>
-                <DashSidebar />
-                <ApplyTeacher></ApplyTeacher>
-            </div>
+            <div>
+        <Head>
+            <title>Add Blog - HelloTalk</title>
+        </Head>
+          <Navbar />
+          <div className="grid  lg:md:grid-cols-[300px_minmax(900px,_1fr)]">
+            <DashSidebar />
+            <ApplyTeacher />
+          </div>
+      </div>
         </div>
     );
 };

From 1c265d0ca3aef0d84063ff7456f26a421947da9b Mon Sep 17 00:00:00 2001
From: Sujoy Paul <freelancersujoy@gmail.com>
Date: Fri, 24 Feb 2023 00:43:13 +0600
Subject: [PATCH 4/5] setup general and applyteacher page and also fix the bug
 of self error

---
 components/Dashboard/UserComps/PrivacyPolicy.js | 1 -
 pages/dashboard/applyteacher.js                 | 5 ++++-
 pages/dashboard/general.js                      | 7 +++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/components/Dashboard/UserComps/PrivacyPolicy.js b/components/Dashboard/UserComps/PrivacyPolicy.js
index 1b4b3f9..d32bc57 100644
--- a/components/Dashboard/UserComps/PrivacyPolicy.js
+++ b/components/Dashboard/UserComps/PrivacyPolicy.js
@@ -1,4 +1,3 @@
-
 import dynamic from 'next/dynamic';
 import React, { useEffect, useRef, useState, useMemo } from 'react';
 
diff --git a/pages/dashboard/applyteacher.js b/pages/dashboard/applyteacher.js
index 0e78cb8..236e38f 100644
--- a/pages/dashboard/applyteacher.js
+++ b/pages/dashboard/applyteacher.js
@@ -3,13 +3,14 @@ import React from 'react';
 import DashSidebar from '../../components/Dashboard/DashSidebar';
 import ApplyTeacher from '../../components/Dashboard/UserComps/ApplyTeacher';
 import Navbar from '../../components/Shared/Navbar/Navbar';
+//all fixed
 
 const applyteacher = () => {
     return (
         <div>
             <div>
         <Head>
-            <title>Add Blog - HelloTalk</title>
+            <title>Apply for teacher - HelloTalk</title>
         </Head>
           <Navbar />
           <div className="grid  lg:md:grid-cols-[300px_minmax(900px,_1fr)]">
@@ -20,3 +21,5 @@ const applyteacher = () => {
         </div>
     );
 };
+
+export default applyteacher
\ No newline at end of file
diff --git a/pages/dashboard/general.js b/pages/dashboard/general.js
index 956fbb6..9b67ab1 100644
--- a/pages/dashboard/general.js
+++ b/pages/dashboard/general.js
@@ -4,19 +4,18 @@ import DashSidebar from '../../components/Dashboard/DashSidebar';
 import PrivacyPolicy from '../../components/Dashboard/UserComps/PrivacyPolicy';
 import Navbar from '../../components/Shared/Navbar/Navbar';
 
-const index = () => {
+const general = () => {
   return (
     <div>
       {/* <PrivateRoute> */}
         <div>
           <Head>
-            <title>HelloTalk - General</title>
+            <title>General - HelloTalk</title>
           </Head>
           <Navbar />
           <div className="grid lg:md:grid-cols-[300px_minmax(900px,_1fr)]">
             <DashSidebar />
             <PrivacyPolicy></PrivacyPolicy>
-            {/* <AllBlogs /> */}
           </div>
         </div>
       {/* </PrivateRoute> */}
@@ -24,4 +23,4 @@ const index = () => {
   );
 };
 
-export default index;
+export default general;

From ac52e1d3f20c0fc6d3cbd9fa65dce3380e38aa95 Mon Sep 17 00:00:00 2001
From: Sujoy Paul <freelancersujoy@gmail.com>
Date: Fri, 24 Feb 2023 02:04:20 +0600
Subject: [PATCH 5/5] fixing error of general

---
 pages/dashboard/applyteacher.js | 16 ----------------
 pages/dashboard/general.js      | 19 ++-----------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/pages/dashboard/applyteacher.js b/pages/dashboard/applyteacher.js
index c9da0fe..39e924b 100644
--- a/pages/dashboard/applyteacher.js
+++ b/pages/dashboard/applyteacher.js
@@ -9,17 +9,6 @@ const applyteacher = () => {
     return (
         <div>
             <div>
-<<<<<<< HEAD
-        <Head>
-            <title>Apply for teacher - HelloTalk</title>
-        </Head>
-          <Navbar />
-          <div className="grid  lg:md:grid-cols-[300px_minmax(900px,_1fr)]">
-            <DashSidebar />
-            <ApplyTeacher />
-          </div>
-      </div>
-=======
                 <Head>
                     <title>Apply for teacher - HelloTalk</title>
                 </Head>
@@ -29,13 +18,8 @@ const applyteacher = () => {
                     <ApplyTeacher />
                 </div>
             </div>
->>>>>>> 568bef749b3d4beb766990f21992458d64d2bd2f
         </div>
     );
 };
 
-<<<<<<< HEAD
-export default applyteacher
-=======
 export default applyteacher;
->>>>>>> 568bef749b3d4beb766990f21992458d64d2bd2f
diff --git a/pages/dashboard/general.js b/pages/dashboard/general.js
index f196626..84a71f7 100644
--- a/pages/dashboard/general.js
+++ b/pages/dashboard/general.js
@@ -5,14 +5,8 @@ import PrivacyPolicy from '../../components/Dashboard/UserComps/PrivacyPolicy';
 import Navbar from '../../components/Shared/Navbar/Navbar';
 
 const general = () => {
-<<<<<<< HEAD
-  return (
-    <div>
-      {/* <PrivateRoute> */}
-=======
     return (
         <div>
->>>>>>> 568bef749b3d4beb766990f21992458d64d2bd2f
         <div>
           <Head>
             <title>General - HelloTalk</title>
@@ -23,17 +17,8 @@ const general = () => {
             <PrivacyPolicy></PrivacyPolicy>
           </div>
         </div>
-<<<<<<< HEAD
-      {/* </PrivateRoute> */}
-    </div>
-  );
-};
-
-export default general;
-=======
         </div>
-    );
+  );
 };
 
-export default general;
->>>>>>> 568bef749b3d4beb766990f21992458d64d2bd2f
+export default general
\ No newline at end of file