From f92867d743572171c05e16b71bdc04daf090b600 Mon Sep 17 00:00:00 2001 From: Prem Pardeshi Date: Wed, 24 Jul 2024 20:50:41 +0530 Subject: [PATCH 1/4] DELETE WORKFLOWS --- .github/workflows/build.yml | 25 --------------------- .github/workflows/deploy.yml | 42 ------------------------------------ 2 files changed, 67 deletions(-) delete mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index c8b64f0e..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -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 57e9cc9a9e1baba6d332f5d80398a2eab201a846 Mon Sep 17 00:00:00 2001 From: Prem Pardeshi Date: Wed, 24 Jul 2024 21:17:32 +0530 Subject: [PATCH 2/4] Addes workflow for CI --- .github/workflows/build.yml | 26 ++++++++++++++++++++++++++ package.json | 5 ++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..d3b3133d --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,26 @@ +name: Build on PR + +on: + pull_request: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + steps: + -uses: action/checkout@v3 + -name: Use Node.js + uses: action/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 dev + \ No newline at end of file diff --git a/package.json b/package.json index 4be5bbb6..23f13fd7 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,8 @@ "dev": "turbo dev", "lint": "turbo lint", "format": "prettier --write \"**/*.{ts,tsx,md}\"", - "db:generate": "cd packages/db && npx prisma generate && cd ../..", - "start-user-app": "cd ./apps/user-app && npm run start" - + "start-user-app": "cd ./apps/user-app && npm run start", + "db:generate": "cd packages/db && npx prisma generate && cd ../.." }, "devDependencies": { "@repo/eslint-config": "*", From ca177e741ed741e4088e2a57d36e80882862c12e Mon Sep 17 00:00:00 2001 From: Prem Pardeshi Date: Wed, 24 Jul 2024 21:20:28 +0530 Subject: [PATCH 3/4] Demo Change --- apps/user-app/app/page.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/user-app/app/page.tsx b/apps/user-app/app/page.tsx index 0288eb02..3c379fd6 100644 --- a/apps/user-app/app/page.tsx +++ b/apps/user-app/app/page.tsx @@ -1,12 +1,13 @@ import { getServerSession } from "next-auth"; -import { redirect } from 'next/navigation' +import { redirect } from "next/navigation"; import { authOptions } from "./lib/auth"; export default async function Page() { + console.log("HI"); const session = await getServerSession(authOptions); if (session?.user) { - redirect('/dashboard') + redirect("/dashboard"); } else { - redirect('/api/auth/signin') + redirect("/api/auth/signin"); } } From 8b9b371f49fe03bfc56965898f94e2b8bb0caf80 Mon Sep 17 00:00:00 2001 From: Prem Pardeshi Date: Wed, 24 Jul 2024 21:25:36 +0530 Subject: [PATCH 4/4] fasdfasdf --- apps/user-app/app/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user-app/app/page.tsx b/apps/user-app/app/page.tsx index 3c379fd6..5506725d 100644 --- a/apps/user-app/app/page.tsx +++ b/apps/user-app/app/page.tsx @@ -3,7 +3,7 @@ import { redirect } from "next/navigation"; import { authOptions } from "./lib/auth"; export default async function Page() { - console.log("HI"); + console.log("asdf"); const session = await getServerSession(authOptions); if (session?.user) { redirect("/dashboard");