diff --git a/schemas/init.sql b/schemas/init.sql index d2c3ea2..bd74ce6 100644 --- a/schemas/init.sql +++ b/schemas/init.sql @@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS users ( -- 4. Insert root admin user (password: 3DBFC7FEF43B45E887C8E54205C8EC8F) INSERT IGNORE INTO users (email, username, password_hash, full_name, role, email_verified) VALUES -('root@nordicstorium.com', 'root', '$2b$10$MDURVVPDTo60o.W5rHJOPex3jwR8.s.xc5e1dpYF8DG7bu5SXXwLq', 'Root Administrator', 'admin', TRUE); +('root@nordicstorium.se', 'root', '$2b$10$MDURVVPDTo60o.W5rHJOPex3jwR8.s.xc5e1dpYF8DG7bu5SXXwLq', 'Root Administrator', 'admin', TRUE); -- 5. Create categories table (Required for webshop) CREATE TABLE IF NOT EXISTS categories ( diff --git a/src/app/api/conversations/[id]/route.ts b/src/app/api/conversations/[id]/route.ts index 2944219..ec63ca7 100644 --- a/src/app/api/conversations/[id]/route.ts +++ b/src/app/api/conversations/[id]/route.ts @@ -141,7 +141,7 @@ export async function POST(request: NextRequest, { params }: RouteParams) { conversation.user_email, `Nytt svar: ${conversation.subject}`, 'Nordic Storium Support', - process.env.SMTP_FROM || 'support@nordicstorium.com', + process.env.SMTP_FROM || 'info@nordicstorium.se', null, null, content, diff --git a/src/lib/email.ts b/src/lib/email.ts index 595e798..5c2429b 100644 --- a/src/lib/email.ts +++ b/src/lib/email.ts @@ -13,7 +13,7 @@ const transporter = nodemailer.createTransport({ export const sendEmail = async (to: string, subject: string, html: string) => { try { const info = await transporter.sendMail({ - from: `"Nordic Storium" <${process.env.SMTP_FROM || 'noreply@nordicstorium.com'}>`, + from: `"Nordic Storium" <${process.env.SMTP_FROM || 'info@nordicstorium.se'}>`, to, subject, html, @@ -27,6 +27,14 @@ export const sendEmail = async (to: string, subject: string, html: string) => { }; const premiumTemplate = (content: string) => ` + + + + + + Nordic Storium + +

Nordic Storium

@@ -45,6 +53,8 @@ const premiumTemplate = (content: string) => `
+ + `; export const sendVerificationEmail = async (email: string, token: string) => { @@ -92,7 +102,7 @@ export const sendPasswordResetEmail = async (email: string, token: string) => { }; export const sendContactEmail = async (name: string, email: string, subject: string, message: string) => { - const adminEmail = process.env.CONTACT_EMAIL || 'admin@nordicstorium.com'; + const adminEmail = process.env.CONTACT_EMAIL || 'info@nordicstorium.se'; const content = `

Nytt Kontaktmeddelande

@@ -119,7 +129,7 @@ export const sendSellFurnitureEmail = async ( message: string, images: { filename: string; content: Buffer; contentType: string }[] ) => { - const adminEmail = process.env.CONTACT_EMAIL || 'admin@nordicstorium.com'; + const adminEmail = process.env.CONTACT_EMAIL || 'info@nordicstorium.se'; const content = `

Försäljning av Möbler

@@ -148,7 +158,7 @@ export const sendSellFurnitureEmail = async ( })); const info = await transporter.sendMail({ - from: `"Nordic Storium" <${process.env.SMTP_FROM || 'noreply@nordicstorium.com'}>`, + from: `"Nordic Storium" <${process.env.SMTP_FROM || 'info@nordicstorium.se'}>`, to: adminEmail, subject: `Försäljning av Möbler: ${name}`, html: premiumTemplate(content), @@ -173,13 +183,17 @@ export const sendMessageNotification = async ( actionLink: string, actionText: string ) => { + // Determine labels and values even if null to show clarity + const phoneDisplay = senderPhone || 'Ej angivet'; + const personnummerDisplay = senderPersonnummer || 'Ej angivet'; + const content = `

Nytt Meddelande

Från: ${senderName}

Email: ${senderEmail}

- ${senderPhone ? `

Telefon: ${senderPhone}

` : ''} - ${senderPersonnummer ? `

Personnummer: ${senderPersonnummer}

` : ''} +

Telefon: ${phoneDisplay}

+

Personnummer: ${personnummerDisplay}