From 36bbaefb23c35393c76e8a865b2763d2a3ff2c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Wo=C5=BAniak?= <adrian.wozniak.1986@gmail.com>
Date: Fri, 15 Oct 2021 15:58:15 +0200
Subject: [PATCH] Fix email content type. Style lists

---
 actors/mail-actor/src/invite.rs  |  2 ++
 actors/mail-actor/src/welcome.rs |  2 ++
 web/js/css/styledEditor.scss     | 14 ++++++++++++++
 web/src/model.rs                 | 12 ++++++------
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/actors/mail-actor/src/invite.rs b/actors/mail-actor/src/invite.rs
index cce38b8a..79995e0e 100644
--- a/actors/mail-actor/src/invite.rs
+++ b/actors/mail-actor/src/invite.rs
@@ -1,4 +1,5 @@
 use actix::{Handler, Message};
+use lettre::message::header::ContentType;
 use lettre::message::Mailbox;
 use uuid::Uuid;
 
@@ -49,6 +50,7 @@ impl Handler<Invite> for MailExecutor {
             .to(Mailbox::new(None, to))
             .from(Mailbox::new(None, from))
             .subject("Invitation to JIRS project")
+            .header(ContentType::TEXT_HTML)
             .body(html)
             .map_err(|e| {
                 log::error!("{:?}", e);
diff --git a/actors/mail-actor/src/welcome.rs b/actors/mail-actor/src/welcome.rs
index 34b20b32..4a0ee626 100644
--- a/actors/mail-actor/src/welcome.rs
+++ b/actors/mail-actor/src/welcome.rs
@@ -1,4 +1,5 @@
 use actix::{Handler, Message};
+use lettre::message::header::ContentType;
 use lettre::message::Mailbox;
 use uuid::Uuid;
 
@@ -51,6 +52,7 @@ impl Handler<Welcome> for MailExecutor {
             .to(Mailbox::new(None, to))
             .from(Mailbox::new(None, from))
             .subject("Welcome to JIRS")
+            .header(ContentType::TEXT_HTML)
             .body(html)
             .map_err(|e| {
                 log::error!("{:?}", e);
diff --git a/web/js/css/styledEditor.scss b/web/js/css/styledEditor.scss
index c0dedd83..9639b739 100644
--- a/web/js/css/styledEditor.scss
+++ b/web/js/css/styledEditor.scss
@@ -61,6 +61,20 @@
     display: none;
     min-height: 40px;
     padding-top: 15px;
+
+    ul {
+      > li {
+        list-style: disc;
+        margin-left: 20px;
+      }
+    }
+
+    ol {
+      > li {
+        list-style: decimal;
+        margin-left: 28px;
+      }
+    }
   }
 
   > input.editorRadio {
diff --git a/web/src/model.rs b/web/src/model.rs
index 47f5ef33..2d9bb21d 100644
--- a/web/src/model.rs
+++ b/web/src/model.rs
@@ -302,20 +302,20 @@ impl Model {
             messages_tooltip_visible: false,
             issue_ids: vec![],
             user_ids: vec![],
-            users_by_id: HashMap::with_capacity(1_000),
+            users_by_id: Default::default(),
             user_settings: None,
             comment_ids: vec![],
-            comments_by_id: HashMap::with_capacity(1_000),
+            comments_by_id: Default::default(),
+            issues_by_id: Default::default(),
             issue_status_ids: vec![],
-            issue_statuses_by_id: HashMap::with_capacity(1_000),
-            issue_statuses_by_name: HashMap::with_capacity(1_000),
+            issue_statuses_by_id: Default::default(),
+            issue_statuses_by_name: Default::default(),
             messages: vec![],
             user_projects: vec![],
             projects: vec![],
             epic_ids: vec![],
-            issues_by_id: HashMap::with_capacity(1_000),
+            epics_by_id: Default::default(),
             show_extras: false,
-            epics_by_id: HashMap::with_capacity(1_000),
             modals_stack: vec![],
             modals: Modals::default(),
             key_triggers: std::rc::Rc::new(std::cell::RefCell::new(HashMap::with_capacity(20))),