Just commit

src/modules/ConnectionString.py

@@ -12,9 +12,9 @@ def ConnectionString(database) -> str or None:
     if not os.path.isdir(sqlitePath):
         os.mkdir(sqlitePath)
     if parser.get("Database", "type") == "postgresql":
-        cn = f'postgresql+psycopg2://{parser.get("Database", "username")}:{parser.get("Database", "password")[1]}@{parser.get("Database", "host")[1]}/{database}'
-    elif parser.get("Database", "type")[1] == "mysql":
-        cn = f'mysql+mysqldb://{parser.get("Database", "username")[1]}:{parser.get("Database", "password")[1]}@{parser.get("Database", "host")[1]}/{database}'
+        cn = f'postgresql+psycopg2://{parser.get("Database", "username")}:{parser.get("Database", "password")}@{parser.get("Database", "host")}/{database}'
+    elif parser.get("Database", "type") == "mysql":
+        cn = f'mysql+mysqldb://{parser.get("Database", "username")}:{parser.get("Database", "password")}@{parser.get("Database", "host")}/{database}'
     else:
         cn = f'sqlite:///{os.path.join(sqlitePath, f"{database}.db")}'
     if not database_exists(cn):

src/modules/DashboardClient.py

@@ -1,3 +0,0 @@
-class DashboardClient:
-    def __init__(self):
-        pass

src/modules/DashboardClients.py

@@ -0,0 +1,58 @@
+import sqlalchemy as db
+from sqlalchemy.orm import DeclarativeBase, Mapped
+from sqlalchemy.testing.schema import mapped_column
+
+from .ConnectionString import ConnectionString
+
+
+class DashboardClients:
+    def __init__(self):
+        self.engine = db.create_engine(ConnectionString("wgdashboard"))
+        self.metadata = db.MetaData()
+        
+        self.dashboardClientsTable = db.Table(
+            'DashboardClients', self.metadata,
+            db.Column('ClientID', db.String(255), nullable=False, primary_key=True),
+            db.Column('Email', db.String(255), nullable=False, index=True),
+            db.Column('Password', db.String(500)),
+            db.Column('TotpKey', db.String(500)),
+            db.Column('TotpKeyVerified', db.Integer),
+            db.Column('CreatedDate', 
+                      (db.DATETIME if 'sqlite:///' in ConnectionString("wgdashboard") else db.TIMESTAMP),
+                      server_default=db.func.now()),
+            db.Column('DeletedDate', 
+                      (db.DATETIME if 'sqlite:///' in ConnectionString("wgdashboard") else db.TIMESTAMP)),
+            extend_existing=True,
+        )
+
+        self.dashboardClientsInfoTable = db.Table(
+            'DashboardClientsInfo', self.metadata,
+            db.Column('ClientID', db.String(255), nullable=False, primary_key=True),
+            db.Column('Firstname', db.String(500)),
+            db.Column('Lastname', db.String(500)),
+            extend_existing=True,
+        )
+
+        self.metadata.create_all(self.engine)
+        self.Clients = []
+        self.__getClients()
+        print('hi')
+        print(self.Clients)
+        
+    def __getClients(self):
+        with self.engine.connect() as conn:
+            self.Clients = conn.execute(
+                db.select(
+                    self.dashboardClientsTable.c.ClientID,
+                    self.dashboardClientsTable.c.Email,
+                    self.dashboardClientsTable.c.CreatedDate
+                ).where(
+                    self.dashboardClientsTable.c.DeletedDate is None)
+                ).mappings().fetchall()
+            
+    
+    
+    def SignUp(self, Email, Password, ConfirmPassword) -> tuple[bool, str]:
+        pass
+    
+        

src/modules/DashboardLogger.py

@@ -12,6 +12,7 @@ class DashboardLogger:
         self.engine = db.create_engine(ConnectionString("wgdashboard_log"))
         self.metadata = db.MetaData()
         self.dashboardLoggerTable = db.Table('DashboardLog', self.metadata,
+                                             
                                              db.Column('LogID', db.String(255), nullable=False, primary_key=True),
                                              db.Column('LogDate', (db.DATETIME if DashboardConfig.GetConfig("Database", "type")[1] == 'sqlite' else db.TIMESTAMP),
                                                        server_default=db.func.now()),
@@ -19,7 +20,7 @@ class DashboardLogger:
                                              db.Column('IP', db.String(255)),
                                              
                                              db.Column('Status', db.String(255), nullable=False),
-                                             db.Column('Message', db.Text)
+                                             db.Column('Message', db.Text), extend_existing=True,
                                              )
         self.metadata.create_all(self.engine)
         self.log(Message="WGDashboard started")