Merge branch 'master' of https://github.com/AndreWohnsland/Cocktailma…

…ker_AW
AndreWohnsland · Nov 21, 2021 · 1e667a6 · 1e667a6
2 parents d3edb99 + 48c7f7f
commit 1e667a6
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 11 deletions.
diff --git a/config/config_manager.py b/config/config_manager.py
@@ -1,7 +1,7 @@
 import os
 import yaml
 
-CONFIG_FILE = os.path.join(os.path.dirname(__file__), "..", "custom_config.yaml")
+CONFIG_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "custom_config.yaml")
 
 
 class ConfigManager:

diff --git a/dashboard/backend/main.py b/dashboard/backend/main.py
@@ -8,7 +8,7 @@
 from pydantic import BaseModel
 
 DATABASE_NAME = "team"
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 database_path = os.path.join(DIRPATH, "storage", f"{DATABASE_NAME}.db")
 
 app = FastAPI()

diff --git a/dashboard/frontend/main.py b/dashboard/frontend/main.py
@@ -20,7 +20,7 @@
 mpl.rcParams.update({'text.color': "white", 'axes.labelcolor': "white"})
 
 DATABASE_NAME = "team"
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 load_dotenv(os.path.join(DIRPATH, ".language.env"))
 database_path = os.path.join(DIRPATH, "storage", f"{DATABASE_NAME}.db")
 

diff --git a/dashboard/qt-app/.language.env b/dashboard/qt-app/.language.env
@@ -1 +1 @@
-LANGUAGE=en
+UI_LANGUAGE=en
diff --git a/dashboard/qt-app/waffle.py b/dashboard/qt-app/waffle.py
@@ -8,13 +8,13 @@
 
 from pywaffle import Waffle
 
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 load_dotenv(os.path.join(DIRPATH, ".language.env"))
 matplotlib.rcParams.update({'text.color': "white", 'axes.labelcolor': "white"})
 
 
 def __choose_language(element: dict) -> str:
-    language = os.getenv("LANGUAGE")
+    language = os.getenv("UI_LANGUAGE")
     return element.get(language, element["en"])
 
 

diff --git a/microservice/database.py b/microservice/database.py
@@ -3,7 +3,7 @@
 import sqlite3
 
 DATABASE_NAME = "failed_data"
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 
 
 class DatabaseHandler:

diff --git a/readme.md b/readme.md
@@ -1,5 +1,13 @@
 # The Cocktailmaker
 
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/AndreWohnsland/Cocktailmaker_AW)
+![GitHub Release Date](https://img.shields.io/github/release-date/AndreWohnsland/Cocktailmaker_AW)
+![Python Version](https://img.shields.io/badge/python-%3E%3D%203.6-blue)
+![GitHub](https://img.shields.io/github/license/AndreWohnsland/Cocktailmaker_AW)
+![GitHub issues](https://img.shields.io/github/issues-raw/AndreWohnsland/Cocktailmaker_AW)
+![GitHub Repo stars](https://img.shields.io/github/stars/AndreWohnsland/Cocktailmaker_AW?style=social)
+
+
 #### A Python and Qt Based App for a Cocktail machine
 
 <br />

diff --git a/src/database_commander.py b/src/database_commander.py
@@ -6,7 +6,7 @@
 from typing import Any, Dict, List
 
 DATABASE_NAME = "Cocktail_database"
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 
 
 class DatabaseCommander:

diff --git a/src/logger_handler.py b/src/logger_handler.py
@@ -1,7 +1,7 @@
 import os
 import logging
 
-dirpath = os.path.dirname(__file__)
+dirpath = os.path.dirname(os.path.abspath(__file__))
 
 
 class LoggerHandler:

diff --git a/src/save_handler.py b/src/save_handler.py
@@ -6,7 +6,7 @@
 from src.display_controller import DP_CONTROLLER
 from src.service_handler import SERVICE_HANDLER
 
-DIRPATH = os.path.dirname(__file__)
+DIRPATH = os.path.dirname(os.path.abspath(__file__))
 
 
 class SaveHandler:

diff --git a/src_ui/setup_mainwindow.py b/src_ui/setup_mainwindow.py
@@ -40,7 +40,8 @@ def __init__(self, parent=None):
         self.logger_handler.log_start_program()
         self.connect_objects()
         self.connect_other_windows()
-        self.icon_path = os.path.join(os.path.dirname(__file__), "..", "ui_elements", "Cocktail-icon.png")
+        self.icon_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                                      "..", "ui_elements", "Cocktail-icon.png")
         # as long as its not UI_DEVENVIRONMENT (usually touchscreen) hide the cursor
         if not self.UI_DEVENVIRONMENT:
             self.setCursor(Qt.BlankCursor)