diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8b64f0e..b4784ee6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,25 +1,26 @@ name: Build on PR -on: +on: pull_request: branches: - master - -jobs: - build: + +jobs: + build: runs-on: ubuntu-latest - steps: + steps: - uses: actions/checkout@v3 - name: Use Node.js uses: actions/setup-node@v3 - with: + with: node-version: '20' - - - name: Install Dependencies + + - 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 diff --git a/apps/user-app/app/page.tsx b/apps/user-app/app/page.tsx index 0288eb02..48ab634c 100644 --- a/apps/user-app/app/page.tsx +++ b/apps/user-app/app/page.tsx @@ -1,3 +1,7 @@ + + + + import { getServerSession } from "next-auth"; import { redirect } from 'next/navigation' import { authOptions } from "./lib/auth"; diff --git a/apps/user-app/components/AddMoneyCard.tsx b/apps/user-app/components/AddMoneyCard.tsx index e9c202c8..9caf7e3a 100644 --- a/apps/user-app/components/AddMoneyCard.tsx +++ b/apps/user-app/components/AddMoneyCard.tsx @@ -1,7 +1,6 @@ "use client" import { Button } from "@repo/ui/button"; import { Card } from "@repo/ui/card"; -import { Center } from "@repo/ui/center"; import { Select } from "@repo/ui/select"; import { useState } from "react"; import { TextInput } from "@repo/ui/textinput"; diff --git a/package-lock.json b/package-lock.json index c5f06ffe..ab502b3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3062,9 +3062,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001600", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz", - "integrity": "sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==", + "version": "1.0.30001703", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001703.tgz", + "integrity": "sha512-kRlAGTRWgPsOj7oARC9m1okJEXdL/8fekFVcxA8Hl7GH4r/sN4OJn/i6Flde373T50KS7Y37oFbMwlE8+F42kQ==", "funding": [ { "type": "opencollective", @@ -3078,7 +3078,8 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "2.4.2", diff --git a/package.json b/package.json index 4be5bbb6..85307f8a 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "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" - }, "devDependencies": { "@repo/eslint-config": "*",