jannik/Tischverwaltung
1
0
Fork 0
mirror of https://github.com/JannikKoester/Tischverwaltung.git synced 2026-01-08 22:10:07 +01:00
Code Issues Releases Wiki Activity

newdesign

Browse Source
This commit is contained in:
JannikKoester
2020-08-17 16:41:58 +02:00
parent 102ba709d3
commit de8f5295ab
26 changed files with 2674 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

51
calender.sql
View File

@@ -1,51 +0,0 @@
/*
Navicat MySQL Data Transfer
Source Server : test
Source Server Version : 50505
Source Host : localhost:3306
Source Database : calender
Target Server Type : MYSQL
Target Server Version : 50505
File Encoding : 65001
Date: 2020-08-14 16:59:06
*/
SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for `calenderplanner`
-- ----------------------------
DROP TABLE IF EXISTS `calenderplanner`;
CREATE TABLE `calenderplanner` (
`uniqueid` int(16) NOT NULL AUTO_INCREMENT,
`year` int(16) NOT NULL,
`month` int(16) NOT NULL,
`day` int(16) NOT NULL,
`reserviert` int(16) NOT NULL,
`reserviertvon` varchar(16) NOT NULL,
`tisch` int(16) NOT NULL,
PRIMARY KEY (`uniqueid`)
) ENGINE=InnoDB AUTO_INCREMENT=173 DEFAULT CHARSET=utf8mb4;
-- ----------------------------
-- Records of calenderplanner
-- ----------------------------
INSERT INTO `calenderplanner` VALUES ('167', '2020', '4', '6', '1', 'jannik', '8');
INSERT INTO `calenderplanner` VALUES ('168', '2020', '4', '6', '1', 'jannik2', '7');
-- ----------------------------
-- Table structure for `users`
-- ----------------------------
DROP TABLE IF EXISTS `users`;
CREATE TABLE `users` (
`uniqueid` int(16) NOT NULL,
`users` varchar(16) DEFAULT NULL,
PRIMARY KEY (`uniqueid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- ----------------------------
-- Records of users
-- ----------------------------

5
footer.php
View File

@@ -1,5 +0,0 @@
<?php
/*
echo '<footer class="fixed-bottom">
Test</footer>';
*/

22
header.php
View File

@@ -1,22 +0,0 @@
<?php
echo '<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<a class="navbar-brand" href="#">Tischplaner</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarColor02">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input type="email" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp" placeholder="Benutzername">
<input type="email" class="form-control" id="exampleInputEmail1" aria-describedby="emailHelp" placeholder="Passwort">
<button type="submit" class="btn btn-primary">Login</button>
</form>
</div>
</nav>';

6
newDesign/assets/bootstrap/css/bootstrap.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
newDesign/assets/bootstrap/js/bootstrap.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

100
newDesign/assets/css/Footer-Dark.css Normal file
View File

@@ -0,0 +1,100 @@
.footer-dark {
margin-top:25px;
margin-left:-520px;
color: #f0f9ff;
background-color: #282d32;
position: fixed;
height: 130px;
bottom: 0;
width: 100%;
}
.footer-dark .row {
margin-top:30px;
}
.footer-dark h3 {
margin-top: 0;
margin-bottom: 12px;
font-weight: bold;
font-size: 16px;
}
.footer-dark ul {
padding: 0;
list-style: none;
line-height: 1.6;
font-size: 14px;
margin-bottom: 0;
}
.footer-dark ul a {
color: inherit;
text-decoration: none;
opacity: 0.6;
}
.footer-dark ul a:hover {
opacity: 0.8;
}
@media (max-width:767px) {
.footer-dark .item:not(.social) {
text-align: center;
padding-bottom: 20px;
}
}
.footer-dark .item.text {
margin-bottom: 36px;
}
@media (max-width:767px) {
.footer-dark .item.text {
margin-bottom: 0;
}
}
.footer-dark .item.text p {
opacity: 0.6;
margin-bottom: 0;
}
.footer-dark .item.social {
text-align: center;
}
@media (max-width:991px) {
.footer-dark .item.social {
text-align: center;
margin-top: 20px;
}
}
.footer-dark .item.social > a {
font-size: 20px;
width: 36px;
height: 36px;
line-height: 36px;
display: inline-block;
text-align: center;
border-radius: 50%;
box-shadow: 0 0 0 1px rgba(255,255,255,0.4);
margin: 0 8px;
color: #fff;
opacity: 0.75;
}
.footer-dark .item.social > a:hover {
opacity: 0.9;
}
.footer-dark .copyright {
text-align: center;
padding-top: 24px;
opacity: 0.3;
font-size: 13px;
margin-bottom: 0;
}

167
newDesign/assets/css/Header-Dark.css Normal file
View File

@@ -0,0 +1,167 @@
body {
background: url(../../assets/img/mountain_bg.jpg) #444;
background-size: cover;
padding-bottom: 80px;
}
@media (min-width:768px) {
.header-dark {
padding-bottom: 120px;
}
}
.header-dark .navbar {
background: transparent;
color: #fff;
border-radius: 0;
box-shadow: none;
border: none;
}
@media (min-width:768px) {
.header-dark .navbar {
padding-top: .75rem;
padding-bottom: .75rem;
}
}
.header-dark .navbar .navbar-brand {
font-weight: bold;
color: inherit;
}
.header-dark .navbar .navbar-brand:hover {
color: #f0f0f0;
}
.header-dark .navbar .navbar-collapse span {
margin-top: 5px;
}
.header-dark .navbar .navbar-collapse span .login {
color: #d9d9d9;
margin-right: .5rem;
text-decoration: none;
}
.header-dark .navbar .navbar-collapse span .login:hover {
color: #fff;
}
.header-dark .navbar .navbar-toggler {
border-color: #747474;
}
.header-dark .navbar .navbar-toggler:hover, .header-dark .navbar-toggler:focus {
background: none;
}
.header-dark .navbar .navbar-toggler {
color: #eee;
}
.header-dark .navbar .navbar-collapse, .header-dark .navbar .form-inline {
border-color: #636363;
}
@media (min-width: 992px) {
.header-dark .navbar.navbar .navbar-nav .nav-link {
padding-left: 1.2rem;
padding-right: 1.2rem;
}
}
.header-dark .navbar.navbar-dark .navbar-nav .nav-link {
color: #d9d9d9;
}
.header-dark .navbar.navbar-dark .navbar-nav .nav-link:focus, .header-dark .navbar.navbar-dark .navbar-nav .nav-link:hover {
color: #fcfeff !important;
background-color: transparent;
}
.header-dark .navbar .navbar-nav > li > .dropdown-menu {
margin-top: -5px;
box-shadow: 0 4px 8px rgba(0,0,0,.1);
background-color: #fff;
border-radius: 2px;
}
.header-dark .navbar .dropdown-menu .dropdown-item:focus, .header-dark .navbar .dropdown-menu .dropdown-item {
line-height: 2;
font-size: 14px;
color: #37434d;
}
.header-dark .navbar .dropdown-menu .dropdown-item:focus, .header-dark .navbar .dropdown-menu .drodown-item:hover {
background: #ebeff1;
}
.header-dark .navbar .action-button, .header-dark .navbar .action-button:active {
background: #208f8f;
border-radius: 20px;
font-size: inherit;
color: #fff;
box-shadow: none;
border: none;
text-shadow: none;
padding: .5rem .8rem;
transition: background-color 0.25s;
}
.header-dark .navbar .action-button:hover {
background: #269d9d;
}
.header-dark .navbar .form-inline label {
color: #ccc;
}
.header-dark .navbar .form-inline .search-field {
display: inline-block;
width: 80%;
background: none;
border: none;
border-bottom: 1px solid transparent;
border-radius: 0;
color: #ccc;
box-shadow: none;
color: inherit;
transition: border-bottom-color 0.3s;
}
.header-dark .navbar .form-inline .search-field:focus {
border-bottom: 1px solid #ccc;
}
.header-dark .hero {
margin-top: 60px;
}
@media (min-width:768px) {
.header-dark .hero {
margin-top: 20px;
}
}
.header-dark .hero h1 {
color: #fff;
font-family: 'Bitter', serif;
font-size: 40px;
margin-top: 20px;
margin-bottom: 80px;
}
@media (min-width:768px) {
.header-dark .hero h1 {
margin-bottom: 50px;
line-height: 1.5;
}
}
.header-dark .hero .embed-responsive iframe {
background-color: #666;
}

0
newDesign/assets/css/styles.css Normal file
View File

BIN
newDesign/assets/fonts/ionicons.eot Normal file
View File

Binary file not shown.

11
newDesign/assets/fonts/ionicons.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

2230
newDesign/assets/fonts/ionicons.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 326 KiB

BIN
newDesign/assets/fonts/ionicons.ttf Normal file
View File

Binary file not shown.

BIN
newDesign/assets/fonts/ionicons.woff Normal file
View File

Binary file not shown.

BIN
newDesign/assets/img/mountain_bg.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 72 KiB

2
newDesign/assets/js/jquery.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

0
getTables.php → newDesign/getTables.php
View File

96
index.php → newDesign/index.php
View File

@@ -1,6 +1,7 @@
<!DOCTYPE html>
<body>
<?php
require 'required/header.php';
if (session_status() == PHP_SESSION_NONE) {
session_start();
@@ -11,38 +12,14 @@ if (session_status() == PHP_SESSION_NONE) {
}
require 'settings.php';
require 'modal.php';
?>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="bootstrap.min.css">
<link rel="stylesheet" href="calender.css">
<script src="tables.js"></script>
<!-- jQuery library -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<!-- Popper JS -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
<!-- Latest compiled JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
</head>
<body style ="background-color:lightblue;">
<div class="container">
<?php
require 'header.php';
require 'footer.php';
?>
<?php
if(isset($_GET['result']))
{
if($_GET['result'] == "gotrecords")
if($_GET['result'] == "gotrecords" || $_GET['result'] == "loggedin")
{
$selectedjan ='';
$selectedfeb ='';
@@ -116,7 +93,7 @@ require 'footer.php';
echo '<form action="getTables.php" method="post">
<div class="form-group">
<label for="sel1">Monat:</label>
<label for="sel1"style="color:white;font-family:Bitter;font-size:32px;">Monat:</label>
<select class="form-control" name="month">
<option value ="Januar"'. $selectedjan.'>Januar</option>
<option value ="Februar"'. $selectedfeb.'>Februar</option>
@@ -133,7 +110,7 @@ require 'footer.php';
</select>';
echo '<div class="form-group">
<label for="sel1">Tag:</label>
<label for="sel1"style="color:white;font-family:Bitter;font-size:32px;">Tag:</label>
<select class="form-control" name="day">
<option value = '.$_SESSION["day"].' selected>'.$_SESSION["day"].'</option>
<option value ="1">1</option>
@@ -168,9 +145,9 @@ require 'footer.php';
<option value ="30">30</option>
</select>
</div>
<button id="trigger" name="getTables" type="submit" class="btn btn-primary" id="aktualisiere">Aktualisiere erneut</button>
<button id="trigger" name="getTables" type="submit" class="btnchange" id="aktualisiere">Aktualisiere erneut</button>
</form>
<h2>'.$_SESSION["day_string"].'. '.$_SESSION["month_string"].' </h2>';
<h2 style="color:white;font-family:Bitter; text-align:center;">'.$_SESSION["day_string"].'. '.$_SESSION["month_string"].' </h2>';
@@ -182,7 +159,7 @@ require 'footer.php';
else{
echo '<form action="getTables.php" method="post">
<div class="form-group">
<label for="sel1">Monat:</label>
<label for="sel1" style="color:white;font-family:Bitter;font-size:32px;">Monat:</label>
<select class="form-control" name="month">
<option value ="Januar">Januar</option>
<option value ="Februar">Februar</option>
@@ -199,7 +176,7 @@ require 'footer.php';
</select>';
echo '<div class="form-group">
<label for="sel1">Tag:</label>
<label for="sel1"style="color:white;font-family:Bitter;font-size:32px;">Tag:</label>
<select class="form-control" name="day">
<option value ="1">1</option>
<option value ="2">2</option>
@@ -233,7 +210,7 @@ require 'footer.php';
<option value ="30">30</option>
</select>
</div>
<button name="getTables" type="submit" class="btn btn-primary">Aktualisieren</button>
<button name="getTables" type="submit" class="btnchange">Aktualisieren</button>
</form>';
@@ -249,7 +226,7 @@ require 'footer.php';
<div>
<div class="container" >
<div class="container" style="background-color:lightgrey;opacity: 0.6;border:solid;" >
<div class="right-tables">
<ul>
@@ -262,7 +239,7 @@ require 'footer.php';
{
if($_SESSION["Tisch3"] == "FREI")
{
echo '<button id="buttonTable1" type="button" class="btn btn-light" data-toggle="modal" data-target="#myModal3" style="color:green;">Tisch 3 <br> ist frei.</button>';
echo '<button id="buttonTable1" type="button" class="btn btn-light" data-toggle="modal" data-target="#myModal3" style="color:green;opacity: 1.5;">Tisch 3 <br> ist frei.</button>';
}
else
@@ -482,6 +459,10 @@ require 'footer.php';
echo $_SESSION["sucessmessagereplaced"];
$_SESSION["sucessmessagereplaced"]="";
}
if(isset( $_SESSION["accnotfound"])){
echo $_SESSION["accnotfound"];
$_SESSION["accnotfound"]="";
}
?>
@@ -494,24 +475,17 @@ require 'footer.php';
</div>
<script type="text/javascript">
function codeAddress() {
if(document.getElementById('aktualisiere'))
{
document.getElementById('aktualisiere').click();
}
else
{
alert("nix gefunden");
}
}
</script>
<br>
<?php
require 'required/footer.php';
?>
</body>
<style>
.left-tables button {
width: 220px;
@@ -539,13 +513,27 @@ require 'footer.php';
}
button:disabled,
button[disabled]{
border: 3px solid red !important;
color: red !important;
.btnchange {
background: #208f8f;
border-radius: 20px;
font-size: inherit;
color: #fff;
box-shadow: none;
border: none;
text-shadow: none;
padding: .5rem .8rem;
transition: background-color 0.25s;
height:90px;
width:200px;
}
</style>
</html>

0
insertEntry.php → newDesign/insertEntry.php
View File

38
newDesign/login.php Normal file
View File

@@ -0,0 +1,38 @@
<?php
require 'settings.php';
require 'getTables.php';
session_start();
if(isset($_POST['loginBtn'])){
$uname = $_POST['uname'];
$pw = $_POST['pw'];
//Check if User exists
$sql = "SELECT * FROM users WHERE users='$uname' AND password='$pw'";
$result = $conn->query($sql);
if ($result->num_rows > 0) {
// output data of each row
while($row = $result->fetch_assoc()) {
$_SESSION["LoggedInUser"] = array($row['uniqueid'],$row['users']);
header("location:index.php?result=loggedin");
}
$_SESSION["month"] = '';
$_SESSION["month_string"] = '';
$_SESSION["day"] = '';
$_SESSION["day_string"] = '';
}
else
{
header("location:index.php?result=gotrecords");
$_SESSION["accnotfound"] = '<div class="alert alert-danger">
Benutzername oder Passwort falsch!</div>';
}
// echo $pw .$uname;
//header("location:index.php?result=gotrecords");
}
else
{
header("location:index.php");
}

12
newDesign/logout.php Normal file
View File

@@ -0,0 +1,12 @@
<?php
require 'settings.php';
session_start();
if(isset($_POST['logoutBtn'])){
session_destroy();
header("location:index.php");
}
else
{
header("location:index.php");
}

0
modal.php → newDesign/modal.php
View File

27
newDesign/required/footer.php Normal file
View File

@@ -0,0 +1,27 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
<title>Tischreservierung</title>
<link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Bitter:400,700">
<link rel="stylesheet" href="assets/fonts/ionicons.min.css">
<link rel="stylesheet" href="assets/css/Footer-Dark.css">
<link rel="stylesheet" href="assets/css/Header-Dark.css">
<link rel="stylesheet" href="assets/css/styles.css">
</head>
<div class="footer-dark">
<footer>
<div class="container">
<div class="row">
<div class="col item social"><a href="#"><i class="icon ion-social-facebook"></i></a><a href="#"><i class="icon ion-social-twitter"></i></a><a href="#"><i class="icon ion-social-snapchat"></i></a><a href="#"><i class="icon ion-social-instagram"></i></a></div>
</div>
<p class="copyright">Rene Knipschild © 2020</p>
</div>
</footer>
</div>
<script src="assets/js/jquery.min.js"></script>
<script src="assets/bootstrap/js/bootstrap.min.js"></script>

32
newDesign/required/header.php Normal file
View File

@@ -0,0 +1,32 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
<title>Tischreservierung</title>
<link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Bitter:400,700">
<link rel="stylesheet" href="assets/fonts/ionicons.min.css">
<link rel="stylesheet" href="assets/css/Footer-Dark.css">
<link rel="stylesheet" href="assets/css/Header-Dark.css">
<link rel="stylesheet" href="assets/css/styles.css">
</head>
<div>
<div class="header-dark">
<nav class="navbar navbar-dark navbar-expand-lg navigation-clean-search">
<div class="container"><a class="navbar-brand" href="#">rkCSD</a><button data-toggle="collapse" class="navbar-toggler" data-target="#navcol-1"><span class="sr-only">Toggle navigation</span><span class="navbar-toggler-icon"></span></button>
<div class="collapse navbar-collapse"
id="navcol-1">
<ul class="nav navbar-nav">
<li class="nav-item" role="presentation"><a class="nav-link" href="#">Home</a></li>
</ul>
<form class="form-inline mr-auto" action="post">
</form><span class="navbar-text"></span><a class="btn btn-light action-button" role="button" href="#">Einloggen</a></div>
</div>
</nav>
</div>
</div>
</div>
</div>

0
settings.php → newDesign/settings.php
View File

111
tables.js
View File

@@ -1,111 +0,0 @@
/*tisch1 = {
"name":"",
"tag":30
};
tisch2 = {
"name":"Ernst",
"tag":30
};
tisch3 = {
"name":"Daniel",
"tag":30
};
tisch4 = {
"name":"",
"tag":30
};
tisch5 = {
"name":"Siggi",
"tag":30
};
tisch6 = {
"name":"Holga",
"tag":30
};
/*
<script>
$(function(){
//alert(Object.values(tisch1));
$('#table1 p').text(tisch1.name);
$('#table2 p').text(tisch2.name);
$('#table3 p').text(tisch3.name);
$('#table4 p').text(tisch4.name);
$('#table5 p').text(tisch5.name);
$('#table6 p').text(tisch6.name);
checkForFreeTables();
});
function checkForFreeTables()
{
if(tisch1.name ==="")
{
document.getElementById("buttonTable1").style.background='green';
$('#table1 p').text("Dieser Platz ist noch frei!");
}
else
{
document.getElementById("buttonTable1").style.background='red';
$('#table1 p').text("Besetzt von " + tisch1.name);
}
if(tisch2.name ==="")
{
document.getElementById("buttonTable2").style.background='green';
$('#table2 p').text("Dieser Platz ist noch frei!");
}
else
{
document.getElementById("buttonTable2").style.background='red';
$('#table2 p').text("Besetzt von " + tisch2.name);
}
if(tisch3.name ==="")
{
document.getElementById("buttonTable3").style.background='green';
$('#table3 p').text("Dieser Platz ist noch frei!");
}
else
{
document.getElementById("buttonTable3").style.background='red';
$('#table3 p').text("Besetzt von " + tisch3.name);
}
if(tisch4.name ==="")
{
document.getElementById("buttonTable4").style.background='green';
$('#table4 p').text("Dieser Platz ist noch frei!");
}
else
{
document.getElementById("buttonTable4").style.background='red';
$('#table4 p').text("Besetzt von " + tisch4.name);
}
if(tisch5.name ==="")
{
document.getElementById("buttonTable5").style.background='green';
$('#table5 p').text("Dieser Platz ist noch frei!");
}
else
{
document.getElementById("buttonTable5").style.background='red';
$('#table5 p').text("Besetzt von " + tisch5.name);
}
if(tisch6.name ==="")
{
document.getElementById("buttonTable6").style.background='green';
$('#table6 p').text("Besetzt von " + tisch6.name);
}
else
{
document.getElementById("buttonTable6").style.background='red';
$('#table6 p').text("Dieser Platz ist besetzt!");
}
}
</script>