Compare commits
3 Commits
3291fbf6a0
...
new-regist
| Author | SHA1 | Date | |
|---|---|---|---|
| c8500a4337 | |||
| 03d823c713 | |||
| 773f8ad2b6 |
@@ -1,5 +1,5 @@
|
||||
[project]
|
||||
name = "new-registration-app"
|
||||
name = "meal-manager"
|
||||
version = "0.1.0"
|
||||
description = "Add your description here"
|
||||
readme = "README.md"
|
||||
@@ -10,6 +10,9 @@ dependencies = [
|
||||
"sqlalchemy>=2.0.44",
|
||||
"uvicorn[standard]>=0.35.0",
|
||||
]
|
||||
[build-system]
|
||||
requires = ["uv_build>=0.9.0,<0.10.0"]
|
||||
build-backend = "uv_build"
|
||||
|
||||
[dependency-groups]
|
||||
dev = [
|
||||
@@ -19,7 +22,6 @@ dev = [
|
||||
[tool.isort]
|
||||
profile = "black"
|
||||
|
||||
|
||||
[tool.alembic]
|
||||
|
||||
# path to migration scripts.
|
||||
BIN
signup/Logo.png
BIN
signup/Logo.png
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB |
@@ -1,98 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Termin hinzufügen</title>
|
||||
<link rel="stylesheet" href="style.css"> <!-- Link to the CSS file -->
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<div class="container">
|
||||
<div id="branding">
|
||||
<img src="Logo.png" alt="Logo">
|
||||
<h1>Termin hinzufügen</h1>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<div class="container">
|
||||
<h2>Neuen Termin hinzufügen</h2>
|
||||
<form action="add.php" method="POST">
|
||||
<label for="title">Title:</label>
|
||||
<input type="text" id="title" name="title" required>
|
||||
|
||||
<label for="melly">Melly Link:</label>
|
||||
<input type="text" id="melly" name="melly" required>
|
||||
|
||||
<label for="date">Event Date:</label>
|
||||
<input type="date" id="date" name="date" required>
|
||||
|
||||
<label for="signup_deadline">Anmeldung bis:</label>
|
||||
<input type="datetime-local" id="signup_deadline" name="signup_deadline" required>
|
||||
|
||||
<label for="password">Password:</label>
|
||||
<input type="password" id="password" name="password" required>
|
||||
|
||||
<button type="submit" class="btn">Hinzfügen</button>
|
||||
</form>
|
||||
|
||||
<?php
|
||||
ini_set('display_errors', 1);
|
||||
ini_set('display_startup_errors', 1);
|
||||
error_reporting(E_ALL);
|
||||
|
||||
$config = require 'config.php';
|
||||
|
||||
// Database connection parameters
|
||||
$host = $config['db']['host'];
|
||||
$dbname = $config['db']['dbname'];
|
||||
$username = $config['db']['username'];
|
||||
$password = $config['db']['password'];
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] == "POST") {
|
||||
// Retrieve form data
|
||||
$title = $_POST['title'];
|
||||
$melly = $_POST['melly'];
|
||||
$date = $_POST['date'];
|
||||
$deadline = $_POST['signup_deadline'];
|
||||
|
||||
$webform_password = $_POST['password'];
|
||||
|
||||
if($webform_password != $config['webform_password']) {
|
||||
echo 'Invalid Password!';
|
||||
} else {
|
||||
|
||||
try {
|
||||
// Create connection
|
||||
$dsn = "pgsql:host=$host;dbname=$dbname";
|
||||
$pdo = new PDO($dsn, $username, $password);
|
||||
|
||||
// Set error mode to exception for easier debugging
|
||||
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
||||
|
||||
// SQL query to insert a new dinner option
|
||||
$sql = "INSERT INTO meals (title, link, event_date, registration_closes) VALUES (:title, :melly, :date, :deadline)";
|
||||
$stmt = $pdo->prepare($sql);
|
||||
|
||||
// Bind parameters
|
||||
$stmt->bindParam(':title', $title);
|
||||
$stmt->bindParam(':melly', $melly);
|
||||
$stmt->bindParam(':date', $date);
|
||||
$stmt->bindParam(':deadline', $deadline);
|
||||
|
||||
// Execute the statement
|
||||
$stmt->execute();
|
||||
|
||||
echo '<p class="success">Dinner option added successfully!</p>';
|
||||
|
||||
} catch (PDOException $e) {
|
||||
// Handle connection or query error
|
||||
echo "Error: " . $e->getMessage();
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,13 +0,0 @@
|
||||
CREATE TABLE meals (
|
||||
id SERIAL PRIMARY KEY,
|
||||
title TEXT NOT NULL,
|
||||
link TEXT NOT NULL,
|
||||
event_date DATE NOT NULL,
|
||||
registration_closes TIMESTAMP NOT NULL
|
||||
);
|
||||
|
||||
|
||||
INSERT INTO meals (title, link, event_date, registration_closes)
|
||||
VALUES ('Kidneybohnen Burger mit veganem Coleslaw','https://melly.de/plan/2ZSNYWR37VB8','2025-03-05', '2025-03-02T17:30:30'),
|
||||
('Gemüselasagne mit Salat','hhttps://melly.de/plan/M4XU9XMVM2HP','2025-02-28', '2025-02-23T17:30:30'),
|
||||
RETURNING *;
|
||||
108
signup/index.php
108
signup/index.php
@@ -1,108 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Allmende-Essen</title>
|
||||
<link rel="stylesheet" href="style.css">
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<div class="container">
|
||||
<div id="branding">
|
||||
<img src="Logo.png" alt="Logo"/>
|
||||
<h1>Gemeinsames Essen in der Allmende</h1>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
<?php
|
||||
|
||||
ini_set('display_errors', 1);
|
||||
ini_set('display_startup_errors', 1);
|
||||
error_reporting(E_ALL);
|
||||
|
||||
$config = require 'config.php';
|
||||
|
||||
// Database connection parameters
|
||||
$host = $config['db']['host'];
|
||||
$dbname = $config['db']['dbname'];
|
||||
$username = $config['db']['username'];
|
||||
$password = $config['db']['password'];
|
||||
|
||||
// Create connection
|
||||
$dsn = "pgsql:host=$host;dbname=$dbname";
|
||||
$pdo = new PDO($dsn, $username, $password);
|
||||
|
||||
// Query to fetch future dinner options
|
||||
$sql = "SELECT id, title, link, event_date, registration_closes FROM meals WHERE event_date >= now()::date order by registration_closes < now(), event_date";
|
||||
$stmt = $pdo->prepare($sql);
|
||||
$stmt->execute();
|
||||
|
||||
$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
$days = ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"];
|
||||
|
||||
$today = strtotime(date('Y-m-d'));
|
||||
$now = strtotime(date("Y-m-d H:i:s"));
|
||||
?>
|
||||
|
||||
<div class="container">
|
||||
<?php // Display dinner options
|
||||
for($i = 0; $i < sizeof($result); $i++) {
|
||||
$row = $result[$i];
|
||||
|
||||
$event_date = strtotime($row["event_date"]);
|
||||
|
||||
$weekday = date("w", $event_date);
|
||||
$date = new DateTimeImmutable($row["event_date"]);
|
||||
|
||||
$end_of_registration = strtotime($row["registration_closes"]);
|
||||
echo '<div class="dinner-option">';
|
||||
echo '<h2>' . $days[$weekday] . " " . $date->format('d.m.Y') .'</h2>';
|
||||
echo '<p>' . htmlspecialchars($row["title"]) . '</p>';
|
||||
if ($end_of_registration > $now) {
|
||||
echo '<a href="' . $row["link"] . '" class="btn">Zur Anmeldung</a>';
|
||||
} else {
|
||||
echo '<a href="' . $row["link"] . '" class="btn btn-grey">Anmeldungen ansehen</a>';
|
||||
}
|
||||
echo '</div>';
|
||||
}
|
||||
// close container
|
||||
echo '</div>';
|
||||
|
||||
// Query to fetch past dinner options
|
||||
$sql = "SELECT id, title, link, event_date FROM meals WHERE event_date < now()::date order by event_date";
|
||||
$stmt = $pdo->prepare($sql);
|
||||
$stmt->execute();
|
||||
|
||||
$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
if(sizeof($result) > 0) {
|
||||
?>
|
||||
|
||||
<div class="container">
|
||||
<h2>Vergangene Essen</h2>
|
||||
|
||||
<?php
|
||||
for($i = 0; $i < sizeof($result); $i++) {
|
||||
$row = $result[$i];
|
||||
|
||||
$event_date = strtotime($row["event_date"]);
|
||||
|
||||
$weekday = date("w", $event_date);
|
||||
$date = new DateTimeImmutable($row["event_date"]);
|
||||
|
||||
echo '<div class="dinner-option">';
|
||||
echo '<h2>' . $days[$weekday] . " " . $date->format('d.m.Y') .'</h2>';
|
||||
echo '<p>' . htmlspecialchars($row["title"]) . '</p>';
|
||||
echo '<a href="' . $row["link"] . '" class="btn btn-grey">Anmeldungen ansehen</a>';
|
||||
echo '</div>';
|
||||
}
|
||||
// close container
|
||||
echo '</div>';
|
||||
}
|
||||
?>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,75 +0,0 @@
|
||||
body {
|
||||
font-family: Arial, sans-serif;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background-color: #f4f4f4;
|
||||
color: #333;
|
||||
}
|
||||
.container {
|
||||
width: 80%;
|
||||
margin: auto;
|
||||
overflow: hidden;
|
||||
}
|
||||
header {
|
||||
background: #333;
|
||||
color: #fff;
|
||||
padding-top: 30px;
|
||||
min-height: 70px;
|
||||
border-bottom: #77aaff 3px solid;
|
||||
}
|
||||
header a {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
text-transform: uppercase;
|
||||
font-size: 16px;
|
||||
}
|
||||
header ul {
|
||||
padding: 0;
|
||||
list-style: none;
|
||||
}
|
||||
header li {
|
||||
float: left;
|
||||
display: inline;
|
||||
padding: 0 20px 0 20px;
|
||||
}
|
||||
header #branding {
|
||||
float: left;
|
||||
}
|
||||
header #branding img {
|
||||
height: 50px;
|
||||
width: 40px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
header #branding h1 {
|
||||
margin: 0;
|
||||
}
|
||||
header nav {
|
||||
float: right;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.dinner-option {
|
||||
background: #fff;
|
||||
padding: 20px;
|
||||
margin: 20px 0;
|
||||
border-radius: 5px;
|
||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
.dinner-option h2 {
|
||||
margin-top: 0;
|
||||
}
|
||||
.btn {
|
||||
background: #77aaff;
|
||||
color: #fff;
|
||||
padding: 10px 20px;
|
||||
text-decoration: none;
|
||||
border-radius: 5px;
|
||||
display: inline-block;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.btn-grey {
|
||||
background: #ccc;
|
||||
color: #333;
|
||||
}
|
||||
.btn:hover {
|
||||
background: #5a99d0;
|
||||
}
|
||||
0
src/meal_manager/__init__.py
Normal file
0
src/meal_manager/__init__.py
Normal file
@@ -1,9 +1,7 @@
|
||||
from logging.config import fileConfig
|
||||
|
||||
from sqlalchemy import engine_from_config
|
||||
from sqlalchemy import pool
|
||||
|
||||
from alembic import context
|
||||
from sqlalchemy import engine_from_config, pool
|
||||
|
||||
# this is the Alembic Config object, which provides
|
||||
# access to the values within the .ini file in use.
|
||||
@@ -18,7 +16,7 @@ if config.config_file_name is not None:
|
||||
# for 'autogenerate' support
|
||||
# from myapp import mymodel
|
||||
# target_metadata = mymodel.Base.metadata
|
||||
from models import Base
|
||||
from meal_manager.models import Base
|
||||
|
||||
target_metadata = Base.metadata
|
||||
|
||||
@@ -8,9 +8,8 @@ Create Date: 2025-10-12 20:46:13.452705
|
||||
|
||||
from typing import Sequence, Union
|
||||
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
from alembic import op
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision: str = "299a83240036"
|
||||
@@ -11,7 +11,14 @@ from fastapi.templating import Jinja2Templates
|
||||
from sqlalchemy import create_engine, select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from models import Base, Event, Household, Registration, Subscription, TeamRegistration
|
||||
from meal_manager.models import (
|
||||
Base,
|
||||
Event,
|
||||
Household,
|
||||
Registration,
|
||||
Subscription,
|
||||
TeamRegistration,
|
||||
)
|
||||
|
||||
sqlite_file_name = "database.db"
|
||||
sqlite_url = f"sqlite:///{sqlite_file_name}"
|
||||
@@ -38,9 +45,9 @@ async def on_startup(app_: FastAPI):
|
||||
|
||||
|
||||
app = FastAPI(lifespan=on_startup)
|
||||
app.mount("/static", StaticFiles(directory="static"), name="static")
|
||||
app.mount("/static", StaticFiles(directory="src/meal_manager/static"), name="static")
|
||||
|
||||
templates = Jinja2Templates(directory="templates")
|
||||
templates = Jinja2Templates(directory="src/meal_manager/templates")
|
||||
|
||||
SessionDep = Annotated[Session, Depends(get_session)]
|
||||
|
||||
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
22
new-registration-app/uv.lock → uv.lock
generated
22
new-registration-app/uv.lock → uv.lock
generated
@@ -333,18 +333,9 @@ wheels = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mypy-extensions"
|
||||
version = "1.1.0"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/a2/6e/371856a3fb9d31ca8dac321cda606860fa4548858c0cc45d9d1d4ca2628b/mypy_extensions-1.1.0.tar.gz", hash = "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558", size = 6343, upload-time = "2025-04-22T14:54:24.164Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/79/7b/2c79738432f5c924bef5071f933bcc9efd0473bac3b4aa584a6f7c1c8df8/mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", size = 4963, upload-time = "2025-04-22T14:54:22.983Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "new-registration-app"
|
||||
name = "meal-manager"
|
||||
version = "0.1.0"
|
||||
source = { virtual = "." }
|
||||
source = { editable = "." }
|
||||
dependencies = [
|
||||
{ name = "alembic" },
|
||||
{ name = "fastapi", extra = ["standard"] },
|
||||
@@ -372,6 +363,15 @@ dev = [
|
||||
{ name = "isort", specifier = ">=6.0.1" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mypy-extensions"
|
||||
version = "1.1.0"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/a2/6e/371856a3fb9d31ca8dac321cda606860fa4548858c0cc45d9d1d4ca2628b/mypy_extensions-1.1.0.tar.gz", hash = "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558", size = 6343, upload-time = "2025-04-22T14:54:24.164Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/79/7b/2c79738432f5c924bef5071f933bcc9efd0473bac3b4aa584a6f7c1c8df8/mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", size = 4963, upload-time = "2025-04-22T14:54:22.983Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "packaging"
|
||||
version = "25.0"
|
||||
Reference in New Issue
Block a user