Merge pull request #41 from imdeveshshukla/deploy

Deploy

.github/workflows/deploy.yml

@@ -32,14 +32,14 @@ jobs:
     - name: Verify Pushed Image
       run: docker pull imdeveshshukla/quiet-backend
 
-    # - 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 imdeveshshukla/quiet-backend:latest
-    #       sudo docker stop web-app || true
-    #       sudo docker rm web-app || true
-    #       sudo docker run -e DATABASE_URL ${{ secrets.DB_URL }} --restart-always -d --name web-app -p 3005:3000 imdeveshshukla/quiet-backend:latest
+    - name: Deploy
+      uses: appleboy/ssh-action@master  #working
+      with:
+        host: ${{ secrets.SSH_HOST }}
+        username: ${{ secrets.SSH_USERNAME }}
+        key: ${{ secrets.SSH_KEY }}
+        script: |
+          sudo docker pull imdeveshshukla/quiet-backend:latest
+          sudo docker stop web-app || true
+          sudo docker rm web-app || true
+          sudo docker run --env-file .env --restart always -d --name web-app -p 3000:3000 imdeveshshukla/quiet-backend:latest

backend/Dockerfile

@@ -17,4 +17,4 @@ RUN npx prisma generate
 
 EXPOSE 3000
 
-CMD ["npm", "run", "dev"]
+CMD ["npm", "run", "deploy"]

backend/package.json

@@ -6,7 +6,8 @@
   "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "node src/server.js"
+    "dev": "nodemon src/server.js",
+    "deploy":"node src/server.js"
   },
   "author": "",
   "license": "ISC",

backend/src/server.js

@@ -15,19 +15,19 @@ dotenv.config({
 })
 const app = express() 
 const port = 3000
-const whitelist = ['http://localhost:5173', 'http://localhost:3000']
 const corsOptions = {
-  credentials:true,
-  origin: function (origin, callback) {
-    if (whitelist.indexOf(origin) !== -1) {
-      callback(null, true)
-    } else {
-      callback(new Error('Not allowed by CORS'))
-    }
-  }
-}
-
-app.use(cors(corsOptions));
+  credentials: true,
+  origin: 'https://www.bequiet.live',
+  methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
+  allowedHeaders: [
+    "Origin",
+    "Content-Type",
+    "Accept",
+    "Authorization",
+    "X-Requested-With",
+  ],
+};
+app.use('*',cors(corsOptions));
 app.use(bodyParser.json())
 app.use(express.json());
 app.use(express.urlencoded({extended:true}));

frontend/.gitignore

@@ -12,6 +12,8 @@ dist
 dist-ssr
 *.local
 
+.env
+
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json

frontend/src/utils/localhost.js

@@ -1,2 +1,2 @@
-const baseAddress = 'http://localhost:3000/'
-export default baseAddress;
+const baseAddress = "https://api.bequiet.live/"
+export default baseAddress;