Merge pull request #9 from sametcn99/dev

Dev

Author: sametcn99

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "booking-calendar",
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"private": true,
 	"scripts": {
 		"dev:server": "bun run --watch src/server/index.ts",

src/client/src/api.ts

@@ -96,9 +96,18 @@ export interface ApiVersionInfo {
 }
 
 export interface ApiWebhookSettings {
-	enabled: boolean;
-	url: string;
-	has_secret: boolean;
+	outbound: {
+		enabled: boolean;
+		url: string;
+		has_secret: boolean;
+	};
+	inbound: {
+		enabled: boolean;
+		endpoint: string;
+		has_secret: boolean;
+		scopes: string[];
+	};
+	supported_actions: string[];
 }
 
 async function parseApiResponse<T>(response: Response): Promise<T> {
@@ -495,10 +504,22 @@ export const api = {
 			"/admin/settings/webhook",
 		).then((r) => r.data),
 
+	getWebhookSecret: (target: "outbound" | "inbound") =>
+		request<{ success: boolean; data: { secret: string } }>(
+			`/admin/settings/webhook/secret?target=${target}`,
+		).then((r) => r.data.secret),
+
 	setWebhookSettings: (input: {
-		enabled: boolean;
-		url: string;
-		secret?: string;
+		outbound?: {
+			enabled?: boolean;
+			url?: string;
+			secret?: string;
+		};
+		inbound?: {
+			enabled?: boolean;
+			secret?: string;
+			scopes?: string[];
+		};
 	}) =>
 		request<{ success: boolean; data: ApiWebhookSettings }>(
 			"/admin/settings/webhook",

src/client/src/components/AdminLayout.tsx

@@ -16,6 +16,7 @@ import { useState } from "react";
 import { Outlet, useLocation, useNavigate } from "react-router-dom";
 import { useAuth } from "../context/AuthContext";
 import { useI18n } from "../context/I18nContext";
+import AppToaster from "./AppToaster";
 
 export default function AdminLayout() {
 	const [css] = useStyletron();
@@ -53,6 +54,8 @@ export default function AdminLayout() {
 				backgroundColor: "var(--color-bg-primary)",
 			})}
 		>
+			<AppToaster />
+
 			{/* Sidebar */}
 			<nav
 				className={css({

src/client/src/components/AppToaster.tsx

@@ -0,0 +1,12 @@
+import { PLACEMENT, ToasterContainer } from "baseui/toast";
+
+const TOAST_AUTO_HIDE_DURATION = 5000;
+
+export default function AppToaster() {
+	return (
+		<ToasterContainer
+			placement={PLACEMENT.bottomRight}
+			autoHideDuration={TOAST_AUTO_HIDE_DURATION}
+		/>
+	);
+}

src/client/src/components/PageLoadingSpinner.tsx

@@ -0,0 +1,48 @@
+import { useStyletron } from "baseui";
+import { Loader } from "lucide-react";
+
+interface Props {
+	label?: string;
+}
+
+export default function PageLoadingSpinner({ label }: Props) {
+	const [css] = useStyletron();
+
+	return (
+		<div
+			className={css({
+				display: "flex",
+				flexDirection: "column",
+				alignItems: "center",
+				justifyContent: "center",
+				padding: "80px 24px",
+				gap: "16px",
+			})}
+		>
+			<Loader
+				size={32}
+				className={css({
+					color: "var(--color-accent-500, #8b5cf6)",
+					animationName: {
+						from: { transform: "rotate(0deg)" },
+						to: { transform: "rotate(360deg)" },
+					} as unknown as string,
+					animationDuration: "1s",
+					animationTimingFunction: "linear",
+					animationIterationCount: "infinite",
+				})}
+			/>
+			{label && (
+				<p
+					className={css({
+						fontSize: "14px",
+						color: "var(--color-text-subtle)",
+						margin: 0,
+					})}
+				>
+					{label}
+				</p>
+			)}
+		</div>
+	);
+}

src/client/src/i18n/en.json

@@ -250,7 +250,9 @@
 		"emailNotificationsRequiresAdminEmail": "Set an admin email first to enable email notifications.",
 		"emailNotificationsSaved": "Email notification setting saved",
 		"webhook": "Webhook Notifications",
-		"webhookDescription": "Mirror every push notification event to your webhook endpoint with signed delivery headers.",
+		"webhookDescription": "Configure signed outbound events and inbound command execution for external system integrations.",
+		"webhookOutboundTitle": "Outbound Events",
+		"webhookOutboundDescription": "Publish slot, appointment, link, planner, community event, and push changes to an external webhook endpoint.",
 		"webhookEnabled": "Webhook notifications are enabled",
 		"webhookDisabled": "Webhook notifications are disabled",
 		"webhookUrl": "Webhook URL",
@@ -259,11 +261,27 @@
 		"webhookSecretHint": "Signature header format: sha256=<hmac>. Minimum 16 characters.",
 		"webhookSecretPlaceholder": "Paste a long random secret",
 		"webhookGenerateSecret": "Generate Random Secret",
+		"webhookRevealSecret": "Reveal",
+		"webhookHideSecret": "Hide",
 		"webhookSecretConfigured": "A secret is already configured. Leave empty to keep it unchanged.",
+		"webhookSecretHiddenHint": "Stored secrets are hidden after refresh for security. Enter a new value only if you want to replace it.",
 		"webhookSave": "Save Webhook Settings",
 		"webhookSaved": "Webhook settings saved",
 		"webhookSendTest": "Send Test Event",
 		"webhookTestSent": "Test webhook event sent",
+		"webhookInboundTitle": "Inbound Commands",
+		"webhookInboundDescription": "Allow signed external systems to run approved actions inside Booking Calendar without sharing the admin session.",
+		"webhookInboundEnabled": "Inbound webhook commands are enabled",
+		"webhookInboundDisabled": "Inbound webhook commands are disabled",
+		"webhookInboundEndpoint": "Inbound Endpoint",
+		"webhookInboundEndpointHint": "Send signed POST requests to this endpoint with action, params, and data fields.",
+		"webhookInboundSecret": "Inbound Signing Secret",
+		"webhookInboundSecretHint": "Use the same sha256=<hmac> header format based on timestamp.body. Minimum 16 characters.",
+		"webhookInboundSecretPlaceholder": "Paste the secret used by the external command sender",
+		"webhookInboundSecretConfigured": "An inbound secret is already configured. Leave empty to keep it unchanged.",
+		"webhookInboundSecretHiddenHint": "Stored inbound secrets are hidden after refresh for security. Enter a new value only if you want to replace it.",
+		"webhookInboundScopes": "Allowed Scopes",
+		"webhookInboundScopesHint": "Only the checked action groups can be executed by inbound webhook commands.",
 		"version": "Version",
 		"versionDescription": "See your current app version and check if a newer GitHub release is available.",
 		"currentVersion": "Current version",
@@ -332,6 +350,7 @@
 		"plannerLegend": "Planner Events"
 	},
 	"common": {
+		"loading": "Loading...",
 		"error": "An error occurred",
 		"confirmationTitle": "Please confirm",
 		"confirmDeleteMessage": "Are you sure you want to delete this item?",

src/client/src/i18n/schema.json

@@ -963,6 +963,12 @@
 				"webhookDescription": {
 					"type": "string"
 				},
+				"webhookOutboundTitle": {
+					"type": "string"
+				},
+				"webhookOutboundDescription": {
+					"type": "string"
+				},
 				"webhookEnabled": {
 					"type": "string"
 				},
@@ -987,9 +993,18 @@
 				"webhookGenerateSecret": {
 					"type": "string"
 				},
+				"webhookRevealSecret": {
+					"type": "string"
+				},
+				"webhookHideSecret": {
+					"type": "string"
+				},
 				"webhookSecretConfigured": {
 					"type": "string"
 				},
+				"webhookSecretHiddenHint": {
+					"type": "string"
+				},
 				"webhookSave": {
 					"type": "string"
 				},
@@ -1002,6 +1017,45 @@
 				"webhookTestSent": {
 					"type": "string"
 				},
+				"webhookInboundTitle": {
+					"type": "string"
+				},
+				"webhookInboundDescription": {
+					"type": "string"
+				},
+				"webhookInboundEnabled": {
+					"type": "string"
+				},
+				"webhookInboundDisabled": {
+					"type": "string"
+				},
+				"webhookInboundEndpoint": {
+					"type": "string"
+				},
+				"webhookInboundEndpointHint": {
+					"type": "string"
+				},
+				"webhookInboundSecret": {
+					"type": "string"
+				},
+				"webhookInboundSecretHint": {
+					"type": "string"
+				},
+				"webhookInboundSecretPlaceholder": {
+					"type": "string"
+				},
+				"webhookInboundSecretConfigured": {
+					"type": "string"
+				},
+				"webhookInboundSecretHiddenHint": {
+					"type": "string"
+				},
+				"webhookInboundScopes": {
+					"type": "string"
+				},
+				"webhookInboundScopesHint": {
+					"type": "string"
+				},
 				"version": {
 					"type": "string"
 				},
@@ -1159,6 +1213,8 @@
 				"emailNotificationsSaved",
 				"webhook",
 				"webhookDescription",
+				"webhookOutboundTitle",
+				"webhookOutboundDescription",
 				"webhookEnabled",
 				"webhookDisabled",
 				"webhookUrl",
@@ -1167,11 +1223,27 @@
 				"webhookSecretHint",
 				"webhookSecretPlaceholder",
 				"webhookGenerateSecret",
+				"webhookRevealSecret",
+				"webhookHideSecret",
 				"webhookSecretConfigured",
+				"webhookSecretHiddenHint",
 				"webhookSave",
 				"webhookSaved",
 				"webhookSendTest",
 				"webhookTestSent",
+				"webhookInboundTitle",
+				"webhookInboundDescription",
+				"webhookInboundEnabled",
+				"webhookInboundDisabled",
+				"webhookInboundEndpoint",
+				"webhookInboundEndpointHint",
+				"webhookInboundSecret",
+				"webhookInboundSecretHint",
+				"webhookInboundSecretPlaceholder",
+				"webhookInboundSecretConfigured",
+				"webhookInboundSecretHiddenHint",
+				"webhookInboundScopes",
+				"webhookInboundScopesHint",
 				"version",
 				"versionDescription",
 				"currentVersion",
@@ -1331,6 +1403,9 @@
 		"common": {
 			"type": "object",
 			"properties": {
+				"loading": {
+					"type": "string"
+				},
 				"error": {
 					"type": "string"
 				},
@@ -1390,6 +1465,7 @@
 				}
 			},
 			"required": [
+				"loading",
 				"error",
 				"confirmationTitle",
 				"confirmDeleteMessage",

src/client/src/i18n/tr.json

@@ -250,7 +250,9 @@
 		"emailNotificationsRequiresAdminEmail": "E-posta bildirimlerini açmak için önce admin e-postası kaydedin.",
 		"emailNotificationsSaved": "E-posta bildirim ayarı kaydedildi",
 		"webhook": "Webhook Bildirimleri",
-		"webhookDescription": "Her push bildirim olayını imzalı teslim başlıklarıyla webhook adresinize aynalar.",
+		"webhookDescription": "Harici sistem entegrasyonları için imzalı dışa giden eventleri ve içe gelen komut yürütmesini yapılandırın.",
+		"webhookOutboundTitle": "Dışa Giden Eventler",
+		"webhookOutboundDescription": "Slot, randevu, bağlantı, planlayıcı, topluluk etkinliği ve push değişikliklerini harici webhook adresine yayınlayın.",
 		"webhookEnabled": "Webhook bildirimleri etkin",
 		"webhookDisabled": "Webhook bildirimleri devre dışı",
 		"webhookUrl": "Webhook URL",
@@ -259,11 +261,27 @@
 		"webhookSecretHint": "Imza basligi formati: sha256=<hmac>. Minimum 16 karakter.",
 		"webhookSecretPlaceholder": "Uzun ve rastgele bir gizli anahtar girin",
 		"webhookGenerateSecret": "Rastgele Gizli Anahtar Uret",
+		"webhookRevealSecret": "Goster",
+		"webhookHideSecret": "Gizle",
 		"webhookSecretConfigured": "Bir gizli anahtar zaten kayıtlı. Aynı kalması için boş bırakın.",
+		"webhookSecretHiddenHint": "Kayitli secret guvenlik nedeniyle sayfa yenilendikten sonra gosterilmez. Yalnizca degistirmek istiyorsaniz yeni bir deger girin.",
 		"webhookSave": "Webhook Ayarlarını Kaydet",
 		"webhookSaved": "Webhook ayarları kaydedildi",
 		"webhookSendTest": "Test Olayı Gönder",
 		"webhookTestSent": "Test webhook olayı gönderildi",
+		"webhookInboundTitle": "İçe Gelen Komutlar",
+		"webhookInboundDescription": "Admin oturumunu paylaşmadan, imzalı harici sistemlerin izin verilen aksiyonları Booking Calendar içinde çalıştırmasına izin verin.",
+		"webhookInboundEnabled": "İçe gelen webhook komutları etkin",
+		"webhookInboundDisabled": "İçe gelen webhook komutları devre dışı",
+		"webhookInboundEndpoint": "İçe Gelen Endpoint",
+		"webhookInboundEndpointHint": "Bu endpoint'e action, params ve data alanları içeren imzalı POST istekleri gönderin.",
+		"webhookInboundSecret": "İçe Gelen İmzalama Gizli Anahtarı",
+		"webhookInboundSecretHint": "timestamp.body tabanlı sha256=<hmac> başlık formatını kullanın. Minimum 16 karakter.",
+		"webhookInboundSecretPlaceholder": "Harici komut göndericisinin kullanacağı gizli anahtarı girin",
+		"webhookInboundSecretConfigured": "Bir inbound secret zaten kayıtlı. Aynı kalması için boş bırakın.",
+		"webhookInboundSecretHiddenHint": "Kayitli inbound secret guvenlik nedeniyle sayfa yenilendikten sonra gosterilmez. Yalnizca degistirmek istiyorsaniz yeni bir deger girin.",
+		"webhookInboundScopes": "İzinli Scope'lar",
+		"webhookInboundScopesHint": "Yalnızca işaretlenen aksiyon grupları inbound webhook komutları tarafından çalıştırılabilir.",
 		"version": "Sürüm",
 		"versionDescription": "Mevcut uygulama sürümünüzü görün ve GitHub'da daha yeni bir release olup olmadığını kontrol edin.",
 		"currentVersion": "Mevcut sürüm",
@@ -332,6 +350,7 @@
 		"plannerLegend": "Planlayıcı Etkinlikleri"
 	},
 	"common": {
+		"loading": "Yükleniyor...",
 		"error": "Bir hata oluştu",
 		"confirmationTitle": "Lütfen onaylayın",
 		"confirmDeleteMessage": "Bu öğeyi silmek istediğinize emin misiniz?",

src/client/src/pages/AppointmentDetailPage/index.tsx

@@ -1,10 +1,11 @@
 import { useStyletron } from "baseui";
 import { Button, KIND, SIZE } from "baseui/button";
-import { PLACEMENT, ToasterContainer, toaster } from "baseui/toast";
+import { toaster } from "baseui/toast";
 import { Copy } from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useParams } from "react-router-dom";
 import { type ApiAppointment, api } from "../../api";
+import AppToaster from "../../components/AppToaster";
 import ConfirmationDialog from "../../components/ConfirmationDialog";
 import { useI18n } from "../../context/I18nContext";
 
@@ -119,7 +120,7 @@ export default function AppointmentDetailPage() {
 				justifyContent: "center",
 			})}
 		>
-			<ToasterContainer placement={PLACEMENT.bottomRight} />
+			<AppToaster />
 
 			<div
 				className={css({