@jhits/plugin-newsletter 0.0.15 → 0.0.17

package/dist/views/components/SmtpSettingsModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SmtpSettingsModal.d.ts","sourceRoot":"","sources":["../../../src/views/components/SmtpSettingsModal.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAkBH,UAAU,sBAAsB;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,wBAAgB,iBAAiB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,sBAAsB,kDAuZ5E"}
+{"version":3,"file":"SmtpSettingsModal.d.ts","sourceRoot":"","sources":["../../../src/views/components/SmtpSettingsModal.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAmBH,UAAU,sBAAsB;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,wBAAgB,iBAAiB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,sBAAsB,kDAia5E"}

package/dist/views/components/SmtpSettingsModal.js

@@ -15,6 +15,11 @@ export function SmtpSettingsModal({ isOpen, onClose }) {
         fromName: '',
         primaryLanguage: 'en',
         logoUrl: '',
+        unsubscribeTranslations: {
+            en: 'Unsubscribe',
+            nl: 'Afmelden',
+            sv: 'Avanmälan',
+        },
     });
     const [smtpLoading, setSmtpLoading] = useState(true);
     const [smtpSaving, setSmtpSaving] = useState(false);
@@ -47,6 +52,11 @@ export function SmtpSettingsModal({ isOpen, onClose }) {
                     fromName: data.fromName || '',
                     primaryLanguage: data.primaryLanguage || 'en',
                     logoUrl: data.logoUrl || '',
+                    unsubscribeTranslations: data.unsubscribeTranslations || {
+                        en: 'Unsubscribe',
+                        nl: 'Afmelden',
+                        sv: 'Avanmälan',
+                    },
                 });
                 setFromEmailEditable(!!data.from && data.from !== data.user);
             }

package/dist/views/components/TestEmailModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TestEmailModal.d.ts","sourceRoot":"","sources":["../../../src/views/components/TestEmailModal.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAOH,UAAU,mBAAmB;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAWD,wBAAgB,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,mBAAmB,kDAoPtE"}
+{"version":3,"file":"TestEmailModal.d.ts","sourceRoot":"","sources":["../../../src/views/components/TestEmailModal.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAQH,UAAU,mBAAmB;IACzB,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAWD,wBAAgB,cAAc,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,mBAAmB,kDAyUtE"}

package/dist/views/components/TestEmailModal.js

@@ -5,6 +5,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useState, useEffect } from 'react';
 import { X, Send, RefreshCw, CheckCircle2, AlertCircle, Mail, Globe, Sparkles } from 'lucide-react';
+import { DomainPromptModal } from './DomainPromptModal';
 const languages = [
     { code: 'en', label: 'EN' },
     { code: 'nl', label: 'NL' },
@@ -18,9 +19,13 @@ export function TestEmailModal({ isOpen, onClose }) {
     const [isSending, setIsSending] = useState(false);
     const [sendSuccess, setSendSuccess] = useState(false);
     const [sendError, setSendError] = useState(null);
+    // Domain prompt state
+    const [showDomainPrompt, setShowDomainPrompt] = useState(false);
+    const [isCheckingDomain, setIsCheckingDomain] = useState(false);
     useEffect(() => {
         if (isOpen) {
             fetchWelcomeEmailStatus();
+            setShowDomainPrompt(false);
         }
     }, [isOpen]);
     const fetchWelcomeEmailStatus = async () => {
@@ -40,7 +45,7 @@ export function TestEmailModal({ isOpen, onClose }) {
             console.error('Failed to load welcome email status:', error);
         }
     };
-    const handleSend = async () => {
+    const handleSend = async (skipDomainCheck = false) => {
         if (!email.trim()) {
             setSendError('Please enter an email address');
             return;
@@ -50,6 +55,30 @@ export function TestEmailModal({ isOpen, onClose }) {
             setSendError('Please enter a valid email address');
             return;
         }
+        // Check if we need to prompt for domain first (usually helpful in dev mode)
+        if (!skipDomainCheck) {
+            try {
+                setIsCheckingDomain(true);
+                // Check if this language has a domain configured
+                const response = await fetch('/api/plugin-website/settings');
+                const siteConfig = await response.json();
+                const hasDomain = siteConfig.domainLocaleConfig?.some((c) => c.locale === language &&
+                    c.domain &&
+                    c.domain !== 'undefined' &&
+                    c.domain.trim() !== '');
+                if (!hasDomain) {
+                    setShowDomainPrompt(true);
+                    setIsCheckingDomain(false);
+                    return; // Stop here, wait for domain prompt
+                }
+            }
+            catch (error) {
+                console.warn('Failed to check domain configuration:', error);
+            }
+            finally {
+                setIsCheckingDomain(false);
+            }
+        }
         try {
             setIsSending(true);
             setSendError(null);
@@ -61,6 +90,12 @@ export function TestEmailModal({ isOpen, onClose }) {
             });
             const data = await response.json();
             if (!response.ok) {
+                // If server detects missing domain, trigger prompt
+                if (data.code === 'DOMAIN_MISSING') {
+                    setShowDomainPrompt(true);
+                    setIsSending(false);
+                    return;
+                }
                 throw new Error(data.error || 'Failed to send test email');
             }
             setSendSuccess(true);
@@ -78,22 +113,56 @@ export function TestEmailModal({ isOpen, onClose }) {
             setIsSending(false);
         }
     };
+    const handleSaveDomain = async (domain) => {
+        try {
+            // Get current site config
+            const response = await fetch('/api/plugin-website/settings');
+            const siteConfig = await response.json();
+            const currentConfigs = siteConfig.domainLocaleConfig || [];
+            const newConfigs = [...currentConfigs];
+            const existingIndex = newConfigs.findIndex((c) => c.locale === language);
+            if (existingIndex >= 0) {
+                newConfigs[existingIndex] = { ...newConfigs[existingIndex], domain };
+            }
+            else {
+                newConfigs.push({ locale: language, domain });
+            }
+            // Save updated site config
+            const saveResponse = await fetch('/api/plugin-website/settings', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    ...siteConfig,
+                    domainLocaleConfig: newConfigs
+                }),
+            });
+            if (!saveResponse.ok)
+                throw new Error('Failed to save website settings');
+            // Re-trigger send with domain check skipped
+            setShowDomainPrompt(false);
+            handleSend(true);
+        }
+        catch (error) {
+            console.error('Failed to save domain:', error);
+            throw error;
+        }
+    };
     if (!isOpen)
         return null;
-    return (_jsxs("div", { className: "fixed inset-0 z-50 flex items-center justify-center", children: [_jsx("div", { className: "absolute inset-0 bg-black/50 backdrop-blur-sm", onClick: () => !isSending && onClose() }), _jsxs("div", { className: "relative w-full max-w-md mx-4 bg-white dark:bg-neutral-900 rounded-3xl border border-dashboard-border shadow-2xl overflow-hidden", children: [_jsxs("div", { className: "flex items-center justify-between px-8 py-6 border-b border-dashboard-border", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "w-10 h-10 rounded-2xl bg-primary/10 flex items-center justify-center", children: _jsx(Mail, { className: "w-5 h-5 text-primary" }) }), _jsxs("div", { children: [_jsx("h2", { className: "text-xl font-black text-dashboard-text uppercase tracking-tight", children: "Test Email" }), _jsx("p", { className: "text-xs text-dashboard-text-secondary", children: "Send a test email to verify SMTP" })] })] }), _jsx("button", { onClick: () => !isSending && onClose(), disabled: isSending, className: "p-2 rounded-full hover:bg-dashboard-border transition-colors", children: _jsx(X, { size: 20, className: "text-dashboard-text-secondary" }) })] }), _jsx("div", { className: "p-8", children: _jsxs("div", { className: "space-y-4", children: [_jsxs("div", { children: [_jsx("label", { className: "text-xs font-bold text-dashboard-text-secondary uppercase tracking-widest block mb-2", children: "Email Template" }), _jsxs("div", { className: "flex gap-2", children: [_jsxs("button", { onClick: () => setEmailType('test'), className: `flex-1 flex items-center justify-center gap-2 px-4 py-3 rounded-xl text-xs font-bold uppercase tracking-widest transition-colors ${emailType === 'test'
-                                                        ? 'bg-primary text-white'
-                                                        : 'bg-dashboard-bg border border-dashboard-border text-dashboard-text hover:bg-dashboard-border'}`, children: [_jsx(Mail, { size: 14 }), "Test"] }), _jsxs("button", { onClick: () => setEmailType('welcome'), disabled: !welcomeEmailConfigured, className: `flex-1 flex items-center justify-center gap-2 px-4 py-3 rounded-xl text-xs font-bold uppercase tracking-widest transition-colors ${emailType === 'welcome'
-                                                        ? 'bg-primary text-white'
-                                                        : welcomeEmailConfigured
-                                                            ? 'bg-dashboard-bg border border-dashboard-border text-dashboard-text hover:bg-dashboard-border'
-                                                            : 'bg-dashboard-bg border border-dashboard-border text-dashboard-text-secondary opacity-50 cursor-not-allowed'}`, children: [_jsx(Sparkles, { size: 14 }), "Welcome", !welcomeEmailConfigured && (_jsx("span", { className: "text-[9px] normal-case opacity-70", children: "(Not configured)" }))] })] })] }), _jsxs("div", { children: [_jsx("label", { className: "text-xs font-bold text-dashboard-text-secondary uppercase tracking-widest block mb-2", children: "Recipient Email" }), _jsx("input", { type: "email", value: email, onChange: (e) => {
-                                                setEmail(e.target.value);
-                                                setSendError(null);
-                                            }, onKeyDown: (e) => e.key === 'Enter' && handleSend(), placeholder: "your@email.com", className: "w-full px-4 py-3 bg-dashboard-bg border border-dashboard-border rounded-xl outline-none focus:ring-2 focus:ring-primary transition-colors text-dashboard-text" })] }), _jsxs("div", { children: [_jsxs("label", { className: "text-xs font-bold text-dashboard-text-secondary uppercase tracking-widest block mb-2", children: [_jsx(Globe, { size: 12, className: "inline mr-1" }), "Language"] }), _jsx("div", { className: "flex gap-2", children: languages.map((lang) => (_jsx("button", { onClick: () => setLanguage(lang.code), className: `px-4 py-2 rounded-xl text-xs font-bold uppercase tracking-widest transition-colors ${language === lang.code
-                                                    ? 'bg-primary text-white'
-                                                    : 'bg-dashboard-bg border border-dashboard-border text-dashboard-text hover:bg-dashboard-border'}`, children: lang.label }, lang.code))) })] }), sendError && (_jsxs("div", { className: "flex items-center gap-2 text-red-500 text-sm", children: [_jsx(AlertCircle, { size: 16 }), sendError] })), _jsx("p", { className: "text-xs text-dashboard-text-secondary", children: "A test email will be sent to this address using your configured SMTP settings." })] }) }), _jsxs("div", { className: "flex items-center justify-end gap-3 px-8 py-6 border-t border-dashboard-border bg-dashboard-bg/50", children: [_jsx("button", { onClick: onClose, disabled: isSending, className: "px-6 py-3 rounded-full text-[10px] font-black uppercase tracking-widest transition-colors bg-dashboard-bg border border-dashboard-border text-dashboard-text hover:bg-dashboard-border", children: "Cancel" }), _jsx("button", { onClick: handleSend, disabled: isSending || sendSuccess, className: `inline-flex items-center gap-2 px-6 py-3 rounded-full text-[10px] font-black uppercase tracking-widest transition-colors shadow-lg ${isSending
-                                    ? 'bg-neutral-400 text-white cursor-not-allowed'
-                                    : sendSuccess
-                                        ? 'bg-green-600 text-white'
-                                        : 'bg-primary text-white hover:bg-primary/90'}`, children: isSending ? (_jsxs(_Fragment, { children: [_jsx(RefreshCw, { className: "w-4 h-4 animate-spin" }), "Sending..."] })) : sendSuccess ? (_jsxs(_Fragment, { children: [_jsx(CheckCircle2, { className: "w-4 h-4" }), "Sent!"] })) : (_jsxs(_Fragment, { children: [_jsx(Send, { className: "w-4 h-4" }), "Send Test"] })) })] })] })] }));
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { className: "fixed inset-0 z-50 flex items-center justify-center", children: [_jsx("div", { className: "absolute inset-0 bg-black/50 backdrop-blur-sm", onClick: () => !isSending && onClose() }), _jsxs("div", { className: "relative w-full max-w-md mx-4 bg-white dark:bg-neutral-900 rounded-3xl border border-dashboard-border shadow-2xl overflow-hidden", children: [_jsxs("div", { className: "flex items-center justify-between px-8 py-6 border-b border-dashboard-border", children: [_jsxs("div", { className: "flex items-center gap-3", children: [_jsx("div", { className: "w-10 h-10 rounded-2xl bg-primary/10 flex items-center justify-center", children: _jsx(Mail, { className: "w-5 h-5 text-primary" }) }), _jsxs("div", { children: [_jsx("h2", { className: "text-xl font-black text-dashboard-text uppercase tracking-tight", children: "Test Email" }), _jsx("p", { className: "text-xs text-dashboard-text-secondary", children: "Send a test email to verify SMTP" })] })] }), _jsx("button", { onClick: () => !isSending && onClose(), disabled: isSending, className: "p-2 rounded-full hover:bg-dashboard-border transition-colors", children: _jsx(X, { size: 20, className: "text-dashboard-text-secondary" }) })] }), _jsx("div", { className: "p-8", children: _jsxs("div", { className: "space-y-4", children: [_jsxs("div", { children: [_jsx("label", { className: "text-xs font-bold text-dashboard-text-secondary uppercase tracking-widest block mb-2", children: "Email Template" }), _jsxs("div", { className: "flex gap-2", children: [_jsxs("button", { onClick: () => setEmailType('test'), className: `flex-1 flex items-center justify-center gap-2 px-4 py-3 rounded-xl text-xs font-bold uppercase tracking-widest transition-colors ${emailType === 'test'
+                                                                ? 'bg-primary text-white'
+                                                                : 'bg-dashboard-bg border border-dashboard-border text-dashboard-text hover:bg-dashboard-border'}`, children: [_jsx(Mail, { size: 14 }), "Test"] }), _jsxs("button", { onClick: () => setEmailType('welcome'), disabled: !welcomeEmailConfigured, className: `flex-1 flex items-center justify-center gap-2 px-4 py-3 rounded-xl text-xs font-bold uppercase tracking-widest transition-colors ${emailType === 'welcome'
+                                                                ? 'bg-primary text-white'
+                                                                : welcomeEmailConfigured
+                                                                    ? 'bg-dashboard-bg border border-dashboard-border text-dashboard-text hover:bg-dashboard-border'
+                                                                    : 'bg-dashboard-bg border border-dashboard-border text-dashboard-text-secondary opacity-50 cursor-not-allowed'}`, children: [_jsx(Sparkles, { size: 14 }), "Welcome", !welcomeEmailConfigured && (_jsx("span", { className: "text-[9px] normal-case opacity-70", children: "(Not configured)" }))] })] })] }), _jsxs("div", { children: [_jsx("label", { className: "text-xs font-bold text-dashboard-text-secondary uppercase tracking-widest block mb-2", children: "Recipient Email" }), _jsx("input", { type: "email", value: email, onChange: (e) => {
+                                                        setEmail(e.target.value);
+                                                        setSendError(null);
+                                                    }, onKeyDown: (e) => e.key === 'Enter' && handleSend(), placeholder: "your@email.com", className: "w-full px-4 py-3 bg-dashboard-bg border border-dashboard-border rounded-xl outline-none focus:ring-2 focus:ring-primary transition-colors text-dashboard-text" })] }), _jsxs("div", { children: [_jsxs("label", { className: "text-xs font-bold text-dashboard-text-secondary uppercase tracking-widest block mb-2", children: [_jsx(Globe, { size: 12, className: "inline mr-1" }), "Language"] }), _jsx("div", { className: "flex gap-2", children: languages.map((lang) => (_jsx("button", { onClick: () => setLanguage(lang.code), className: `px-4 py-2 rounded-xl text-xs font-bold uppercase tracking-widest transition-colors ${language === lang.code
+                                                            ? 'bg-primary text-white'
+                                                            : 'bg-dashboard-bg border border-dashboard-border text-dashboard-text hover:bg-dashboard-border'}`, children: lang.label }, lang.code))) })] }), sendError && (_jsxs("div", { className: "flex items-center gap-2 text-red-500 text-sm", children: [_jsx(AlertCircle, { size: 16 }), sendError] })), _jsx("p", { className: "text-xs text-dashboard-text-secondary", children: "A test email will be sent to this address using your configured SMTP settings." })] }) }), _jsxs("div", { className: "flex items-center justify-end gap-3 px-8 py-6 border-t border-dashboard-border bg-dashboard-bg/50", children: [_jsx("button", { onClick: onClose, disabled: isSending, className: "px-6 py-3 rounded-full text-[10px] font-black uppercase tracking-widest transition-colors bg-dashboard-bg border border-dashboard-border text-dashboard-text hover:bg-dashboard-border", children: "Cancel" }), _jsx("button", { onClick: () => handleSend(), disabled: isSending || sendSuccess || isCheckingDomain, className: `inline-flex items-center gap-2 px-6 py-3 rounded-full text-[10px] font-black uppercase tracking-widest transition-colors shadow-lg ${isSending || isCheckingDomain
+                                            ? 'bg-neutral-400 text-white cursor-not-allowed'
+                                            : sendSuccess
+                                                ? 'bg-green-600 text-white'
+                                                : 'bg-primary text-white hover:bg-primary/90'}`, children: isSending || isCheckingDomain ? (_jsxs(_Fragment, { children: [_jsx(RefreshCw, { className: "w-4 h-4 animate-spin" }), isCheckingDomain ? 'Checking...' : 'Sending...'] })) : sendSuccess ? (_jsxs(_Fragment, { children: [_jsx(CheckCircle2, { className: "w-4 h-4" }), "Sent!"] })) : (_jsxs(_Fragment, { children: [_jsx(Send, { className: "w-4 h-4" }), "Send Test"] })) })] })] })] }), _jsx(DomainPromptModal, { isOpen: showDomainPrompt, onClose: () => setShowDomainPrompt(false), onSave: handleSaveDomain, language: language })] }));
 }

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@jhits/plugin-newsletter",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "Newsletter management and email delivery plugin for the JHITS ecosystem",
   "publishConfig": {
     "access": "public"
   },
-  "main": "./src/index.ts",
-  "types": "./src/index.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./src/index.tsx",
-      "import": "./src/index.tsx",
-      "default": "./src/index.tsx"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
     },
     "./src": {
       "types": "./src/index.tsx",
@@ -19,9 +19,9 @@
       "default": "./src/index.tsx"
     },
     "./server": {
-      "types": "./src/index.server.ts",
-      "import": "./src/index.server.ts",
-      "default": "./src/index.server.ts"
+      "types": "./dist/index.server.d.ts",
+      "import": "./dist/index.server.js",
+      "default": "./dist/index.server.js"
     }
   },
   "dependencies": {
@@ -48,6 +48,50 @@
     "react-dom": "19.2.4",
     "typescript": "^5.9.3"
   },
+  "jhits": {
+    "views": [
+      {
+        "id": "newsletters",
+        "labels": {
+          "en": "Campaigns",
+          "nl": "Campagnes",
+          "sv": "Kampanjer"
+        }
+      },
+      {
+        "id": "new",
+        "labels": {
+          "en": "New Campaign",
+          "nl": "Nieuwe Campagne",
+          "sv": "Ny Kampanj"
+        }
+      },
+      {
+        "id": "welcome",
+        "labels": {
+          "en": "Welcome Email",
+          "nl": "Welkomstmail",
+          "sv": "Välkomstbrev"
+        }
+      },
+      {
+        "id": "subscribers",
+        "labels": {
+          "en": "Subscribers",
+          "nl": "Abonnees",
+          "sv": "Prenumeranter"
+        }
+      },
+      {
+        "id": "settings",
+        "labels": {
+          "en": "Settings",
+          "nl": "Instellingen",
+          "sv": "Inställningar"
+        }
+      }
+    ]
+  },
   "files": [
     "src",
     "dist",

package/src/api/email-utils.ts

@@ -19,6 +19,7 @@ interface SmtpConfig {
     from: string;
     fromName: string;
     logoUrl?: string;
+    unsubscribeTranslations?: Record<string, string>;
 }
 
 async function getSmtpConfig(config: NewsletterApiConfig): Promise<SmtpConfig | null> {
@@ -36,11 +37,47 @@ async function getSmtpConfig(config: NewsletterApiConfig): Promise<SmtpConfig |
             from: smtpConfig.from,
             fromName: smtpConfig.fromName || '',
             logoUrl: smtpConfig.logoUrl || '',
+            unsubscribeTranslations: smtpConfig.unsubscribeTranslations || {},
         };
     }
     return null;
 }
 
+async function resolveBaseUrl(config: NewsletterApiConfig, language: string): Promise<string> {
+    try {
+        const dbConnection = await config.getDb();
+        const db = dbConnection.db();
+        const settings = db.collection('settings');
+        
+        // Try to get site config from plugin-website (stored in 'settings' collection with identifier 'site_config')
+        const siteConfig = await settings.findOne({ identifier: 'site_config' });
+        
+        if (siteConfig && siteConfig.domainLocaleConfig && Array.isArray(siteConfig.domainLocaleConfig)) {
+            // Find domain for this locale
+            const localeConfig = siteConfig.domainLocaleConfig.find((c: any) => c.locale === language);
+            if (localeConfig && localeConfig.domain && localeConfig.domain !== 'undefined' && localeConfig.domain.trim() !== '') {
+                const domain = localeConfig.domain.trim();
+                // Add protocol if missing
+                if (!domain.startsWith('http')) {
+                    const protocol = domain.includes('localhost') ? 'http' : 'https';
+                    return `${protocol}://${domain}`;
+                }
+                return domain;
+            }
+        }
+    } catch (error) {
+        console.warn('[NewsletterAPI] Failed to resolve language-specific base URL:', error);
+    }
+
+    // Fallback to default, carefully checking for 'undefined' string
+    const fallback = process.env.NEXT_PUBLIC_SITE_URL;
+    if (fallback && fallback !== 'undefined' && fallback.trim() !== '') {
+        return fallback;
+    }
+    
+    return 'https://botanicsandyou.com';
+}
+
 export async function sendWelcomeEmail(
     config: NewsletterApiConfig,
     email: string,
@@ -54,9 +91,9 @@ export async function sendWelcomeEmail(
     
     const isDutch = language === 'nl';
     const isSwedish = language === 'sv';
-    const baseUrl = host
-        ? (host.includes('localhost') ? 'http' : 'https') + '://' + host
-        : config.baseUrl || 'https://bya.jorishummel.com';
+    
+    // Resolve base URL based on language settings from plugin-website
+    const baseUrl = await resolveBaseUrl(config, language);
 
     const slugs: Record<string, string> = {
         sv: '/avmälla',
@@ -103,6 +140,12 @@ export async function sendWelcomeEmail(
         if (blocks && blocks.length > 0) {
             const { generateNewsletterEmailHtml } = await import('../lib/email/EmailRenderer');
             
+            // Get unsubscribe text (Priority: metadata manual override > global SMTP translation > hardcoded localized default)
+            const globalTranslations = smtpConfig.unsubscribeTranslations || {};
+            const hardcodedDefaults: Record<string, string> = { en: 'Unsubscribe', nl: 'Afmelden', sv: 'Avanmälan' };
+            const defaultText = globalTranslations[language] || hardcodedDefaults[language] || hardcodedDefaults.en;
+            const unsubscribeText = metadata?.unsubscribeText || defaultText;
+
             html = generateNewsletterEmailHtml(
                 blocks,
                 { subject: metadata?.subject || '', previewText: metadata?.previewText || '' },
@@ -111,6 +154,7 @@ export async function sendWelcomeEmail(
                     locale: language,
                     logoUrl: logoSrc,
                     unsubscribeUrl,
+                    unsubscribeText,
                     footerText: `© ${new Date().getFullYear()} ${smtpConfig.fromName || 'Botanics & You'}`,
                 }
             );
@@ -131,6 +175,11 @@ export async function sendWelcomeEmail(
                 }
             }
 
+            // Get unsubscribe text for legacy template too
+            const globalTranslations = smtpConfig.unsubscribeTranslations || {};
+            const hardcodedDefaults: Record<string, string> = { en: 'Unsubscribe', nl: 'Afmelden', sv: 'Avanmälan' };
+            const unsubscribeText = globalTranslations[language] || hardcodedDefaults[language] || hardcodedDefaults.en;
+
             const template = handlebars.compile(templateContent);
             html = template({
                 fromName: smtpConfig.fromName || 'Botanics & You',
@@ -141,7 +190,7 @@ export async function sendWelcomeEmail(
                     ? 'Tack för att du är en del av vår community. Vi tror att naturen ger oss allt vi verkligen behöver.'
                     : 'Thank you for joining our community. We believe that nature provides everything we truly need.',
                 unsubscribeUrl,
-                unsubscribeText: isDutch ? 'Afmelden' : isSwedish ? 'Avanmälan' : 'Unsubscribe',
+                unsubscribeText,
                 tagline: isDutch ? 'Natuurlijk verbonden' : isSwedish ? 'Naturligt ansluten' : 'Naturally connected',
                 currentYear: new Date().getFullYear(),
             });

package/src/api/handlers/newsletters.ts

@@ -40,8 +40,9 @@ export async function GET_NEWSLETTERS(
         const skip = parseInt(searchParams.get('skip') || '0', 10);
         const sortBy = searchParams.get('sortBy') || 'updatedAt';
         const sortOrder = searchParams.get('sortOrder') || 'desc';
+        const language = searchParams.get('language') || 'en';
 
-        const query: any = {};
+        const query: Record<string, unknown> = {};
         if (status) {
             query['publication.status'] = status;
         }
@@ -55,7 +56,7 @@ export async function GET_NEWSLETTERS(
             ]
         };
 
-        const sort: any = {};
+        const sort: Record<string, 1 | -1> = {};
         sort[sortBy] = sortOrder === 'asc' ? 1 : -1;
 
         const newsletterList = await newsletters
@@ -65,20 +66,39 @@ export async function GET_NEWSLETTERS(
             .skip(skip)
             .toArray();
 
-        const listItems: NewsletterListItem[] = newsletterList.map((newsletter: any) => ({
-            id: newsletter._id?.toString() || newsletter.id,
-            title: newsletter.title,
-            slug: newsletter.slug,
-            status: newsletter.publication?.status || 'draft',
-            subject: newsletter.metadata?.subject || '',
-            scheduledDate: newsletter.publication?.scheduledDate,
-            sentDate: newsletter.publication?.sentDate,
-            authorId: newsletter.publication?.authorId,
-            updatedAt: newsletter.updatedAt || newsletter.createdAt,
-            recipientCount: newsletter.recipientCount,
-            hidden: newsletter.hidden,
-            sendHistory: newsletter.sendHistory || [],
-        }));
+        const primaryLanguage = 'en'; // Default primary
+
+        const listItems: NewsletterListItem[] = newsletterList.map((newsletter: Record<string, any>) => {
+            const languages = newsletter.languages || {};
+            const newsletterPrimaryLang = newsletter.metadata?.lang || primaryLanguage;
+            
+            // Get title (from subject) and subject from language-specific content
+            let title = newsletter.metadata?.subject || '';
+            
+            if (languages[language]) {
+                title = languages[language].metadata?.subject || title;
+            } else if (language !== newsletterPrimaryLang && languages[newsletterPrimaryLang]) {
+                // Fall back to primary language
+                title = languages[newsletterPrimaryLang].metadata?.subject || title;
+            }
+            
+            return {
+                id: newsletter._id?.toString() || newsletter.id,
+                title: title || newsletter.title || 'Untitled',
+                slug: newsletter.slug,
+                status: newsletter.publication?.status || 'draft',
+                subject: title,
+                scheduledDate: newsletter.publication?.scheduledDate,
+                sentDate: newsletter.publication?.sentDate,
+                authorId: newsletter.publication?.authorId,
+                updatedAt: newsletter.updatedAt || newsletter.createdAt,
+                recipientCount: newsletter.recipientCount,
+                hidden: newsletter.hidden,
+                sendHistory: newsletter.sendHistory || [],
+                availableLanguages: Object.keys(languages),
+                languages,
+            };
+        });
 
         return NextResponse.json(listItems);
     } catch (error: any) {
@@ -142,7 +162,7 @@ export async function GET_NEWSLETTER(
 
         const result: Newsletter = {
             id: newsletter._id?.toString() || newsletter.id,
-            title: newsletter.title,
+            title: metadata.subject || 'Untitled',
             slug: newsletter.slug,
             blocks,
             metadata,
@@ -201,7 +221,7 @@ export async function POST_NEWSLETTER(
         
         // Generate slug for backwards compatibility, but id is primary
         const existingNewsletters = await newsletters.find({}, { projection: { slug: 1 } }).toArray();
-        const existingSlugs = existingNewsletters.map((n: any) => n.slug).filter(Boolean);
+        const existingSlugs = existingNewsletters.map((n: Record<string, any>) => n.slug).filter(Boolean);
         const slug = generateSlugFromTitle(finalTitle, existingSlugs);
 
         const newsletterDocument = {
@@ -306,8 +326,8 @@ export async function PUT_NEWSLETTER(
         // Set primary language if not set
         const primaryLanguage = existing.metadata?.lang || language;
 
-        const updateData: any = {
-            title: finalTitle,
+        const updateData: Record<string, unknown> = {
+            title: finalTitle, // Keep root title for backwards compatibility
             blocks: blocks || [], // Keep blocks at root for backwards compatibility
             metadata: {
                 subject: metadata.subject.trim(),

package/src/api/handlers/send-newsletter.ts

@@ -20,6 +20,7 @@ interface SmtpConfig {
     from: string;
     fromName: string;
     logoUrl?: string;
+    unsubscribeTranslations?: Record<string, string>;
 }
 
 async function getSmtpConfig(config: NewsletterApiConfig): Promise<SmtpConfig | null> {
@@ -37,6 +38,7 @@ async function getSmtpConfig(config: NewsletterApiConfig): Promise<SmtpConfig |
             from: smtpConfig.from,
             fromName: smtpConfig.fromName || '',
             logoUrl: smtpConfig.logoUrl || '',
+            unsubscribeTranslations: smtpConfig.unsubscribeTranslations || {},
         };
     }
     return null;
@@ -49,6 +51,41 @@ function getNewsletterFilter(idOrSlug: string) {
     return { slug: idOrSlug };
 }
 
+async function resolveBaseUrl(config: NewsletterApiConfig, language: string): Promise<string> {
+    try {
+        const dbConnection = await config.getDb();
+        const db = dbConnection.db();
+        const settings = db.collection('settings');
+        
+        // Try to get site config from plugin-website (stored in 'settings' collection with identifier 'site_config')
+        const siteConfig = await settings.findOne({ identifier: 'site_config' });
+        
+        if (siteConfig && siteConfig.domainLocaleConfig && Array.isArray(siteConfig.domainLocaleConfig)) {
+            // Find domain for this locale
+            const localeConfig = siteConfig.domainLocaleConfig.find((c: any) => c.locale === language);
+            if (localeConfig && localeConfig.domain && localeConfig.domain !== 'undefined' && localeConfig.domain.trim() !== '') {
+                const domain = localeConfig.domain.trim();
+                // Add protocol if missing
+                if (!domain.startsWith('http')) {
+                    const protocol = domain.includes('localhost') ? 'http' : 'https';
+                    return `${protocol}://${domain}`;
+                }
+                return domain;
+            }
+        }
+    } catch (error) {
+        console.warn('[NewsletterAPI] Failed to resolve language-specific base URL:', error);
+    }
+
+    // Fallback to default, carefully checking for 'undefined' string
+    const fallback = process.env.NEXT_PUBLIC_SITE_URL;
+    if (fallback && fallback !== 'undefined' && fallback.trim() !== '') {
+        return fallback;
+    }
+    
+    return 'https://botanicsandyou.com';
+}
+
 export async function POST_SEND_NEWSLETTER(
     req: NextRequest,
     idOrSlug: string,
@@ -123,7 +160,19 @@ export async function POST_SEND_NEWSLETTER(
             connectionTimeout: 30000,
         });
 
-        const baseUrl = config.baseUrl || 'http://localhost:3001';
+        // Resolve base URL based on language settings from plugin-website
+        const baseUrl = await resolveBaseUrl(config, language);
+        
+        // Final sanity check - if domain is STILL undefined, stop sending and ask user for domain
+        if (baseUrl.includes('undefined')) {
+            return NextResponse.json(
+                { 
+                    error: 'Domain not configured for this language. Please define your website domain first.',
+                    code: 'DOMAIN_MISSING'
+                },
+                { status: 400 }
+            );
+        }
         
         let logoAttachment: any = undefined;
         let logoSrc = smtpConfig.logoUrl || `${baseUrl}/logo_black.svg`;
@@ -188,25 +237,35 @@ export async function POST_SEND_NEWSLETTER(
                 const subscriber = isTest ? null : await subscribers.findOne({ email });
                 const subscriberLang = subscriber?.language || language;
                 const subscriberSlug = slugs[subscriberLang] || slugs.en;
-                const unsubscribeUrl = `${baseUrl}${subscriberSlug}?email=${encodeURIComponent(email)}`;
                 
-                return { email, unsubscribeUrl };
+                // Resolve correct base URL for this specific subscriber's language
+                const subscriberBaseUrl = await resolveBaseUrl(config, subscriberLang);
+                const unsubscribeUrl = `${subscriberBaseUrl}${subscriberSlug}?email=${encodeURIComponent(email)}`;
+                
+                return { email, unsubscribeUrl, subscriberLang, subscriberBaseUrl };
             })
         );
 
         let successCount = 0;
         let failedCount = 0;
 
-        for (const { email, unsubscribeUrl } of recipientsWithUrls) {
+        for (const { email, unsubscribeUrl, subscriberLang, subscriberBaseUrl } of recipientsWithUrls) {
             try {
+                // Get unsubscribe text (Priority: metadata manual override > global SMTP translation > hardcoded localized default)
+                const globalTranslations = smtpConfig.unsubscribeTranslations || {};
+                const hardcodedDefaults: Record<string, string> = { en: 'Unsubscribe', nl: 'Afmelden', sv: 'Avanmälan' };
+                const defaultText = globalTranslations[subscriberLang] || hardcodedDefaults[subscriberLang] || hardcodedDefaults.en;
+                const unsubscribeText = metadata?.unsubscribeText || defaultText;
+
                 const html = generateNewsletterEmailHtml(
                     blocks,
                     { subject: metadata.subject || '', previewText: metadata.previewText || '' },
                     {
-                        baseUrl,
-                        locale: language,
+                        baseUrl: subscriberBaseUrl,
+                        locale: subscriberLang,
                         logoUrl: logoSrc,
                         unsubscribeUrl,
+                        unsubscribeText,
                         footerText: `© ${new Date().getFullYear()} ${smtpConfig.fromName || 'Botanics & You'}`,
                     }
                 );