From 6687ebf680c1ec52e202129a8e4efc2a887b7cd4 Mon Sep 17 00:00:00 2001
From: Deepanshu <deepanshubhati2121@gmail.com>
Date: Sat, 6 Jul 2024 00:55:13 +0530
Subject: [PATCH 1/5] change

---
 apps/user-app/app/layout.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/user-app/app/layout.tsx b/apps/user-app/app/layout.tsx
index 5733d9aa..b5516c77 100644
--- a/apps/user-app/app/layout.tsx
+++ b/apps/user-app/app/layout.tsx
@@ -4,6 +4,7 @@ import { Inter } from "next/font/google";
 import { Providers } from "../provider";
 import { AppbarClient } from "../components/AppbarClient";
 
+
 const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {

From 0fa52b6674d932cd184cd0dbef869329220c2634 Mon Sep 17 00:00:00 2001
From: Deepanshu_6002 <deepanshubhati2121@gmail.com>
Date: Mon, 2 Dec 2024 11:20:34 +0530
Subject: [PATCH 2/5] github

---
 .github/workflows/build.yml  | 25 ---------------------
 .github/workflows/deploy.yml | 42 ------------------------------------
 2 files changed, 67 deletions(-)
 delete mode 100644 .github/workflows/deploy.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c8b64f0e..e69de29b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,25 +0,0 @@
-name: Build on PR
-
-on:
-  pull_request:
-    branches:
-      - master
-
-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
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index acbed6e5..00000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Build and Deploy to Docker Hub
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check Out Repo
-      uses: actions/checkout@v2
-
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Build and Push Docker image
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./docker/Dockerfile.user
-        push: true
-        tags: 100xdevs/week-18-class:latest  # Replace with your Docker Hub username and repository
-
-    - name: Verify Pushed Image
-      run: docker pull 100xdevs/week-18-class:latest  # Replace with your Docker Hub username and repository
-
-    - name: Deploy to EC2
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.SSH_HOST }}
-        username: ${{ secrets.SSH_USERNAME }}
-        key: ${{ secrets.SSH_KEY }}
-        script: |
-          sudo docker pull 100xdevs/week-18-class:latest
-          sudo docker stop web-app || true
-          sudo docker rm web-app || true
-          sudo docker run -d --name web-app -p 3005:3000 100xdevs/week-18-class:latest
\ No newline at end of file

From 8c95f45cf1c5e21c632386586d7d8bb49e5358fe Mon Sep 17 00:00:00 2001
From: Deepanshu_6002 <deepanshubhati2121@gmail.com>
Date: Mon, 2 Dec 2024 11:32:33 +0530
Subject: [PATCH 3/5] changes

---
 apps/merchant-app/lib/name.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/merchant-app/lib/name.ts

diff --git a/apps/merchant-app/lib/name.ts b/apps/merchant-app/lib/name.ts
new file mode 100644
index 00000000..e69de29b

From 4e9c33e7173816f84f7d780575e9bea0e4370e72 Mon Sep 17 00:00:00 2001
From: Deepanshu_6002 <deepanshubhati2121@gmail.com>
Date: Mon, 2 Dec 2024 11:49:55 +0530
Subject: [PATCH 4/5] change

---
 apps/merchant-app/lib/name.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 apps/merchant-app/lib/name.ts

diff --git a/apps/merchant-app/lib/name.ts b/apps/merchant-app/lib/name.ts
deleted file mode 100644
index e69de29b..00000000

From c28fbb822b4e730a9aceb471184cd20d47876eae Mon Sep 17 00:00:00 2001
From: Deepanshu_6002 <deepanshubhati2121@gmail.com>
Date: Mon, 2 Dec 2024 11:51:18 +0530
Subject: [PATCH 5/5] change

---
 apps/merchant-app/lib/race.ts | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 apps/merchant-app/lib/race.ts

diff --git a/apps/merchant-app/lib/race.ts b/apps/merchant-app/lib/race.ts
new file mode 100644
index 00000000..e69de29b