From c40fb4ca141aa5d63014a0b3d912d53225aae7c8 Mon Sep 17 00:00:00 2001
From: mrfry <mr.fry@tutanota.com>
Date: Wed, 21 Apr 2021 16:13:58 +0200
Subject: [PATCH] New 404 and login page

---
 src/sharedViews/404.ejs   |  39 +++++++++---
 src/sharedViews/login.ejs | 121 ++++++++++++++++++++++----------------
 submodules/qmining-page   |   2 +-
 3 files changed, 101 insertions(+), 61 deletions(-)
diff --git a/src/sharedViews/404.ejs b/src/sharedViews/404.ejs
index 4126305..90dc519 100755
--- a/src/sharedViews/404.ejs
+++ b/src/sharedViews/404.ejs
@@ -1,25 +1,46 @@
 <html>
 
-<body bgcolor="#212127">
+<body bgcolor="#222426">
 
 	<head>
+	<title>Nem található - Qmining | Frylabs.net</title>
 		<style>
+			@import url('https://fonts.googleapis.com/css2?family=Kameron&family=Overpass+Mono:wght@300;400&display=swap');
 			body {
-				font: normal 14px Verdana;
+				text-align: center;
+				font-family: 'Kameron', serif;
+				font-family: 'Overpass Mono', monospace;
 				color: #999999;
 			}
-
-			a {
-				color: #9999ff;
+			h2 {
+				margin-bottom: 0px;
+				padding-top: 40px;
+				font-size: 75px;
+			}
+			p {
+				font-size: 25px;
+			}
+			a, a:visited {
+				text-decoration: none;
+				font-size: 14px;
+				color: inherit;
+			}
+			a:hover {
+				color: white;
+			}
+			img {
+				width: 30%;
+				padding-top: 35px;
+				padding-bottom: 30px;
 			}
 		</style>
 	</head>
-
+	<h2>Oops...</h2>
 	<center>
-		<h1>404</h1>
-
-		<iframe width="660" height="465" src="https://www.youtube-nocookie.com/embed/SjfspM5sDIA" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+		<img src="/img/frylabs-404-cut.jpg" alt="FryLabs 404">
 	</center>
+	<p>Az oldal, amit kerestél úgy tűnik, hogy nem létezik!</p>
+	<a href="/">&#171;&#171; Visszatérés a főoldalra</a>
 </body>
 
 </html>
diff --git a/src/sharedViews/login.ejs b/src/sharedViews/login.ejs
index b9aed1b..e45b8f1 100644
--- a/src/sharedViews/login.ejs
+++ b/src/sharedViews/login.ejs
@@ -1,41 +1,47 @@
 <html>
   <body bgcolor="#222426">
     <head>
-      <title>Frylabs</title>
+      <title>Qmining | Frylabs.net - Login</title>
       <meta charset="UTF-8">
       <meta name="viewport" content="width=device-width, initial-scale=0.6" />
       <style>
-        a {
+		body {
+		  background-color: #222426;
+		}
+        <!--a {
           color: lightblue;
-        }
-        .center {
-          width: 380px;
-          height: 340px;
-          position: absolute;
+        }-->
+        .logindiv {
+          height: 100%;
+		  float: left;
           left: 0;
-          right: 0;
-          top: 0;
+          right: 0;          
           bottom: 0;
-          margin: auto;
+          margin: 0;
+		  position: absolute;
           max-width: 100%;
           max-height: 100%;
-          overflow: none;
-
           text-align: center;
         }
         .text {
-          font-size: 18px;
-          color: white;
-          margin: 20px;
+		  font-family: 'Courier New', monospace;
+		  text-shadow: 1px 1px 8px black;
+          font-size: 20px;
+          color: red;
+          margin: 5px;
         }
         .title {
+		font-family: 'Courier New', monospace;
+		  padding-top: 17%;
           margin: 20px;
-          font-size: 50px;
+          font-size: 70px;
           font-weight: bold;
           color: white;
         }
         .inputContainer {
-          width: 100%;
+          max-width: 100%;
+		  clear: both;
+		  padding-bottom: 23px;
         }
         .showpwContainer {
           color: white;
@@ -44,28 +50,40 @@
         }
         input[type=text], input[type=password], textarea {
           font-size: 16px;
-          color: #ffffff;
+          color: white;
           background-color: #181a1b;
-          width: 100%;
+          width: 20%;
           padding: 12px 20px;
           margin: 8px 0;
           box-sizing: border-box;
-          border: 2px solid #333333;
+          border: 2px solid white;
         }
-        input[type=text]:focus, input[type=password]:focus, textarea:focus {
-          border: 2px solid #000;
+        input[type=text]:focus, input[type=password]:focus, textarea:focus, input[type=text]:hover, input[type=password]:hover, textarea:hover {
+          border: 2px solid #F2CB05;
         }
         button {
-          background-color: #9999ff;
+          background-color: #F2CB05;
           border: none;
-          color: white;
-          padding: 16px 32px;
-          text-decoration: none;
+          color: black;
+          padding: 13px 30px;
+          font-variant: small-caps;
+		  font-weight: 500;
+		  font-size: 15px;
           margin: 4px 2px;
           cursor: pointer;
+		  text-shadow: 1px 1px 8px black;
+		  transition: width 0.5s, height 0.5s, ease-in 0.5s;
         }
+		button:active {
+		  transform: translateY(2.5px); 
+		}
+		button:hover {
+		  text-shadow: 2px 2px 8px black;
+		  transition: width 0.5s, height 0.5s, ease-out 0.5s;
+		  background-color: #a38c1a; 
+		}
         .disabledButton {
-          background-color: #999999;
+          background-color: #a38c1a;
         }
         .ircLinkContainer {
           display: flex;
@@ -88,30 +106,31 @@
         }
       </style>
     </head>
-    <div class='center'>
-      <div class='title'>
-        Frylabs
-      </div>
-      <div id='text' class='text'></div>
-      <div id='feedback'>
-        <textarea placeholder='Üzenet' id='feedbackTextArea'></textarea>
-        <input id='email' type='text' placeholder='E-mail, amire választ vársz (nem kötelező)' />
-        <div class='ircLinkContainer' >
-          <a class='ircLink' href='<%= devel? 'http' : 'https' %>://qmining.frylabs.net/irc?loginClick'>IRC chatszoba</a>
-        </div>
-        <button id='sendFeedbackButton' onclick="SendFeedback(this)">Submit</button>
-      </div>
-      <div id='form'>
-        <div class='inputContainer'>
-          <input placeholder='Jelszó' onkeyup="PWKeyUp(this)" type='text' id='pw' name='pw' autocomplete="off" autofocus/>
-          <input type='hidden' id='cid' name='pw' autocomplete="off"/>
-        </div>
-        <div class='ircLinkContainer' >
-          <a class='ircLink' onclick='ShowFeedback()'>Contact</a>
-        </div>
-        <button id='sendButton' onclick="Login(this)">Login</button>
-      </div>
-    </div>
+    <div class='logindiv'>
+		<div class='title'>
+			<img src="/img/frylabs-logo_large_transparent.png" alt="FryLabs">
+		</div>
+		<div id='text' class='text'>
+		</div>
+		<div id='feedback'>
+			<textarea placeholder='Üzenet' id='feedbackTextArea'></textarea>
+			<input id='email' type='text' placeholder='E-mail, amire választ vársz (nem kötelező)' />
+			<div class='ircLinkContainer'>
+			  <a class='ircLink' href='<%= devel? 'http' : 'https' %>://qmining.frylabs.net/irc?loginClick'>IRC chatszoba</a>
+			</div>
+			<button id='sendFeedbackButton' onclick="SendFeedback(this)">Submit</button>
+		</div>
+		<div id='form'>
+			<div class='inputContainer'>
+				<input type='password' placeholder='Jelszó' onkeyup="PWKeyUp(this)" type='text' id='pw' name='pw' autocomplete="off" autofocus/>
+				<input type='hidden' id='cid' name='pw' autocomplete="off"/>
+			</div>
+			<div class='ircLinkContainer' >
+				<!--a class='ircLink' onclick='ShowFeedback()'>Contact</a-->
+			</div>
+			<button id='sendButton' onclick="Login(this)">Belépés</button>
+		</div>
+	</div>
   </body>
   <script>
     function PWKeyUp (inputField) {
diff --git a/submodules/qmining-page b/submodules/qmining-page
index 4c4fb1d..d7fa024 160000
--- a/submodules/qmining-page
+++ b/submodules/qmining-page
@@ -1 +1 @@
-Subproject commit 4c4fb1dacce3306de27407b501000851822394a4
+Subproject commit d7fa02435fd58755184ca0849379e27941e6f244
