diff --git a/.gitignore b/.gitignore
index c7f7bd3..cb0882e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-
-dbConnect.php
+sql/db-data/**/*
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..80df2ae
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,25 @@
+version: '3.7'
+
+services:
+ db:
+ build:
+ context: ./sql
+ ports:
+ - "5455:3306"
+ volumes:
+ - "./sql/db-data:/var/lib/mysql"
+ environment:
+ MYSQL_ROOT_PASSWORD: "Test"
+
+ webserver:
+ build:
+ context: ./frontend
+ ports:
+ - "80:80"
+ volumes:
+ - "./frontend:/var/www/html"
+ depends_on:
+ - db
+
+# docker run -d -p 5455:3306 -v `pwd`/setup:/docker-entrypoint-initdb.d/ -v `pwd`/mysql-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=Test mariadb
+# docker run -d -p 80:80 --name my-apache-php-app -v `pwd`:/var/www/html php:7.0-apache
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
new file mode 100644
index 0000000..26faba3
--- /dev/null
+++ b/frontend/Dockerfile
@@ -0,0 +1,4 @@
+FROM php:7-apache
+
+RUN docker-php-ext-install pdo pdo_mysql mysqli
+RUN a2enmod rewrite
diff --git a/css/style.css b/frontend/css/style.css
similarity index 100%
rename from css/style.css
rename to frontend/css/style.css
diff --git a/~dbConnect.php b/frontend/dbConnect.php
similarity index 66%
rename from ~dbConnect.php
rename to frontend/dbConnect.php
index 888225d..07876fa 100644
--- a/~dbConnect.php
+++ b/frontend/dbConnect.php
@@ -1,12 +1,11 @@
-connect_error) {
die('Connect Error (' . $database->connect_errno . ') ' . $database->connect_error);
}
-?>
\ No newline at end of file
+?>
diff --git a/img/header_blue.png b/frontend/img/header_blue.png
similarity index 100%
rename from img/header_blue.png
rename to frontend/img/header_blue.png
diff --git a/img/header_lime.png b/frontend/img/header_lime.png
similarity index 100%
rename from img/header_lime.png
rename to frontend/img/header_lime.png
diff --git a/img/header_pink.png b/frontend/img/header_pink.png
similarity index 100%
rename from img/header_pink.png
rename to frontend/img/header_pink.png
diff --git a/index.php b/frontend/index.php
similarity index 100%
rename from index.php
rename to frontend/index.php
diff --git a/js/app.js b/frontend/js/app.js
similarity index 100%
rename from js/app.js
rename to frontend/js/app.js
diff --git a/js/contentloader.js b/frontend/js/contentloader.js
similarity index 100%
rename from js/contentloader.js
rename to frontend/js/contentloader.js
diff --git a/js/particles.js b/frontend/js/particles.js
similarity index 100%
rename from js/particles.js
rename to frontend/js/particles.js
diff --git a/js/stats.js b/frontend/js/stats.js
similarity index 100%
rename from js/stats.js
rename to frontend/js/stats.js
diff --git a/php/generateLink.php b/frontend/php/generateLink.php
similarity index 100%
rename from php/generateLink.php
rename to frontend/php/generateLink.php
diff --git a/php/logout.php b/frontend/php/logout.php
similarity index 100%
rename from php/logout.php
rename to frontend/php/logout.php
diff --git a/php/showentries.php b/frontend/php/showentries.php
similarity index 100%
rename from php/showentries.php
rename to frontend/php/showentries.php
diff --git a/php/signup.php b/frontend/php/signup.php
similarity index 100%
rename from php/signup.php
rename to frontend/php/signup.php
diff --git a/segments/_404.html b/frontend/segments/_404.html
similarity index 100%
rename from segments/_404.html
rename to frontend/segments/_404.html
diff --git a/segments/_entryForm.php b/frontend/segments/_entryForm.php
similarity index 100%
rename from segments/_entryForm.php
rename to frontend/segments/_entryForm.php
diff --git a/segments/_footer.html b/frontend/segments/_footer.html
similarity index 100%
rename from segments/_footer.html
rename to frontend/segments/_footer.html
diff --git a/segments/_header.php b/frontend/segments/_header.php
similarity index 100%
rename from segments/_header.php
rename to frontend/segments/_header.php
diff --git a/segments/_headerSession.php b/frontend/segments/_headerSession.php
similarity index 100%
rename from segments/_headerSession.php
rename to frontend/segments/_headerSession.php
diff --git a/segments/_home.php b/frontend/segments/_home.php
similarity index 100%
rename from segments/_home.php
rename to frontend/segments/_home.php
diff --git a/segments/_indexTestLoginVals.php b/frontend/segments/_indexTestLoginVals.php
similarity index 100%
rename from segments/_indexTestLoginVals.php
rename to frontend/segments/_indexTestLoginVals.php
diff --git a/segments/_login.php b/frontend/segments/_login.php
similarity index 88%
rename from segments/_login.php
rename to frontend/segments/_login.php
index 2a37627..c91006b 100644
--- a/segments/_login.php
+++ b/frontend/segments/_login.php
@@ -14,9 +14,10 @@ if( (isset($_POST['loginName'])) && isset($_POST['loginPassword'])){
$object = $result->fetch_object();
$_SESSION['user'] = $object->id;
$_SESSION['username'] = $object->username;
- echo "Einloggen erfolgreich
Willkommen " . $_SESSION['username'];
- //header("refresh:1;");
- header('Location: index.php?page=myFriendsBook');
+ // echo "Einloggen erfolgreich
Willkommen " . $_SESSION['username'];
+ // header("refresh:1;");
+ // header("location:index.php?page=myFriendsBook");
+ echo "";
} else {
echo "Einloggen fehlgeschlagen";
}
diff --git a/segments/_myFriendsBook.php b/frontend/segments/_myFriendsBook.php
similarity index 100%
rename from segments/_myFriendsBook.php
rename to frontend/segments/_myFriendsBook.php
diff --git a/segments/_register.php b/frontend/segments/_register.php
similarity index 100%
rename from segments/_register.php
rename to frontend/segments/_register.php
diff --git a/sql/entiresTable.sql b/sql/1-setup.sql
similarity index 52%
rename from sql/entiresTable.sql
rename to sql/1-setup.sql
index 15d619d..1005723 100644
--- a/sql/entiresTable.sql
+++ b/sql/1-setup.sql
@@ -1,4 +1,26 @@
-CREATE TABLE `kd42696_ipr-projekt`.`entries` (
+CREATE DATABASE friendsbook;
+
+USE friendsbook;
+
+CREATE TABLE `user` (
+ `ID` INT NOT NULL AUTO_INCREMENT,
+ `username` VARCHAR(50) NOT NULL DEFAULT '0',
+ `email` VARCHAR(100) NOT NULL DEFAULT '0',
+ `password` VARCHAR(100) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`ID`),
+ UNIQUE INDEX `user`(`username`)
+) ENGINE = InnoDB;
+
+CREATE TABLE `tans` (
+ `id` INT NOT NULL AUTO_INCREMENT,
+ `userID` INT NOT NULL,
+ `tan` VARCHAR(13) NOT NULL,
+ `used` BOOLEAN NOT NULL,
+ PRIMARY KEY (`id`),
+ FOREIGN KEY (`userID`) REFERENCES `user`(`ID`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE = InnoDB;
+
+CREATE TABLE `entries` (
`id` INT NOT NULL AUTO_INCREMENT ,
`userID` INT NOT NULL ,
`tanID` INT NOT NULL ,
@@ -26,7 +48,7 @@ CREATE TABLE `kd42696_ipr-projekt`.`entries` (
`absturz` LONGTEXT DEFAULT NULL ,
`trinkspiel` LONGTEXT DEFAULT NULL ,
PRIMARY KEY (`id`),
- UNIQUE (`tanID`)) ENGINE = InnoDB;
-
- ALTER TABLE `entries` ADD FOREIGN KEY (`userID`) REFERENCES `user`(`ID`) ON DELETE CASCADE ON UPDATE CASCADE;
- ALTER TABLE `entries` ADD FOREIGN KEY (`tanID`) REFERENCES `tans`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ UNIQUE (`tanID`),
+ FOREIGN KEY (`userID`) REFERENCES `user`(`ID`) ON DELETE CASCADE ON UPDATE CASCADE,
+ FOREIGN KEY (`tanID`) REFERENCES `tans`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE = InnoDB;
diff --git a/sql/2-sample-data.sql b/sql/2-sample-data.sql
new file mode 100644
index 0000000..8de8c20
--- /dev/null
+++ b/sql/2-sample-data.sql
@@ -0,0 +1,235 @@
+
+USE `friendsbook`;
+
+SET FOREIGN_KEY_CHECKS=0;
+
+--
+-- Daten für Tabelle `entries`
+--
+
+INSERT INTO `entries` (`id`, `userID`, `tanID`, `vorname`, `nachname`, `geburtstag`, `wohnort`, `strasse`, `kennenUns`, `festnetz`, `handynummer`, `email`, `hobbies`, `berufswunsch`, `essen`, `insel`, `film`, `sport`, `charakter`, `tier`, `musik`, `game`, `alk`, `story`, `absturz`, `trinkspiel`) VALUES
+(6, 24, 78, 'asdasd', 'asdasd', '', '', '', 'asdasd', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
+(7, 24, 79, 'asdasd', 'asdasd', '', '', '', 'aaassad', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
+(8, 24, 81, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
+(9, 2, 123, 'asd', 'asdasd', '', '', '', 'ssssss', '', '', 'sssss', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
+(10, 2, 124, 'Test', 'Nachname', '', '', '', 'von der Uni aus', '', '', 'sag_ich_nicht@noway.com ', 'Zocken', '', '', '', 'Terminator', '', '', '', '', '', '', '', '', ''),
+(11, 2, 125, 'Peter', 'Dieter', '', '', 'Schlüpfweg 25', 'aus dem haus', '', '', 'mailmailman', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
+(12, 2, 126, 'sadadsf', 'asdfasdf', '', '', '', 'asdfhjkkjl', '', '', 'jklhjkl', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
+(13, 2, 131, 'Vorname ', 'Lol', '', '', '', 'Bahn', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
+(14, 2, 132, 'Simon', 'Kellner', '', '', '', 'Studium ', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
+(15, 2, 133, 'llol', 'Ashfsad', '283843', 'Idsofnjdsn', 'Sijdfdendefjno', 'Eiisdfwnedfn', '479', 'Q23829', 'Dndsifnsjd', 'Ue2981e2wsnddsn', 'Uiwwerue2r2', 'Uiewfewkrw', 'Kwerfekjwj', 'Kesnfnfjekwfn', 'Esnfnfewfn', 'Kdsfnff', 'Wefjfednq', 'Jwendf', 'Koewnfdksjfn', 'Jkwenfsfn', 'Jkewnfndw', 'Ewnfnfejkw', 'Wefksff'),
+(16, 2, 134, 'frieder heinrich', 'baumann von neuschwanberg', '01.01.1971', '', '', 'hochadeltreffen', '', '', '', '', 'bin zu reich zum arbeiten', 'kaviar', '', '', '', '', '', 'Mozart', '', 'Champagner ', '', '', ''),
+(17, 2, 139, ' hi', 'du', ' ', '', '', 'fd', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ' ', ' ', ' '),
+(18, 2, 140, ' ', ' ', '', '', '', ' ', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
+(19, 6, 141, 'Vorname', 'Nachname', '', '', '', 'Studium', '', '', 'mailadresse@mail.com', '', 'Entwickler', '', '', '', '', '', '', '', '', '', '', '', ''),
+(20, 10, 61, 'Simon', 'Kellner', '', '', '', 'Studium', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''),
+(21, 30, 144, 'Hans ', 'Wurst', '', 'Essen', 'Lyonerweg 12', ' Aus dem Supermarkt ', '', '', '', '', '', ' Käse ', '', '', '', '', '', '', '', '', '', '', ''),
+(22, 30, 145, 'Angela', 'Merkel', '', '', '', 'Von den Wahlen', '', '', 'angieforpresident@cdu.de', ' Den Horst nerven ', ' Mutter Teresa ', '', ' Ein Flüchtlingsboot ', '', '', '', '', '', '', '', '', '', ''),
+(23, 30, 146, ' Joachim ', 'Löw', '03.02.1960', 'Feiburg', 'Kicker-Allee 71', ' Aus dem Trainingslager ', '05474902014', 'nur für ganz besondere Freunde', 'hireme@besttrainereuwest.org', ' Handball, Am Sack kratzen', ' Volleyball Trainer ', '', ' Basketball ', ' Die wilden Kerle ', ' Tennis ', 'Trainer bei FIFA', ' Löwe', 'We are the Champions', ' FIFA ', '', ' Mit dem Bus über den Pokal gefahren ', ' Bin schon ganz unten ', ''),
+(24, 30, 147, 'Dagobert ', 'Duck', '99.99.9999€', 'Entenhausen', 'Goldweg 99', 'Du hast meinen Geldspeicher gereinigt', '', '', '', 'Geld zählen und im Geld schwimmen und angeben dass man der Reichste im Dorf ist', 'Googilionär', 'Frische Scheine', 'Meine Kreditkarte ', '', '', '', 'Sparschwein', '', '', 'Teuerer Scotch', '', '', ''),
+(25, 2, 66, '