Merge pull request #35 from Jellayy/beta-0.1.1

Beta 0.1.1
Jellayy · May 21, 2022 · b29f7e2 · b29f7e2
2 parents b9b6f1a + 3f2e697
commit b29f7e2
Show file tree

Hide file tree

Showing 37 changed files with 257 additions and 20 deletions.
diff --git a/.github/workflows/pyinstaller-windows.yml b/.github/workflows/pyinstaller-windows.yml
@@ -21,5 +21,5 @@ jobs:
 
  - uses: actions/upload-artifact@v2
  with:
- name: ez.gg-alpha-v00.0${{ github.run_number }}
+ name: ez.gg-beta-v0.1.1-build-${{ github.run_number }}
  path: src/dist/windows
diff --git a/src/eel_driver.py b/src/eel_driver.py
@@ -54,6 +54,11 @@ def run_autopilot():
  pass
 
 
+@eel.expose
+def get_version():
+ return "Beta v0.1.1"
+
+
 # Start Logging
 home_folder = str(Path.home())
 logging.basicConfig(

diff --git a/src/eel_driver.spec b/src/eel_driver.spec
@@ -37,4 +37,5 @@ exe = EXE(pyz,
  disable_windowed_traceback=False,
  target_arch=None,
  codesign_identity=None,
- entitlements_file=None )
+ entitlements_file=None,
+ icon='Z:\\github\\workspace\\src\\utils\\ui\\assets\\icon.ico')
diff --git a/src/utils/opgg.py b/src/utils/opgg.py
@@ -19,20 +19,18 @@ async def get_rune_page(champion):
 
  runes = []
  # Keystone
- data = r_soup.find_all("div", {"class": "css-1w13bvn e495vw30"}, limit=1)
+ data = r_soup.find_all("div", {"class": "css-r2m0dx e1o8f101"}, limit=1)
  runes.append(str(data).split("img")[1].split("/")[6].split(".")[0])
 
  # Primary and Secondary Tree Perks
- data = r_soup.find_all("div", {"class": "css-l5ga7x e495vw30"}, limit=5)
+ data = r_soup.find_all("div", {"class": "css-1rjzcri e1o8f101"}, limit=5)
  for entry in data:
  runes.append(str(entry).split("img")[1].split("/")[6].split(".")[0])
 
  # Flex Perk Tree
- data = r_soup.find_all("div", {"class": "css-1my9c6 e14t5af50"}, limit=1)
- data = str(data).split("img")
- data.pop(0)
+ data = r_soup.find_all("img", {"class": "css-anaetp e1gtrici1"}, limit=9)
  for entry in data:
- if not entry.__contains__('grayscale'):
+ if 'grayscale' not in str(entry):
  runes.append(str(entry).split("/")[6].split(".")[0])
 
  # Keystone and Secondary Tree
@@ -61,7 +59,7 @@ async def get_sum_spells(champion):
  r_soup = bs4.BeautifulSoup(r.text, 'html.parser')
 
  spells = []
- data = r_soup.find_all("ul", {"class": "css-wc914 e1jyy41s0"}, limit=1)
+ data = r_soup.find_all("ul", {"class": "css-14r5yga esh6m080"}, limit=1)
  data = str(data).split("img")
  data.pop(0)
  for entry in data:
@@ -79,11 +77,11 @@ async def get_sum_spells(champion):
 async def main():
  # Should return ELEVEN perks
  # Example: ['8112', '8126', '8138', '8105', '8226', '8233', '5008', '5008', '5003', '8100', '8200']
- await get_rune_page("Cho'Gath")
+ print(await get_rune_page("Cho'Gath"))
 
  # Should return TWO perks
  # Example: ['SummonerFlash', 'SummonerDot']
- await get_sum_spells("Cho'Gath")
+ print(await get_sum_spells("Cho'Gath"))
 
 
 if __name__ == '__main__':

diff --git a/src/utils/ui/assets/android-icon-144x144.png b/src/utils/ui/assets/android-icon-144x144.png
diff --git a/src/utils/ui/assets/android-icon-192x192.png b/src/utils/ui/assets/android-icon-192x192.png
diff --git a/src/utils/ui/assets/android-icon-36x36.png b/src/utils/ui/assets/android-icon-36x36.png
diff --git a/src/utils/ui/assets/android-icon-48x48.png b/src/utils/ui/assets/android-icon-48x48.png
diff --git a/src/utils/ui/assets/android-icon-72x72.png b/src/utils/ui/assets/android-icon-72x72.png
diff --git a/src/utils/ui/assets/android-icon-96x96.png b/src/utils/ui/assets/android-icon-96x96.png
diff --git a/src/utils/ui/assets/apple-icon-114x114.png b/src/utils/ui/assets/apple-icon-114x114.png
diff --git a/src/utils/ui/assets/apple-icon-120x120.png b/src/utils/ui/assets/apple-icon-120x120.png
diff --git a/src/utils/ui/assets/apple-icon-144x144.png b/src/utils/ui/assets/apple-icon-144x144.png
diff --git a/src/utils/ui/assets/apple-icon-152x152.png b/src/utils/ui/assets/apple-icon-152x152.png
diff --git a/src/utils/ui/assets/apple-icon-180x180.png b/src/utils/ui/assets/apple-icon-180x180.png
diff --git a/src/utils/ui/assets/apple-icon-57x57.png b/src/utils/ui/assets/apple-icon-57x57.png
diff --git a/src/utils/ui/assets/apple-icon-60x60.png b/src/utils/ui/assets/apple-icon-60x60.png
diff --git a/src/utils/ui/assets/apple-icon-72x72.png b/src/utils/ui/assets/apple-icon-72x72.png
diff --git a/src/utils/ui/assets/apple-icon-76x76.png b/src/utils/ui/assets/apple-icon-76x76.png
diff --git a/src/utils/ui/assets/apple-icon-precomposed.png b/src/utils/ui/assets/apple-icon-precomposed.png
diff --git a/src/utils/ui/assets/apple-icon.png b/src/utils/ui/assets/apple-icon.png
diff --git a/src/utils/ui/assets/browserconfig.xml b/src/utils/ui/assets/browserconfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
diff --git a/src/utils/ui/assets/favicon-16x16.png b/src/utils/ui/assets/favicon-16x16.png
diff --git a/src/utils/ui/assets/favicon-32x32.png b/src/utils/ui/assets/favicon-32x32.png
diff --git a/src/utils/ui/assets/favicon-96x96.png b/src/utils/ui/assets/favicon-96x96.png
diff --git a/src/utils/ui/assets/favicon.ico b/src/utils/ui/assets/favicon.ico
diff --git a/src/utils/ui/assets/icon.ico b/src/utils/ui/assets/icon.ico
diff --git a/src/utils/ui/assets/manifest.json b/src/utils/ui/assets/manifest.json
@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+ {
+ "src": "\/android-icon-36x36.png",
+ "sizes": "36x36",
+ "type": "image\/png",
+ "density": "0.75"
+ },
+ {
+ "src": "\/android-icon-48x48.png",
+ "sizes": "48x48",
+ "type": "image\/png",
+ "density": "1.0"
+ },
+ {
+ "src": "\/android-icon-72x72.png",
+ "sizes": "72x72",
+ "type": "image\/png",
+ "density": "1.5"
+ },
+ {
+ "src": "\/android-icon-96x96.png",
+ "sizes": "96x96",
+ "type": "image\/png",
+ "density": "2.0"
+ },
+ {
+ "src": "\/android-icon-144x144.png",
+ "sizes": "144x144",
+ "type": "image\/png",
+ "density": "3.0"
+ },
+ {
+ "src": "\/android-icon-192x192.png",
+ "sizes": "192x192",
+ "type": "image\/png",
+ "density": "4.0"
+ }
+ ]
+}
diff --git a/src/utils/ui/assets/ms-icon-144x144.png b/src/utils/ui/assets/ms-icon-144x144.png
diff --git a/src/utils/ui/assets/ms-icon-150x150.png b/src/utils/ui/assets/ms-icon-150x150.png
diff --git a/src/utils/ui/assets/ms-icon-310x310.png b/src/utils/ui/assets/ms-icon-310x310.png
diff --git a/src/utils/ui/assets/ms-icon-70x70.png b/src/utils/ui/assets/ms-icon-70x70.png
diff --git a/src/utils/ui/autopilot.html b/src/utils/ui/autopilot.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
- <title>EZ.GG Beta v0.1</title>
+ <title>EZ.GG</title>
 
  <!-- Expose eel -->
  <script src="/eel.js" type="text/javascript"></script>
@@ -15,8 +15,24 @@
  <!--Fontawesome icon init-->
  <link href="assets/fontawesome/css/all.min.css" rel="stylesheet">
 
- <!--Favicon-->
- <link href="assets/favicon.png" rel="icon">
+ <!--Themeing and icons-->
+ <link rel="apple-touch-icon" sizes="57x57" href="assets/apple-icon-57x57.png">
+ <link rel="apple-touch-icon" sizes="60x60" href="assets/apple-icon-60x60.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="assets/apple-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="76x76" href="assets/apple-icon-76x76.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="assets/apple-icon-114x114.png">
+ <link rel="apple-touch-icon" sizes="120x120" href="assets/apple-icon-120x120.png">
+ <link rel="apple-touch-icon" sizes="144x144" href="assets/apple-icon-144x144.png">
+ <link rel="apple-touch-icon" sizes="152x152" href="assets/apple-icon-152x152.png">
+ <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-icon-180x180.png">
+ <link rel="icon" type="image/png" sizes="192x192" href="assets/android-icon-192x192.png">
+ <link rel="icon" type="image/png" sizes="32x32" href="assets/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="96x96" href="assets/favicon-96x96.png">
+ <link rel="icon" type="image/png" sizes="16x16" href="assets/favicon-16x16.png">
+ <link rel="manifest" href="assets/manifest.json">
+ <meta name="msapplication-TileColor" content="#ffffff">
+ <meta name="msapplication-TileImage" content="assets/ms-icon-144x144.png">
+ <meta name="theme-color" content="#ffffff">
 </head>
 <body class="preload">
 
@@ -180,11 +196,25 @@
  <input class="button" disabled id="autopilot_btn" type="button" value="START">
  -->
  </div>
+
+ <!-- Update Notifier -->
+ <div class="update-banner" hidden>
+ <div class="update-banner__inner">
+ <div class="update-banner__copy">
+ <div class="update-banner__header">Update Available!</div>
+ <div class="update-banner__description">
+ <span id="update_description">A new version of EZ.GG is available on GitHub, please update for the latest features and fixes!</span>
+ </div>
+ </div>
+ </div>
+ </div>
 </div>
 
 <!--Sidebar Driver JS Init-->
 <script src="sidebar.js" type="text/javascript"></script>
 <!--Javascript Init-->
 <script src="autopilot.js" type="text/javascript"></script>
+<!-- Version Handler Init-->
+<script src="version_handler.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/utils/ui/debug.html b/src/utils/ui/debug.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
- <title>EZ.GG Beta v0.1</title>
+ <title>EZ.GG</title>
 
  <!-- Expose eel -->
  <script src="/eel.js" type="text/javascript"></script>
@@ -15,8 +15,24 @@
  <!--Fontawesome icon init-->
  <link href="assets/fontawesome/css/all.min.css" rel="stylesheet">
 
- <!--Favicon-->
- <link href="assets/favicon.png" rel="icon">
+ <!--Themeing and icons-->
+ <link rel="apple-touch-icon" sizes="57x57" href="assets/apple-icon-57x57.png">
+ <link rel="apple-touch-icon" sizes="60x60" href="assets/apple-icon-60x60.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="assets/apple-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="76x76" href="assets/apple-icon-76x76.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="assets/apple-icon-114x114.png">
+ <link rel="apple-touch-icon" sizes="120x120" href="assets/apple-icon-120x120.png">
+ <link rel="apple-touch-icon" sizes="144x144" href="assets/apple-icon-144x144.png">
+ <link rel="apple-touch-icon" sizes="152x152" href="assets/apple-icon-152x152.png">
+ <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-icon-180x180.png">
+ <link rel="icon" type="image/png" sizes="192x192" href="assets/android-icon-192x192.png">
+ <link rel="icon" type="image/png" sizes="32x32" href="assets/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="96x96" href="assets/favicon-96x96.png">
+ <link rel="icon" type="image/png" sizes="16x16" href="assets/favicon-16x16.png">
+ <link rel="manifest" href="assets/manifest.json">
+ <meta name="msapplication-TileColor" content="#ffffff">
+ <meta name="msapplication-TileImage" content="assets/ms-icon-144x144.png">
+ <meta name="theme-color" content="#ffffff">
 </head>
 <body class="preload">
 
@@ -61,7 +77,22 @@
 
  </div>
 
+ <!-- Update Notifier -->
+ <div class="update-banner" hidden>
+ <div class="update-banner__inner">
+ <div class="update-banner__copy">
+ <div class="update-banner__header">Update Available!</div>
+ <div class="update-banner__description">
+ <span id="update_description">A new version of EZ.GG is available on GitHub, please update for the latest features and fixes!</span>
+ </div>
+ </div>
+ </div>
+ </div>
+
  <!--Sidebar Driver JS Init-->
  <script src="sidebar.js" type="text/javascript"></script>
+
+ <!-- Version Handler Init-->
+ <script src="version_handler.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/utils/ui/main.html b/src/utils/ui/main.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
- <title>EZ.GG Beta v0.1</title>
+ <title>EZ.GG</title>
 
  <!-- Expose eel -->
  <script src="/eel.js" type="text/javascript"></script>
@@ -15,8 +15,24 @@
  <!--Fontawesome icon init-->
  <link href="assets/fontawesome/css/all.min.css" rel="stylesheet">
 
- <!--Favicon-->
- <link href="assets/favicon.png" rel="icon">
+ <!--Themeing and icons-->
+ <link rel="apple-touch-icon" sizes="57x57" href="assets/apple-icon-57x57.png">
+ <link rel="apple-touch-icon" sizes="60x60" href="assets/apple-icon-60x60.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="assets/apple-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="76x76" href="assets/apple-icon-76x76.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="assets/apple-icon-114x114.png">
+ <link rel="apple-touch-icon" sizes="120x120" href="assets/apple-icon-120x120.png">
+ <link rel="apple-touch-icon" sizes="144x144" href="assets/apple-icon-144x144.png">
+ <link rel="apple-touch-icon" sizes="152x152" href="assets/apple-icon-152x152.png">
+ <link rel="apple-touch-icon" sizes="180x180" href="assets/apple-icon-180x180.png">
+ <link rel="icon" type="image/png" sizes="192x192" href="assets/android-icon-192x192.png">
+ <link rel="icon" type="image/png" sizes="32x32" href="assets/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="96x96" href="assets/favicon-96x96.png">
+ <link rel="icon" type="image/png" sizes="16x16" href="assets/favicon-16x16.png">
+ <link rel="manifest" href="assets/manifest.json">
+ <meta name="msapplication-TileColor" content="#ffffff">
+ <meta name="msapplication-TileImage" content="assets/ms-icon-144x144.png">
+ <meta name="theme-color" content="#ffffff">
 </head>
 <body class="preload">
 
@@ -80,10 +96,25 @@
  </div> -->
  </div>
 
+ <!-- Update Notifier -->
+ <div class="update-banner" hidden>
+ <div class="update-banner__inner">
+ <div class="update-banner__copy">
+ <div class="update-banner__header">Update Available!</div>
+ <div class="update-banner__description">
+ <span id="update_description">A new version of EZ.GG is available on GitHub, please update for the latest features and fixes!</span>
+ </div>
+ </div>
+ </div>
+ </div>
+
  <!--Sidebar Driver JS Init-->
  <script src="sidebar.js" type="text/javascript"></script>
 
  <!-- main.js init -->
  <script src="main.js" type="text/javascript"></script>
+
+ <!-- Version Handler Init-->
+ <script src="version_handler.js" type="text/javascript"></script>
 </body>
 </html>
diff --git a/src/utils/ui/style.css b/src/utils/ui/style.css
@@ -431,4 +431,23 @@ form label {
 
 #checkboxes label {
  display: block;
+}
+
+.update-banner {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ z-index: 2147483645;
+ box-sizing: border-box;
+ width: 100%;
+ background-color: #2288ff;
+}
+
+.update-banner__inner {
+ text-align: center;
+ padding: 10px 5px;
+}
+
+.update-banner__header {
+ margin-bottom: 5px;
 }