diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c8b64f0e..bffc081b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,9 +17,10 @@ jobs:
- name: Install Dependencies
run: npm install
-
- - name: Generate prisma client
+
+
+ - name: Generate Prisma client
run: npm run db:generate
- name: Run Build
- run: npm run build
+ run: npm run build
\ No newline at end of file
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/(dashboard)/dashboard/page.tsx b/apps/user-app/app/(dashboard)/dashboard/page.tsx
index bba052d2..97eba6fa 100644
--- a/apps/user-app/app/(dashboard)/dashboard/page.tsx
+++ b/apps/user-app/app/(dashboard)/dashboard/page.tsx
@@ -1,4 +1,5 @@
+
export default function() {
return
Dashboard
diff --git a/docker/Dockerfile.user b/docker/Dockerfile.user
deleted file mode 100644
index d8cde5b1..00000000
--- a/docker/Dockerfile.user
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM node:20.12.0-alpine3.19
-
-WORKDIR /usr/src/app
-
-COPY package.json package-lock.json turbo.json tsconfig.json ./
-
-COPY apps ./apps
-COPY packages ./packages
-
-# Install dependencies
-RUN npm install
-# Can you add a script to the global package.json that does this?
-RUN npm run db:generate
-
-# Can you filter the build down to just one app?
-RUN npm run build
-
-CMD ["npm", "run", "start-user-app"]
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index c5f06ffe..44384142 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1498,7 +1498,6 @@
"integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
"dev": true,
"optional": true,
- "peer": true,
"engines": {
"node": ">=14"
}
@@ -1536,13 +1535,13 @@
"version": "5.11.0",
"resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.11.0.tgz",
"integrity": "sha512-N6yYr3AbQqaiUg+OgjkdPp3KPW1vMTAgtKX6+BiB/qB2i1TjLYCrweKcUjzOoRM5BriA4idrkTej9A9QqTfl3A==",
- "devOptional": true
+ "dev": true
},
"node_modules/@prisma/engines": {
"version": "5.11.0",
"resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.11.0.tgz",
"integrity": "sha512-gbrpQoBTYWXDRqD+iTYMirDlF9MMlQdxskQXbhARhG6A/uFQjB7DZMYocMQLoiZXO/IskfDOZpPoZE8TBQKtEw==",
- "devOptional": true,
+ "dev": true,
"hasInstallScript": true,
"dependencies": {
"@prisma/debug": "5.11.0",
@@ -1555,13 +1554,13 @@
"version": "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102",
"resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102.tgz",
"integrity": "sha512-WXCuyoymvrS4zLz4wQagSsc3/nE6CHy8znyiMv8RKazKymOMd5o9FP5RGwGHAtgoxd+aB/BWqxuP/Ckfu7/3MA==",
- "devOptional": true
+ "dev": true
},
"node_modules/@prisma/fetch-engine": {
"version": "5.11.0",
"resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.11.0.tgz",
"integrity": "sha512-994viazmHTJ1ymzvWugXod7dZ42T2ROeFuH6zHPcUfp/69+6cl5r9u3NFb6bW8lLdNjwLYEVPeu3hWzxpZeC0w==",
- "devOptional": true,
+ "dev": true,
"dependencies": {
"@prisma/debug": "5.11.0",
"@prisma/engines-version": "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102",
@@ -1572,7 +1571,7 @@
"version": "5.11.0",
"resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.11.0.tgz",
"integrity": "sha512-rxtHpMLxNTHxqWuGOLzR2QOyQi79rK1u1XYAVLZxDGTLz/A+uoDnjz9veBFlicrpWjwuieM4N6jcnjj/DDoidw==",
- "devOptional": true,
+ "dev": true,
"dependencies": {
"@prisma/debug": "5.11.0"
}
@@ -8477,7 +8476,7 @@
"version": "5.11.0",
"resolved": "https://registry.npmjs.org/prisma/-/prisma-5.11.0.tgz",
"integrity": "sha512-KCLiug2cs0Je7kGkQBN9jDWoZ90ogE/kvZTUTgz2h94FEo8pczCkPH7fPNXkD1sGU7Yh65risGGD1HQ5DF3r3g==",
- "devOptional": true,
+ "dev": true,
"hasInstallScript": true,
"dependencies": {
"@prisma/engines": "5.11.0"
diff --git a/package.json b/package.json
index 4be5bbb6..0df13e80 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +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"
+ "db:generate": "cd packages/db && npx prisma generate && cd ../.."
+
},
"devDependencies": {