From 9f576a41f6a8b1de82f2a0cf901046a76ff9a1ed Mon Sep 17 00:00:00 2001
From: MrFry <mrfry@airmail.cc>
Date: Tue, 7 Apr 2020 07:55:58 +0200
Subject: [PATCH] News page refactor

---
 src/pages/index.js         | 69 ++++++++++++++++++++++++++++----------
 src/pages/index.module.css | 31 ++++++++++-------
 2 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/src/pages/index.js b/src/pages/index.js
index bc45958..18ab108 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -36,27 +36,61 @@ export default function Index (props) {
       })
   }, [])
 
+  const renderQAItem = (n, key) => {
+    return (
+      <div key={key} className={styles.itemContainer}>
+        <div className={styles.itemNumber}>
+          {key} :
+        </div>
+        <div
+          className={styles.question}
+          dangerouslySetInnerHTML={{ __html: n.q }}
+        />
+        <div
+          className={styles.answer}
+          dangerouslySetInnerHTML={{ __html: n.a }}
+        />
+      </div>
+    )
+  }
+
+  const renderNewsItem = (n, key) => {
+    return (
+      <div key={key} className={styles.itemContainer}>
+        <div className={styles.itemNumber}>
+          {key} :
+        </div>
+        <div
+          className={styles.newsTitle}
+          dangerouslySetInnerHTML={{ __html: n.title }}
+        />
+        <div
+          className={styles.newsBody}
+          dangerouslySetInnerHTML={{ __html: n.body }}
+        />
+      </div>
+    )
+  }
+
   const renderNews = () => {
     if (news) {
       let questions = Object.keys(news).map((key, i) => {
-        let q = news[key]
-        return (
-          <div key={key} className={styles.questioncontainer}>
-            <div >
-              <div className={styles.questionnumber}>
-                {key}:
-              </div>
-              <div
-                className={styles.question}
-                dangerouslySetInnerHTML={{ __html: q.q }}
-              />
-              <div
-                className={styles.answer}
-                dangerouslySetInnerHTML={{ __html: q.a }}
-              />
+        let n = news[key]
+        if (n.q) {
+          return (
+            <div key={key}>
+              {renderQAItem(n, key)}
+              <hr />
             </div>
-          </div>
-        )
+          )
+        } else {
+          return (
+            <div key={key}>
+              {renderNewsItem(n, key)}
+              <hr />
+            </div>
+          )
+        }
       }).reverse()
 
       return (
@@ -89,7 +123,6 @@ export default function Index (props) {
     <div>
       {renderMotd()}
       <center>
-
         {Object.keys(links).map((key) => {
           let link = links[key]
           return (
diff --git a/src/pages/index.module.css b/src/pages/index.module.css
index 0189329..855c8a0 100644
--- a/src/pages/index.module.css
+++ b/src/pages/index.module.css
@@ -21,32 +21,39 @@
   margin: 5px;
 }
 
-
-.questioncontainer {
-  margin: 5px;
+.itemContainer {
+  margin: 20px 5px;
 }
 
-.questioncontainer:hover {
+.itemContainer:hover {
   background-color: var(--hoover-color);
 }
 
-.questionscontainer {
-  margin: 10px;
+.newsBody {
+  margin: 0px 5px;
+  font-size: 18px;
+  color: #fff;
+}
+
+.newsTitle {
+  font-size: 28px;
+  color: var(--text-color);
+  margin: 0px 5px;
 }
 
 .question {
-  font-weight: 'bold';
+  font-weight: "bold";
   font-size: 16px;
   color: #fff;
-  margin: 5px;
+  margin: 0px 5px;
 }
 
 .answer {
-  margin: 5px;
+  margin: 0px 5px;
 }
 
-.questionnumber {
+.itemNumber {
   color: #fff;
-  margin: 5px;
-  font-size: 20px;
+  margin: 0px 5px;
+  font-size: 24px;
 }