Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6b84441d75 | ||
|
|
ce8857f92b | ||
|
|
85faf8aa5b |
No files matched your search
@@ -1,14 +1,12 @@
|
|||||||
# Tandoor-Shoppinglist
|
# Tandur
|
||||||
|
|
||||||
Eine Website, die sich von einer selber gehosteten Tandoor-Instanz die Shoppinglist Einträge nimmt, und als Shoppinglist anzeigt.
|
Eine Website, die sich von einer selber gehosteten Tandoor-Instanz die Shoppinglist Einträge nimmt, und als Shoppinglist anzeigt.
|
||||||
|
|
||||||
## Inhalt
|
## Inhalt
|
||||||
- TODO
|
- TODO
|
||||||
- Fsetlegungen
|
- Festlegungen
|
||||||
|
- Ablauf
|
||||||
|
- Installation
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## TODO
|
## TODO
|
||||||
@@ -19,4 +17,34 @@ Eine Website, die sich von einer selber gehosteten Tandoor-Instanz die Shoppingl
|
|||||||
- [ ] Implementieren
|
- [ ] Implementieren
|
||||||
|
|
||||||
## Festlegungen
|
## Festlegungen
|
||||||
*Hier muss noch beschrieben werden, wie genau das gemacht wird.*
|
- Database: SQLite3 mit sqlmodel
|
||||||
|
- API FastAPI
|
||||||
|
- Jinja
|
||||||
|
- TailwindCSS + Alpine.js
|
||||||
|
???
|
||||||
|
|
||||||
|
## Ablauf
|
||||||
|
- Data fetch from Tandoor via APIs
|
||||||
|
- Data fetch from Database
|
||||||
|
- View on Website and edit
|
||||||
|
- Order vie Mail
|
||||||
|
- CSV download *optional
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
### Bare Metal
|
||||||
|
#### Linux
|
||||||
|
##### Download & Setup
|
||||||
|
```
|
||||||
|
git clone https://git.schamagusa.de/rudi/Tandur.git
|
||||||
|
cd Tandur
|
||||||
|
|
||||||
|
source .venv/bin/activate
|
||||||
|
pip install --no-cache-dir -r requirements.txt
|
||||||
|
```
|
||||||
|
##### Run
|
||||||
|
```
|
||||||
|
uvicorn main:app
|
||||||
|
```
|
||||||
|
### Docker Compose (recomended)
|
||||||
|
#TODO
|
||||||
|
|
||||||
-23
@@ -1,23 +0,0 @@
|
|||||||
from typing import Optional
|
|
||||||
from sqlmodel import Field, SQLModel, create_engine, Session
|
|
||||||
|
|
||||||
# 1. Das Datenmodell (Tabelle in der DB)
|
|
||||||
class ShoppingItem(SQLModel, table=True):
|
|
||||||
id: Optional[int] = Field(default=None, primary_key=True)
|
|
||||||
name: str
|
|
||||||
menge: int = Field(default=1)
|
|
||||||
gekauft: bool = Field(default=False)
|
|
||||||
|
|
||||||
# 2. Die SQLite-Verbindung
|
|
||||||
# check_same_thread=False ist zwingend nötig für FastAPI + SQLite
|
|
||||||
sqlite_url = "sqlite:///tandur.db"
|
|
||||||
engine = create_engine(sqlite_url, connect_args={"check_same_thread": False})
|
|
||||||
|
|
||||||
# 3. Funktion zum Erstellen der Tabellen
|
|
||||||
def create_db_and_tables():
|
|
||||||
SQLModel.metadata.create_all(engine)
|
|
||||||
|
|
||||||
# 4. Session-Generator für die Routen
|
|
||||||
def get_session():
|
|
||||||
with Session(engine) as session:
|
|
||||||
yield session
|
|
||||||
@@ -1,19 +1,9 @@
|
|||||||
from contextlib import asynccontextmanager
|
from fastapi import FastAPI, Request
|
||||||
from fastapi import FastAPI, Request, Depends
|
|
||||||
from fastapi.templating import Jinja2Templates
|
from fastapi.templating import Jinja2Templates
|
||||||
from database import create_db_and_tables, get_session, ShoppingItem
|
|
||||||
from sqlmodel import Session
|
|
||||||
|
|
||||||
# Wird beim Starten des Servers exakt einmal ausgeführt
|
app = FastAPI()
|
||||||
@asynccontextmanager
|
|
||||||
async def lifespan(app: FastAPI):
|
|
||||||
create_db_and_tables()
|
|
||||||
yield
|
|
||||||
|
|
||||||
app = FastAPI(lifespan=lifespan)
|
|
||||||
templates = Jinja2Templates(directory="templates")
|
templates = Jinja2Templates(directory="templates")
|
||||||
|
|
||||||
@app.get("/")
|
@app.get("/")
|
||||||
async def home(request: Request, session: Session = Depends(get_session)):
|
async def home(request: Request):
|
||||||
# Hier können wir bald Daten aus der DB laden
|
|
||||||
return templates.TemplateResponse(request=request, name="index.html")
|
return templates.TemplateResponse(request=request, name="index.html")
|
||||||
Reference in new issue
Block a user