Skip to content

Merge Staging to Main #2

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

Merged
earzalien merged 8 commits into from
Mar 7, 2026
Merged

Merge Staging to Main #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
54b4b9f
refactor(trip-ui): enhance accessibility and unify trip components
earzalien Feb 25, 2026
2e5717e
refactor(nav-tabs): improve responsiveness and fix layout distribution
earzalien Feb 25, 2026
ccf9b3c
refactor(invitations): align trip typing with backend and scope modal…
earzalien Feb 25, 2026
54f1d85
refactor(budget): clean and restructure TripBudgetPage logic and styles
earzalien Feb 25, 2026
00cfc27
chore: update package.json metadata and bump version to 1.0.0
earzalien Mar 6, 2026
d6a603a
Enhance deploy workflow with notifications
earzalien Mar 7, 2026
ebd74bb
Enhance deploy workflow with notifications secured
earzalien Mar 7, 2026
740c26c
Enhance deploy workflow with notifications and secured
earzalien Mar 7, 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
76 changes: 70 additions & 6 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,90 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout repository
- name: 📦 Checkout repository
uses: actions/checkout@v3

- name: Setup SSH agent
- name: 🔐 Setup SSH agent
uses: webfactory/ssh-agent@v0.9.0
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Setup known_hosts
- name: 🧾 Setup known_hosts
run: |
mkdir -p ~/.ssh
echo "${{ secrets.VPS_KNOWN_HOST }}" > ~/.ssh/known_hosts
chmod 644 ~/.ssh/known_hosts

- name: Deploy
- name: 🚀 Deploy to VPS
run: |
if [ "${{ github.ref }}" = "refs/heads/main" ]; then
echo "ENVIRONMENT=PRODUCTION" >> $GITHUB_ENV
echo "🚀 Deploying PRODUCTION"
ssh ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} "bash /home/ubuntu/deploy-triptogether.sh"
ssh -o StrictHostKeyChecking=yes \
${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} \
"bash /home/ubuntu/deploy-triptogether.sh"
else
echo "ENVIRONMENT=STAGING" >> $GITHUB_ENV
echo "🧪 Deploying STAGING"
ssh ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} "bash /home/ubuntu/deploy-triptogether-staging.sh"
ssh -o StrictHostKeyChecking=yes \
${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }} \
"bash /home/ubuntu/deploy-triptogether-staging.sh"
fi

############################################################
# ✅ SUCCESS NOTIFICATION (FULLY SECURED)
############################################################
- name: ✅ Telegram Success Notification
if: success()
env:
TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
run: |
SAFE_COMMIT=$(printf "%s" "$COMMIT_MESSAGE" \
| sed -e 's/&/\&/g' \
-e 's/</\&lt;/g' \
-e 's/>/\&gt;/g')

curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage" \
--data-urlencode "chat_id=${TELEGRAM_CHAT_ID}" \
--data-urlencode "parse_mode=HTML" \
--data-urlencode "text=✅ <b>${ENVIRONMENT} Deploy SUCCESS</b>

📦 <b>Repo:</b> ${{ github.repository }}
🌿 <b>Branch:</b> ${{ github.ref_name }}
👤 <b>Author:</b> ${{ github.actor }}
📝 <b>Commit:</b> ${SAFE_COMMIT}
🕒 <b>Date:</b> $(date -u '+%Y-%m-%d %H:%M:%S UTC')

🔎 <a href='https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'>View Logs</a>"

############################################################
# ❌ FAILURE NOTIFICATION (FULLY SECURED)
############################################################
- name: ❌ Telegram Failure Notification
if: failure()
env:
TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
run: |
SAFE_COMMIT=$(printf "%s" "$COMMIT_MESSAGE" \
| sed -e 's/&/\&amp;/g' \
-e 's/</\&lt;/g' \
-e 's/>/\&gt;/g')

curl -s -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage" \
--data-urlencode "chat_id=${TELEGRAM_CHAT_ID}" \
--data-urlencode "parse_mode=HTML" \
--data-urlencode "text=❌ <b>${ENVIRONMENT} Deploy FAILED</b>

📦 <b>Repo:</b> ${{ github.repository }}
🌿 <b>Branch:</b> ${{ github.ref_name }}
👤 <b>Author:</b> ${{ github.actor }}
📝 <b>Commit:</b> ${SAFE_COMMIT}
🕒 <b>Date:</b> $(date -u '+%Y-%m-%d %H:%M:%S UTC')

⚠️ <b>Check immediately.</b>

🔎 <a href='https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'>View Logs</a>"
147 changes: 97 additions & 50 deletions client/src/components/AddExpenseForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,31 @@ type AddExpenseFormProps = {

function AddExpenseForm({ tripId, members, onSuccess }: AddExpenseFormProps) {
const { auth } = useAuth();

const [title, setTitle] = useState("");
const [amount, setAmount] = useState("");
const [categoryId, setCategoryId] = useState("");
const [paidBy, setPaidBy] = useState("");
const [isSubmitting, setIsSubmitting] = useState(false);
const [error, setError] = useState<string | null>(null);

const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
setError(null);

if (!auth?.token) {
console.error("Utilisateur non authentifié");
setError("Utilisateur non authentifié.");
return;
}

if (!title || !amount || !categoryId || !paidBy) {
console.error("Champs manquants");
setError("Veuillez remplir tous les champs.");
return;
}

try {
setIsSubmitting(true);

const response = await fetch(
`${import.meta.env.VITE_API_URL}/api/expenses/${tripId}`,
{
Expand All @@ -58,59 +64,100 @@ function AddExpenseForm({ tripId, members, onSuccess }: AddExpenseFormProps) {
throw new Error(errorData.message || "Erreur création dépense");
}

// Reset
setTitle("");
setAmount("");
setCategoryId("");
setPaidBy("");

onSuccess();
} catch (error) {
console.error(error);
} catch (err: unknown) {
if (err instanceof Error) {
setError(err.message);
} else {
setError("Une erreur est survenue.");
}
} finally {
setIsSubmitting(false);
}
};

return (
<form className="add-expense-form" onSubmit={handleSubmit}>
<h2>Ajouter une dépense</h2>

<input
type="text"
placeholder="Titre"
value={title}
onChange={(e) => setTitle(e.target.value)}
required
/>

<input
type="number"
placeholder="Montant"
value={amount}
onChange={(e) => setAmount(e.target.value)}
required
/>

<select
value={categoryId}
onChange={(e) => setCategoryId(e.target.value)}
required
>
<option value="">Choisir une catégorie</option>
<option value="1">Transport</option>
<option value="2">Nourriture</option>
<option value="3">Logement</option>
<option value="4">Autre</option>
<option value="5">Activité</option>
</select>

<select
value={paidBy}
onChange={(e) => setPaidBy(e.target.value)}
required
>
<option value="">Payé par</option>
{members.map((member) => (
<option key={member.id} value={member.id}>
{member.firstname || member.email}
</option>
))}
</select>

<button type="submit">Enregistrer</button>
<form className="add-expense-form" onSubmit={handleSubmit} noValidate>
<h2 id="add-expense-title">Ajouter une dépense</h2>

{error && (
<div className="form-error" role="alert">
{error}
</div>
)}

{/* Titre */}
<div className="form-group">
<label htmlFor="title">Titre</label>
<input
id="title"
type="text"
value={title}
onChange={(e) => setTitle(e.target.value)}
required
/>
</div>

{/* Montant */}
<div className="form-group">
<label htmlFor="amount">Montant (€)</label>
<input
id="amount"
type="number"
step="0.01"
min="0"
inputMode="decimal"
value={amount}
onChange={(e) => setAmount(e.target.value)}
required
/>
</div>

{/* Catégorie */}
<div className="form-group">
<label htmlFor="category">Catégorie</label>
<select
id="category"
value={categoryId}
onChange={(e) => setCategoryId(e.target.value)}
required
>
<option value="">Choisir une catégorie</option>
<option value="1">Transport</option>
<option value="2">Nourriture</option>
<option value="3">Logement</option>
<option value="4">Activité</option>
<option value="5">Autre</option>
</select>
</div>

{/* Payé par */}
<div className="form-group">
<label htmlFor="paidBy">Payé par</label>
<select
id="paidBy"
value={paidBy}
onChange={(e) => setPaidBy(e.target.value)}
required
>
<option value="">Sélectionner un membre</option>
{members.map((member) => (
<option key={member.id} value={member.id}>
{member.firstname || member.email}
</option>
))}
</select>
</div>

<button type="submit" disabled={isSubmitting}>
{isSubmitting ? "Enregistrement..." : "Enregistrer"}
</button>
</form>
);
}
Expand Down
Loading