Merge pull request #46 from Stake-And-Rope/experimental

Development Progress - week 01
Stake-And-Rope · Jun 4, 2023 · 8fb835e · 8fb835e
2 parents 9cd27de + e07dbe6
commit 8fb835e
Show file tree

Hide file tree

Showing 46 changed files with 210 additions and 112 deletions.
diff --git a/db_handle/postgres_conn.py b/db_handle/postgres_conn.py
@@ -49,7 +49,7 @@ def admin_client():
                 )
         cursor = db_client.cursor()
         cursor.execute("SELECT version()")
-        # print(cursor.fetchone())
+        print("Admin database connection established!")
     except (Exception) as error:
         print("Database connection failed!")
 
@@ -59,9 +59,7 @@ def admin_client():
     POSTGRES_CONNECTION = db_client
 
 
-    """Close connection to the Linux Server and the Postgres DB. This two lines should be commented in production environment"""    
-    # db_client.close()
-    # tunnel.close()
+    """Close connection to the Linux Server and the Postgres DB. This two lines should be commented in production environment"""
 
 def customer_client(username, passwd):
     global USER_POSTGRES_CURSOR
@@ -100,8 +98,8 @@ def customer_client(username, passwd):
                 dbname = str(database_name)
                 )
         user_cursor = user_db_client.cursor()
-        user_cursor.execute("SELECT version()")
-        print(user_cursor.fetchone())
+        # user_cursor.execute("SELECT version()")
+        print("Client database connection established!")
     except (Exception) as error:
         raise Exception("Database connection failed!")
 

diff --git a/development_week_01.md b/development_week_01.md
@@ -0,0 +1,12 @@
+[![Edit in Eraser](https://firebasestorage.googleapis.com/v0/b/second-petal-295822.appspot.com/o/images%2Fgithub%2FOpen%20in%20Eraser.svg?alt=media&token=968381c8-a7e7-472a-8ed6-4a6626da5501)](https://app.eraser.io/workspace/1ZEtbIuCPdTmk2hVUNVJ)
+[View on canvas](https://app.eraser.io/workspace/1ZEtbIuCPdTmk2hVUNVJ?elements=DPFqS85X08w45doNnBBD8A)[View on canvas](https://app.eraser.io/workspace/1ZEtbIuCPdTmk2hVUNVJ?elements=DPFqS85X08w45doNnBBD8A) 
+
+- We will work only on **experimental** branch / **Do not push **any commits to **development** branch
+- Every week we will open a new pull-request from **experimental** to **development **with WIP bot, which will handle the commits.
+- Repository project is updated - now every Issue is assigned to **ONLY** one person. 
+- Work only on the Issues where you are assigned. IF you need to implement major changes to some other functionality, synchronize them with the person assigned to the respective Issue(Task)
+- Every Sunday we will have a merging sessions to close the Weekly Pull-Request from **experimental** to **development. **Automated bots will remind on Saturday and Sunday with Slack notifications in #market-app channel. **Attending the sessions is not obligatory!!!! (But it will affect your X-mas bonus X0-X0-X0 )**
+
+
+
+<!--- Eraser file: https://app.eraser.io/workspace/1ZEtbIuCPdTmk2hVUNVJ --->
diff --git a/img/background.png b/img/background.png
diff --git a/img/subcategories/Accessories.png b/img/subcategories/Accessories.png
diff --git a/img/subcategories/Alcohol Beverages.png b/img/subcategories/Alcohol Beverages.png
diff --git a/img/subcategories/Beach Shoes.png b/img/subcategories/Beach Shoes.png
diff --git a/img/subcategories/Blouses.png b/img/subcategories/Blouses.png
diff --git a/img/subcategories/Coffee.png b/img/subcategories/Coffee.png
diff --git a/img/subcategories/Computers.png b/img/subcategories/Computers.png
diff --git a/img/subcategories/Documentary.png b/img/subcategories/Documentary.png
diff --git a/img/subcategories/Electric Gadgets.png b/img/subcategories/Electric Gadgets.png
diff --git a/img/subcategories/Equipment.png b/img/subcategories/Equipment.png
diff --git a/img/subcategories/Fruits.png b/img/subcategories/Fruits.png
diff --git a/img/subcategories/Garden Design.png b/img/subcategories/Garden Design.png
diff --git a/img/subcategories/Horror.png b/img/subcategories/Horror.png
diff --git a/img/subcategories/Household Appliences.png b/img/subcategories/Household Appliences.png
diff --git a/img/subcategories/Kitchen.png b/img/subcategories/Kitchen.png
diff --git a/img/subcategories/Makeup.png b/img/subcategories/Makeup.png
diff --git a/img/subcategories/Meat.png b/img/subcategories/Meat.png
diff --git a/img/subcategories/Men Shorts.png b/img/subcategories/Men Shorts.png
diff --git a/img/subcategories/Men Suits.png b/img/subcategories/Men Suits.png
diff --git a/img/subcategories/Nail Polish.png b/img/subcategories/Nail Polish.png
diff --git a/img/subcategories/Non-Alcohol Beverages.png b/img/subcategories/Non-Alcohol Beverages.png
diff --git a/img/subcategories/Photography Gadgets.png b/img/subcategories/Photography Gadgets.png
diff --git a/img/subcategories/Products.png b/img/subcategories/Products.png
diff --git a/img/subcategories/Romance.png b/img/subcategories/Romance.png
diff --git a/img/subcategories/Room Decoration.png b/img/subcategories/Room Decoration.png
diff --git a/img/subcategories/Running Shoes.png b/img/subcategories/Running Shoes.png
diff --git a/img/subcategories/Shoes.png b/img/subcategories/Shoes.png
diff --git a/img/subcategories/Skin Care Products.png b/img/subcategories/Skin Care Products.png
diff --git a/img/subcategories/Skirts.png b/img/subcategories/Skirts.png
diff --git a/img/subcategories/Slippers.png b/img/subcategories/Slippers.png
diff --git a/img/subcategories/Sneakers.png b/img/subcategories/Sneakers.png
diff --git a/img/subcategories/Sport Accessories.png b/img/subcategories/Sport Accessories.png
diff --git a/img/subcategories/Sunglasses.png b/img/subcategories/Sunglasses.png
diff --git a/img/subcategories/Vegetables.png b/img/subcategories/Vegetables.png
diff --git a/img/subcategories/Wallets.png b/img/subcategories/Wallets.png
diff --git a/img/subcategories/Watches.png b/img/subcategories/Watches.png
diff --git a/img/subcategories/Women Kimonos.png b/img/subcategories/Women Kimonos.png
diff --git a/pyqt5-gui/login.py b/pyqt5-gui/login.py
@@ -1,3 +1,6 @@
+#!/usr/bin/python3
+import sys
+sys.path.append(r'..')
 from PyQt5.QtWidgets import (
                             QVBoxLayout,
                             QHBoxLayout,
@@ -16,11 +19,10 @@
                         )
 
 from PyQt5.QtCore import Qt
-
-import sys
-sys.path.append(r'..')
 from db_handle import postgres_conn
 import register
+import main_menu
+
 
 
 class LogIn(QWidget):
@@ -104,6 +106,7 @@ def __init__(self):
         def login():
             try:
                 postgres_conn.customer_client(username_textbox.text(), password_textbox.text())
+                open_main_menu()
             except (Exception) as error:
                 error_msg_box = QMessageBox(self)
                 error_msg_box.setIcon(QMessageBox.Warning)
@@ -116,6 +119,10 @@ def open_register():
             register.start_window()
             login_window.hide()
 
+        def open_main_menu():
+            main_menu.start_window()
+            login_window.hide()
+
 def init_app():
     app = QApplication(sys.argv)
     global login_window
@@ -128,6 +135,8 @@ def start_window():
     login_window = LogIn()
     login_window.show()
 
-def open_user_registration(user):
-    return f"You clicked me, {user}!"
+
+
+
+
 # init_app()
diff --git a/pyqt5-gui/main.py b/pyqt5-gui/main.py
@@ -2,5 +2,5 @@
 
 import login
 
-# login.start_window()
+
 login.init_app()
diff --git a/pyqt5-gui/main_menu.py b/pyqt5-gui/main_menu.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 import sys
 import requests
-# Import PyQt5 Engine 
+"""IMPORT PyQt5 ENGINE"""
 from PyQt5.QtWidgets import (QApplication,
                              QWidget,
                              QPushButton,
@@ -24,6 +24,14 @@
 sys.path.append(r'..')
 from collections import deque
 from db_handle import postgres_conn
+import subcategories
+
+# This global variable should be modified to accept it's value dynamically, based on the cattegory button clicked
+global subcategory_name
+subcategory_name = ''
+
+"""INIT CONNECTION TO THE DATABASE"""
+postgres_conn.admin_client()
 
 class MainMenu(QWidget):
     def __init__(self):
@@ -34,24 +42,41 @@ def __init__(self):
         self.setMaximumWidth(1500)
         self.setMaximumHeight(700)
 
-        """INIT CONNECTION TO THE DATABASE"""
-        postgres_conn.admin_client()
+
 
-        def food_open():
-            print("I am eating some food")
-
-        def books_open():
-            print("I am reading books")
+        """OPEN THE PROPER SUBCATEGORY"""
+        def open_func(subcat_name):
+            global subcategory_name
+            subcategory_name = subcat_name
+            open_subcategories()
 
-        def drinks_open():
-            print("I am drinking some drinks")
-
+
+        """SUBCATEGORIES CALL FUNCTION"""
         functions_dict = {
-            'food_open': lambda: food_open(),
-            'books_open': lambda: books_open(),
-            'drinks_open': lambda: drinks_open(),
+            'food_open': lambda: open_func("Food"),
+            'books_open': lambda: open_func("Books"),
+            'drinks_open': lambda: open_func("Drinks"),
+            'accessories_open': lambda: open_func("Accessories"),
+            'homeandliving_open': lambda: open_func("Home and Living"),
+            'hair_open': lambda: open_func("Hair"),
+            'sports_open': lambda: open_func("Sports"),
+            'beachwear_open': lambda: open_func("Beachwear"),
+            'shoes_open': lambda: open_func("Shoes"),
+            'electronics_open': lambda: open_func("Electronics"),
+            'cosmetics_open': lambda: open_func("Cosmetics"),
+            'clothes_open': lambda: open_func("Clothes"),
         }
 
+
+        """LEFT LAYOUT BUTTONS CALL FUNCTION"""
+        left_layout_buttons_dict = {
+            'edit_account': lambda: open_update_account(),
+            'view_my_orders': lambda: open_user_orders(),
+            'payment_options': lambda: print("Payment Options"),
+            'back': lambda: open_categories(),
+        }
+
+
         """ADD CUSTOM FONT TO ARRAY READY TO BE LOADED TO ANY TEXT OBJECT""" 
         font = QFontDatabase.addApplicationFont(r'../fonts/jetbrains-mono.regular.ttf')
         if font < 0:
@@ -89,14 +114,18 @@ def drinks_open():
         left_buttons_layout = QVBoxLayout()
 
 
-        buttons_text = deque(['Edit Account', 'View My Orders', 'Payment Options'])
+        buttons_text = deque(['Edit Account', 'View My Orders', 'Payment Options', 'Back'])
         while buttons_text:
             button = QPushButton()
-            button.setText(buttons_text.popleft())
+            button_text = buttons_text.popleft()
+            button.setText(button_text)
+            button_function = button_text.replace(" ", "_")
+            button_function = button_function.lower()
             button.setFont(QFont(fonts[0], 12))
             button.setFixedWidth(250)
             button.setFixedHeight(30)
-            # button.setStyleSheet("background-color: rgb(51, 153, 255)")
+            button.clicked.connect(left_layout_buttons_dict[button_function])
+
             left_buttons_layout.addWidget(button)
 
         left_buttons_layout.addStretch(0)
@@ -111,19 +140,19 @@ def drinks_open():
         favourites_button.setText("Favourites")
         favourites_button.setFont(QFont(fonts[0], 9))
         favourites_button.setFixedWidth(120)
-        favourites_button.setFixedHeight(23)
+        favourites_button.setFixedHeight(30)
 
         about_button = QPushButton()
         about_button.setText("About")
         about_button.setFont(QFont(fonts[0], 9))
         about_button.setFixedWidth(120)
-        about_button.setFixedHeight(23)
+        about_button.setFixedHeight(30)
 
         log_out_button = QPushButton()
         log_out_button.setText("Log Out")
         log_out_button.setFont(QFont(fonts[0], 9))
         log_out_button.setFixedWidth(100)
-        log_out_button.setFixedHeight(23)
+        log_out_button.setFixedHeight(30)
 
         top_buttons_layout.addStretch(0)
         top_buttons_layout.addSpacing(1000)
@@ -182,18 +211,14 @@ def drinks_open():
                     cat_desc_shadow_effect.setColor(QColor("white"))
                     category_description.setGraphicsEffect(cat_desc_shadow_effect)
 
-
                     category_button = QPushButton()
                     category_button.setText(category_name.text())
                     category_button.setFont(QFont(fonts[0], 11))
                     category_button.setMaximumWidth(150)
 
-                    # current_function_name = categories_functions.popleft()
-                    # print(current_function_name)
-                    # category_button.clicked.connect(functions_dict[current_function_name])
+                    current_function_name = categories_functions.popleft() + "_open"
+                    category_button.clicked.connect(functions_dict[current_function_name])
 
-                    # current_vertical_layout.addWidget(category_name)
-                    # current_vertical_layout.addWidget(category_description)
                     current_vertical_layout.addWidget(category_button)
 
                     current_groupbox.setLayout(current_vertical_layout)
@@ -214,10 +239,105 @@ def drinks_open():
         self.setLayout(main_layout)
         self.show()
 
+        """BRING BACK THE CATEGORIES"""
+        def open_categories():
+            hide_user_update_settings()
+
 
-app = QApplication(sys.argv)
-global login_window
-login_window = MainMenu()
-login_window.show()
-app.exec()
+        """OPEN EDIT ACCOUNT LAYOUT/REPLACE CATEGORIES LAYOUT"""
+        def open_update_account():
+            # Change to dynamic query in implementation
+            postgres_conn.POSTGRES_CURSOR.execute(f"SELECT customer_id, username, first_name, last_name, phone, email_address FROM customers WHERE username = 'pesho'")
+            result = postgres_conn.POSTGRES_CURSOR.fetchone()
+
+            update_user_settings_groupbox = QGroupBox("Update Account Settings")
+            update_user_settings_layout = QVBoxLayout()
+            update_user_settings_layout.addStretch()
+            update_user_settings_layout.addSpacing(10)
+
+            text_labels = deque(['ID', 'Username', 'First Name', 'Last Name', 'Phone Number', 'Email Address'])
+            text_labels_length = len(text_labels)
+
+            for i in range(text_labels_length):
+                current_text_label = QLabel()
+                current_text_label.setText(text_labels.popleft())
+                current_text_label.setFont(QFont(fonts[0], 12))
+
+                current_line_edit = QLineEdit()
+                current_line_edit.setText(str(result[i]))
+                current_line_edit.setFont(QFont(fonts[0], 12))
+                current_line_edit.setMaximumWidth(250)
+                # Disables user_id and username modification
+                if i < 2:
+                    current_line_edit.setReadOnly(True)
+
+                update_user_settings_layout.addWidget(current_text_label)
+                update_user_settings_layout.addWidget(current_line_edit)
+
+
+            update_user_settings_layout.addStretch()
+            update_user_settings_layout.addSpacing(20)
+
+            reset_button = QPushButton()
+            reset_button.setText("Reset to defaults")
+            reset_button.setFont(QFont(fonts[0], 12))
+            reset_button.setFixedWidth(200)
+            reset_button.clicked.connect(lambda: open_update_account())
+
+            update_user_setting_button = QPushButton()
+            update_user_setting_button.setText("Update Info")
+            update_user_setting_button.setFont(QFont(fonts[0], 12))
+            update_user_setting_button.clicked.connect(lambda: update_user())
+            update_user_setting_button.setFixedWidth(200)
+
+            update_user_settings_layout.addWidget(reset_button)
+            update_user_settings_layout.addWidget(update_user_setting_button)
+
+            update_user_settings_groupbox.setLayout(update_user_settings_layout)
 
+            categories_groupbox.hide()
+            main_layout.addWidget(update_user_settings_groupbox, 1, 1)
+
+            global hide_user_update_settings
+            def hide_user_update_settings():
+                update_user_settings_groupbox.hide()
+                categories_groupbox.show()
+
+
+        """OPEN USER ORDERS HISTORY/REPLACE CATEGORIES LAYOUT"""
+        def open_user_orders():
+            pass
+
+
+        """OPEN SUBCATEGORIES WINDOW"""
+        def open_subcategories():
+            subcategories.start_window(subcategory_name)
+            main_window.hide()
+
+        # Not fully implemented, fucntion is still taking old data from qlineedit's
+        def update_user():
+            user_data = []
+            # Make this query dynamically accepting the username in production
+            update_user_query = (f"UPDATE customers SET first_name = %s, last_name = %s, phone = %s, email_address = %s WHERE username = 'pesho'")
+            postgres_conn.POSTGRES_CURSOR.execute(update_user_query, (user_data[0], user_data[1], user_data[2], user_data[3]))
+            postgres_conn.POSTGRES_CONNECTION.commit()
+
+
+"""OBSOLETE - KEEP FOR NOW FOR DEBUGING PURPOSES, BUT MOST PROBEBLY WONT BE NEEDED"""
+def open_app():
+    app = QApplication(sys.argv)
+    global main_window
+    main_window = MainMenu()
+    main_window.show()
+    app.exec()
+
+"""START MAIN MENU"""
+def start_window():
+    global main_menu_window
+    main_menu_window = MainMenu()
+    main_menu_window.show()
+
+# if __name__ == '__main__':
+#     open_app()
+
+open_app()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,5 +2,5 @@

		import login

		# login.start_window()

		login.init_app()