From 6fd9beb46489a1ac5dd8f66cc7412b0729b75986 Mon Sep 17 00:00:00 2001
From: ndaniel1102 <ndani2276@gmail.com>
Date: Fri, 26 Mar 2021 15:44:11 +0100
Subject: [PATCH] Minor style fixes across pages

---
 src/components/layout.js            | 17 ++++--
 src/components/newsEntry.js         |  8 ++-
 src/components/newsEntry.module.css | 11 +++-
 src/defaultStyles.css               | 75 ++++++++++++++++--------
 src/pages/allQuestions.js           | 90 +++++++++++++++--------------
 src/pages/allQuestions.module.css   |  4 ++
 src/pages/contact.js                |  5 ++
 src/pages/faq.js                    |  5 ++
 src/pages/index.module.css          |  2 +-
 src/pages/pwRequest.js              | 28 ++++-----
 src/pages/pwRequest.module.css      |  4 ++
 src/pages/ranklist.js               |  6 +-
 src/pages/ranklist.module.css       | 25 --------
 src/pages/script.js                 |  5 +-
 14 files changed, 165 insertions(+), 120 deletions(-)

diff --git a/src/components/layout.js b/src/components/layout.js
index f0c97f9..0226422 100644
--- a/src/components/layout.js
+++ b/src/components/layout.js
@@ -51,7 +51,7 @@ function MessageButton({
         }}
         style={{ cursor: userSpecificMotd ? 'pointer' : 'default' }}
         title={
-          userSpecificMotd && !userSpecificMotd.seen ? "You've got Mail!" : ''
+          userSpecificMotd && !userSpecificMotd.seen ? 'Új üzeneted van!' : ''
         }
       >
         {userSpecificMotd && !userSpecificMotd.seen ? '📬' : '📭'}
@@ -130,8 +130,10 @@ export default function Layout({
               <a>
                 <img
                   style={{ maxWidth: '100%' }}
-                  src={`${constants.siteUrl}img/frylabs-logo_small_transparent.png`}
-                  alt="Frylabs"
+                  src={`${
+                    constants.siteUrl
+                  }img/frylabs-logo_small_transparent.png`}
+                  alt="FryLabs"
                 />
               </a>
             </Link>
@@ -164,15 +166,18 @@ export default function Layout({
                 Donate
               </a>
             </div>
-            <div className="userStatus">
+            <div className={'userStatus'}>
               <MessageButton
                 userSpecificMotd={userSpecificMotd}
                 setShowMotdModal={setShowMotdModal}
                 refetchGlobalData={refetchGlobalData}
               />
-              <div title="User ID">UID: {userId || '...'}</div>
+              <div className={'uid'} title="User ID">
+                UID: {userId || '...'}
+              </div>
               <div
-                className="logout"
+                className={'logout'}
+                title="Kijelentkezés"
                 onClick={() => {
                   fetch(constants.apiUrl + 'logout', {
                     method: 'GET',
diff --git a/src/components/newsEntry.js b/src/components/newsEntry.js
index 12f3bd3..499c7db 100644
--- a/src/components/newsEntry.js
+++ b/src/components/newsEntry.js
@@ -18,10 +18,14 @@ export default function NewsEntry({
 
   return (
     <div className={styles.newsRoot}>
-      <div className={`${styles.newsContainer} ${admin && styles.adminPost}`}>
+      <div
+        className={`${styles.newsContainer} ${admin &&
+          styles.adminPost}  ${!admin && styles.userPost}  ${uid == user &&
+          styles.ownPost} ${uid == user && admin && styles.adminPost}`}
+      >
         <div className={styles.newsHeader}>
           <div className={styles.newsTitle}>{title}</div>
-          <div className={styles.user}>
+          <div className={styles.userinfo}>
             <div>User #{user}</div>
             <div className={styles.newsDate}> @ {date}</div>
           </div>
diff --git a/src/components/newsEntry.module.css b/src/components/newsEntry.module.css
index ce45752..d5214fd 100644
--- a/src/components/newsEntry.module.css
+++ b/src/components/newsEntry.module.css
@@ -30,11 +30,18 @@
   transition: width 0.5s, height 0.5s, ease-in 0.5s;
 }
 
-
 .adminPost {
   border-left: 4px solid var(--text-color);
 }
 
+.userPost {
+  border-left: 4px solid azure;
+}
+
+.ownPost {
+  border-left: 4px dotted azure;
+}
+
 .newsContainer img {
   max-width: 100%;
   min-width: 200px;
@@ -47,7 +54,7 @@
   align-items: center;
 }
 
-.user {
+.userinfo {
   display: flex;
   align-items: center;
   margin-bottom: 12px;
diff --git a/src/defaultStyles.css b/src/defaultStyles.css
index 6381080..fa24948 100644
--- a/src/defaultStyles.css
+++ b/src/defaultStyles.css
@@ -12,6 +12,7 @@ body {
   font-family: 'Kameron', serif;
   font-family: 'Overpass Mono', monospace;
   color: #999999;
+  cursor: default;
 }
 
 li {
@@ -304,7 +305,7 @@ input:focus {
   margin: 5px 0px 0px 0px;
 }
 
-.pageHeader h1 {
+.pageHeader > h1 {
   padding-top: 6px;
   letter-spacing: 7px;
   text-align: center;
@@ -320,29 +321,23 @@ input:focus {
   text-align: justify;
 }
 
-select {
-  cursor: pointer;
-  width: 100%;
-  max-width: 100%;
-  height: 30px;
-}
-
-select:hover {
-  border: 1px solid #f2cb05;
-}
-
 .userStatus {
   display: flex;
   margin-top: auto;
   margin-bottom: 20px;
   background-color: #373737;
   align-items: center;
+  text-align: center;
   justify-content: space-between;
 }
 
 .msgs {
-  display: flex;
-  align-items: center;
+    font-size: 15px;
+}
+
+.uid {
+  font-size: 14px;
+  margin-right: 10px;
 }
 
 .logout {
@@ -388,10 +383,8 @@ select:hover {
   display: flex;
   align-content: center;
   justify-content: center;
-
   margin: 10px 0px;
   height: 50px;
-  display: flex;
 }
 
 .buttonContainer > * {
@@ -399,18 +392,16 @@ select:hover {
   align-items: center;
   justify-content: center;
   flex: 1;
-
-  background-color: #f2cb05;
+  background-color: var(--hoover-color);
   border: none;
-  color: black;
+  color: var(--text-color);
   padding: 5px 10px;
   font-weight: bold;
   font-size: 15px;
-  margin: 8px 2px 2px 2px;
+  margin: 8px 5px 2px 5px;
   cursor: pointer;
   text-shadow: 1px 1px 8px black;
   transition: width 0.5s, height 0.5s, ease-in 0.5s;
-
   user-select: none;
   cursor: pointer;
   text-align: center;
@@ -424,9 +415,47 @@ select:hover {
 .buttonContainer > *:hover {
   text-shadow: 2px 2px 8px black;
   transition: width 0.5s, height 0.5s, ease-out 0.5s;
-  background-color: #a38c1a;
+  background-color: var(--text-color);
+  color: black;
 }
 
 .buttonContainer > .activeButton {
-  color: var(--text-color);
+  background-color: var(--text-color);
+  color: black;
+}
+
+select {
+  cursor: pointer;
+  width: 100%;
+  max-width: 100%;
+  height: 30px;
+}
+
+select:hover {
+  border: 1px solid #f2cb05;
+}
+
+.selectContainer {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.selectContainer > select {
+  width: 21%;
+  border-radius: 5px;
+  border: 1.5px solid white;
+  background-color: #9c9c98;
+  color: azure;
+  font-family: inherit;
+  margin: 6px 0px;
+}
+
+.selectContainer > select:hover, .selectContainer > select:active {
+  border: 2px solid var(--text-color);
+}
+
+.selectContainer > div {
+  padding: 0px 5px;
+  margin-right: 8px;
 }
diff --git a/src/pages/allQuestions.js b/src/pages/allQuestions.js
index 31bc336..f1b2c43 100644
--- a/src/pages/allQuestions.js
+++ b/src/pages/allQuestions.js
@@ -100,42 +100,47 @@ export default function AllQuestions({ router }) {
     if (dbs) {
       return (
         <>
-          <select
-            className={styles.select}
-            defaultValue={-1}
-            onChange={(event) => {
-              const key = event.target.value
-              setData(null)
-              setFetchingData(true)
-              if (key === 'all') {
-                setSelectedDb(key)
-                fetchAllData(dbs).then((res) => {
-                  setData(mergeData(res))
-                  setFetchingData(false)
-                })
-              } else {
-                setSelectedDb(dbs[key].name)
-                fetchData(dbs[key]).then((res) => {
-                  setData(res.data)
-                  setFetchingData(false)
-                })
-              }
-            }}
-          >
-            <option disabled value={-1}>
-              {' -- Válassz egy kérdés adatbázist -- '}
-            </option>
-            {dbs.map((db, i) => {
-              return (
-                <option value={i} key={db.path}>
-                  {db.name}
-                </option>
-              )
-            })}
-            <option value={'all'} key={'all'}>
-              {'All'}
-            </option>
-          </select>
+          <div className={'pageHeader'}>
+            <h1>Kérdések és tárgyak</h1>
+          </div>
+          <br />
+          <div className={`selectContainer ${styles.content}`}>
+            <select
+              defaultValue={-1}
+              onChange={(event) => {
+                const key = event.target.value
+                setData(null)
+                setFetchingData(true)
+                if (key === 'all') {
+                  setSelectedDb(key)
+                  fetchAllData(dbs).then((res) => {
+                    setData(mergeData(res))
+                    setFetchingData(false)
+                  })
+                } else {
+                  setSelectedDb(dbs[key].name)
+                  fetchData(dbs[key]).then((res) => {
+                    setData(res.data)
+                    setFetchingData(false)
+                  })
+                }
+              }}
+            >
+              <option disabled value={-1}>
+                {' - Válassz egy adatbázist! - '}
+              </option>
+              {dbs.map((db, i) => {
+                return (
+                  <option value={i} key={db.path}>
+                    {db.name}
+                  </option>
+                )
+              })}
+              <option value={'all'} key={'all'}>
+                {'All'}
+              </option>
+            </select>
+          </div>
         </>
       )
     } else {
@@ -152,9 +157,6 @@ export default function AllQuestions({ router }) {
 
     return (
       <div>
-        <Head>
-          <title>Tárgyak - Qmining | Frylabs.net</title>
-        </Head>
         {data ? (
           <>
             <div className={styles.searchContainer}>
@@ -200,9 +202,6 @@ export default function AllQuestions({ router }) {
   const renderQuestionBrowser = () => {
     return (
       <div>
-        <Head>
-          <title>Qmining - Kérdés keresés | Frylabs.net</title>
-        </Head>
         {data ? (
           <>
             <div className={styles.searchContainer}>
@@ -242,19 +241,22 @@ export default function AllQuestions({ router }) {
 
   return (
     <div>
+      <Head>
+        <title>Kérdések és tárgyak - Qmining | Frylabs.net</title>
+      </Head>
       {dbs ? <>{renderDbSelector()}</> : <LoadingIndicator />}
       {dbs && data ? (
         <>
           {`${questionCount} kérdés, ${subjectCount} tárgy`}
           <div className={'buttonContainer'}>
             <div
-              className={!subjectsShowing ? styles.activeTypeSelector : ''}
+              className={!subjectsShowing ? 'activeButton' : ''}
               onClick={() => setSubjectsShowing(false)}
             >
               Kérdések
             </div>
             <div
-              className={subjectsShowing ? styles.activeTypeSelector : ''}
+              className={subjectsShowing ? 'activeButton' : ''}
               onClick={() => setSubjectsShowing(true)}
             >
               Tárgyak
diff --git a/src/pages/allQuestions.module.css b/src/pages/allQuestions.module.css
index e2dffe6..17caef2 100644
--- a/src/pages/allQuestions.module.css
+++ b/src/pages/allQuestions.module.css
@@ -1,3 +1,7 @@
+.content {
+    padding-top: 50px;
+}
+
 .searchContainer {
   width: 100%;
   display: flex;
diff --git a/src/pages/contact.js b/src/pages/contact.js
index 97f1809..836181f 100644
--- a/src/pages/contact.js
+++ b/src/pages/contact.js
@@ -28,6 +28,11 @@ export default function Contact() {
       <Head>
         <title>Kapcsolat - Qmining | Frylabs.net</title>
       </Head>
+      <div className={'pageHeader'}>
+        <h1>Kapcsolat</h1>
+      </div>
+      <br />
+      <br />
       <FeedbackArea from={'contact'} />
       <div className={styles.contactsContainer}>
         <div>Itt vannak hogy hogy lehet kontaktolni</div>
diff --git a/src/pages/faq.js b/src/pages/faq.js
index dd973b3..e2bc0af 100644
--- a/src/pages/faq.js
+++ b/src/pages/faq.js
@@ -251,6 +251,11 @@ export default function FAQ() {
       <Head>
         <title>GYIK - Qmining | Frylabs.net</title>
       </Head>
+      <div className={'pageHeader'}>
+        <h1>GYakran Ismételt Kérdések</h1>
+      </div>
+      <br />
+      <br />
       <div className={'buttonContainer'}>
         {Object.keys(pages).map((key) => {
           const page = pages[key]
diff --git a/src/pages/index.module.css b/src/pages/index.module.css
index a5a220d..3a08d8e 100644
--- a/src/pages/index.module.css
+++ b/src/pages/index.module.css
@@ -55,7 +55,7 @@
 }
 
 .question {
-  font-weight: 'bold';
+  font-weight: bold;
   font-size: 16px;
   color: #fff;
   margin: 0px 5px;
diff --git a/src/pages/pwRequest.js b/src/pages/pwRequest.js
index e32def2..a9e497f 100644
--- a/src/pages/pwRequest.js
+++ b/src/pages/pwRequest.js
@@ -112,29 +112,31 @@ export default function PwRequest() {
           <span>{' ' + daysAfterUserGetsPWs + ' '}</span>
           napot kell várniuk, míg jelszó generálási lehetőséget kapnak.
           <br />
-          Egy felhasználó egyszerre
-          <span>{' ' + addPWCount + ' '}</span>
-          jelszót generálhat, a jelszókérések közt
-          <span>{' ' + addPwPerDay + ' '}</span>
-          napnak kell eltelnie, hogy újabb jelszót kérhess le.
-          <br />
-          Egy felhasználó összesen
+          Egy felhasználó egyszerre, egymás után
           <span>{' ' + maxPWCount + ' '}</span>
-          jelszót generálhat.
+          jelszót generálhat. Összességében korlátlan mennyiségben kérhetők le
+          jelszavak, de
+          <span>{' ' + maxPWCount + ' '}</span>db után el kell telnie{' '}
+          <span>{' ' + addPwPerDay + ' '}</span> napnak, hogy ismét jelszót
+          generálhass.
           <br />
           Ebből eddig
           <span>{' ' + requestedPWS + ' '}</span>
-          lehetőséget használtál fel, tehát még
-          <span>{' ' + remaining}</span> db jelszót kérhetsz le. <br />
+          lehetőséget használtál fel, tehát még{' '}
+          <span>{remaining - requestedPWS}</span> db jelszót kérhetsz le,
+          mielőtt elérnéd a <span>{' ' + maxPWCount + ' '}</span> darabos
+          kvótát.<br />
           <br /> A jelenleg bejelentkezett felhasználó létrehozva:
           <span>{' ' + dayDiff}</span> napja,<span>{' ' + createDate}</span>
           -kor.
           <br />
           <br />
         </div>
-        <div className={'buttonContainer'}>
-          <div onClick={handleSubmit}>Jelszó kérése</div>
-        </div>
+        <center>
+          <div className={`buttonContainer ${styles.pwButton}`}>
+            <div onClick={handleSubmit}>Jelszó kérése</div>
+          </div>
+        </center>
         {result ? (
           <div className={styles.pwContainer}>
             {result.map((r, i) => {
diff --git a/src/pages/pwRequest.module.css b/src/pages/pwRequest.module.css
index a443af3..3c172a8 100644
--- a/src/pages/pwRequest.module.css
+++ b/src/pages/pwRequest.module.css
@@ -33,3 +33,7 @@
 .text span {
   color: var(--text-color);
 }
+
+.pwButton {
+  width: 20% !important;
+}
diff --git a/src/pages/ranklist.js b/src/pages/ranklist.js
index d7b9f44..8cc247a 100644
--- a/src/pages/ranklist.js
+++ b/src/pages/ranklist.js
@@ -133,7 +133,7 @@ export default function RankList() {
       <div className={styles.container}>
         <div>
           <center>
-            <div id="rankHeader" className={'pageHeader'}>
+            <div className={'pageHeader'}>
               <h1>Ranklista</h1>
             </div>
           </center>
@@ -147,7 +147,7 @@ export default function RankList() {
             </p>
           </div>
           <Sleep />
-          <div className={styles.selectContainer}>
+          <div className={'selectContainer'}>
             <div>Megjelenítés: </div>
             <select
               onChange={(e) => {
@@ -164,7 +164,7 @@ export default function RankList() {
               })}
             </select>
           </div>
-          <div className={styles.selectContainer}>
+          <div className={'selectContainer'}>
             <div>Rendezés: </div>
             <select
               value={key}
diff --git a/src/pages/ranklist.module.css b/src/pages/ranklist.module.css
index b0a049c..03fb418 100644
--- a/src/pages/ranklist.module.css
+++ b/src/pages/ranklist.module.css
@@ -105,28 +105,3 @@
 .sumrow {
   color: white;
 }
-
-.selectContainer {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.selectContainer > select {
-  width: 16.5%;
-  border-radius: 5px;
-  border: 1.5px solid white;
-  background-color: #9c9c98;
-  color: azure;
-  font-family: inherit;
-  margin: 6px 0px;
-}
-
-.selectContainer > select:hover, .selectContainer > select:active {
-  border: 2px solid var(--text-color);
-}
-
-.selectContainer > div {
-  padding: 0px 5px;
-  margin-right: 8px;
-}
diff --git a/src/pages/script.js b/src/pages/script.js
index 5133f10..03ed04b 100644
--- a/src/pages/script.js
+++ b/src/pages/script.js
@@ -9,8 +9,11 @@ export default function Script() {
   return (
     <div>
       <Head>
-        <title>Manual - Qmining | Frylabs.net</title>
+        <title>Script - Qmining | Frylabs.net</title>
       </Head>
+      <div className={'pageHeader'}>
+        <h1>Script</h1>
+      </div>
       <div className={'buttonContainer'}>
         <a href="https://www.tampermonkey.net/">
           Ajánlott userscript kezelő bővítmény