Merged in bugfix/MAPG-196-fix-compatibility-issues (pull request #180)

MAPG-196 revert link preload to plain stylesheet because it is not supported everywhere
2020-07-06 19:15:32 +00:00 · 2020-07-06 21:12:56 +02:00 · 2020-07-06 18:05:51 +00:00 · 2020-07-06 20:04:39 +02:00 · 2020-07-06 20:04:39 +02:00 · 2020-07-06 16:52:21 +00:00
7 changed files with 35 additions and 16 deletions
@@ -1,4 +1,3 @@
 .env
 installed
-unit_test_results.xml
 vendor
@@ -17,8 +17,10 @@ pipelines:
              name: Static Code Analysis
              caches:
                  - composer
+              artifacts:
+                  - static_code_analysis_results.json
              script:
                  - apt-get update && apt-get install -y unzip
                  - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
                  - composer install
-                  - vendor/bin/phpstan analyse -c phpstan.neon
+                  - vendor/bin/phpstan analyse -c phpstan.neon --error-format=prettyJson > static_code_analysis_results.json
@@ -404,9 +404,17 @@ div.buttonContainer>button {
 }

 #cookiesNotice {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    margin: 20px;
    background-color: #eeeeee;
+    border: solid #888888 1px;
+    border-radius: 3px;
    padding: 10px;
    text-align: center;
+    z-index: 10;
 }

 #loading {
@@ -4,7 +4,7 @@
 <header class="small">
    <h1>
        <a href="/" title="<?= $_ENV['APP_NAME'] ?>">
-            <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
+            <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>" alt="<?= $_ENV['APP_NAME'] ?>"><!--
         --><span><?= $_ENV['APP_NAME'] ?></span>
        </a>
    </h1>
@@ -3,7 +3,7 @@
@section(content)
 <header>
    <h1>
-        <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
+        <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>" alt="<?= $_ENV['APP_NAME'] ?>"><!--
     --><?= $_ENV['APP_NAME'] ?>
    </h1>
 </header>
@@ -4,7 +4,7 @@
 <header>
    <h1>
        <a href="/" title="<?= $_ENV['APP_NAME'] ?>">
-            <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
+            <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>" alt="<?= $_ENV['APP_NAME'] ?>"><!--
         --><span><?= $_ENV['APP_NAME'] ?></span>
        </a>
    </h1>
@@ -1,13 +1,23 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
    <meta charset="utf-8">
+    <meta name="description" content="<?= $_ENV['APP_NAME'] ?> – A game about guessing where you are based on a street view panorama.">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <meta name="theme-color" content="#198231">
    <title><?= $_ENV['APP_NAME'] ?></title>
+    <?php if (preg_match('/^http(s)?/', $_ENV['STATIC_ROOT']) === 1): ?>
+        <link href="<?= $_ENV['STATIC_ROOT'] ?>" rel="preconnect">
+    <?php endif; ?>
+    <link href="https://fonts.gstatic.com" rel="preconnect">
+    <link href="https://maps.googleapis.com" rel="preconnect">
+    <?php if (!empty($_ENV['GOOGLE_ANALITICS_ID'])): ?>
+        <link href="https://www.googletagmanager.com" rel="preconnect">
+        <link href="https://www.google-analytics.com" rel="preconnect">
+    <?php endif; ?>
+    <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;500&amp;display=swap" rel="stylesheet">
    <link href="<?= $_ENV['STATIC_ROOT'] ?>/css/mapguesser.css?rev=<?= REVISION ?>" rel="stylesheet">
    @yields('externalCss')
-    <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;500&display=swap" rel="stylesheet">
    @yields('inlineCss')
    <link rel="icon" type="image/png" sizes="192x192" href="<?= $_ENV['STATIC_ROOT'] ?>/img/favicon/192x192.png?rev=<?= REVISION ?>">
    <link rel="icon" type="image/png" sizes="96x96" href="<?= $_ENV['STATIC_ROOT'] ?>/img/favicon/96x96.png?rev=<?= REVISION ?>">
@@ -15,16 +25,8 @@
    <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 'Agree', you consent to our use of cookies.
-            </p>
-            <button id="agreeCookiesButton" class="small marginTop">Agree</button>
-        </div>
-    <?php endif; ?>
    <div id="loading">
-        <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/loading.svg?rev=<?= REVISION ?>" width="64" height="64">
+        <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/loading.svg?rev=<?= REVISION ?>" width="64" height="64" alt="Loading">
    </div>
    <div id="cover"></div>
    <div id="modal" class="modal">
@@ -34,6 +36,14 @@
    </div>
    @yields('pagemodal')
    @yields('content')
+    <?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 'Agree', you consent to our use of cookies.
+            </p>
+            <button id="agreeCookiesButton" class="small marginTop">Agree</button>
+        </div>
+    <?php endif; ?>
    <script>
        const STATIC_ROOT = '<?= $_ENV['STATIC_ROOT'] ?>';
        const REVISION = '<?= REVISION ?>';
Author	SHA1	Message	Date
bence	a4c77c3d32	Merged in bugfix/MAPG-196-fix-compatibility-issues (pull request #180) MAPG-196 revert link preload to plain stylesheet because it is not supported everywhere	2020-07-06 19:15:32 +00:00
bence	317329ae84	MAPG-196 revert link preload to plain stylesheet because it is not supported everywhere	2020-07-06 21:12:56 +02:00
bence	234cb7f086	Merged in feature/MAPG-196-fix-issues-reported-by-lighthouse (pull request #179) Feature/MAPG-196 fix issues reported by lighthouse	2020-07-06 18:05:51 +00:00
bence	66c709f00d	MAPG-196 reposition of cookie notice	2020-07-06 20:04:39 +02:00
bence	2737c7d6d6	MAPG-196 speed up asset loading, add missing description, add missing image alts	2020-07-06 20:04:39 +02:00
bence	2ccee26424	Merged in feature/MAPG-199-static-analyser-save-artifact (pull request #178) MAPG-199 save static code analysis results as artifact	2020-07-06 16:52:21 +00:00
bence	8cbf611189	MAPG-199 save static code analysis results as artifact	2020-07-06 18:50:17 +02:00