Merged in feature/MAPG-174-adjust-map-description-style (pull request #140)

MAPG-174 align description center
2020-06-24 20:11:08 +00:00 · 2020-06-24 22:10:24 +02:00 · 2020-06-24 20:03:29 +00:00 · 2020-06-24 21:57:41 +02:00 · 2020-06-24 21:57:40 +02:00 · 2020-06-24 21:57:40 +02:00
5 changed files with 56 additions and 6 deletions
@@ -84,7 +84,7 @@ hr {
 }

 p.small, span.small {
-    font-size: 12px;
+    font-size: 14px;
 }

 .justify {
@@ -148,6 +148,13 @@ button, a.button {
    line-height: 35px;
 }

+button.small {
+    font-size: 14px;
+    padding: 0 12px;
+    height: 32px;
+    line-height: 32px;
+}
+
 button:enabled:hover, button:enabled:focus, a.button:hover, a.button:focus {
    background-color: #29457f;
    outline: none;
@@ -336,6 +343,12 @@ div.buttonContainer>button {
    margin: 0 auto;
 }

+#cookiesNotice {
+    background-color: #eeeeee;
+    padding: 10px;
+    text-align: center;
+}
+
 #loading {
    position: fixed;
    width: 64px;
@@ -30,7 +30,7 @@ $cssFiles = [
                         -->~ <?= $map['area'][0] ?> <?= $map['area'][1] ?><sup>2</sup>
                        </p>
                    </div>
-                    <p class="small justify marginTop"><?= $map['description'] ?></p>
+                    <p class="small center marginTop"><?= $map['description'] ?></p>
                </div>
                <?php if ($isAdmin): ?>
                    <div class="buttonContainer">
@@ -14,5 +14,30 @@
            <script src="<?= $jsFile ?>"></script>
        <?php endforeach; ?>
    <?php endif; ?>
+    <?php if (!isset($_COOKIE['COOKIES_CONSENT'])): ?>
+        <script>
+            (function () {
+                MapGuesser = {
+                    cookiesAgreed: false,
+
+                    agreeCookies: function () {
+                        if (MapGuesser.cookiesAgreed) {
+                            return;
+                        }
+
+                        var expirationDate = new Date(new Date().getTime() + 20 * 365 * 24 * 60 * 60 * 1000).toUTCString();
+                        document.cookie = 'COOKIES_CONSENT=1; expires=' + expirationDate + '; path=/';
+
+                        MapGuesser.cookiesAgreed = true;
+                        document.getElementById('cookiesNotice').style.display = 'none';
+                    }
+                };
+
+                window.onclick = function () {
+                    MapGuesser.agreeCookies();
+                };
+            })();
+        </script>
+    <?php endif; ?>
 </body>
 </html>
@@ -22,6 +22,14 @@
    <link rel="icon" type="image/png" sizes="16x16" href="<?= $_ENV['STATIC_ROOT'] ?>/img/favicon/16x16.png?rev=<?= REVISION ?>">
 </head>
 <body>
+    <?php if (!isset($_COOKIE['COOKIES_CONSENT'])): ?>
+        <div id="cookiesNotice">
+            <p class="small">
+                <?= $_ENV['APP_NAME'] ?> uses cookies to improve user experience. By using the app or clicking I agree, you consent to our use of cookies.
+            </p>
+            <button id="agreeCookies" class="small marginTop">I agree</button>
+        </div>
+    <?php endif; ?>
    <div id="loading">
        <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/loading.svg?rev=<?= REVISION ?>" width="64" height="64">
    </div>
@@ -49,15 +49,19 @@ Container::$routeCollection->group('admin', function (MapGuesser\Routing\RouteCo
    $routeCollection->post('admin.deleteMap', 'deleteMap/{mapId}', [MapGuesser\Controller\MapAdminController::class, 'deleteMap']);
 });

-Container::$sessionHandler = new MapGuesser\Session\DatabaseSessionHandler();
+if (isset($_COOKIE['COOKIES_CONSENT'])) {
+    Container::$sessionHandler = new MapGuesser\Session\DatabaseSessionHandler();

-session_set_save_handler(Container::$sessionHandler, true);
-session_start([
+    session_set_save_handler(Container::$sessionHandler, true);
+    session_start([
        'gc_maxlifetime' => 604800,
        'cookie_lifetime' => 604800,
        'cookie_httponly' => true,
        'cookie_samesite' => 'Lax'
-]);
+    ]);
+} else {
+    $_SESSION = [];
+}

 Container::$request = new MapGuesser\Request\Request($_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'], $_GET, $_POST, $_SESSION);
Author	SHA1	Message	Date
bence	721b611cdb	Merged in feature/MAPG-174-adjust-map-description-style (pull request #140) MAPG-174 align description center	2020-06-24 20:11:08 +00:00
bence	70fb30f673	MAPG-174 align description center	2020-06-24 22:10:24 +02:00
bence	e200dab2a4	Merged in feature/MAPG-172-create-cookie-notice (pull request #139) Feature/MAPG-172 create cookie notice	2020-06-24 20:03:29 +00:00
bence	e8c246f002	MAPG-172 add cookie consent DIV and JS handler	2020-06-24 21:57:41 +02:00
bence	251bf1be3d	MAPG-172 add new styles	2020-06-24 21:57:40 +02:00
bence	0be20a6097	MAPG-172 don't send session if user didn't consent the cookies	2020-06-24 21:57:40 +02:00