Refactor: requested changes from vyshnav

- moved constants to constant/index - shifted layout wrappers to provider - used constants
TEDx-SJEC · Sep 26, 2024 · 8ba8eb0 · 8ba8eb0
1 parent 88fcdbc
commit 8ba8eb0
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 27 deletions.
diff --git a/src/app/actions/get-price.ts b/src/app/actions/get-price.ts
@@ -1,6 +1,7 @@
 "use server";
 
 import prisma from "@/server/db";
+import { basePrice, initialdiscount } from "@/constants";
 
 class CouponError extends Error {
   constructor(message: string) {
@@ -16,8 +17,7 @@ export const getPrice = async (
   discountAmount: number;
   finalPrice: number;
 }> => {
-  const basePrice = 1000;
-  let discountAmount = 0;
+  let discountAmount = initialdiscount;
   let finalPrice = basePrice;
   if (couponCode) {
     const coupon = await prisma.referral.findUnique({

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -1,13 +1,8 @@
 import Providers from "@/components/Layout/Provider";
-import { NextSSRPlugin } from "@uploadthing/react/next-ssr-plugin";
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
-import { Toaster } from "sonner";
-import { extractRouterConfig } from "uploadthing/server";
 import "./globals.css";
 
-import { ourFileRouter } from "@/app/api/uploadthing/core";
-
 const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
@@ -23,21 +18,7 @@ export default function RootLayout({
   return (
     <html lang="en" className="dark">
       <body className={inter.className}>
-        <NextSSRPlugin routerConfig={extractRouterConfig(ourFileRouter)} />
-        <Providers>
-          {children}{" "}
-          <Toaster
-            position="top-center"
-            toastOptions={{
-              classNames: {
-                error: "text-red-400 border-red-400",
-                success: "text-green-400 border-green-400",
-                warning: "text-yellow-400 border-yellow-400",
-                info: "text-blue-400 border-blue-400",
-              },
-            }}
-          />
-        </Providers>
+        <Providers>{children} </Providers>
       </body>
     </html>
   );

diff --git a/src/components/Layout/Provider.tsx b/src/components/Layout/Provider.tsx
@@ -1,14 +1,31 @@
-"use client";
+"use client";;
+import { ourFileRouter } from "@/app/api/uploadthing/core";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { NextSSRPlugin } from "@uploadthing/react/next-ssr-plugin";
 import { SessionProvider } from "next-auth/react";
 import { ReactNode } from "react";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { Toaster } from "sonner";
+import { extractRouterConfig } from "uploadthing/server";
+
 export default function Providers({ children }: { children: ReactNode }) {
   const queryClient = new QueryClient();
   return (
     <>
       <SessionProvider>
         <QueryClientProvider client={queryClient}>
+          <NextSSRPlugin routerConfig={extractRouterConfig(ourFileRouter)} />
           {children}
+          <Toaster
+            position="top-center"
+            toastOptions={{
+              classNames: {
+                error: "text-red-400 border-red-400",
+                success: "text-green-400 border-green-400",
+                warning: "text-yellow-400 border-yellow-400",
+                info: "text-blue-400 border-blue-400",
+              },
+            }}
+          />
         </QueryClientProvider>
       </SessionProvider>
     </>

diff --git a/src/components/payment.tsx b/src/components/payment.tsx
@@ -6,13 +6,14 @@ import { useState } from "react";
 import { Input } from "./ui/input";
 import { toast } from "sonner";
 import getErrorMessage from "@/utils/getErrorMessage";
+import { basePrice, initialdiscount } from "@/constants";
 
 export function Payment() {
   const [coupon, setCoupon] = useState("");
   const [pricing, setPricing] = useState({
-    basePrice: 1200,
-    discountAmount: 0,
-    finalPrice: 1200,
+    basePrice: basePrice,
+    discountAmount: initialdiscount,
+    finalPrice: basePrice,
   });
   const verifyCoupon = async () => {
     try {

diff --git a/src/constants/index.ts b/src/constants/index.ts
@@ -0,0 +1,2 @@
+export const basePrice = 1000;
+export const initialdiscount = 0;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export const basePrice = 1000;
		export const initialdiscount = 0;