diff --git a/src/app/_util/otp.ts b/src/app/_util/otp.ts index 288ed93..0e1fc67 100644 --- a/src/app/_util/otp.ts +++ b/src/app/_util/otp.ts @@ -14,13 +14,8 @@ interface SendOtpPayload { } function getStoredMobileNumber(): string { -<<<<<<< HEAD // const mobileNumber = localStorage.getItem('remitter_mobile_no'); const mobileNumber = "7890544527"; -======= - const mobileNumber = localStorage.getItem('remitter_mobile_no'); - // const mobileNumber = "6297421727"; ->>>>>>> 9850e742fc9e2db185e3a73807bc3c84570153e7 if (!mobileNumber) throw new Error('Mobile number not found.'); return mobileNumber; } diff --git a/src/app/administrator/home/page.tsx b/src/app/administrator/home/page.tsx index 82231f1..fcab96f 100644 --- a/src/app/administrator/home/page.tsx +++ b/src/app/administrator/home/page.tsx @@ -22,6 +22,7 @@ import { IconUsers, IconChevronDown, IconChevronUp, + IconReportSearch, IconSettings, } from "@tabler/icons-react"; import UserConfiguration from "./UserConfiguration"; @@ -36,6 +37,7 @@ export default function Login() { const [lastLoginDetails, setLastLoginDetails] = useState(null); const [userMenuOpen, setUserMenuOpen] = useState(true); const [configMenuOpen, setConfigMenuOpen] = useState(false); + const [reportOpen, setReportMenuOpen] = useState(false); async function handleLogout(e: React.FormEvent) { e.preventDefault(); @@ -226,6 +228,74 @@ export default function Login() { + {/* Reports */} + setReportMenuOpen(!reportOpen)} + style={{ + display: "flex", + alignItems: "center", + justifyContent: "space-between", + width: "100%", + padding: "5px 6px", + borderRadius: "4px", + marginTop: "8px", + backgroundColor: "rgba(255,255,255,0.1)", + color: "white", + fontSize: "13px", + }} + > + + + + Reports + + + {reportOpen ? : } + + + + setView("activeUsersReport")} + style={{ + cursor: "pointer", + color: view === "activeUsersReport" ? "#02a355" : "white", + backgroundColor: view === "activeUsersReport" ? "white" : "transparent", + borderRadius: "3px", + padding: "3px 6px", + transition: "0.2s", + }} + > + • Active Users Report + + setView("noOfTrans")} + style={{ + cursor: "pointer", + color: view === "noOfTrans" ? "#02a355" : "white", + backgroundColor: view === "noOfTrans" ? "white" : "transparent", + borderRadius: "3px", + padding: "3px 6px", + transition: "0.2s", + }} + > + • Transactions Report + + {/* setView("unlockUser")} + style={{ + cursor: "pointer", + color: view === "unlockUser" ? "#02a355" : "white", + backgroundColor: view === "unlockUser" ? "white" : "transparent", + borderRadius: "3px", + padding: "3px 6px", + transition: "0.2s", + }} + > + • User Unlock + */} + + + {/* Configuration */} setConfigMenuOpen(!configMenuOpen)} @@ -303,6 +373,16 @@ export default function Login() { {view === "userConf" && } {view === "viewUser" && } {view === "unlockUser" && } + {view === "noOfTrans" && ( + + Reports will be Coming Soon + + )} + {view === "activeUsersReport" && ( + + Active users Reports will be Coming Soon + + )} {view === "ifscConfig" && ( IFSC Configuration Page Coming Soon diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index c6f5449..54cf6ab 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -45,13 +45,8 @@ export default function Login() { } try { -<<<<<<< HEAD // await sendOtp({ type: 'LOGIN_OTP', username: CIF, mobileNumber: mobile }); await sendOtp({ type: 'LOGIN_OTP', username: CIF, mobileNumber: "7890544527" }); -======= - await sendOtp({ type: 'LOGIN_OTP', username: CIF, mobileNumber: mobile }); - // await sendOtp({ type: 'LOGIN_OTP', username: CIF, mobileNumber: "6297421727" }); ->>>>>>> 9850e742fc9e2db185e3a73807bc3c84570153e7 notifications.show({ color: 'orange', title: 'OTP Required', @@ -72,13 +67,8 @@ export default function Login() { async function handleVerifyOtp(mobile?: string) { try { if (mobile) { -<<<<<<< HEAD // await verifyLoginOtp(otp, mobile); await verifyLoginOtp(otp, '7890544527'); -======= - await verifyLoginOtp(otp, mobile); - // await verifyLoginOtp(otp, '6297421727'); ->>>>>>> 9850e742fc9e2db185e3a73807bc3c84570153e7 return true; } }