Skip to content

pull #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Racheli2006 wants to merge 6 commits into
base: racheli-verner
Choose a base branch
from
Open

pull #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
313e8d4
Update index.html
developerfsbaum Mar 10, 2026
6eb07ce
Update order.js
developerfsbaum Mar 10, 2026
1c13d90
Update order.js
developerfsbaum Mar 10, 2026
7b64fea
Merge pull request #2 from developerfsbaum/main
t3232853 Mar 10, 2026
3f16d46
Create tyaakobi.yml
t3232853 Mar 10, 2026
fc39241
Merge pull request #4 from developerfsbaum/tamar_yaakobi
t3232853 Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .github/workflows/tyaakobi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions node.js/controller/order.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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] });
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion react/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title> React</title>
<title> קונדיטוריה</title>
</head>
<body>
<div id="root"></div>
Expand Down