Merge pull request #15 from Paradax-Elite/master

:)
MManoah · Aug 24, 2020 · 6d6414c · 6d6414c
2 parents 0d58693 + 9883c73
commit 6d6414c
Show file tree

Hide file tree

Showing 17 changed files with 370 additions and 154 deletions.
diff --git a/config/clubs.json b/config/clubs.json
@@ -0,0 +1,6 @@
+{
+"club Name": "clubData",
+"Another Club": "clubData",
+"Emoji Club 💔": "clubData",
+"etc": "clubData"
+}
diff --git a/src/css/index.css b/src/css/index.css
@@ -11,7 +11,7 @@ body {
 }
 .sidebarcomp {
   text-align: center;
-  margin-top: 1.8em;
+  margin-top: 0em;
   display: block;
   -webkit-app-region: no-drag;
 }
@@ -36,6 +36,7 @@ h3 {
   border-width: thin;
   color: white;
   cursor: pointer;
+  font-size: 23px;
 }
 .barMouseOver {
   transition: border 500ms, color 500ms;
@@ -179,11 +180,14 @@ img {
 .clubPage {
   text-align: center;
 }
-#clubs {
+.clubs {
   font-size: 1.5em;
-  margin-top: 5em;
+  margin-top: 1em;
   cursor: pointer;
 }
+.bottomClubs{
+  margin-top: 1em !important;
+}
 #setClub {
   padding: 0;
   font-size: 1.7em;
@@ -283,8 +287,8 @@ img {
   text-align: center;
   color: white;
   font-size: 30px;
-  line-height: 20px;
-  margin-top: 50px;
+  line-height: 25px;
+  margin-top: 30px;
 }
 .iconButtons {
   display: inline-block;
@@ -310,3 +314,38 @@ dd{
   -webkit-text-stroke-width: 0.7px;
   -webkit-text-stroke-color: white;
 }
+.customContent{
+  text-align: center;
+}
+#endPoint{
+  cursor: text;
+  font-size: 20px;
+}
+#method{
+  font-size: 18px;
+  cursor: pointer;
+}
+#requestBody{
+  font-size: 32px;
+  cursor: text;
+}
+#response{
+  font-size: 32px;
+  overflow:hidden;
+}
+#requestLCU{
+  padding: 0;
+  font-size: 1.5em;
+  width: 5.5em;
+  height: 30px;
+  padding-bottom: 1px;
+  cursor: pointer;
+}
+#lcuEndpoints{
+  padding: 0;
+  font-size: 1.5em;
+  width: 6em;
+  height: 30px;
+  padding-bottom: 1px;
+  cursor: pointer;
+}
diff --git a/src/html/club.html b/src/html/club.html
@@ -9,41 +9,30 @@ <h4 class="clubT">
       </h4>
       <h4 class="clubT">*And Restart This Program*</h4>
       <h4 class="clubT">*You must also be in a club first*</h4>
+      <h4 class="clubT">*User Clubs is located in config/clubs.json*</h4>
       <select
         name="clubs"
-        id="clubs"
+        id="presetClubs"
+        class="clubs"
         onfocus="this.size=5;"
         onblur="this.size=1;"
         onchange="this.size=1; this.blur();"
       >
         <option disabled selected value> Choose a Club </option>
-        <option class="club" value="blackHeart">🖤</option>
-        <option class="club" value="flower">🌸</option>
-        <option class="club" value="frog">🐸</option>
-        <option class="club" value="star">STAR ⭐</option>
-        <option class="club" value="key">🔑🔑</option>
-        <option class="club" value="L9">L9</option>
-        <option class="club" value=":)">:)</option>
-        <option class="club" value=":(">:(</option>
-        <option class="club" value="God">God</option>
-        <option class="club" value="Girl">Girl</option>
-        <option class="club" value="eGirl">eGirl</option>
-        <option class="club" value="Kitty">Kitty</option>
-        <option class="club" value="123">123</option>
-        <option class="club" value="Kat">Kat</option>
-        <option class="club" value="Rakan">Rakan</option>
-        <option class="club" value="Annie">Annie </option>
-        <option class="club" value="Teemo">Teemo </option>
-        <option class="club" value="Solid">Solid</option>
-        <option class="club" value="Agony">Agony</option>
-        <option class="club" value="Skarl">Skarl</option>
-        <option class="club" value="Tahm:">Tahm:</option>
-        <option class="club" value="ok•••">ok•••</option>
-        <option class="club" value="XD:">XD:</option>
-        <option class="club" value="Jáññà">Jáññà</option>
-        <option class="club" value="Λ.D">Λ.D</option>
-        <option class="club" value="¿kys">¿kys</option>
+        <option class="club" value="clubName">clubName</option>
       </select>
+      <br>
+      <select
+        name="clubs2"
+        id="customClubs"
+        class="clubs bottomClubs"
+        onfocus="this.size=5;"
+        onblur="this.size=1;"
+        onchange="this.size=1; this.blur();"
+      >
+        <option disabled selected value> User Clubs </option>
+      </select>
+
       <br />
       <div class="clubData">
         <input

diff --git a/src/html/custom.html b/src/html/custom.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+  <body>
+    <div class="dragtop"></div>
+    <div class="customContent">
+      <div class="customTopItems">
+        <input
+          type="text"
+          id="endPoint"
+          name="endPoint"
+          placeholder="Enter Endpoint Here"
+        />
+        <select name="method" id="method">
+          <option disabled selected value> Methods </option>
+          <option class="methods" value="GET">GET</option>
+          <option class="methods" value="POST">POST</option>
+          <option class="methods" value="PUT">PUT</option>
+          <option class="methods" value="PATCH">PATCH</option>
+          <option class="methods" value="DELETE">DELETE</option>
+        </select>
+      </div>
+
+      <h2>Request Body (For POST and PUT)</h2>
+      <textarea id="requestBody" name="requestBody" rows="4" cols="50">
+{
+    "":""
+}
+        </textarea
+      >
+      <button type="button" id="lcuEndpoints">List of Endpoints</button>
+      <button type="button" id="requestLCU">Make Request</button>
+      <h2>Response</h2>
+      <textarea id="response" name="response" rows="4" cols="50"> </textarea>
+    </div>
+  </body>
+</html>
diff --git a/src/html/home.html b/src/html/home.html
@@ -3,7 +3,7 @@
   <body>
     <div class="dragtop"></div>
     <h1 id="homeHead">LEAGUE PROFILE TOOL</h1>
-    <h4 class="version">Local Version: V.2.4.4</h4>
+    <h4 class="version">Local Version: V.2.4.5</h4>
     <h4 id="newVersion" class="version"></h4>
     <h3 class="contact">Check github for discord</h3>
     <span class="icon icon-github-circled"></span>

diff --git a/src/html/icon.html b/src/html/icon.html
@@ -218,8 +218,7 @@
       height="100"
     />
     <h4 id="customIcon">
-      Any icon code, the icon shows to everyone <br>on the client (you will not see it) <br>however it
-      goes away when you log out!
+      The custom icon goes away when you log out!
     </h4>
     <form>
       <div class="form-group">
@@ -232,8 +231,12 @@ <h4 id="customIcon">
       </div>
     </form>
     <div class="iconB">
-    <button id="lolNames" class="btn btn-large btn-default iconButtons">Codes</button>
-    <button id="iconCode" class="btn btn-large btn-default iconButtons">Submit</button>
+      <button id="lolNames" class="btn btn-large btn-default iconButtons">
+        Codes
+      </button>
+      <button id="iconCode" class="btn btn-large btn-default iconButtons">
+        Submit
+      </button>
     </div>
   </body>
 </html>
diff --git a/src/index.html b/src/index.html
@@ -36,6 +36,9 @@ <h3 id="club">Club Tag</h3>
             <div class="sidebarcomp">
               <h3 id="aram">Aram</h3>
             </div>
+            <div class="sidebarcomp">
+              <h3 id="custom">Custom Request</h3>
+            </div>
             <div class="sidebarcomp">
               <h3 id="faq">F.A.Q</h3>
             </div>

diff --git a/src/index.js b/src/index.js
@@ -2,6 +2,7 @@ const { app, BrowserWindow, dialog, globalShortcut } = require("electron");
 const path = require("path");
 const exec = require("child_process").exec;
 let pathSpecified = false;
+
 // Check if the user is logged into the league client
 const isRunning = (query, cb) => {
   let platform = process.platform;
@@ -23,12 +24,14 @@ const isRunning = (query, cb) => {
     cb(stdout.toLowerCase().indexOf(query.toLowerCase()) > -1);
   });
 };
+
+// Check if clientPath file contains the client path or if the file is corrupted
 try {
   const fs = require("fs");
-  const clientPath = fs.readFileSync('config\\clientPath.txt').toString();
+  const clientPath = fs.readFileSync("config\\clientPath.txt").toString();
   if (clientPath !== "") pathSpecified = true;
 } catch (err) {
-  dialog.showErrorBox("Error", 'The path file is corrupted');
+  dialog.showErrorBox("Error", "The path file is corrupted");
 }
 // status will be true or false
 isRunning("LeagueClient.exe", (status) => {
@@ -86,4 +89,4 @@ app.on("activate", () => {
   if (BrowserWindow.getAllWindows().length === 0) {
     createWindow();
   }
-});
+});