diff --git a/_pages/error.php b/_pages/error.php index b1d1d14..5d0c017 100644 --- a/_pages/error.php +++ b/_pages/error.php @@ -1,5 +1,5 @@
-
+
diff --git a/_pages/index.php b/_pages/index.php index 3bf9fb2..53795d8 100644 --- a/_pages/index.php +++ b/_pages/index.php @@ -1,11 +1,30 @@ + query("SELECT topic FROM questions"); + $topics = $topics->fetchAll(PDO::FETCH_ASSOC); + $topics = array_unique($topics, SORT_REGULAR); + + if (!isset($_SESSION['score'])) { + $_SESSION['score'] = 0; + } + // set default Message + // set topic session + + // initialize current question index if not set + if (!isset($_SESSION['current_question'])) { + $_SESSION['current_question'] = 0; + } + + ?>
-
+

Trivia Quiz

-

Are you ready for the Ultimate Quiz experience.
Join the fun today.

+

Are you ready for the Ultimate Quiz experience.
Join the fun today.

@@ -18,35 +37,134 @@
-
-

Category

-
Please choose the category of the quiz you wanna do!
-
+ +
+

Category

+
Please choose the category of the quiz you wanna do!
+
+ +
+

Have Fun

+
Have fun answering the Questions of the quiz!
+
+
- -
-
-
-
-
-

// Frage Name

+ + +
+
+
+
+
+
+

+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ + +
+
+
+
+
+

+ +

+
+
+
+
+
+
+
+ + ' . $result . '

'; + } else if (isset($_SESSION['current_question'])) { + echo '

' . $current_question['question_text'] . '

'; + echo '
'; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo '
'; + } + ?> +
+
-
-
-
-
- // content here +
+ +
+
+
+
+
+

+ Not Loggedin +

+
+
+
+
+
+
+
+

+ +

+ Login +
-
- +
\ No newline at end of file diff --git a/_pages/preset.php b/_pages/preset.php index 5a1d52a..ccab764 100644 --- a/_pages/preset.php +++ b/_pages/preset.php @@ -1,5 +1,5 @@
-
+
diff --git a/_pages/sign-in.php b/_pages/sign-in.php index 41740e2..e9624f3 100644 --- a/_pages/sign-in.php +++ b/_pages/sign-in.php @@ -17,6 +17,7 @@ if ($user) { if (sha256($_POST['password']) == $user['password_sha256'] && $_POST['email'] == $user['email']) { login($conn, $_POST['email'], $_POST['password']); + updateUser($conn, $_POST['email']); $_SESSION['LOGGEDIN'] = true; $_SESSION['EMAIL'] = $user['email']; $_SESSION['USERNAME'] = $user['username']; diff --git a/assets/img/bg_main.jpg b/assets/img/bg_main.jpg new file mode 100644 index 0000000..acc1a8e Binary files /dev/null and b/assets/img/bg_main.jpg differ diff --git a/docker-compose.yml b/docker-compose.yml index e5f114f..8bf8b55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,18 +50,7 @@ services: test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD interval: 5s retries: 10 - - # PhpMyAdmin Service - phpmyadmin: - image: phpmyadmin/phpmyadmin:5 - ports: - - 8080:80 - environment: - PMA_HOST: mysql - depends_on: - mysql: - condition: service_healthy - + volumes: db_data: driver: local diff --git a/inc/config.php b/inc/config.php index 8906b92..d028263 100644 --- a/inc/config.php +++ b/inc/config.php @@ -2,10 +2,4 @@ // set the default timezone to use. Available since PHP 5.1 date_default_timezone_set('Europe/Berlin'); -if (isset($_SESSION['LOGGEDIN'])) { - $logged_in = true; -} else { - $logged_in = false; -} - - +$logged_in = $_SESSION['LOGGEDIN']??false; \ No newline at end of file diff --git a/inc/functions.php b/inc/functions.php index 4ce7ed0..22be879 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -69,14 +69,17 @@ function login($conn, $email, $password) } catch (PDOException $e) { echo $e->getMessage(); } - try { - $sql = "UPDATE users SET last_login, ip = :last_login, :ip WHERE email = :email"; - $stmt = $conn->prepare($sql); - $stmt->bindParam(':last_login', getTimestamp(), PDO::PARAM_STR); - $stmt->bindParam(':ip', getrealip(), PDO::PARAM_STR); - } catch (PDOException $e) { - echo $e->getMessage(); - } +} + +// update last login +function updateUser($conn, $email) +{ + $sql = "UPDATE users SET last_login = :last_login, ip = :ip WHERE email = :email"; + $stmt = $conn->prepare($sql); + $stmt->bindParam(':last_login', getTimestamp(), PDO::PARAM_STR); + $stmt->bindParam(':ip', getrealip(), PDO::PARAM_STR); + $stmt->bindParam(':email', $email, PDO::PARAM_STR); + $stmt->execute(); } // logout diff --git a/inc/templates/head.php b/inc/templates/head.php index 5f74c09..2626dda 100644 --- a/inc/templates/head.php +++ b/inc/templates/head.php @@ -1,11 +1,84 @@ query("SELECT * FROM questions WHERE topic = '" . $_SESSION['topic'] . "'"); + $qsInfo = $qsInfo->fetchAll(PDO::FETCH_ASSOC); +} + +// get current question + if (!isset($_SESSION['current_question'])) { + $_SESSION['current_question'] = 0; + } + + $current_question = $qsInfo[$_SESSION['current_question']]; + + +// check if form is submitted +if (isset($_POST['next'])) { + + // insert answer into database + $timest = getTimestamp(); + $find = "SELECT * FROM answers WHERE user_id = :user_id AND question_id = :question_id"; + $stmt = $conn->prepare($find); + $stmt->bindParam(':user_id', $_SESSION['ID']); + $stmt->bindParam(':question_id', $current_question['id']); + $stmt->execute(); + $result = $stmt->fetch(PDO::FETCH_ASSOC); + if ($result) { + $sql = "UPDATE answers SET answer = :answer, correct = :correct, timest = :timest WHERE user_id = :user_id AND question_id = :question_id"; + } else { + $sql = "INSERT INTO answers (user_id, question_id, answer, correct, timest) VALUES (:user_id, :question_id, :answer, :correct, :timest)"; + } + $stmt = $conn->prepare($sql); + $stmt->bindParam(':user_id', $_SESSION['ID']); + $stmt->bindParam(':question_id', $current_question['id']); + $stmt->bindParam(':answer', $_POST['answer']); + $stmt->bindParam(':correct', $current_question['correct']); + $stmt->bindParam(':timest', $timest); + $stmt->execute(); + // increment current question index + $_SESSION['current_question'] = $_SESSION['current_question'] + 1; + + // check if all questions have been answered + if ($_SESSION['current_question'] >= count($qsInfo)) { + // reset current question index + $result = "All questions answered, show results here"; + unset($_SESSION['current_question']); + unset($_SESSION['topic']); + } + header("Location: index.php?page=index"); +} +print_r($_SESSION); ?> + @@ -76,7 +149,7 @@ Sign In - + Register @@ -101,7 +174,7 @@ - Register + Register @@ -118,13 +191,13 @@
  • - '.$user['username'].''; - } else { - echo 'Login'; - }; - ?> + ' . $user['username'] . ''; + } else { + echo 'Login'; + }; + ?>
    • diff --git a/index.php b/index.php index 5292fee..96651d3 100644 --- a/index.php +++ b/index.php @@ -1,7 +1,8 @@