From bf0b07cd9596275affdea1e0fc84138d6c4c354f Mon Sep 17 00:00:00 2001
From: "stepan.moc" <stepan.moc@tul.cz>
Date: Thu, 9 May 2024 11:06:18 +0200
Subject: [PATCH] =?UTF-8?q?Fix/83=20fix=20pro=20produk=C4=8Dn=C3=AD=20fe?=
 =?UTF-8?q?=20workflow=20(#90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* changed server.js, application.yml and application-prod.yml. Removed pull_request from deploy-app.yml

---------

Co-authored-by: Štěpán Moc <stemoc@seznam.cz>
---
 backend/src/main/resources/application-prod.yml | 6 +++---
 backend/src/main/resources/application.yml      | 4 ++--
 frontend/server.js                              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml
index 514a00a..da7c9d6 100644
--- a/backend/src/main/resources/application-prod.yml
+++ b/backend/src/main/resources/application-prod.yml
@@ -30,7 +30,7 @@ spring:
       name: ${SECURITY_USERNAME}
       password: ${SECURITY_PASSWORD}
   jwt:
-    secure: false
-    sameSite: "Lax"
+    secure: true
+    sameSite: "none"
     duration: 86400000 # 1 day
-    secret: ${JWT_SECRET}
\ No newline at end of file
+    secret: ${JWT_SECRET}
diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
index 556f652..45cda93 100644
--- a/backend/src/main/resources/application.yml
+++ b/backend/src/main/resources/application.yml
@@ -20,7 +20,7 @@ spring:
         show_sql: false
         default_schema: public
   jwt:
-    secure: false
-    sameSite: "Lax"
+    secure: true
+    sameSite: "none"
     duration: 86400000 # 1 day
     secret: "7A25432A462D4A614E645267556B58703272357538782F413F4428472B4B6250" # random string in base64, should be changed in production
diff --git a/frontend/server.js b/frontend/server.js
index 6c98cae..faaf5ee 100644
--- a/frontend/server.js
+++ b/frontend/server.js
@@ -1,9 +1,9 @@
 const express = require('express');
 const path = require('path');
 const app = express();
-app.use(express.static(__dirname + '/dist/<app-name>'));
+app.use(express.static(__dirname + '/dist/frontend/browser'));
 app.get('/*', function(req,res) {
   res.sendFile(path.join(__dirname+
-    '/dist/<app-name>/index.html'));});
+    '/dist/frontend/browser/index.html'));});
 app.listen(process.env.PORT || 8080);