Merge branch 'main' of https://github.com/55gms/55GMS

55gms · Apr 13, 2024 · 51cc7fe · 51cc7fe
2 parents c518311 + 6d54c70
commit 51cc7fe
Show file tree

Hide file tree

Showing 12 changed files with 145 additions and 170 deletions.
diff --git a/static/assets/css/dash.css b/static/assets/css/dash.css
@@ -25,3 +25,28 @@
   transform: scale(0.8);
   border-radius: 12px;
 }
+
+.btnn {
+  font-family: "Inter", Arial, sans-serif;
+  cursor: pointer;
+  background-color: #fc8585;
+  border: none;
+  color: rgb(248, 244, 244);
+  padding: 15px 20px;
+  margin: 3px 6px 3px 6px;
+  text-align: center;
+  text-decoration: none;
+  display: inline-block;
+  font-size: 16px;
+  border-radius: 10px;
+  transition: all 0.2s ease-in-out;
+  transform: scale(1);
+}
+.btnn:hover {
+  transform: scale(1.2);
+  border-radius: 5px;
+}
+.btnn:active {
+  transform: scale(0.8);
+  border-radius: 12px;
+}
diff --git a/static/assets/css/games.css b/static/assets/css/games.css
@@ -18,7 +18,7 @@ h6 {
 }
 
 #searchbar {
-  font-family: "Inter", Arial, sans-serif;
+  font-family: "Inter", Arial, Helvetica, sans-serif;
   padding: 15px 20px;
   margin: 8px 0;
   box-sizing: border-box;
@@ -31,14 +31,14 @@ h6 {
 }
 #searchbar:focus {
   width: 60%;
-  border: 2px solid #555;
+  border: 1px solid #555;
   border-radius: 8px;
 }
 
 ::placeholder {
   font-family: "Inter", Arial, sans-serif;
   color: var(--textcolor);
-  opacity: 0.4; /* Firefox */
+  opacity: 0.6; /* Firefox */
   /* center the placeholder */
   text-align: center;
 }
@@ -71,9 +71,6 @@ img {
   transition: 0.2s;
 }
 
-body {
-  background-color: #5e7594;
-}
 /* Existing styles */
 
 .image-container {

diff --git a/static/assets/css/index.css b/static/assets/css/index.css
@@ -1,12 +1,5 @@
 @import url("https://fonts.googleapis.com/css2?family=Inter&display=swap");
 
-
-body {
-  background-color: #5e7594;
-  color: #c9c9c9;
-  font-family: "Inter", Arial, sans-serif;
-}
-
 #title {
   font-size: 48px;
   color: #ffffff;
@@ -17,6 +10,7 @@ body {
   padding-top: 3%;
 }
 
+/* The message that pops up */
 #sub {
   font-size: 20px;
   color: #c1ce4b;
@@ -25,26 +19,6 @@ body {
   text-align: center;
 }
 
-#redBttn {
-  font-family: "Inter", Arial, sans-serif;
-  cursor: pointer;
-  background-color: #413d3d;
-  border: none;
-  color: rgb(248, 244, 244);
-  padding: 10px 30px;
-  margin-left: 10px;
-  margin-right: 10px;
-  text-align: center;
-  text-decoration: none;
-  display: inline-block;
-  font-size: 16px;
-  border-radius: 8px;
-  transition: all 0.2s ease;
-}
-#redBttn:hover {
-  scale: 1.1;
-  transition: 0.2s;
-}
 
 .redBttn {
   font-family: "Inter", Arial, sans-serif;

diff --git a/static/assets/css/settings.css b/static/assets/css/settings.css
@@ -3,7 +3,6 @@
 .row {
   margin-right: auto;
   grid-gap: 2rem;
-  position: absolute;
   top: 105px;
   left: 2%;
   right: 2%;
@@ -68,39 +67,14 @@ p {
   transition: all 0.2s ease-in-out;
   transform: scale(1);
 }
-
 .tab-cloak:hover {
-  transform: scale(1.1);
+  scale: 1.1;
 }
-
-button {
-  cursor: pointer;
-  background-color: #fc8585;
-  border: none;
-  color: rgb(248, 244, 244);
-  padding: 15px 20px;
-  margin: 3px 6px 3px 6px;
-  text-align: center;
-  text-decoration: none;
-  display: inline-block;
-  font-family: "Inter", Arial, sans-serif;
-  font-size: 16px;
-  border-radius: 10px;
-  transition: all 0.2s ease-in-out;
-  transform: scale(1);
-}
-#button:hover {
-  transform: scale(1.2);
-  border-radius: 5px;
+img {
+  border-radius: 5px 5px 0 0;
 }
 
-#button:active {
-  transform: scale(0.8);
-  border-radius: 12px;
-}
-
-select,
-input {
+select, input {
   font-family: Arial, sans-serif;
   border: none;
   background-color: rgb(255, 255, 255);
@@ -135,14 +109,11 @@ select {
 
 .tab-cloaker-form {
   font-family: "Inter", Arial, sans-serif;
-  border-radius: 0.375rem;
-  color: rgb(255, 255, 255);
   cursor: pointer;
   border: 2px;
   transition: 0.2s;
   margin-top: 10px;
   background-color: #5e7594;
-  padding: 0.5rem;
   border-radius: 0.375rem;
   color: rgb(255, 255, 255);
   padding: 5px;

diff --git a/static/assets/css/style.css b/static/assets/css/style.css
@@ -28,7 +28,7 @@ main {
   text-align: center;
   text-decoration: none;
   display: inline-block;
-  font-family: Inter, Arial, sans-serif;
+  font-family: "Inter", Arial, sans-serif;
   font-size: 16px;
   border-radius: 8px;
   transition: all 0.15s ease;
@@ -53,7 +53,7 @@ main {
   text-align: center;
   text-decoration: none;
   display: inline-block;
-  font-family: Inter, Arial, sans-serif;
+  font-family: "Inter", Arial, sans-serif;
   font-size: 16px;
   border-radius: 8px;
   transition: all 0.15s ease;
@@ -71,7 +71,7 @@ main {
   text-align: center;
   text-decoration: none;
   display: inline-block;
-  font-family: Inter, Arial, sans-serif;
+  font-family: "Inter", Arial, sans-serif;
   font-size: 16px;
   margin: 4px 2px;
   cursor: pointer;

diff --git a/static/assets/js/motd.js b/static/assets/js/motd.js
@@ -1,5 +1,5 @@
 window.addEventListener("load", (event) => {
-  fetch("/static/assets/json/motd.json")
+  fetch("/assets/json/motd.json")
     .then((response) => response.json())
     .then((data) => {
       document.getElementById("motd").onclick = function () {

diff --git a/static/assets/uv/science.css b/static/assets/uv/science.css
@@ -1,34 +1,39 @@
+@import url("https://fonts.googleapis.com/css2?family=Inter&display=swap");
+
+
 .form__input {
-  top: -15vh;
-  padding: 1vw;
+  font-family: "Inter", Arial, Helvetica, sans-serif;
+  font-size: 16px;
+  top: 50%;
   width: 50%;
-  position: relative;
-  border-radius: 5px;
-  background: #7a8fab;
-  text-align: center;
-  font-size: 24px;
+  padding: 1vw;
   border: none;
+  border-radius: 10px;
+  text-align: center;
   outline: none;
   color: white;
-  transition: 0.2s;
   margin: 0;
   position: absolute;
-  top: 50%;
   left: 50%;
+  transition: 0.5s;
   -ms-transform: translate(-50%, -50%);
   transform: translate(-50%, -50%);
 }
 
 .form__input::placeholder {
+  font-family: "Inter", Arial, Helvetica, sans-serif;
+  font-size: 16px;
   color: #aaa;
   text-align: center;
+  opacity: 0.4;
 }
 
 .form_input:hover {
-  scale: 1.2;
+  width: 53%;
 }
 
 .form__input:focus {
   outline: none;
   box-shadow: 0 0 5px rgba(255, 255, 255, 0.5);
+  width: 60%;
 }
diff --git a/static/dashboard.html b/static/dashboard.html
@@ -50,7 +50,7 @@ <h1 id="title">Reds Dashboard</h1>
         Quote of the Day
       </button>
       <button
-        id="gs"
+        class="gs"
         onclick="Swal.fire({title:'Official Links', html:`55gms.com<br>55gms.me<br>55gms.lol<br>55gms.de<br>55gms.xyz<br>exploits.pages.dev<br><br>Join the <a href='https://discord.gg/XKCMxMeGmQ'>discord</a> for more unblocked links`});"
       >
         Official Links
@@ -67,22 +67,22 @@ <h1 id="title">Reds Dashboard</h1>
 
       <br /><br /><br />
       <a href="g"
-        ><button id="btnn"><b>Games</b></button></a
+        ><button class="btnn"><b>Games</b></button></a
       >
       <a href="a"
-        ><button id="btnn"><b>Apps</b></button></a
+        ><button class="btnn"><b>Apps</b></button></a
       >
       <a href="-"
-        ><button id="btnn"><b>Exploits</b></button></a
+        ><button class="btnn"><b>Exploits</b></button></a
       ><br /><br />
       <a href="p"
-        ><button id="btnn"><b>Proxies</b></button></a
+        ><button class="btnn"><b>Proxies</b></button></a
       >
       <a href="e"
-        ><button id="btnn"><b>AI</b></button></a
+        ><button class="btnn"><b>AI</b></button></a
       ><br /><br /><br />
-      <a href="s"><button id="btnn">Settings</button></a>
-      <a href="/misc/index.html"><button id="btnn">Random Stuff</button></a
+      <a href="s"><button class="btnn">Settings</button></a>
+      <a href="/misc/index.html"><button class="btnn">Random Stuff</button></a
       ><br />
       <script
         async

diff --git a/static/index.html b/static/index.html
@@ -4,8 +4,9 @@
     <link rel="icon" type="image/x-icon" href="/img/canvas.ico" />
     <script src="/assets/js/font.js"></script>
     <script src="/assets/js/randomSentence.js?v=2"></script>
-    <link rel="stylesheet" type="text/css" href="/assets/css/index.css?1" />
-    <link rel="stylesheet" type="text/css" href="/assets/css/nav.css?v=2" />
+    <link rel="stylesheet" type="text/css" href="/assets/css/index.css" />
+    <link rel="stylesheet" type="text/css" href="/assets/css/style.css" />
+    <link rel="stylesheet" type="text/css" href="/assets/css/nav.css" />
     <title>Dashboard</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="author" content="Rednotsus" />
@@ -44,15 +45,15 @@ <h1 id="sub">
       <br />
       <a href="d"><button class="zoom glow-on-hover">Dashboard</button></a>
       <br /><br /><br /><br />
-      <a href="e"><button class="redBttn">ChatGPT For School</button></a>
+      <a href="e"><button class="gs">ChatGPT For School</button></a>
 
-      <a href="https://docs.google.com/spreadsheets/d/1j4pSMcTHv8APUjVet4D5vgvzP1AeRw-jOQLZW5FIvao/edit?usp=sharing"><button class="redBttn">Game request Status</button></a>
-      <a href="/misc/index.html"><button class="redBttn">Random Things</button></a>
+      <a href="https://docs.google.com/spreadsheets/d/1j4pSMcTHv8APUjVet4D5vgvzP1AeRw-jOQLZW5FIvao/edit?usp=sharing"><button class="gs">Game request Status</button></a>
+      <a href="/misc/index.html"><button class="gs">Random Things</button></a>
       <br /><br />
       <iframe src="https://invidget.switchblade.xyz/vV7mkcPhMy?theme=dark" frameborder="0"></iframe>
-      <!-- Start of CuterCounter Code -->
+
+      <!-- CuterCounter Code -->
       <br><a href="https://www.cutercounter.com/hits.php?id=hxofkcx&nd=9&style=40" target="_blank"><img src="https://www.cutercounter.com/hits.php?id=hxofkcx&nd=9&style=40" border="0" width="109" height="23"></a>
-      <!-- End of CuterCounter Code -->
 
       <script async src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-6700774525685317"
      crossorigin="anonymous"></script>

diff --git a/static/robots.txt b/static/robots.txt
@@ -0,0 +1 @@
+Sitemap: https://55gms.com/sitemap.xml
diff --git a/static/science.html b/static/science.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
    <head>
       <meta http-equiv="Cache-control" content="public">
       <script src="/assets/js/script.js?v=4"></script>