From e9e9f94130e452e9d88eb0c1949b8f80e98c2f13 Mon Sep 17 00:00:00 2001
From: mrfry <mrfry@airmail.cc>
Date: Tue, 16 Feb 2021 12:59:23 +0100
Subject: [PATCH] admin msg html tags fix, added X to close modals

---
 src/components/layout.js        |  6 ++++--
 src/components/modal.js         | 10 ++++++++++
 src/components/modal.module.css | 11 +++++++++++
 src/defaultStyles.css           |  6 +++---
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/components/layout.js b/src/components/layout.js
index 0a514a4..5e2ebb3 100644
--- a/src/components/layout.js
+++ b/src/components/layout.js
@@ -89,7 +89,7 @@ export default function Layout({
         </div>
         {sidebarOpen ? (
           <>
-            <div id="sideBarLinks">
+            <div id="sideBarLinks" className="sidebarLinks">
               {Object.keys(tabs).map((key) => {
                 const item = tabs[key]
                 return (
@@ -178,7 +178,9 @@ export default function Layout({
                 }}
               >
                 <div style={{ textAlign: 'center' }}>Üzenet admintól:</div>
-                <div>{userSpecificMotd.msg}</div>
+                <div
+                  dangerouslySetInnerHTML={{ __html: userSpecificMotd.msg }}
+                />
               </Modal>
             ) : null}
           </>
diff --git a/src/components/modal.js b/src/components/modal.js
index c23354f..8c449ab 100644
--- a/src/components/modal.js
+++ b/src/components/modal.js
@@ -36,6 +36,16 @@ export default function Modal(props) {
         }}
         className={styles.modalContent}
       >
+        {closeClick && (
+          <div
+            className={styles.close}
+            onClick={() => {
+              closeClick()
+            }}
+          >
+            ❌
+          </div>
+        )}
         {props.children}
       </div>
     </div>
diff --git a/src/components/modal.module.css b/src/components/modal.module.css
index 9d098a5..4723bd0 100644
--- a/src/components/modal.module.css
+++ b/src/components/modal.module.css
@@ -20,3 +20,14 @@
   padding: 20px;
   cursor: auto;
 }
+
+.close {
+  cursor: pointer;
+  font-size: 18px;
+  position: absolute;
+
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  display: inline;
+}
diff --git a/src/defaultStyles.css b/src/defaultStyles.css
index 0857e6c..20c379a 100644
--- a/src/defaultStyles.css
+++ b/src/defaultStyles.css
@@ -42,7 +42,7 @@ a {
   padding: 1px 16px;
 }
 
-.sidebar a {
+.sidebarLinks a {
   display: block;
   color: black;
   padding: 16px;
@@ -50,12 +50,12 @@ a {
   color: var(--bright-color);
 }
 
-.sidebar a.active {
+.sidebarLinks a.active {
   background-color: var(--text-color);
   color: black;
 }
 
-.sidebar a:hover:not(.active) {
+.sidebarLinks a:hover:not(.active) {
   background-color: #555;
   color: white;
 }