fix backend and register page

Delemangi · Mar 4, 2024 · 743c2a5 · 743c2a5
1 parent 05a771f
commit 743c2a5
Show file tree

Hide file tree

Showing 8 changed files with 140 additions and 58 deletions.
diff --git a/backend/app/database.py b/backend/app/database.py
@@ -1,50 +1,26 @@
 import os
 from collections.abc import AsyncGenerator
 
-from sqlalchemy.ext.asyncio import (
-    AsyncSession,
-    async_sessionmaker,
-    create_async_engine,
-    AsyncEngine,
-)
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
 
 from app.auth.models import Role  # noqa: F401
 from app.file_transfer.models import File, Webhook  # noqa: F401
 from app.models import Base
 
-engine: AsyncEngine | None = None
 SQLALCHEMY_DATABASE_URL = os.getenv("DATABASE_URL")
 
-
-def get_engine() -> AsyncEngine:
-    global engine  # noqa: PLW0603
-
-    if SQLALCHEMY_DATABASE_URL is None:
-        raise ValueError("DATABASE_URL environment variable is not set")
-
-    if engine is None:
-        engine = create_async_engine(SQLALCHEMY_DATABASE_URL, echo=True)
-    return engine
-
-
-async_session_maker: None | async_sessionmaker = None
-
-
-def get_session_maker() -> async_sessionmaker:
-    global async_session_maker  # noqa: PLW0603
-    if async_session_maker is None:
-        async_session_maker = async_sessionmaker(
-            autocommit=False, autoflush=False, bind=get_engine(), expire_on_commit=False
-        )
-    return async_session_maker
+engine = create_async_engine(SQLALCHEMY_DATABASE_URL, echo=True)
+async_session_maker = async_sessionmaker(
+    autocommit=False, autoflush=False, bind=engine, expire_on_commit=False
+)
 
 
 async def initialize_database() -> None:
-    async with get_engine().begin() as conn:
+    async with engine.begin() as conn:
         await conn.run_sync(Base.metadata.drop_all)
         await conn.run_sync(Base.metadata.create_all)
 
 
 async def get_async_session() -> AsyncGenerator[AsyncSession, None]:
-    async with get_session_maker() as session:  # type: ignore
+    async with async_session_maker() as session:  # type: ignore
         yield session
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -32,4 +32,4 @@ services:
     container_name: synthra-frontend
     restart: unless-stopped
     ports:
-      - "5002:5000"
+      - "4173:4173"
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -28,5 +28,9 @@
     "typescript": "^5.3.3",
     "vite": "^5.0.0"
   },
-  "type": "module"
+  "type": "module",
+  "dependencies": {
+    "@svelteuidev/composables": "^0.15.4",
+    "@svelteuidev/core": "^0.15.4"
+  }
 }
diff --git a/frontend/src/app.html b/frontend/src/app.html
@@ -1,4 +1,7 @@
 <!doctype html>
+<script>
+	import { SvelteUIProvider } from '@svelteuidev/core';
+</script>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
@@ -7,6 +10,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     %sveltekit.head%
   </head>
+  <style>
+    body {
+      margin: 0;
+    }
+  </style>
   <body data-sveltekit-preload-data="hover">
     <div style="display: contents">%sveltekit.body%</div>
   </body>

diff --git a/frontend/src/lib/components/Header.svelte b/frontend/src/lib/components/Header.svelte
@@ -0,0 +1,18 @@
+<!-- Header.svelte -->
+
+<header>
+  <h1>Synthra</h1>
+</header>
+
+<style>
+  header {
+    text-align: start;
+    margin: 5;
+    border-bottom: 1px solid gray;
+    padding: 10px
+  }
+
+  h1 {
+    margin: 0;
+  }
+</style>
diff --git a/frontend/src/lib/index.ts b/frontend/src/lib/index.ts
@@ -1 +1,4 @@
 // place files you want to import through the `$lib` alias in this folder.
+import Header from './components/Header.svelte'
+
+export {Header}