From 313e8d4632990bd9561d9631901f58e031f1388f Mon Sep 17 00:00:00 2001 From: developerfsbaum Date: Tue, 10 Mar 2026 09:28:34 +0200 Subject: [PATCH 1/4] Update index.html --- react/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/react/index.html b/react/index.html index 0f83788..6d26ddf 100644 --- a/react/index.html +++ b/react/index.html @@ -4,7 +4,7 @@ - React + קונדיטוריה
From 6eb07ce07b7bc681ced069868e7167312eae79e4 Mon Sep 17 00:00:00 2001 From: developerfsbaum Date: Tue, 10 Mar 2026 09:33:22 +0200 Subject: [PATCH 2/4] Update order.js --- node.js/controller/order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node.js/controller/order.js b/node.js/controller/order.js index 40b0114..8c0a9a5 100644 --- a/node.js/controller/order.js +++ b/node.js/controller/order.js @@ -107,7 +107,7 @@ exports.delete = (req, res) => { if (err) { res.status(500).send("שגיאה במחיקת ההזמנה"); } else { - res.send({ message: "הזמנה נמחקה בהצלחה", deleted: deleted[0] }); + res.send({ message: "ההזמנה נמחקה בהצלחה", deleted: deleted[0] }); } }); } From 1c13d909b66b64945d16956dd7cb46336364f39c Mon Sep 17 00:00:00 2001 From: developerfsbaum Date: Tue, 10 Mar 2026 09:34:42 +0200 Subject: [PATCH 3/4] Update order.js --- node.js/controller/order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node.js/controller/order.js b/node.js/controller/order.js index 8c0a9a5..e284e0b 100644 --- a/node.js/controller/order.js +++ b/node.js/controller/order.js @@ -27,7 +27,7 @@ exports.getByUserId = (req, res) => { const userOrders = orders.filter(o => o.userId === userId); if (userOrders.length === 0) { - res.status(404).send("לא נמצאו הזמנות למשתמש זה"); + res.status(404).send("לא נמצאו הזמנות למשתמש זה."); } else { res.send(userOrders); } From 3f16d461ee8d19b016cb2983cb2760f422e0f10e Mon Sep 17 00:00:00 2001 From: Tamar Yaakobi Date: Tue, 10 Mar 2026 12:15:55 +0200 Subject: [PATCH 4/4] Create tyaakobi.yml --- .github/workflows/tyaakobi.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/tyaakobi.yml diff --git a/.github/workflows/tyaakobi.yml b/.github/workflows/tyaakobi.yml new file mode 100644 index 0000000..8aeafd6 --- /dev/null +++ b/.github/workflows/tyaakobi.yml @@ -0,0 +1,31 @@ +name: Deploy to EC2 + +on: + push: + branches: + - tamar_yaakobi + +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: Connect and deploy + uses: appleboy/ssh-action@v1.0.3 + with: + host: ${{ secrets.EC2_HOST_TYAAKOBI }} + username: ${{ secrets.EC2_USER_TYAAKOBI }} + key: ${{ secrets.EC2_SSH_KEY_TYAAKOBI }} + script: | + cd ~/KonditoriaApp + git pull origin tamar_yaakobi + + cd react + npm install + npm run build + sudo cp -r dist/* /var/www/html/ + + cd ../node.js + npm install + + sudo systemctl restart bakery.service