From 1b5eda340f6edb3b32399a8906afc2fe7df47c68 Mon Sep 17 00:00:00 2001
From: BarsTiger <kit.barsic@gmail.com>
Date: Thu, 27 Jan 2022 11:49:27 +0200
Subject: [PATCH] GUI development

---
 horsygui.py         |  2 +-
 modules/auth.py     | 10 ++++++----
 modules/uploader.py |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/horsygui.py b/horsygui.py
index 7514da9..89a1545 100644
--- a/horsygui.py
+++ b/horsygui.py
@@ -94,7 +94,7 @@ def get_source_gui():
 
 def upload_gui():
     from modules.uploader import upload
-    upload(True, ui, login_ui)
+    upload(True, ui, login_ui, UiMainWindow)
 
 
 # Run functions on startup
diff --git a/modules/auth.py b/modules/auth.py
index af5d262..95d71b5 100644
--- a/modules/auth.py
+++ b/modules/auth.py
@@ -2,7 +2,7 @@ import json
 import modules.vars as horsy_vars
 
 
-def get_auth(is_gui=False, login_ui=None):
+def get_auth(is_gui=False, login_ui=None, Ui_LoginWindow=None):
     with open(horsy_vars.horsypath + 'config.cfg') as f:
         config = json.load(f)
 
@@ -24,17 +24,19 @@ def get_auth(is_gui=False, login_ui=None):
             print('[OK] Auth created')
             return config['auth']
         else:
-            login_ui.show()
-            login_ui.login_button.clicked.connect(lambda: get_auth(login_ui=login_ui))
+            Ui_LoginWindow.show()
+            login_ui.login_button.clicked.connect(lambda: get_gui_auth(login_ui=login_ui,
+                                                                       Ui_LoginWindow=Ui_LoginWindow))
 
 
-def get_gui_auth(login_ui):
+def get_gui_auth(login_ui, Ui_LoginWindow):
     with open(horsy_vars.horsypath + 'config.cfg') as f:
         config = json.load(f)
     if login_ui.email_box.text() != '' and login_ui.password_box.text() != '':
         with open(horsy_vars.horsypath + 'config.cfg', 'w') as f:
             config['auth'] = {'email': login_ui.email_box.text(), 'password': login_ui.password_box.text()}
             json.dump(config, f)
+        Ui_LoginWindow.close()
 
 
 def del_auth():
diff --git a/modules/uploader.py b/modules/uploader.py
index 1fcaf11..f1e2931 100644
--- a/modules/uploader.py
+++ b/modules/uploader.py
@@ -16,7 +16,7 @@ def urlmatch(s):
     return re.match("^https?://.*.(?:zip|exe)$", s) is not None
 
 
-def upload(is_gui=False, ui=None, login_ui=None):
+def upload(is_gui=False, ui=None, login_ui=None, Ui_LoginWindow=None):
     if not is_gui:
         print('Welcome to the uploader')
         print('Before starting, please make sure you have done your project and [blink]uploaded[/] it to any hosting '
@@ -93,7 +93,7 @@ def upload(is_gui=False, ui=None, login_ui=None):
         }
 
     else:
-        auth = get_auth(is_gui)
+        auth = get_auth(is_gui, login_ui, Ui_LoginWindow)
 
         project_name = ui.packagename_box.text()
         if not matches(project_name) or len(project_name) > 64 or len(project_name) < 3: