diff --git a/apps/client/actions/Event/getEventDetails.ts b/apps/client/actions/Event/getEventDetails.ts index 462e6c86..80acaa65 100644 --- a/apps/client/actions/Event/getEventDetails.ts +++ b/apps/client/actions/Event/getEventDetails.ts @@ -6,17 +6,7 @@ export async function getEventDetails(eventId: string) { const event = await prisma.event.findUnique({ where: { id: eventId, - }, - include: { - orderBook: { - include: { - yes: true, - no: true, - - }, - }, - }, - }); + }}); if (!event) { throw new Error("Event not found"); diff --git a/apps/client/actions/OTP/sendOtp.ts b/apps/client/actions/OTP/sendOtp.ts index 877dfcfa..8e34e228 100644 --- a/apps/client/actions/OTP/sendOtp.ts +++ b/apps/client/actions/OTP/sendOtp.ts @@ -10,13 +10,12 @@ const twilioClient = twilio( export const sendSMSOTP = async (phoneNumber: string) => { if(phoneNumber.length <= 10)return { success: false, message: "Failed to update OTP" }; try { - const OTP = Math.floor(1000 + Math.random() * 9000).toString(); + const OTP = Math.floor(100000 + Math.random() * 9000).toString(); // Check if OTP already exists const isOtpDataExists = await prisma.oTP.findUnique({ where: { otpID: phoneNumber }, }); - console.log("isOtpDataExists", isOtpDataExists); if (isOtpDataExists) { // Update existing OTP @@ -27,13 +26,11 @@ export const sendSMSOTP = async (phoneNumber: string) => { expiresAt: new Date(Date.now() + 10 * 60 * 1000) }, }); - console.log("updateOtp", updateOtp); if (!updateOtp) { return { success: false, message: "Failed to update OTP" }; } else { const res = await sendTwillioMsg(OTP, phoneNumber) - console.log("res in update", res) return res; } } else { @@ -45,13 +42,11 @@ export const sendSMSOTP = async (phoneNumber: string) => { expiresAt: new Date(Date.now() + 10 * 60 * 1000), }, }); - console.log("newOTP", newOTP); if (!newOTP) { return { success: false, message: "Failed to create OTP" }; } const res = await sendTwillioMsg(OTP, phoneNumber) - console.log("res in new otp", res) return res; } } catch (error) { @@ -68,7 +63,7 @@ async function sendTwillioMsg(OTP: string, phoneNumber: string) { from: process.env.TWILIO_NUMBER, to: phoneNumber, }); - console.log(message); + console.log(message); // just to get rid of linting error return { success: true, message: "send OTP" }; } catch (error) { diff --git a/apps/client/actions/OTP/validateOtp.ts b/apps/client/actions/OTP/validateOtp.ts index 7448e2f4..ba348cff 100644 --- a/apps/client/actions/OTP/validateOtp.ts +++ b/apps/client/actions/OTP/validateOtp.ts @@ -9,7 +9,7 @@ export const verifySMSOTPAction = async (otp: string, phoneNumber: string) => { otp, }, }); - console.log(otpData); + // console.log("otpData", otpData); if(otpData?.isVerified){ return { verified: true, message: "User Already Exists" }; } diff --git a/apps/client/app/(lobby)/auth/signin/page.tsx b/apps/client/app/(lobby)/auth/signin/page.tsx index 08df5ff9..f2df4774 100644 --- a/apps/client/app/(lobby)/auth/signin/page.tsx +++ b/apps/client/app/(lobby)/auth/signin/page.tsx @@ -1,6 +1,6 @@ "use client" +import { Login } from '@/components/landing/Auth/Singin'; import React from 'react'; -import { Login } from '../../../../components/landing/Auth/Singin'; const Page = () => { return ( diff --git a/apps/client/app/(lobby)/wallet/page.tsx b/apps/client/app/(lobby)/wallet/page.tsx index 496f84d9..4a0b68de 100644 --- a/apps/client/app/(lobby)/wallet/page.tsx +++ b/apps/client/app/(lobby)/wallet/page.tsx @@ -15,6 +15,7 @@ const Page = () => { {}} @@ -22,6 +23,7 @@ const Page = () => { {}} diff --git a/apps/client/app/globals.css b/apps/client/app/globals.css index 16c47d13..4c160b72 100644 --- a/apps/client/app/globals.css +++ b/apps/client/app/globals.css @@ -130,4 +130,13 @@ body{ } html { @apply bg-gray-100; +} + +.no-scrollbar::-webkit-scrollbar { + display: none; +} + +.no-scrollbar { + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ } \ No newline at end of file diff --git a/apps/client/app/layout.tsx b/apps/client/app/layout.tsx index eae0dc2e..603f93de 100644 --- a/apps/client/app/layout.tsx +++ b/apps/client/app/layout.tsx @@ -1,9 +1,9 @@ import type { Metadata } from "next"; import localFont from "next/font/local"; import "./globals.css"; -import { SessionProviders } from "@/providers/session-provider"; import Navbar from "@/components/landing/Appbar/Navbar"; import { Toaster } from "react-hot-toast"; +import { Providers } from "@/providers/_provider"; const geistSans = localFont({ src: "./fonts/GeistVF.woff", @@ -31,10 +31,10 @@ export default function RootLayout({ - - + + {children} - + diff --git a/apps/client/app/page.tsx b/apps/client/app/page.tsx index 9d4b2aa9..a09a3e4b 100644 --- a/apps/client/app/page.tsx +++ b/apps/client/app/page.tsx @@ -1,35 +1,12 @@ -import { HeroComp } from "@/components/landing/Home/HeroComp"; -import ToggleSections from "@/components/landing/Home/ToogleSections"; -import { TradeComp } from "@/components/landing/Home/TradeComp"; -import { DownloadBanner } from "@/components/landing/Home/DownloadBanner"; -import TradingNewsComponent from "@/components/landing/Home/TradingNewsComponent"; -import FeatureComponent from "@/components/landing/Home/Features"; -import ProboCare from "@/components/landing/Home/ProboCare"; +"use client" +import HomeWrapper from "@/components/landing/Home/HomeWrapper"; +// import TradePage from "@/components/landing/EventTrade/Trade"; export default function Page() { return ( -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
+
+ + {/* */}
); } diff --git a/apps/client/components/landing/Appbar/Navbar.tsx b/apps/client/components/landing/Appbar/Navbar.tsx index 37cb4088..a42cf9fb 100644 --- a/apps/client/components/landing/Appbar/Navbar.tsx +++ b/apps/client/components/landing/Appbar/Navbar.tsx @@ -31,12 +31,12 @@ export const Navbar = () => { ); return ( -