Initiales .sql script angepasst

Login Form updated
fixed login and register with right linktos
2025-07-07 11:03:51 +02:00 · 2025-07-07 11:01:54 +02:00 · 2025-07-07 10:42:58 +02:00
6 changed files with 91 additions and 93 deletions
--- a/CSS/style.css
+++ b/CSS/style.css
@@ -164,7 +164,7 @@ a {
    box-sizing: border-box;
 }

-.tickets-container  {
+.event-container  {
    position: absolute;
    top: 200px;
    background-color: #BAC8D4;
@@ -297,7 +297,7 @@ a {
        padding: 16px 8px;
        box-sizing: border-box;
    }
-    .tickets-container {
+    .event-container {
        position: static;
        width: 95vw;
        max-width: 400px;
@@ -310,7 +310,7 @@ a {
        font-size: 1.5em;
        text-align: center;
    }
-    .tickets-container h1 {
+    .event-container h1 {
        font-size: 1.5em;
        text-align: center;
    }
--- a/Views/Auth/showLoginForm.phtml
+++ b/Views/Auth/showLoginForm.phtml
@@ -1,20 +1,23 @@
 <div class="inhalt">
    <div class="login-container">
        <h1>Anmelden</h1>
-        <form class="form-horizontal" action="#" method="post">
-            <label>
-                <input class="input-email" type="text" placeholder="E-Mail">
-            </label>
+        <?php if (!empty($errors['login'])): ?>
+            <div class="login-error"><?=htmlspecialchars($errors['login'])?></div>
+        <?php endif; ?>
+        <form class="form-horizontal" action="index.php" method="post">
+            <input type="hidden" name="controller" value="Auth">
+            <input type="hidden" name="do" value="login">
+            <label for="email">E-Mail</label>
+            <input class="input-email" type="email" name="email" id="email" placeholder="E-Mail" required>
+            <label for="password">Passwort</label>
+            <input class="input-passwort" type="password" name="password" id="password" placeholder="Passwort" required>
+            <button class="button-loggin" type="submit">Login</button>
        </form>
-        <form class="form-horizontal" action="#" method="post">
-            <label>
-                <input class="input-passwort" type="text" placeholder="Passwort">
-            </label>
-        </form>
-        <button class="button-loggin">Login</button>
-        <a class="link-passwort-vergessen" href="?controller=Login&do=showPasswortVergessen">Passwort vergessen?</a>
-        <a class="link-konto-erstellen" href="?controller=Register&do=showRegisterPage">Konto erstellen</a>
-
+        <div style="text-align:center; margin-top: 1.5em;">
+            <a class="link-passwort-vergessen" href="?controller=Auth&do=showForgotPasswordForm">Passwort vergessen?</a>
+            <br>
+            <a class="link-konto-erstellen" href="?controller=Auth&do=showRegistrationForm">Konto erstellen</a>
+        </div>
    </div>
 </div>

--- a/Views/Auth/showRegistrationForm.phtml
+++ b/Views/Auth/showRegistrationForm.phtml
--- a/Views/Event/showEvents.phtml
+++ b/Views/Event/showEvents.phtml
@@ -3,6 +3,10 @@
    <h2>Alle Ausstellungen</h2>

 <?php if (!empty($events)): ?>
+    <div class="inhalt">
+    <div class="event-container">
+    <h1>Tickets</h1>
+    <div class="event-container-inhalt">
    <table>
        <thead>
        <tr>
@@ -28,5 +32,8 @@
 <?php else: ?>
    <p>Derzeit sind keine Ausstellungen verfügbar.</p>
 <?php endif; ?>
+    </div>
+    </div>
+    </div>

 <?php include dirname(__DIR__) . '/footer.phtml'; ?>
--- a/Views/header.phtml
+++ b/Views/header.phtml
@@ -12,11 +12,11 @@
            <div id="logo" ><a class="link-logo" href="#"></a></div>
            <button id="nav-toggle-btn" aria-label="Menü ein-/ausklappen">&#9660;</button>
            <div class="nav-links">
-                <a id="link-tickets" class="links" href="?controller=Tickets&do=showTickets">Tickets</a>
+                <a id="link-tickets" class="links" href="?controller=Event&do=showEvents">Event</a>
                <a id="link-infos" class="links" href="?controller=Welcome&do=showWelcome">Infos</a>
                <a id="link-profil" class="links" href="?controller=Profile&do=showProfile">Profil</a>
-                <a id="link-login" class="links" href="?controller=Login&do=showLoginPage">Login</a>
-                <a id="link-register" class="links" href="?controller=Register&do=showRegisterPage">Register</a>
+                <a id="link-login" class="links" href="?controller=Auth&do=showLoginForm">Login</a>
+                <a id="link-register" class="links" href="?controller=Auth&do=showRegistrationForm">Register</a>
                <div id="profile-picture"></div>
            </div>
        </div>
--- a/bibarts.sql
+++ b/bibarts.sql
@@ -1,124 +1,112 @@
-- phpMyAdmin SQL Dump
-- version 4.5.1
-- http://www.phpmyadmin.net
--
-- Host: 127.0.0.1
-- Erstellungszeit: 24. Nov 2017 um 17:01
-- Server-Version: 10.1.16-MariaDB
-- PHP-Version: 7.0.9
-
 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
 SET time_zone = "+00:00";

--
-- Datenbank: `blog`
--
-
 -- --------------------------------------------------------

-CREATE TABLE User (
-    userid INT AUTO_INCREMENT PRIMARY KEY,
-    vorname VARCHAR(50),
-    nachname VARCHAR(50),
-    strasse VARCHAR(100),
-    hausnr VARCHAR(10),
-    postleitzahl VARCHAR(10),
-    ort VARCHAR(50),
-    land VARCHAR(50),
-    tel VARCHAR(20),
+CREATE TABLE user (
+    user_id INT AUTO_INCREMENT PRIMARY KEY,
+    first_name VARCHAR(50),
+    last_name VARCHAR(50),
+    street VARCHAR(100),
+    house_number VARCHAR(10),
+    postal_code VARCHAR(10),
+    city VARCHAR(50),
+    country VARCHAR(50),
+    phone VARCHAR(20),
    email VARCHAR(100) UNIQUE,
-    isAdmin BOOLEAN DEFAULT FALSE,
+    is_admin BOOLEAN DEFAULT FALSE,
+    valid_until DATETIME NOT NULL DEFAULT '3025-01-01 00:00:00',
    password VARCHAR(255)
 );


-CREATE TABLE Standort (
-    standortid INT AUTO_INCREMENT PRIMARY KEY,
-    strasse VARCHAR(100),
-    hausnr VARCHAR(10),
-    plz VARCHAR(10),
-    ort VARCHAR(50),
-    land VARCHAR(50),
-    tel VARCHAR(20),
+CREATE TABLE location (
+    location_id INT AUTO_INCREMENT PRIMARY KEY,
+    street VARCHAR(100),
+    house_number VARCHAR(10),
+    postal_code VARCHAR(10),
+    city VARCHAR(50),
+    country VARCHAR(50),
+    phone VARCHAR(20),
    email VARCHAR(100)
 );


-CREATE TABLE Ausstellung (
-    austellungid INT AUTO_INCREMENT PRIMARY KEY,
-    standortid INT,
-    datum_von DATE,
-    datum_bis DATE,
+CREATE TABLE event (
+    event_id INT AUTO_INCREMENT PRIMARY KEY,
+    location_id INT,
+    start_date DATE,
+    end_date DATE,
    name VARCHAR(100),
-    beschreibung TEXT,
+    description TEXT,
    max_tickets INT,
-    FOREIGN KEY (standortid) REFERENCES Standort(standortid)
+    ticket_price DECIMAL(5,2),
+    FOREIGN KEY (location_id) REFERENCES location(location_id)
 );


-CREATE TABLE Ticket (
-    ticketid INT AUTO_INCREMENT PRIMARY KEY,
-    userid INT,
-    ausstellungid INT,
-    kaufdatum DATE,
-    gueltigkeit DATE,
-    preis DECIMAL(10,2),
-    FOREIGN KEY (userid) REFERENCES User(userid),
-    FOREIGN KEY (ausstellungid) REFERENCES Ausstellung(austellungid)
+CREATE TABLE ticket (
+    ticket_id INT AUTO_INCREMENT PRIMARY KEY,
+    user_id INT,
+    event_id INT,
+    purchase_date DATE,
+    valid_until DATE,
+    FOREIGN KEY (user_id) REFERENCES user(user_id),
+    FOREIGN KEY (event_id) REFERENCES event(event_id)
 );


-CREATE TABLE Gutschein (
-    gutscheinid INT AUTO_INCREMENT PRIMARY KEY,
+CREATE TABLE voucher (
+    voucher_id INT AUTO_INCREMENT PRIMARY KEY,
    code VARCHAR(50) UNIQUE,
-    rabatt INT CHECK (rabatt BETWEEN 0 AND 100),
-    ausstellungid INT,
-    gueltigkeit DATE,
-    FOREIGN KEY (ausstellungid) REFERENCES Ausstellung(austellungid)
+    discount INT CHECK (discount BETWEEN 0 AND 100),
+    event_id INT,
+    valid_until DATE,
+    FOREIGN KEY (event_id) REFERENCES event(event_id)
 );


-CREATE TABLE News (
-    newsid INT AUTO_INCREMENT PRIMARY KEY,
+CREATE TABLE news (
+    news_id INT AUTO_INCREMENT PRIMARY KEY,
    name VARCHAR(100),
-    beschreibung TEXT,
-    datum DATE
+    description TEXT,
+    date DATE
 );



-- User-Daten
-INSERT INTO User (vorname, nachname, strasse, hausnr, postleitzahl, ort, land, tel, email, isAdmin, password)
+-- User-Daten (Passwort: passwort123)
+INSERT INTO user (first_name, last_name, street, house_number, postal_code, city, country, phone, email, is_admin, password)
 VALUES
-    ('Max', 'Muster', 'Musterstraße', '1', '12345', 'Musterstadt', 'Deutschland', '0123456789', 'max@muster.de', FALSE, 'passwort123'),
-    ('Anna', 'Beispiel', 'Beispielweg', '5a', '54321', 'Beispielstadt', 'Deutschland', '0987654321', 'anna@beispiel.de', TRUE, 'adminpass');
+    ('Max', 'Muster', 'Musterstraße', '1', '12345', 'Musterstadt', 'Deutschland', '0123456789', 'max@muster.de', FALSE, '$2y$10$VAj.C0XHPUxV4oXS6b79aumlg5fBMPPx5FPqgkQSIQeBLh0WtYmKy'),
+    ('Anna', 'Beispiel', 'Beispielweg', '5a', '54321', 'Beispielstadt', 'Deutschland', '0987654321', 'anna@beispiel.de', TRUE, '$2y$10$cnPBpkvLbdpDxzYvxlQg9uVp5y8ggr2SWL8NAMg9zk.3QnnEl.MGq');

 -- Standort-Daten
-INSERT INTO Standort (strasse, hausnr, plz, ort, land, tel, email)
+INSERT INTO location (street, house_number, postal_code, city, country, phone, email)
 VALUES
    ('Galeriestraße', '10', '10115', 'Berlin', 'Deutschland', '030123456', 'kontakt@galerie-berlin.de'),
    ('Kunstallee', '22b', '50667', 'Köln', 'Deutschland', '0221123456', 'info@kunst-koeln.de');

 -- Ausstellung-Daten
-INSERT INTO Ausstellung (standortid, datum_von, datum_bis, name, beschreibung, max_tickets)
+INSERT INTO event (location_id, start_date, end_date, name, description, max_tickets, ticket_price)
 VALUES
-    (1, '2025-07-01', '2025-08-31', 'Moderne Meisterwerke', 'Eine Sammlung moderner Kunstwerke aus Europa.', 200),
-    (2, '2025-09-10', '2025-10-20', 'Kunst der Antike', 'Ausstellung antiker Skulpturen und Gemälde.', 150);
+    (1, '2025-07-01', '2025-08-31', 'Moderne Meisterwerke', 'Eine Sammlung moderner Kunstwerke aus Europa.', 200, 19.99),
+    (2, '2025-09-10', '2025-10-20', 'Kunst der Antike', 'Ausstellung antiker Skulpturen und Gemälde.', 150, 39.99);

-- Gutschein-Daten (Spaltennamen korrigiert)
-INSERT INTO Gutschein (code, rabatt, ausstellungid, gueltigkeit)
+-- Gutschein-Daten
+INSERT INTO voucher (code, discount, event_id, valid_until)
 VALUES
    ('SOMMER2025', 15, 1, '2025-08-31'),
    ('HERBST25', 25, 2, '2025-10-15');

-- Ticket-Daten (Spaltennamen korrigiert)
-INSERT INTO Ticket (userid, ausstellungid, kaufdatum, gueltigkeit, preis)
+-- Ticket-Daten
+INSERT INTO ticket (user_id, event_id, purchase_date, valid_until)
 VALUES
-    (1, 1, '2025-06-01', '2025-07-15', 12.50),
-    (2, 2, '2025-06-05', '2025-09-15', 10.00);
+    (1, 1, '2025-06-01', '2025-07-15'),
+    (2, 2, '2025-06-05', '2025-09-15');

 -- News-Daten
-INSERT INTO News (name, beschreibung, datum)
+INSERT INTO news (name, description, date)
 VALUES
    ('Neuer Standort eröffnet', 'Unsere Galerie in Köln ist jetzt geöffnet!', '2025-06-01'),
-    ('Frühbucher-Rabatt', 'Sichern Sie sich jetzt 15% Rabatt auf unsere Sommerausstellung.', '2025-05-20');
+    ('Frühbucher-Rabatt', 'Sichern Sie sich jetzt 15% Rabatt auf unsere Sommerausstellung.', '2025-05-20');
Author	SHA1	Message	Date
Karsten Tlotzek	97c03d817e	Initiales .sql script angepasst	2025-07-07 11:03:51 +02:00
Karsten Tlotzek	877be4e567	Login Form updated	2025-07-07 11:01:54 +02:00
pbbfa23cse	ef3349c6e4	fixed login and register with right linktos	2025-07-07 10:42:58 +02:00