added data

.env

@@ -7,7 +7,7 @@ INSTAGRAM_URL=https://www.instagram.com
 
 # BACKEND END POINTS
 REACT_APP_MAIN_API="https://devapi.mermsemr.com"
-# REACT_APP_MAIN_API="http://localhost:14700"
+#REACT_APP_MAIN_API="http://localhost:14700"
 
 # ENQUIRIES CONTACTS
 VITE_CALL_ENDPOINT='09099000000'
@@ -20,4 +20,6 @@ VITE_BANK_NAME_SHORT='FCMB'
 # Inactivity timeout/logout AT 10MINS
 REACT_APP_TIMEOUT=600000
 
+#CLOUDFLARE
+REACT_APP_TURNSTILE_SITE_KEY=0x4AAAAAADQV82wuocFR-u5O
 

.env.development

@@ -18,4 +18,7 @@ VITE_BANK_NAME='First City Monument Bank'
 VITE_BANK_NAME_SHORT='FCMB'
 
 # Inactivity timeout/logout AT 10MINS
-REACT_APP_TIMEOUT=600000
+REACT_APP_TIMEOUT=600000
+
+#CLOUDFLARE
+REACT_APP_TURNSTILE_SITE_KEY=0x4AAAAAADQV82wuocFR-u5O

.env.production

@@ -7,7 +7,7 @@ INSTAGRAM_URL=https://www.instagram.com
 
 # BACKEND END POINTS
 REACT_APP_MAIN_API="https://api.mermsemr.com"
-#REACT_APP_MAIN_API="http://localhost:14700"
+# REACT_APP_MAIN_API="http://localhost:14700"
 
 # ENQUIRIES CONTACTS
 VITE_CALL_ENDPOINT='09099000000'
@@ -18,4 +18,7 @@ VITE_BANK_NAME='First City Monument Bank'
 VITE_BANK_NAME_SHORT='FCMB'
 
 # Inactivity timeout/logout AT 10MINS
-REACT_APP_TIMEOUT=600000
+REACT_APP_TIMEOUT=600000
+
+#CLOUDFLARE
+REACT_APP_TURNSTILE_SITE_KEY=0x4AAAAAADQV82wuocFR-u5O

package.json

@@ -5,6 +5,7 @@
   "dependencies": {
     "@reduxjs/toolkit": "^2.5.1",
     "@tanstack/react-query": "^5.66.0",
+    "@marsidev/react-turnstile": "^1.5.2",
     "apexcharts": "^4.5.0",
     "axios": "^1.7.9",
     "cra-template": "1.2.0",

src/RouteLinks.js

@@ -9,6 +9,7 @@ const RouteLinks = {
     billings: '/billings',
     files_uploads: '/files-uploads',
     recentSignup: '/recent-signup',
+    recentAccount: '/recent-account',
     loansPage: '/loans',
     transactionsPage: '/transactions',
     countrySettings: '/country',

src/SiteRoutes.jsx

@@ -25,6 +25,7 @@ import CountrySettingsPage from "./pages/CountrySettingsPage";
 import ProductViewPage from "./pages/ProductViewPage";
 import FilesUploadPage from "./pages/FilesUploadPage"; // TRANSACTION DETAILS PAGE
 import AccountEditpage from "./pages/AccountEditPage";
+import RecentAccountsPage from "./pages/RecentAccountsPage";
 
 // const Home = lazy(() => import('./pages/Home'));
 
@@ -35,6 +36,8 @@ export default function SiteRoutes() {
 
             <Route element={<UserExist/>}>
                 <Route path={RouteLinks.homePage} element={<HomePage/>}/> {`*/HOME PAGE*/`}
+                
+                <Route path={RouteLinks.recentAccount} element={<RecentAccountsPage/>}/> {`*/RECENT SIGNUP PAGE*/`}
                 <Route path={RouteLinks.recentSignup} element={<RecentSignupPage/>}/> {`*/RECENT SIGNUP PAGE*/`}
                 <Route path={RouteLinks.subscriptions} element={<SubscriptionsPage/>}/> {`*/SUBSCRIPTIONS PAGE*/`}
                 <Route path={RouteLinks.customerPage} element={<CustomerPage/>}/> {`*/CUSTOMER PAGE*/`}

src/components/account_edit/AccountBannerCom.jsx

@@ -30,9 +30,6 @@ export default function AccountBannerCom({accountInfo}) {
                                 <th scope="col" className="px-2">
                                     Country
                                 </th>
-                                <th scope="col" className="px-2 text-right">
-                                    Action
-                                </th>
                             </tr>
                             </thead>
                             <tbody>

src/components/account_edit/UpdateProfile.jsx

@@ -44,7 +44,6 @@ export default function UpdateProfile({accountInfo}) {
             console.log(error)
         },
         onSuccess: (res) => {
-            console.log('res', res)
             // if(res?.data?.resultCode != '0') {
             //     throw new Error(res?.data?.message || res?.data?.resultDescription || 'An error occurred while updating profile')
             // }

src/components/auth/LoginCom.jsx

@@ -4,6 +4,7 @@ import {useNavigate} from 'react-router-dom'
 import {useMutation} from '@tanstack/react-query'
 import {Formik, Form} from 'formik'
 import * as Yup from "yup";
+import {Turnstile} from '@marsidev/react-turnstile'
 
 import InputText from '../InputText'
 import {updateUserDetails} from "../../store/UserDetails";
@@ -30,6 +31,7 @@ export default function LoginCom() {
     const navigate = useNavigate()
 
     const [loading, setLoading] = useState(false)
+    const [turnstileToken, setTurnstileToken] = useState(null)
 
     const login = useMutation({
         mutationFn: (fields) => {
@@ -53,9 +55,9 @@ export default function LoginCom() {
     })
 
     //FUNCTION TO HANDLE LOGIN
-    const handleSubmit = (values, helper) => {
-        login.mutate(values)
-        // handleLogin()
+    const handleSubmit = (values) => {
+        if (!turnstileToken) return
+        login.mutate({...values, cf_turnstile_response: turnstileToken})
     };
 
     return (
@@ -107,9 +109,17 @@ export default function LoginCom() {
                                                 />
                                                 {/* <p className='text-sm text-end font-medium text-primary'>Forget password ?</p> */}
                                             </div>
+                                            <div className="text-center col-12 mt-3">
+                                                    <Turnstile
+                                                        siteKey={process.env.REACT_APP_TURNSTILE_SITE_KEY}
+                                                        onSuccess={setTurnstileToken}
+                                                        onExpire={() => setTurnstileToken(null)}
+                                                        onError={() => setTurnstileToken(null)}
+                                                    />
+                                                </div>
                                             <div className='h-10 mb-10'>
-                                                <button type='submit' disabled={login.isPending}
-                                                        className='w-full h-full bg-primary text-white font-bold rounded-md'>{login.isPending || loading ? 'loading...' : 'Login'}</button>
+                                                <button type='submit' disabled={login.isPending || !turnstileToken}
+                                                        className='w-full h-full bg-primary text-white font-bold rounded-md disabled:opacity-50 disabled:cursor-not-allowed'>{login.isPending || loading ? 'loading...' : 'Login'}</button>
                                             </div>
 
                                             {login.error &&

src/components/layouts/aside/DashboardAside.jsx

@@ -151,8 +151,9 @@ export default function DashboardAside() {
 const asideNavLinks = [
     {name: 'Dashboard', status: 1, icon: 'dashboard', to: RouteLinks.homePage},
     {
-        name: 'Deployments', title: 'Activities', status: 1, icon: 'arrow-right', subLinks: [
+        name: 'Front Office', title: 'Activities', status: 1, icon: 'arrow-right', subLinks: [
             {name: 'Recent Signup', status: 1, icon: 'dot', to: RouteLinks.recentSignup},
+            {name: 'Recent Accounts(30)', status: 1, icon: 'dot', to: RouteLinks.recentAccount},
             {name: 'Provisions', status: 1, icon: 'dot', to: RouteLinks.subscriptions},
             {name: 'Customers', status: 1, icon: 'dot', to: RouteLinks.customerPage},
             {name: 'Billings', status: 1, icon: 'dot', to: RouteLinks.billings},

src/components/layouts/rightaside/RecentPaymentsBar.jsx

@@ -86,6 +86,7 @@ export default function RecentPaymentsBar({
                 <Link
                   to={item.url}
                   key={index}
+                  target="_blank" 
                   className="flex gap-3 items-center"
                 >
                   <div className="px-4 py-2 bg-[#0E172E] rounded-md">

src/components/recent_accounts/RecentAccounts.jsx

@@ -0,0 +1,203 @@
+import { useState } from "react";
+import { useQuery } from "@tanstack/react-query";
+import queryKeys from "../../services/queryKeys";
+
+import BreadcrumbCom from "../breadcrumb/BreadcrumbCom";
+import TablePaginatedWrapper from "../tableWrapper/TablePaginatedWrapper";
+import Icons from "../Icons";
+import { getRecentAccount } from "../../services/siteServices";
+import getDateTimeFromDateString from "../../helpers/getDateTimeFromDateString";
+import {Link} from 'react-router-dom';
+
+
+export default function RecentAccounts() {
+  const [page, setPage] = useState(1);
+  const [filter, setFilter] = useState({ type: "", id: "" });
+  const [willFilter, setWillFilter] = useState(false);
+
+  const handleFilter = ({ target: { name, value } }) => {
+    setFilter((prev) => ({ ...prev, [name]: value }));
+  };
+
+  const handleFilterByParams = () => {
+    if (filter.type && !filter.id) {
+      return;
+    } else if (!filter.type) {
+      setPage(1);
+      setWillFilter((prev) => !prev);
+      setFilter({ type: "", id: "" });
+    } else {
+      setPage(1);
+      setWillFilter((prev) => !prev);
+    }
+  };
+
+  const { data, isFetching, isError, error } = useQuery({
+    queryKey: [...queryKeys.recent_account, page, willFilter],
+    queryFn: () => {
+      const filterData = filter?.type ? { [filter?.type]: filter.id } : {};
+      const reqData = {
+        page,
+        ...filterData,
+      };
+      return getRecentAccount(reqData);
+    },
+    staleTime: 0, //0 mins
+  });
+  const recentSignupData = data?.data?.members; // BILLINGS LIST
+  const pagination = data?.data?.pagination;
+  // console.log('DATA', data?.data)
+
+  return (
+    <div className="w-full flex flex-col gap-8">
+      <BreadcrumbCom
+        title="Recent Accounts"
+        paths={["Dashboard", "Recent Acc"]}
+      />
+
+      <div className="box bg-white dark:bg-black-box text-black-body dark:text-white-body">
+        {isError ? (
+          <p className="text-red-500">{error?.message}</p>
+        ) : (
+          <>
+            {/* filter section */}
+            <div className="px-2 py-2 mb-4 flex flex-col sm:flex-row flex-wrap sm:items-center gap-2">
+              <Icons name="filter" className="text-3xl" />
+              <div className="w-full sm:max-w-48">
+                <select
+                  name="type"
+                  value={filter?.type}
+                  className="h-10 w-full p-2 rounded-md"
+                  onChange={handleFilter}
+                >
+                  <option value="">All</option>
+                  <option value="username">Username</option>
+                </select>
+              </div>
+              <div className="w-full sm:max-w-48">
+                <input
+                  name="id"
+                  value={filter?.id}
+                  disabled={!filter.type}
+                  className={`h-10 w-full p-2 rounded-md outline-none border border-black-aside ${!filter.type && "opacity-30"}`}
+                  onChange={handleFilter}
+                />
+              </div>
+              <button
+                onClick={handleFilterByParams}
+                disabled={filter.type && !filter.id}
+                className={`h-10 bg-primary px-2 py-1 rounded-md text-white font-medium sm:self-end ${filter.type && !filter.id && "opacity-50"}`}
+              >
+                Submit
+              </button>
+            </div>
+            {/* end of filter section */}
+
+            <TablePaginatedWrapper
+              data={recentSignupData}
+              isFetching={isFetching}
+              setPage={setPage}
+              itemsPerPage={pagination?.limit}
+              pagination={pagination}
+            >
+              {({ data }) => (
+                <>
+                  <table className="py-2 w-full text-sm">
+                    <thead className="py-2 text-sm text-slate-500 text-left">
+                      <tr>
+                        <th scope="col" className="px-2 py-2">
+                          Added
+                        </th>
+                        <th scope="col" className="px-2">
+                          User Name /Email
+                        </th>
+                        <th scope="col" className="px-2 text-right">
+                          Name
+                        </th>
+                        <th scope="col" className="px-2 text-right">
+                          Country
+                        </th>
+                        <th scope="col" className="px-2 text-right">
+                          Action
+                        </th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {data && data.length > 0 ? (
+                        data?.map((item, index) => (
+                          <tr
+                            key={index}
+                            className="py-2 border-t border-dashed border-slate-300"
+                          >
+                            <td className="px-2 py-2">
+                              <div className="w-full min-w-48 flex items-center gap-2 whitespace-nowrap">
+                                <div className="text-left">
+                                  <div className="text-base font-semibold">
+                                    {getDateTimeFromDateString(item?.added)}
+                                  </div>
+                                </div>
+                              </div>
+                            </td>
+                            <td className="px-2">
+                              <div className="text-left">
+                                <div className="text-base font-semibold">
+                                  {item?.username}
+                                </div>
+                                <div className="text-base font-semibold">
+                                  {item?.email}
+                                </div>
+                              </div>
+                            </td>
+                            <td className="px-2">
+                              <div className="text-right">
+                                <div className="text-base font-semibold">
+                                  {item?.firstname} {item?.lastname}
+                                </div>
+                                {/* <div className="font-normal text-gray-500">{item?.external_url}</div> */}
+                              </div>
+                            </td>
+                            <td className="px-2">
+                              <div className="text-right">
+                                <div className="text-base font-semibold">
+                                  {item?.country}
+                                </div>
+                              </div>
+                            </td>
+
+                            <td className="px-2 text-right">
+                              <div className="flex items-center justify-end gap-3 md:gap-4">
+                                <div className="p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md">
+                                  <Link
+                                    to={`/account-view/${item?.member_uid}`}
+                                    state={{
+                                      customerID: item?.id,
+                                      memberUID: item?.member_uid,
+                                    }}
+                                  >
+                                    <Icons name="eye" />
+                                  </Link>
+                                </div>
+                              </div>
+                            </td>
+                          </tr>
+                        ))
+                      ) : (
+                        <tr className="py-2 border-t border-dashed border-slate-300">
+                          <td className="px-3 py-2" colSpan={4}>
+                            <div className="flex justify-center items-center">
+                              No Record Found
+                            </div>
+                          </td>
+                        </tr>
+                      )}
+                    </tbody>
+                  </table>
+                </>
+              )}
+            </TablePaginatedWrapper>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}

src/components/recent_signup/RecentSignup.jsx

@@ -51,7 +51,7 @@ export default function RecentSignup() {
   return (
     <div className="w-full flex flex-col gap-8">
       <BreadcrumbCom
-        title="Recent Signup"
+        title="Signup Started Report"
         paths={["Dashboard", "Recent Acc"]}
       />
 
@@ -106,20 +106,20 @@ export default function RecentSignup() {
                     <thead className="py-2 text-sm text-slate-500 text-left">
                       <tr>
                         <th scope="col" className="px-2 py-2">
-                          Added
+                          Signup Stareted Added
                         </th>
                         <th scope="col" className="px-2">
-                          User Name /Email
+                          Email
                         </th>
                         <th scope="col" className="px-2 text-right">
                           Name
                         </th>
                         <th scope="col" className="px-2 text-right">
-                          Country
+                          Status
                         </th>
-                        <th scope="col" className="px-2 text-right">
+                        {/* <th scope="col" className="px-2 text-right">
                           Action
-                        </th>
+                        </th> */}
                       </tr>
                     </thead>
                     <tbody>
@@ -140,9 +140,9 @@ export default function RecentSignup() {
                             </td>
                             <td className="px-2">
                               <div className="text-left">
-                                <div className="text-base font-semibold">
+                                {/* <div className="text-base font-semibold">
                                   {item?.username}
-                                </div>
+                                </div> */}
                                 <div className="text-base font-semibold">
                                   {item?.email}
                                 </div>
@@ -159,12 +159,12 @@ export default function RecentSignup() {
                             <td className="px-2">
                               <div className="text-right">
                                 <div className="text-base font-semibold">
-                                  {item?.country}
+                                  {item?.status}
                                 </div>
                               </div>
                             </td>
 
-                            <td className="px-2 text-right">
+                            {/* <td className="px-2 text-right">
                               <div className="flex items-center justify-end gap-3 md:gap-4">
                                 <div className="p-2 flex justify-center items-center text-slate-500 bg-white-body dark:text-white-body dark:bg-black-body rounded-md">
                                   <Link
@@ -178,7 +178,7 @@ export default function RecentSignup() {
                                   </Link>
                                 </div>
                               </div>
-                            </td>
+                            </td> */}
                           </tr>
                         ))
                       ) : (

src/pages/RecentAccountsPage.jsx

@@ -0,0 +1,8 @@
+import React from 'react'
+import RecentAccounts from "../components/recent_accounts/RecentAccounts";
+
+export default function RecentAccountsPage() {
+    return (
+        <RecentAccounts />
+    )
+}

src/services/queryKeys.js

@@ -16,6 +16,7 @@ const queryKeys = {
     billings: ['billings'],
     right_sidebar: ['right_sidebar'],
     recent_signup: ['recent_signup'],
+    recent_account: ['recent_account'],
     products: ['products'],
     products_template: ['products_template'],
     custom_template: ['custom_template'],

src/services/siteServices.js

@@ -112,6 +112,11 @@ export const getRecentSignup = (reqData) => {
     return getAuxEnd(`/recent-signup`, postData)
 }
 
+export const getRecentAccount = (reqData) => {
+    const postData = { ...reqData }
+    return getAuxEnd(`/recent-account`, postData)
+}
+
 // FUNCTION TO GET PRODUCTS DATA
 export const getProducts = (reqData) => {
     const postData = { ...reqData }
@@ -129,7 +134,7 @@ export const updateUserProfile = (reqData) => {
     let postData = {
         ...reqData
     }
-    return postAuxEnd('/update-profile', postData, false)
+    return postAuxEnd('/office/update-profile', postData, false)
 }
 
 // FUNCTION TO GET PRODUCTS TEMPLATE DATA