From 0af6c1fe9e2ae949ccff03ddb6633a9e1c041d15 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 15 Jan 2023 10:41:36 +0100 Subject: [PATCH] added template for sign up second step --- modules/rabbitmq/rabbitmq.go | 79 --------------------------------- templates/SignUpSecondStep.html | 7 +++ templates/templates.json | 14 ++++++ 3 files changed, 21 insertions(+), 79 deletions(-) create mode 100644 templates/SignUpSecondStep.html diff --git a/modules/rabbitmq/rabbitmq.go b/modules/rabbitmq/rabbitmq.go index 5e5d124..4e84f56 100644 --- a/modules/rabbitmq/rabbitmq.go +++ b/modules/rabbitmq/rabbitmq.go @@ -33,82 +33,3 @@ func Init() { MailMessagesHandling() } - -/* -func Init() { - conn, err := amqp.Dial(getConnectionString()) - - if err != nil { - logrus.Fatalln("RabbitMQ connection failed, err:", err) - } - - ch, err := conn.Channel() - - if err != nil { - logrus.Fatalln(err) - } - - Channel = ch - - err = ch.Qos( - 1, // prefetch count - 0, // prefetch size - false, // global - ) - - if err != nil { - logrus.Fatalln("Failed to set Qos, err:", err) - } - - msgs, err := ch.Consume( - queueMails, // queue - "", // consumer - false, // auto-ack - false, // exclusive - false, // no-local - false, // no-wait - nil, // args - ) - - if err != nil { - logrus.Fatalln("Failed to consume mails, err:", err) - } - - var forever chan struct{} - - go func() { - for d := range msgs { - logrus.Debugln("RECV MAIL") - - mailMessage := structs.RabbitMqMailMessage{} - - if err := json.Unmarshal(d.Body, &mailMessage); err != nil { - logrus.Errorln("Failed to unmarshal json message, err:", err) - continue - } - - logrus.Println(mailMessage.UserMail) - - // only for testing - if !strings.HasSuffix(mailMessage.UserMail, "@roese.dev") && !strings.HasSuffix(mailMessage.UserMail, "@umbach.dev") { - mailMessage.UserMail = "info@clickandjoin.de" - } - - err = mailer.NewMail(structs.Mail{ - To: []string{mailMessage.UserMail}, - TemplateId: mailMessage.TemplateId, - LanguageId: mailMessage.LanguageId, - BodyData: mailMessage.BodyData}) - - if err != nil { - logrus.Errorln("Failed to send new mail, err:", err) - continue - } - - d.Ack(false) - } - }() - - <-forever -} -*/ diff --git a/templates/SignUpSecondStep.html b/templates/SignUpSecondStep.html new file mode 100644 index 0000000..b36dec4 --- /dev/null +++ b/templates/SignUpSecondStep.html @@ -0,0 +1,7 @@ + + + +

%header%

+

%informationText%

+ + \ No newline at end of file diff --git a/templates/templates.json b/templates/templates.json index c9641e1..a6a227d 100644 --- a/templates/templates.json +++ b/templates/templates.json @@ -31,6 +31,20 @@ "en": "a new sign-in on {{.device}} was detected", "de": "eine neue Anmeldung auf {{.device}} wurde festgestellt" } + }, + "SignUpSecondStep": { + "mailSubject": { + "en": "Welcome", + "de": "Willkommen" + }, + "header": { + "en": "Good day {{.account_name}},", + "de": "Guten Tag {{.account_name}}," + }, + "informationText": { + "en": "nice that you are here! Your account is created and you can start right away", + "de": "schön das du da bist! Dein Account ist erstellt und du kannst sofort loslegen" + } } } } \ No newline at end of file