From 0150caf4bb09f8bbd957e4adbe327d1ff9d73e78 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 8 Jan 2024 23:37:13 +0100
Subject: [PATCH 1/2] Added New Page

---
 src/Routers.jsx                     |  2 ++
 src/assets/images/icons/my-page.svg |  1 +
 src/components/Helpers/Icons.jsx    | 53 ++++++++++++++++++++++-----
 src/components/Partials/Header.jsx  | 42 +++++++++++++++++++++-
 src/components/YourPage/index.jsx   | 55 +++++++++++++++++++++++++++++
 src/views/YourPage_.jsx             |  5 +++
 6 files changed, 149 insertions(+), 9 deletions(-)
 create mode 100644 src/assets/images/icons/my-page.svg
 create mode 100644 src/components/YourPage/index.jsx
 create mode 100644 src/views/YourPage_.jsx

diff --git a/src/Routers.jsx b/src/Routers.jsx
index 4f6f51c..6df72d5 100644
--- a/src/Routers.jsx
+++ b/src/Routers.jsx
@@ -53,6 +53,7 @@ import LndPage from "./views/LndPage";
 import FamilySettingsPage from "./views/FamilySettingsPage";
 import AppDownloadPage from "./views/AppDownloadPage";
 import JobGroupsPage from "./views/JobGroupsPage";
+import YourPages from "./views/YourPage_";
 
 export default function Routers() {
   return (
@@ -115,6 +116,7 @@ export default function Routers() {
           <Route exact path="/acc-family"  element={<FamilyAccPage />} />
           <Route exact path="/manage-family"  element={<FamilyManagePage />} />
           <Route exact path="/start-job"  element={<StartJob />} />
+          <Route exact path="/yourpage"  element={<YourPages />} />
           <Route exact path="/manage-active-job"  element={<ManageActiveJobs />} />
           <Route exact path="/blog-page"  element={<BlogPage />} />
           <Route exact path="/offer-interest"  element={<OffersInterestPage />} />
diff --git a/src/assets/images/icons/my-page.svg b/src/assets/images/icons/my-page.svg
new file mode 100644
index 0000000..f6a8217
--- /dev/null
+++ b/src/assets/images/icons/my-page.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 68 50" id="Page"><path fill-rule="evenodd" d="M0 13V2a2 2 0 0 1 2-2h64a2 2 0 0 1 2 2v11H0Zm0 4v31a2 2 0 0 0 2 2h20V17H0Zm26 33h40a2 2 0 0 0 2-2V17H26v33Z" fill="#767fad" class="color000000 svgShape"></path></svg>
\ No newline at end of file
diff --git a/src/components/Helpers/Icons.jsx b/src/components/Helpers/Icons.jsx
index 2b2fb0c..1a4f162 100644
--- a/src/components/Helpers/Icons.jsx
+++ b/src/components/Helpers/Icons.jsx
@@ -462,6 +462,15 @@ export default function Icons({ name }) {
             clipRule="evenodd"
           />
         </svg>
+      ) : name === "my-page" ? (
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 68 50" id="Page">
+          <path
+            fillRule="evenodd"
+            d="M0 13V2a2 2 0 0 1 2-2h64a2 2 0 0 1 2 2v11H0Zm0 4v31a2 2 0 0 0 2 2h20V17H0Zm26 33h40a2 2 0 0 0 2-2V17H26v33Z"
+            fill="#ffffff"
+            className="color000000 svgShape"
+          ></path>
+        </svg>
       ) : name === "accordion-minus" ? (
         <svg
           width="20"
@@ -510,20 +519,48 @@ export default function Icons({ name }) {
       ) : name === "master-card" ? (
         <img className="w-[30px]" src={MasterCard} alt="card" />
       ) : name === "new-dashboard" ? (
-        <img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/dashboard.svg')} alt="dashboard" />
+        <img
+          className="w-[17px] h-[17px]"
+          src={localImgLoad("images/icons/dashboard.svg")}
+          alt="dashboard"
+        />
       ) : name === "new-family" ? (
-        <img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/family.svg')} alt="family" />
+        <img
+          className="w-[17px] h-[17px]"
+          src={localImgLoad("images/icons/family.svg")}
+          alt="family"
+        />
       ) : name === "new-logout" ? (
-        <img className="w-[45px] rounded-full bg-white p-1" src={localImgLoad('images/icons/logout.svg')} alt="logout" />
+        <img
+          className="w-[45px] rounded-full bg-white p-1"
+          src={localImgLoad("images/icons/logout.svg")}
+          alt="logout"
+        />
       ) : name === "new-market" ? (
-        <img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/market.svg')} alt="market" />
+        <img
+          className="w-[17px] h-[17px]"
+          src={localImgLoad("images/icons/market.svg")}
+          alt="market"
+        />
       ) : name === "new-mytask" ? (
-        <img className="w-[17px] h-[17px]" src={localImgLoad('images/icons/my-task.svg')} alt="task" />
+        <img
+          className="w-[17px] h-[17px]"
+          src={localImgLoad("images/icons/my-task.svg")}
+          alt="task"
+        />
       ) : name === "family-id" ? (
-        <img className="w-[20px] h-[20px]" src={localImgLoad('images/icons/family-id.svg')} alt="family-id" />
+        <img
+          className="w-[20px] h-[20px]"
+          src={localImgLoad("images/icons/family-id.svg")}
+          alt="family-id"
+        />
       ) : name === "family-pin" ? (
-        <img className="w-[20px] h-[20px]" src={localImgLoad('images/icons/family-pin.svg')} alt="family-pin" />
-      ): (
+        <img
+          className="w-[20px] h-[20px]"
+          src={localImgLoad("images/icons/family-pin.svg")}
+          alt="family-pin"
+        />
+      ) : (
         ""
       )}
     </>
diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx
index 024e1b9..199f112 100644
--- a/src/components/Partials/Header.jsx
+++ b/src/components/Partials/Header.jsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useMemo, useState } from "react";
+import React, { useContext, useMemo, useState } from "react";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import bank1 from "../../assets/images/bank-1.png";
 import bank2 from "../../assets/images/bank-2.png";
@@ -238,6 +238,9 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
               </div>
             </button>
             {/* balance */}
+            
+            {/* My Page Button */}
+            <PageButton />
 
             {/*<div className="lg:hidden block"></div>*/}
             <WalletHeader
@@ -412,6 +415,17 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                         </div>
                       </Link>
                     </li>
+                    {userDetails && userDetails?.account_type !== "FAMILY" && (
+                      <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
+                        <Link to="/yourpage" className="notifications">
+                          <div className="name">
+                            <p className="text-sm py-2 px-4 text-dark-gray dark:text-white hover:text-sky-blue transition font-medium">
+                              My Page
+                            </p>
+                          </div>
+                        </Link>
+                      </li>
+                    )}
                     {userDetails && userDetails?.account_type !== "FAMILY" && (
                       <>
                         <li className="content-item my-2 hover:bg-slate-100 transition duration-500 rounded-lg">
@@ -656,3 +670,29 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
     </>
   );
 }
+
+
+const PageButton = () => {
+  return (
+    <Link to="/yourpage" className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-sky-blue pr-1.5 pl-4">
+      <div
+          className="flex items-center lg:justify-between justify-center w-full h-full"
+        >
+          <span className="lg:block hidden w-[25px]">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 68 50" id="Page">
+          <path
+            fillRule="evenodd"
+            d="M0 13V2a2 2 0 0 1 2-2h64a2 2 0 0 1 2 2v11H0Zm0 4v31a2 2 0 0 0 2 2h20V17H0Zm26 33h40a2 2 0 0 0 2-2V17H26v33Z"
+            fill="#ffffff"
+            className="color000000 svgShape"
+          ></path>
+        </svg>
+          </span>
+          <p className="lg:text-xl text-lg font-bold text-white">My Page</p>
+          <span className="lg:block hidden">
+            {/* <Icons name="deep-plus" /> */}
+          </span>
+        </div>
+    </Link>
+  )
+}
\ No newline at end of file
diff --git a/src/components/YourPage/index.jsx b/src/components/YourPage/index.jsx
new file mode 100644
index 0000000..2654ee6
--- /dev/null
+++ b/src/components/YourPage/index.jsx
@@ -0,0 +1,55 @@
+import React from "react";
+import Layout from "../Partials/Layout";
+import { InputCom } from "../AddJob/settings";
+
+const YourPage = () => {
+  return (
+    <Layout>
+      <div className="notification-page w-full mb-10">
+        <div className="notification-wrapper w-full">
+          <div className="update-table w-full h-full p-4 bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px]">
+            <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide mb-2">My page</h1>
+            <hr />
+            <div className="">
+              <div className="field w-full">
+                <InputCom
+                  fieldClass="px-4 transfer-field"
+                  parentClass="flex items-center gap-1 justify-between"
+                  labelClass="flex-[0.2] mb-0"
+                  inputClass="flex-[0.8] transfer-field"
+                  label="Fee:"
+                  type="text"
+                  name="fee"
+                  value=""
+                />
+              </div>
+
+              <div className="field w-full mb-6 flex gap-1 justify-between">
+                <label className="text-[#181c32] dark:text-white text-base font-semibold flex flex-[0.2] mt-2.5">
+                  Comment:
+                </label>
+                <textarea
+                  style={{ resize: "none" }}
+                  className="text-base px-4 py-2 rounded-md min-h-[100px] sm:max-w-[550px] max-w-[250px] text-dark-gray dark:text-white w-full bg-slate-100 dark:bg-[#11131F]  focus:ring-0 focus:outline-none flex-[0.8]"
+                  name="comment"
+                  cols="30"
+                  rows="2"
+                />
+              </div>
+              <button
+                type="submit"
+                // disabled={props.isSubmitting}
+                className="text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md"
+              >
+                Continue
+              </button>
+            </div>
+            <hr />
+          </div>
+        </div>
+      </div>
+    </Layout>
+  );
+};
+
+export default YourPage;
diff --git a/src/views/YourPage_.jsx b/src/views/YourPage_.jsx
new file mode 100644
index 0000000..6935292
--- /dev/null
+++ b/src/views/YourPage_.jsx
@@ -0,0 +1,5 @@
+import YourPage from "../components/YourPage";
+
+export default function YourPages() {
+    return <YourPage />;
+  }
\ No newline at end of file

From 057691b2f905ce975cfa4bf123dcd612321cb079 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Tue, 9 Jan 2024 00:21:29 +0100
Subject: [PATCH 2/2] added more things

---
 src/components/YourPage/index.jsx | 28 ++++++++++++++++------------
 src/services/UsersService.js      | 10 ++++++++++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/components/YourPage/index.jsx b/src/components/YourPage/index.jsx
index 2654ee6..1072e0f 100644
--- a/src/components/YourPage/index.jsx
+++ b/src/components/YourPage/index.jsx
@@ -8,16 +8,18 @@ const YourPage = () => {
       <div className="notification-page w-full mb-10">
         <div className="notification-wrapper w-full">
           <div className="update-table w-full h-full p-4 bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px]">
-            <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide mb-2">My page</h1>
+            <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide mb-2">
+              My page
+            </h1>
             <hr />
-            <div className="">
+            <div className="ml-4">
               <div className="field w-full">
                 <InputCom
                   fieldClass="px-4 transfer-field"
                   parentClass="flex items-center gap-1 justify-between"
                   labelClass="flex-[0.2] mb-0"
                   inputClass="flex-[0.8] transfer-field"
-                  label="Fee:"
+                  label="Introduction: "
                   type="text"
                   name="fee"
                   value=""
@@ -26,23 +28,25 @@ const YourPage = () => {
 
               <div className="field w-full mb-6 flex gap-1 justify-between">
                 <label className="text-[#181c32] dark:text-white text-base font-semibold flex flex-[0.2] mt-2.5">
-                  Comment:
+                  Brief Details:
                 </label>
                 <textarea
                   style={{ resize: "none" }}
-                  className="text-base px-4 py-2 rounded-md min-h-[100px] sm:max-w-[550px] max-w-[250px] text-dark-gray dark:text-white w-full bg-slate-100 dark:bg-[#11131F]  focus:ring-0 focus:outline-none flex-[0.8]"
+                  className="text-base px-4 py-2 rounded-md min-h-[100px] text-dark-gray dark:text-white w-full bg-slate-100 dark:bg-[#11131F]  focus:ring-0 focus:outline-none flex-[0.8]"
                   name="comment"
                   cols="30"
                   rows="2"
                 />
               </div>
-              <button
-                type="submit"
-                // disabled={props.isSubmitting}
-                className="text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md"
-              >
-                Continue
-              </button>
+              <div className="w-full flex justify-end mb-2">
+                <button
+                  type="submit"
+                  // disabled={props.isSubmitting}
+                  className="text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-full"
+                >
+                  Continue
+                </button>
+              </div>
             </div>
             <hr />
           </div>
diff --git a/src/services/UsersService.js b/src/services/UsersService.js
index 70a5087..58df97e 100644
--- a/src/services/UsersService.js
+++ b/src/services/UsersService.js
@@ -5,6 +5,16 @@ class usersService {
     console.log("WRB Service Entry");
   }
 
+  MyPageIntro(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      ...reqData
+    };
+    return this.postAuxEnd("/mypageintro", postData);
+  }
+
   CreateUser(reqData) {
     localStorage.setItem("session_token", ``);
     return this.postAuxEnd("/createuser", reqData);