Updating website and score system

Took 1 hour 54 minutes
2020-08-06 01:19:59 +02:00 · 2020-08-06 01:19:59 +02:00 · 4cbdab57e3
commit 4cbdab57e3
parent 7af1867d91
7 changed files with 136 additions and 16 deletions
--- a/index.php
+++ b/index.php
@ -12,8 +12,8 @@ try
    header( 'ETag: ' . $etag );
    if( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && $_SERVER['HTTP_IF_NONE_MATCH'] === $etag )
    {
-        header( 'HTTP/1.1 304 Not Modified', true, 304 );
-        exit();
+        //header( 'HTTP/1.1 304 Not Modified', true, 304 );
+        //exit();
    }


--- a/lang/de_DE.ini
+++ b/lang/de_DE.ini
@ -5,6 +5,7 @@ TITLE = "YourSecretsAreOurs"
 MAIN_TITLE = "YourSecretsAreOurs"
 DESCRIPTION = "Berechne jetzt, wie unschuldig du noch bist!"
 EXPLANATION = "Wähle aus, welche Dinge du bereits getan hast.<br>Wenn du fertig bist, bestätige einfach mit dem Knopf unten!"
+SCORE_FINISHED = "Dein Score wurde mit sehr aufwändigen Prozeduren und Zaubersprüchen berechnet."
 PROJECT_DESCRIPTION = "YourSecretsAreOurs ist ein kleines Projekt, welches von ein paar Schülern geleitet wird.<br>Es dient lediglich zur Belustigung und sollte nicht zu ernst genommen werden.<br>Aber.. wie unschuldig bist du? - Das ist doch eine gute Frage oder?<br>Versuche <strong>nicht</strong> alles durchzuführen!<br>Wenn du alles angekreuzt hast wird es im Tod enden."
 HELP_US = "Hilf mit!"
 REQUEST_MORE = "Beim erweitern der Fragen helfen"
--- a/lang/en_EN.ini
+++ b/lang/en_EN.ini
@ -5,6 +5,7 @@ TITLE = "YourSecretsAreOurs"
 MAIN_TITLE = "YourSecretsAreOurs"
 DESCRIPTION = "Calculate how innocent you still are!"
 EXPLANATION = "Choose which things you have already done.<br>When you are done, just confirm with the button below!"
+SCORE_FINISHED = ""
 PROJECT_DESCRIPTION = "YourSecretsAreOurs is a small project, which is managed by a few students.<br>It is just for fun and should not be taken too seriously.<br>But... how innocent are you? - That's a good question, isn't it?<br>Do not try to do everything!<br>If you check all the boxes it will result in death."
 HELP_US = "Help us!"
 REQUEST_MORE = "Request a question"
--- a/language.class.inc.php
+++ b/language.class.inc.php
@ -20,6 +20,7 @@ class language
        MAIN_TITLE = 'MAIN_TITLE',
        DESCRIPTION = 'DESCRIPTION',
        EXPLANATION = 'EXPLANATION',
+        SCORE_FINISHED = 'SCORE_FINISHED',
        PROJECT_DESCRIPTION = 'PROJECT_DESCRIPTION',
        HELP_US = 'HELP_US',
        REQUEST_MORE = 'REQUEST_MORE',
@ -44,7 +45,6 @@ class language
            {

                self::setLangauge( $_GET['lang'] );
-                header( 'Location: ?' );
            }
            else
            {
--- a/website.class.inc.php
+++ b/website.class.inc.php
@ -9,6 +9,17 @@
 class website
 {

+    public function showScore( ) : string
+    {
+        try {
+            $website = file_get_contents( __DIR__ . '/website_score.html' );
+            $website = $this->replaceDefaultThings( $website );
+        } catch( Exception $e )
+        {
+
+        }
+    }
+
    public function buildWebsite(): string
    {
        try
@ -35,6 +46,7 @@ class website
            language::$lang_file[language::MAIN_TITLE],
            language::$lang_file[language::DESCRIPTION],
            language::$lang_file[language::EXPLANATION],
+            language::$lang_file[language::SCORE_FINISHED],
            language::$lang_file[language::PROJECT_DESCRIPTION],
            language::$lang_file[language::HELP_US],
            language::$lang_file[language::REQUEST_MORE],
@ -45,13 +57,14 @@ class website
        }
        $website = str_replace(
            array(
-                '[LANG]', '[TITLE]', '[MAIN_TITLE]', '[DESCRIPTION]', '[EXPLANATION]', '[PROJECT_DESCRIPTION]', '[HELP_US]', '[REQUEST_MORE]','[LANGUAGE_CHOOSE]', '[JOIN_DISCORD]' ),
+                '[LANG]', '[TITLE]', '[MAIN_TITLE]', '[DESCRIPTION]', '[EXPLANATION]', '[SCORE_FINISHED]', '[PROJECT_DESCRIPTION]', '[HELP_US]', '[REQUEST_MORE]','[LANGUAGE_CHOOSE]', '[JOIN_DISCORD]' ),
            array(
                substr( language::$lang, 0, 2 ),
                language::$lang_file[language::TITLE],
                language::$lang_file[language::MAIN_TITLE],
                language::$lang_file[language::DESCRIPTION],
                language::$lang_file[language::EXPLANATION],
+                language::$lang_file[language::SCORE_FINISHED],
                language::$lang_file[language::PROJECT_DESCRIPTION],
                language::$lang_file[language::HELP_US],
                language::$lang_file[language::REQUEST_MORE],
@ -81,7 +94,7 @@ HTML;
        {
            $questions .= <<<CHECKBOX
 <label>
-        <input name="question_$number" type="checkbox" class="filled-in z-depth-4" />
+        <input name="question_$number" type="checkbox" class="filled-in" />
        <span>$question</span>
 </label><br>
 CHECKBOX;
@ -101,7 +114,7 @@ HTML;


        $questions = $form_start . $questions . $form_end;
-        $website = str_replace( '[QUESTIONS]', $questions, $website );
+        $website = str_replace( '[CONTENT]', $questions, $website );


        return $website;
--- a/website.html
+++ b/website.html
@ -31,31 +31,34 @@
 <body>
 <div class="content">
    <div class="section no-pad-bot" id="index-banner">
-        <div class="container">
-            <br><br>
+        <div class="container z-depth-3">
+
            <h1 class="header center orange-text">[MAIN_TITLE]</h1>
            <div class="row center">
                <h5 class="header col s12 light">[DESCRIPTION]</h5>
            </div>
+            <br>


        </div>
    </div>
+    <br>

-
-    <div class="container">
+    <div class="container" style="padding-left: 15px;">
        <div class="section">
            <h5 class="light">[EXPLANATION]</h5>
        </div>
-        <br>
+
+    </div>
+    <div class="container z-depth-3" style="padding-left: 20px;">
        <div class="section">
-            [QUESTIONS]
+            [CONTENT]
            <br>

        </div>
+
+    </div>
    <br><br>
-    </div>
-
    <footer class="page-footer orange">
        <div class="container">
            <div class="row">
@ -68,7 +71,7 @@
                <div class="col l3 s12">
                    <h5 class="white-text">[HELP_US]</h5>
                    <ul>
-                        <li><a class="white-text disabled" href="#!">[REQUEST_MORE]</a></li>
+                        <li><a class="white-text disabled" href="#">[REQUEST_MORE]</a></li>
                        <li><a class="white-text" href="https://discord.gg/ybxZ2g8">[JOIN_DISCORD]</a></li>
                        <!--<li><a class="white-text" href="#!">Link 2</a></li>
                        <li><a class="white-text" href="#!">Link 3</a></li>
--- a/website_score.html
+++ b/website_score.html
@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="[LANG]">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <title>[TITLE]</title>
+    <link href="vendor/css/material-icons.css" rel="stylesheet">
+    <link type="text/css" rel="stylesheet" href="vendor/css/materialize.min.css" media="screen,projection"/>
+    <link type="text/css" rel="stylesheet" href="vendor/css/default.css">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+
+    <link rel="apple-touch-icon" sizes="57x57" href="/metas/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/metas/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/metas/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/metas/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/metas/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/metas/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/metas/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/metas/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/metas/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="/metas/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/metas/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/metas/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/metas/favicon-16x16.png">
+    <link rel="manifest" href="/metas/manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/metas/ms-icon-144x144.png">
+    <meta name="theme-color" content="#ffffff">
+
+</head>
+<body>
+<div class="content">
+    <div class="section no-pad-bot" id="index-banner">
+        <div class="container z-depth-3">
+
+            <h1 class="header center orange-text">[MAIN_TITLE]</h1>
+            <div class="row center">
+                <h5 class="header col s12 light">[DESCRIPTION]</h5>
+            </div>
+            <br>
+
+
+        </div>
+    </div>
+    <br>
+
+    <div class="container" style="padding-left: 15px;">
+        <div class="section">
+            <h5 class="light">[EXPLANATION]</h5>
+        </div>
+
+    </div>
+    <div class="container z-depth-3" style="padding-left: 20px;">
+        <div class="section ">
+            [CONTENT]
+            <br>
+
+        </div>
+
+    </div>
+    <br><br>
+    <footer class="page-footer orange">
+        <div class="container">
+            <div class="row">
+                <div class="col l6 s12">
+                    <h5 class="white-text">YourSecretsAreOurs</h5>
+                    <p class="grey-text text-lighten-4">[PROJECT_DESCRIPTION]</p>
+
+
+                </div>
+                <div class="col l3 s12">
+                    <h5 class="white-text">[HELP_US]</h5>
+                    <ul>
+                        <li><a class="white-text disabled" href="#">[REQUEST_MORE]</a></li>
+                        <li><a class="white-text" href="https://discord.gg/ybxZ2g8">[JOIN_DISCORD]</a></li>
+                        <!--<li><a class="white-text" href="#!">Link 2</a></li>
+                        <li><a class="white-text" href="#!">Link 3</a></li>
+                        <li><a class="white-text" href="#!">Link 4</a></li>-->
+                    </ul>
+                </div>
+                <div class="col l3 s12">
+                    <h5 class="white-text">[LANGUAGE_CHOOSE]</h5>
+                    <ul>
+                        [LANGUAGES]
+                        <!--<li><a class="white-text" href="#!">Link 2</a></li>
+                        <li><a class="white-text" href="#!">Link 3</a></li>
+                        <li><a class="white-text" href="#!">Link 4</a></li>-->
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="footer-copyright">
+            <div class="container">
+                Made with <i class="small material-icons brown-text">free_breakfast</i> by <a class="orange-text text-lighten-3" href="http://gaminggeneration.de">GamingGeneration.de-Devs</a>
+            </div>
+        </div>
+    </footer>
+</div>
+
+    <script type="text/javascript" src="vendor/js/materialize.min.js"></script>
+</body>
+</html>