feat: added lots of work to landing page

2025-11-19 09:03:29 -06:00
parent 57e09ceea9
commit ac1d18f3a3
8 changed files with 1704 additions and 339 deletions
--- a/internal/email/sender.go
+++ b/internal/email/sender.go
@@ -3,10 +3,10 @@ package email
 import (
  "crypto/tls"
  "fmt"
-  "net"
+  "html"
  "net/smtp"
  "strconv"
-  "time"
+  "strings"

  "landing/internal/config"
 )
@@ -23,13 +23,6 @@ func (s *Sender) SendConfirmationEmail(
  email string,
  unsubscribeLink string,
 ) error {
-  // Parse SMTP port from env
-  port, err := strconv.Atoi(s.cfg.SMTPPort)
-  if err != nil {
-    return fmt.Errorf("invalid SMTP port '%s': %w", s.cfg.SMTPPort, err)
-  }
-
-  // Build email message
  subject := "Thanks for subscribing!"
  htmlBody := fmt.Sprintf(`
    <html>
@@ -41,88 +34,143 @@ func (s *Sender) SendConfirmationEmail(
    </html>
  `, unsubscribeLink)

+  return s.sendEmail(email, subject, htmlBody)
+}
+
+func (s *Sender) SendContactConfirmation(email, name string) error {
+  subject := "We received your message - RideAware"
+  htmlBody := fmt.Sprintf(`
+    <html>
+    <body>
+      <h2>Thank you for reaching out, %s!</h2>
+      <p>We've received your message and will get back to you as soon as possible.</p>
+      <p>In the meantime, feel free to check out more about RideAware on our website.</p>
+      <p>Best regards,<br>The RideAware Team</p>
+    </body>
+    </html>
+  `, html.EscapeString(name))
+
+  return s.sendEmail(email, subject, htmlBody)
+}
+
+func (s *Sender) SendContactNotification(
+  adminEmail, name, email, subject, message string,
+) error {
+  emailSubject := fmt.Sprintf("New contact message from %s", name)
+  htmlBody := fmt.Sprintf(`
+    <html>
+    <body>
+      <h3>New Contact Message</h3>
+      <p><strong>From:</strong> %s (%s)</p>
+      <p><strong>Subject:</strong> %s</p>
+      <h4>Message:</h4>
+      <p>%s</p>
+    </body>
+    </html>
+  `,
+    html.EscapeString(name),
+    html.EscapeString(email),
+    html.EscapeString(subject),
+    strings.ReplaceAll(html.EscapeString(message), "\n", "<br>"),
+  )
+
+  return s.sendEmail(adminEmail, emailSubject, htmlBody)
+}
+
+func (s *Sender) sendEmail(toEmail, subject, htmlBody string) error {
+  port, err := strconv.Atoi(s.cfg.SMTPPort)
+  if err != nil {
+    return fmt.Errorf("invalid SMTP port '%s': %w", s.cfg.SMTPPort, err)
+  }
+
  message := fmt.Sprintf(
    "From: %s\r\nTo: %s\r\nSubject: %s\r\nContent-Type: text/html; charset=utf-8\r\n\r\n%s",
    s.cfg.SMTPUser,
-    email,
+    toEmail,
    subject,
    htmlBody,
  )

+  addr := fmt.Sprintf("%s:%d", s.cfg.SMTPHost, port)
+
+  // Port 465 uses direct SSL/TLS
+  return s.sendEmailSSL(addr, toEmail, message)
+}
+
+func (s *Sender) sendEmailSSL(addr, toEmail, message string) error {
  // Create TLS config
  tlsConfig := &tls.Config{
    ServerName: s.cfg.SMTPHost,
  }

-  // Send email using smtp.SendMail
-  addr := fmt.Sprintf("%s:%d", s.cfg.SMTPHost, port)
-  auth := smtp.PlainAuth("", s.cfg.SMTPUser, s.cfg.SMTPPass, s.cfg.SMTPHost)
-
-  // Use a custom dialer with timeout
-  conn, err := net.DialTimeout("tcp", addr, 10*time.Second)
+  // Try to dial with TLS
+  conn, err := tls.Dial("tcp", addr, tlsConfig)
  if err != nil {
-    return fmt.Errorf("failed to connect to SMTP server: %w", err)
+    return fmt.Errorf("failed to dial TLS to %s: %w", addr, err)
  }
  defer conn.Close()

+  // Create SMTP client
  client, err := smtp.NewClient(conn, s.cfg.SMTPHost)
  if err != nil {
    return fmt.Errorf("failed to create SMTP client: %w", err)
  }
  defer client.Close()

-  // Start TLS
-  if err := client.StartTLS(tlsConfig); err != nil {
-    return fmt.Errorf("failed to start TLS: %w", err)
-  }
-
  // Authenticate
+  auth := smtp.PlainAuth("", s.cfg.SMTPUser, s.cfg.SMTPPass, s.cfg.SMTPHost)
  if err := client.Auth(auth); err != nil {
-    return fmt.Errorf("failed to authenticate: %w", err)
+    return fmt.Errorf("failed to authenticate with %s: %w", s.cfg.SMTPUser, err)
  }

-  // Set recipient and send
+  // Set sender
  if err := client.Mail(s.cfg.SMTPUser); err != nil {
-    return fmt.Errorf("failed to set mail from: %w", err)
+    return fmt.Errorf("failed to set mail from %s: %w", s.cfg.SMTPUser, err)
  }

-  if err := client.Rcpt(email); err != nil {
-    return fmt.Errorf("failed to set mail to: %w", err)
+  // Set recipient
+  if err := client.Rcpt(toEmail); err != nil {
+    return fmt.Errorf("failed to set mail to %s: %w", toEmail, err)
  }

+  // Get data writer
  wc, err := client.Data()
  if err != nil {
    return fmt.Errorf("failed to get data writer: %w", err)
  }
  defer wc.Close()

+  // Write message
  if _, err := wc.Write([]byte(message)); err != nil {
    return fmt.Errorf("failed to write message: %w", err)
  }

-  if err := client.Quit(); err != nil {
-    return fmt.Errorf("failed to quit SMTP: %w", err)
-  }
+  // Quit - ignore quit errors since email was already queued
+  _ = client.Quit()

  return nil
 }

-// TestConnection tests SMTP connection without sending email
 func (s *Sender) TestConnection() error {
  port, err := strconv.Atoi(s.cfg.SMTPPort)
  if err != nil {
    return fmt.Errorf("invalid SMTP port '%s': %w", s.cfg.SMTPPort, err)
  }

-  // Test TCP connection
  addr := fmt.Sprintf("%s:%d", s.cfg.SMTPHost, port)
-  conn, err := net.DialTimeout("tcp", addr, 10*time.Second)
+
+  // Test TLS connection
+  tlsConfig := &tls.Config{
+    ServerName: s.cfg.SMTPHost,
+  }
+
+  conn, err := tls.Dial("tcp", addr, tlsConfig)
  if err != nil {
-    return fmt.Errorf("TCP connection failed to %s: %w", addr, err)
+    return fmt.Errorf("failed to dial TLS to %s: %w", addr, err)
  }
  defer conn.Close()

-  // Test SMTP connection
+  // Test SMTP client creation
  client, err := smtp.NewClient(conn, s.cfg.SMTPHost)
  if err != nil {
    return fmt.Errorf("failed to create SMTP client: %w", err)