Newbranch

.github/workflows/build.yml

@@ -0,0 +1,28 @@
+name: Build on PR
+
+on:
+  pull_request:
+    branches:
+      - master
+      - migration
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: generate prisma client
+        run: npm run db:generate
+
+      - name: Run Build
+        run: npm run build  

apps/merchant-app/app/api/auth/[...nextauth]/route.ts

@@ -1,6 +1,6 @@
-import NextAuth from "next-auth"
-import { authOptions } from "../../../../lib/auth"
+// import NextAuth from "next-auth"
+// import { authOptions } from "../../../../lib/auth"
 
-const handler = NextAuth(authOptions)
+// const handler = NextAuth(authOptions)
 
-export { handler as GET, handler as POST }
+// export { handler as GET, handler as POST }

apps/merchant-app/app/api/user/route.ts

@@ -1,15 +1,9 @@
 import { NextResponse } from "next/server"
-import { PrismaClient } from "@repo/db/client";
 
-const client = new PrismaClient();
+
 
 export const GET = async () => {
-    await client.user.create({
-        data: {
-            email: "asd",
-            name: "adsads"
-        }
-    })
+
     return NextResponse.json({
         message: "hi there"
     })

apps/merchant-app/app/page.tsx

@@ -1,10 +1,8 @@
 "use client";
 
-import { useBalance } from "@repo/store/balance";
-
 export default function() {
-  const balance = useBalance();
+
   return <div>
-    hi there {balance}
+    hi there
   </div>
 }

apps/merchant-app/lib/auth.ts

@@ -1,48 +0,0 @@
-import GoogleProvider from "next-auth/providers/google";
-import db from "@repo/db/client";
-
-export const authOptions = {
-    providers: [
-        GoogleProvider({
-            clientId: process.env.GOOGLE_CLIENT_ID || "",
-            clientSecret: process.env.GOOGLE_CLIENT_SECRET || ""
-        })
-    ],
-    callbacks: {
-      async signIn({ user, account }: {
-        user: {
-          email: string;
-          name: string
-        },
-        account: {
-          provider: "google" | "github"
-        }
-      }) {
-        console.log("hi signin")
-        if (!user || !user.email) {
-          return false;
-        }
-
-        await db.merchant.upsert({
-          select: {
-            id: true
-          },
-          where: {
-            email: user.email
-          },
-          create: {
-            email: user.email,
-            name: user.name,
-            auth_type: account.provider === "google" ? "Google" : "Github" // Use a prisma type here
-          },
-          update: {
-            name: user.name,
-            auth_type: account.provider === "google" ? "Google" : "Github" // Use a prisma type here
-          }
-        });
-
-        return true;
-      }
-    },
-    secret: process.env.NEXTAUTH_SECRET || "secret"
-  }

apps/user-app/app/(dashboard)/transfer/page.tsx

@@ -25,7 +25,7 @@ async function getOnRampTransactions() {
             userId: Number(session?.user?.id)
         }
     });
-    return txns.map(t => ({
+    return txns.map((t: any) => ({
         time: t.startTime,
         amount: t.amount,
         status: t.status,

apps/user-app/app/page.tsx

@@ -3,10 +3,10 @@ import { redirect } from 'next/navigation'
 import { authOptions } from "./lib/auth";
 
 export default async function Page() {
-  const session = await getServerSession(authOptions);
-  if (session?.user) {
-    redirect('/dashboard')
-  } else {
-    redirect('/api/auth/signin')
-  }
+    const session = await getServerSession(authOptions);
+    if (session?.user) {
+        redirect('/dashboard')
+    } else {
+        redirect('/api/auth/signin')
+    }
 }

package.json

@@ -5,7 +5,8 @@
     "build": "turbo build",
     "dev": "turbo dev",
     "lint": "turbo lint",
-    "format": "prettier --write \"**/*.{ts,tsx,md}\""
+    "format": "prettier --write \"**/*.{ts,tsx,md}\"",
+    "db:generate": "cd packages/db && npx prisma migrate && cd ../../"
   },
   "devDependencies": {
     "@repo/eslint-config": "*",