From 11740cb50350f64153c5642f4355a1d231c5943a Mon Sep 17 00:00:00 2001 From: Alex <$(pass /github/email)> Date: Wed, 14 May 2025 12:29:47 +0200 Subject: [PATCH] fixes in prod --- frontend/src/lib/locales/de.js | 6 ++++++ go-backend/internal/database/db.go | 7 ++++--- go-backend/internal/services/email_service.go | 4 ++-- go-backend/templates/email/mail_verification.tmpl | 2 +- go-backend/templates/email/mail_verification.txt.tmpl | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/frontend/src/lib/locales/de.js b/frontend/src/lib/locales/de.js index 414cf49..f5e022f 100644 --- a/frontend/src/lib/locales/de.js +++ b/frontend/src/lib/locales/de.js @@ -170,9 +170,14 @@ export default { end_date: 'Leasingende', leasing_rate: 'Leasingrate' }, + insurances: { + edit: 'Daten bearbeiten', + create: 'Versicherung erstellen' + }, loading: { user_data: 'Lade Nutzerdaten', subscription_data: 'Lade Modelldaten', + insurance_data: 'Lade Versicherungsdaten', car_data: 'Lade Fahrzeugdaten', please_wait: 'Bitte warten...', updating: 'Aktualisiere...' @@ -188,6 +193,7 @@ export default { cancel: 'Abbrechen', confirm: 'Bestätigen', actions: 'Aktionen', + create: 'Hinzufügen', edit: 'Bearbeiten', delete: 'Löschen', not_set: 'Nicht gesetzt', diff --git a/go-backend/internal/database/db.go b/go-backend/internal/database/db.go index 42eff53..a487e05 100644 --- a/go-backend/internal/database/db.go +++ b/go-backend/internal/database/db.go @@ -50,8 +50,8 @@ func Open(dbPath string, adminMail string, debug bool) (*gorm.DB, error) { sqlDB.SetMaxIdleConns(1) sqlDB.SetConnMaxLifetime(time.Hour) + db.Exec("PRAGMA foreign_keys = OFF;") if err := db.AutoMigrate( - &models.User{}, &models.Subscription{}, &models.Membership{}, &models.Consent{}, @@ -62,11 +62,12 @@ func Open(dbPath string, adminMail string, debug bool) (*gorm.DB, error) { &models.Car{}, &models.Location{}, &models.Damage{}, - &models.Insurance{}, + // &models.Insurance{}, + // &models.User{}, ); err != nil { return nil, fmt.Errorf("failed to migrate database: %w", err) } - + db.Exec("PRAGMA foreign_keys = ON;") logger.Info.Print("Opened DB") DB = db var categoriesCount int64 diff --git a/go-backend/internal/services/email_service.go b/go-backend/internal/services/email_service.go index 98c1bee..7ddbb33 100644 --- a/go-backend/internal/services/email_service.go +++ b/go-backend/internal/services/email_service.go @@ -71,13 +71,13 @@ func (s *EmailService) SendVerificationEmail(user *models.User, token *string) e LastName string Token string BASEURL string - ID uint + UserID uint }{ FirstName: user.FirstName, LastName: user.LastName, Token: *token, BASEURL: config.Site.BaseURL, - ID: user.ID, + UserID: user.ID, } subject := constants.MailVerificationSubject diff --git a/go-backend/templates/email/mail_verification.tmpl b/go-backend/templates/email/mail_verification.tmpl index 4b909ca..9e307ee 100644 --- a/go-backend/templates/email/mail_verification.tmpl +++ b/go-backend/templates/email/mail_verification.tmpl @@ -70,7 +70,7 @@