Merged in bugfix/MAPG-189-fix-inputwithbuttons-input-padding (pull request #168)

MAPG-189 fix div.inputWithButton>input's padding when it is focused

.env.example

@@ -1,3 +1,4 @@
+APP_NAME=MapQuiz
 DEV=1
 DB_HOST=mariadb
 DB_USER=mapguesser
@@ -11,3 +12,6 @@ STATIC_ROOT=/static
 MAIL_FROM=mapguesser@mapguesser-dev.ch
 MAIL_HOST=mail
 MAIL_PORT=2500
+GOOGLE_OAUTH_CLIENT_ID=your_google_oauth_client_id
+GOOGLE_OAUTH_CLIENT_SECRET=your_google_oauth_client_secret
+GOOGLE_ANALITICS_ID=your_google_analytics_id

.gitignore

@@ -1,3 +1,4 @@
 .env
 installed
+unit_test_results.xml
 vendor

README.md

@@ -1,5 +1,63 @@
 # MapGuesser
 
-This is the MapGuesser Application project.
+This is the MapGuesser Application project. This is a game about guessing where you are based on a street view panorama - inspired by existing applications.
 
-License: GNU AGPL 3.0
+## Installation
+
+### Clone the Git repository
+
+The first step is obviously cloning the repository to your machine:
+
+```
+git clone https://bitbucket.org/esoko/mapguesser.git
+```
+
+All the commands listed here should be executed from the repository root.
+
+### (Optional) Setup Docker stack
+
+The easiest way to build up a fully working application with web server and database is to use Docker Compose with the included `docker-compose.yml`.
+
+All you have to do is executing the following command:
+
+```
+docker-compose up -d
+```
+
+Attach shell to the container of `mapguesser_app`. All of the following commands should be executed there.
+
+**If you don't use the Docker stack you need to install your environment manually. Check `docker-compose.yml` and `docker/Dockerfile` to see the system requirements.**
+
+### Initialize project
+
+This command installes all of the Composer requirements and creates a copy of the example `.env` file.
+
+```
+composer create-project
+```
+
+### Set environment variables
+
+The `.env` file contains several environment variables that are needed by the application to work properly. These should be configured for your environment.
+
+**You should set here the API keys that enable playing the game. Without these API keys the application cannot work well. To get Google API keys visit this page: https://console.developers.google.com/**
+
+One very important variable is `DEV`. This indicates that the application operates in development (staging) and not in produciton mode.
+
+If you install the application in the Docker stack for development (staging) environment, only the variables for external dependencies (API keys, map attribution, etc.) should be adapted. All other variables (for DB connection, static root, mailing, etc.) are fine with the default value.
+
+### Finalize installation
+
+After you set the environment variables in the `.env` file, execute the following command:
+
+```
+scripts/install.sh
+```
+
+**And you are done!** The application is ready to use and develop.
+
+If you installed it in the Docker stack, you can reach it on http://localhost. The mails that are sent by the application can be found on http://localhost:8080/. If needed, the database server can be directly reached on localhost:3306.
+
+---
+
+*License: **GNU AGPL 3.0**. Full license text can be found in file `LICENSE`.*

bitbucket-pipelines.yml

@@ -0,0 +1,15 @@
+image: php:7.4.7-cli-buster
+
+pipelines:
+    default:
+        - step:
+              name: Unit Testing
+              caches:
+                  - composer
+              artifacts:
+                  - unit_test_results.xml
+              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/phpunit --log-junit unit_test_results.xml --testdox tests

cache/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

composer.json

@@ -8,7 +8,9 @@
     "symfony/console": "^5.1",
     "phpmailer/phpmailer": "^6.1"
   },
-  "require-dev": {},
+  "require-dev": {
+    "phpunit/phpunit": "^9"
+  },
   "autoload": {
     "psr-4": {
       "MapGuesser\\": "src"

database/migrations/structure/20200620_2113_google_login.sql

@@ -0,0 +1,8 @@
+ALTER TABLE
+  `users`
+ADD
+  `google_sub` varchar(255) CHARACTER SET ascii COLLATE ascii_bin NULL DEFAULT NULL,
+ADD
+  UNIQUE `google_sub` (`google_sub`),
+MODIFY
+  `password` varchar(60) NULL DEFAULT NULL;

docker-compose.yml

@@ -10,7 +10,9 @@ services:
             - 'mariadb'
             - 'mail'
     mariadb:
-        image: mariadb:10.1
+        image: mariadb:10.3
+        ports:
+            - 3306:3306
         volumes:
             - mysql:/var/lib/mysql
         environment:

docker/Dockerfile

@@ -4,8 +4,8 @@ ENV DEBIAN_FRONTEND noninteractive
 
 # Install Nginx, PHP and further necessary packages
 RUN apt update --fix-missing
-RUN apt install -y curl git mariadb-client nginx \
-    php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip
+RUN apt install -y curl git unzip mariadb-client nginx \
+    php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml
 
 # Configure Nginx with PHP
 RUN mkdir -p /run/php
@@ -21,7 +21,7 @@ RUN ./install-composer.sh
 # Install Node.js and required packages
 RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
 RUN apt install -y nodejs
-RUN npm install -g uglify-js clean-css-cli svgo
+RUN npm install -g uglify-js clean-css-cli svgo yarn
 
 EXPOSE 80
 VOLUME /var/www/mapguesser

mail/signup-noconfirm.html

@@ -0,0 +1,9 @@
+Hi,
+<br><br>
+You recently signed up on {{APP_NAME}} with this Google account ({{EMAIL}}).
+<br><br>
+Have fun on {{APP_NAME}}!
+<br><br>
+Regards,<br>
+{{APP_NAME}}<br>
+<a href="{{BASE_URL}}" title="{{APP_NAME}}">{{BASE_URL}}</a>

mail/signup.html

@@ -1,13 +1,14 @@
 Hi,
 <br><br>
-You recently signed up on MapGuesser with this email address ({{EMAIL}}). To activate your account, please click on the following link:<br>
+You recently signed up on {{APP_NAME}} with this email address ({{EMAIL}}). To activate your account, please click on the following link:<br>
 <a href="{{ACTIVATE_LINK}}" title="Account activation">{{ACTIVATE_LINK}}</a>
 <br><br>
-If you did not sign up on MapGuesser or changed your mind, no further action is required, your email address will be deleted soon.<br>
+If you did not sign up on {{APP_NAME}} or changed your mind, no further action is required, your email address will be deleted soon.<br>
 However if you want to immediately delete it, please click on the following link:<br>
 <a href="{{CANCEL_LINK}}" title="Sign up cancellation">{{CANCEL_LINK}}</a>
 <br><br>
-Have fun on MapGuesser!
+Have fun on {{APP_NAME}}!
 <br><br>
 Regards,<br>
-MapGuesser
+{{APP_NAME}}<br>
+<a href="{{BASE_URL}}" title="{{APP_NAME}}">{{BASE_URL}}</a>

main.php

@@ -1,5 +1,7 @@
 <?php
 
+define('SCRIPT_STARTED', hrtime(true));
+
 require 'vendor/autoload.php';
 
 const ROOT = __DIR__;

mapg

@@ -7,5 +7,6 @@ $app = new Symfony\Component\Console\Application('MapGuesser Console', '');
 
 $app->add(new MapGuesser\Cli\DatabaseMigration());
 $app->add(new MapGuesser\Cli\AddUserCommand());
+$app->add(new MapGuesser\Cli\LinkViewCommand());
 
 $app->run();

public/index.php

@@ -9,7 +9,7 @@ if (($pos = strpos($url, '?')) !== false) {
 }
 $url = rawurldecode($url);
 
-$match = Container::$routeCollection->match($method, explode('/', $url));
+$match = Container::$routeCollection->match($method, $url == '' ? [] : explode('/', $url));
 
 if ($match !== null) {
     list($route, $params) = $match;
@@ -36,16 +36,17 @@ if ($match !== null) {
 
         if ($response instanceof MapGuesser\Interfaces\Response\IContent) {
             header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
-            echo $response->render();
+            $response->render();
 
             return;
         } elseif ($response instanceof MapGuesser\Interfaces\Response\IRedirect) {
-            header('Location: ' . Container::$request->getBase() . '/' . $response->getUrl(), true, $response->getHttpCode());
+            header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
 
             return;
         }
     }
 }
 
+$content = new MapGuesser\Response\HtmlContent('error/404');
 header('Content-Type: text/html; charset=UTF-8', true, 404);
-require ROOT . '/views/error/404.php';
+$content->render();

public/static/css/game.css

@@ -1,12 +1,15 @@
 #panorama {
-    width: 100%;
-    height: calc(100% - 40px);
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
     z-index: 1;
 }
 
-#guessCover {
+#panoCover {
     position: absolute;
-    top: 40px;
+    top: 0;
     left: 0;
     bottom: 0;
     right: 0;
@@ -111,7 +114,7 @@
         z-index: 2;
     }
     #guess {
-        top: 50px;
+        top: 10px;
         left: 20px;
         opacity: 0.95;
         visibility: hidden;
@@ -157,7 +160,7 @@
     #guess.result {
         width: initial;
         height: initial;
-        top: 50px;
+        top: 10px;
         left: 50px;
         right: 50px;
         bottom: 50px;
@@ -167,11 +170,11 @@
     }
     @media screen and (max-height: 424px) {
         #guess {
-            top: 50px;
+            top: 10px;
             height: initial;
         }
         #guess.adapt:hover {
-            top: 50px;
+            top: 10px;
             height: initial;
         }
         #guess.result {

public/static/css/map_editor.css

@@ -1,9 +1,13 @@
 #map {
-    width: 100%;
-    height: calc(100% - 40px);
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
     z-index: 1;
 }
 
+/* modify the cursor for the Leaflet map */
 .leaflet-container {
     cursor: crosshair;
 }
@@ -16,6 +20,8 @@
 
 #noPano {
     display: flex;
+    justify-content: center;
+    align-items: center;
     position: absolute;
     z-index: 2;
     visibility: hidden;
@@ -23,12 +29,12 @@
 }
 
 #noPano>p {
-    margin: auto;
+    text-align: center;
 }
 
 #control {
     position: absolute;
-    top: 50px;
+    top: 10px;
     right: 10px;
     width: 125px;
     z-index: 3;
@@ -48,31 +54,34 @@
 
 @media screen and (max-width: 999px) and (min-height: 600px) {
     #map.selected {
-        height: calc(50% - 20px);
+        height: 50%;
     }
     #panorama, #noPano {
         left: 0;
         bottom: 0;
         right: 0;
-        height: calc(50% - 20px);
+        height: 50%;
     }
     #placeControl {
-        top: calc(50% + 30px);
+        top: calc(50% + 10px);
     }
 }
 
 @media screen and (min-width: 1000px), (max-height: 599px) {
     #map.selected {
+        top: 0;
+        bottom: 0;
+        left: 0;
         width: 50%;
     }
     #panorama, #noPano {
-        top: 40px;
+        top: 0;
         bottom: 0;
         right: 0;
         width: 50%;
     }
     #placeControl {
-        top: 50px;
+        top: 10px;
     }
     #modified.selected {
         right: calc(50% + 10px);

public/static/css/mapguesser.css

@@ -17,6 +17,16 @@ button::-moz-focus-inner, input::-moz-focus-inner {
     border: 0;
 }
 
+/* to be compatible with browsers that don't know <main> */
+main {
+    display: block;
+}
+
+::selection {
+    background-color: #28a745;
+    color: #ffffff;
+}
+
 p, h1, h2, input, textarea, select, button, a {
     font-family: 'Roboto', sans-serif;
 }
@@ -37,7 +47,7 @@ h1>a:hover, h1>a:focus {
     text-decoration: none;
 }
 
-h2, div.header.small h1 {
+h2, header.small h1 {
     font-size: 24px;
 }
 
@@ -78,8 +88,8 @@ hr {
     font-weight: 500;
 }
 
-.small {
-    font-size: 12px;
+p.small, span.small {
+    font-size: 14px;
 }
 
 .justify {
@@ -102,6 +112,10 @@ hr {
     margin-right: 10px;
 }
 
+.center {
+    text-align: center;
+}
+
 .right {
     text-align: right;
 }
@@ -110,6 +124,7 @@ svg.inline, img.inline {
     display: inline;
     width: 1em;
     height: 1em;
+    margin-right: 0.3em;
     vertical-align: -0.15em;
 }
 
@@ -138,6 +153,27 @@ button, a.button {
     line-height: 35px;
 }
 
+button.small, div.inputWithButton>button {
+    font-size: 14px;
+    padding: 0 12px;
+    height: 32px;
+    line-height: 32px;
+}
+
+button.small {
+    height: 32px;
+    line-height: 32px;
+}
+
+div.inputWithButton>button {
+    border-radius: 2px;
+    height: 27px;
+    line-height: 27px;
+    width: 75px;
+    margin-left: -79px;
+    vertical-align: 2px;
+}
+
 button:enabled:hover, button:enabled:focus, a.button:hover, a.button:focus {
     background-color: #29457f;
     outline: none;
@@ -169,7 +205,7 @@ button.gray, a.button.gray {
     background-color: #808080;
 }
 
-button.gray:hover, button.gray:focus, a.button.gray:hover, a.button.gray:focus {
+button.gray:enabled:hover, button.gray:enabled:focus, a.button.gray:hover, a.button.gray:focus {
     background-color: #555555;
 }
 
@@ -177,7 +213,7 @@ button.red, a.button.red {
     background-color: #aa5e5e;
 }
 
-button.red:hover, button.red:focus, a.button.red:hover, a.button.red:focus {
+button.red:enabled:hover, button.red:enabled:focus, a.button.red:hover, a.button.red:focus {
     background-color: #7f2929;
 }
 
@@ -185,7 +221,7 @@ button.yellow, a.button.yellow {
     background-color: #e8a349;
 }
 
-button.yellow:hover, button.yellow:focus, a.button.yellow:hover, a.button.yellow:focus {
+button.yellow:enabled:hover, button.yellow:enabled:focus, a.button.yellow:hover, a.button.yellow:focus {
     background-color: #c37713;
 }
 
@@ -193,7 +229,7 @@ button.green, a.button.green {
     background-color: #28a745;
 }
 
-button.green:hover, button.green:focus, a.button.green:hover, a.button.green:focus {
+button.green:enabled:hover, button.green:enabled:focus, a.button.green:hover, a.button.green:focus {
     background-color: #1b7d31;
 }
 
@@ -201,22 +237,36 @@ input, select, textarea {
     background-color: #f9fafb;
     border: solid #c8d2e1 1px;
     border-radius: 2px;
-    padding: 4px;
     box-sizing: border-box;
     font-size: 15px;
     font-weight: 300;
 }
 
+input, select {
+    height: 30px;
+    line-height: 30px;
+    padding: 0 5px;
+}
+
 textarea {
-    font-size: 13px;
+    padding: 5px;
     resize: none;
 }
 
-input.big, select.big, textarea.big {
-    padding: 5px;
+input.big, select.big, textarea.big, div.inputWithButton>input {
     font-size: 18px;
 }
 
+input.big, select.big, div.inputWithButton>input {
+    height: 35px;
+    line-height: 35px;
+    padding: 0 6px;
+}
+
+textarea.big {
+    padding: 6px;
+}
+
 input.fullWidth, select.fullWidth, textarea.fullWidth {
     display: block;
     width: 100%;
@@ -231,22 +281,41 @@ input:disabled, select:disabled, textarea:disabled {
 input:focus, select:focus, textarea:focus {
     background-color: #ffffff;
     border: solid #29457f 2px;
-    padding: 3px;
     outline: none;
 }
 
-input.big:focus, select.big:focus, textarea.big:focus {
+input:focus, select:focus {
+    padding: 0 4px;
+}
+
+textarea:focus {
     padding: 4px;
 }
 
+input.big:focus, select.big:focus {
+    padding: 0 5px;
+}
+
+div.inputWithButton>input {
+    width: 100%;
+    padding: 0 83px 0 6px;
+}
+
+div.inputWithButton>input:focus {
+    padding: 0 82px 0 5px;
+}
+
+textarea.big:focus {
+    padding: 5px;
+}
+
 div.modal {
     position: fixed;
-    top: 100px;
     background-color: #ffffff;
     border-radius: 3px;
-    padding: 20px;
     box-sizing: border-box;
-    z-index: 3;
+    overflow-y: auto;
+    z-index: 6;
     visibility: hidden;
 }
 
@@ -258,7 +327,7 @@ div.modal {
     right: 0;
     background-color: #000000;
     opacity: 0.5;
-    z-index: 2;
+    z-index: 5;
     visibility: hidden;
 }
 
@@ -271,7 +340,7 @@ p.formError {
     display: none;
 }
 
-div.header {
+header {
     display: grid;
     grid-template-columns: auto auto;
     background-color: #333333;
@@ -281,33 +350,51 @@ div.header {
     color: white;
 }
 
-div.header.small {
+header.small {
     height: 40px;
     line-height: 40px;
 }
 
-div.header>p.header {
+header>p {
     line-height: inherit;
     text-align: right;
 }
 
-div.header>p.header>span {
+header>p>span {
     padding-left: 6px;
 }
 
-div.header>p.header>span>a:link, div.header>p.header>span>a:visited {
+header>p>span>a:link, header>p>span>a:visited {
     color: inherit;
 }
 
-div.header>p.header>span:not(:last-child) {
+header>p>span:not(:last-child) {
     border-right: solid white 1px;
     padding-right: 6px;
 }
 
-div.main {
+main {
     padding: 6px 12px;
 }
 
+main.full {
+    position: relative;
+    width: 100%;
+    height: calc(100% - 40px);
+    padding: 0;
+}
+
+footer {
+    background-color: #444444;
+    padding: 6px 12px;
+    color: white;
+    text-align: center;
+}
+
+footer>p {
+    font-size: 13px;
+}
+
 div.buttonContainer {
     height: 35px;
 }
@@ -316,6 +403,12 @@ div.buttonContainer>button {
     margin: 0 auto;
 }
 
+#cookiesNotice {
+    background-color: #eeeeee;
+    padding: 10px;
+    text-align: center;
+}
+
 #loading {
     position: fixed;
     width: 64px;
@@ -324,7 +417,7 @@ div.buttonContainer>button {
     left: 50%;
     margin-top: -32px;
     margin-left: -32px;
-    z-index: 5;
+    z-index: 7;
     visibility: hidden;
 }
 
@@ -338,16 +431,27 @@ div.box {
 }
 
 @media screen and (max-width: 599px) {
-    div.header h1 span {
+    header h1 span {
         display: none;
     }
+    footer>p:not(:first-child) {
+        margin-top: 4px;
+    }
     button, a.button {
         padding: 0;
         width: 100%;
     }
+    button.marginLeft, a.button.marginLeft {
+        margin-left: 0;
+    }
+    button.marginRight, a.button.marginRight {
+        margin-right: 0;
+    }
     div.modal {
         left: 20px;
         right: 20px;
+        padding-left: 15px;
+        padding-right: 15px;
     }
     div.box {
         width: initial;
@@ -355,9 +459,48 @@ div.box {
 }
 
 @media screen and (min-width: 600px) {
+    footer>p {
+        display: inline;
+    }
+    footer>p:not(:first-child) {
+        padding-left: 6px;
+    }
+    footer>p:not(:last-child) {
+        border-right: solid white 1px;
+        padding-right: 6px;
+    }
     div.modal {
         width: 540px;
         left: 50%;
         margin-left: -270px;
+        padding-left: 20px;
+        padding-right: 20px;
+    }
+}
+
+@media screen and (max-height: 399px) {
+    div.modal {
+        top: 20px;
+        max-height: calc(100% - 40px);
+        padding-top: 10px;
+        padding-bottom: 10px;
+    }
+}
+
+@media screen and (min-height: 400px) and (max-height: 499px) {
+    div.modal {
+        top: 50px;
+        max-height: calc(100% - 100px);
+        padding-top: 15px;
+        padding-bottom: 15px;
+    }
+}
+
+@media screen and (min-height: 500px) {
+    div.modal {
+        top: 75px;
+        max-height: calc(100% - 150px);
+        padding-top: 15px;
+        padding-bottom: 15px;
     }
 }

public/static/css/maps.css

@@ -18,7 +18,16 @@ div.mapItem>div.title {
     color: white;
     border-top-left-radius: 3px;
     border-top-right-radius: 3px;
-    padding: 4px 8px;
+    padding: 0 8px;
+    height: 35px;
+    line-height: 35px;
+}
+
+div.mapItem>div.title>p {
+    line-height: inherit;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 div.mapItem>div.title>p.title {
@@ -29,17 +38,16 @@ div.mapItem>div.title>p.title {
 div.mapItem>div.imgContainer {
     width: 100%;
     padding-top: 50%;
-    background: #cccccc;
-}
-
-div.mapItem>div.imgContainer>img {
-    width: 100%;
-    margin-top: -50%
+    background-color: #cccccc;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: cover;
 }
 
 div.mapItem>div.inner {
     background-color: #eeeeee;
     padding: 10px 8px;
+    box-sizing: border-box;
 }
 
 div.mapItem>div.inner>div.info {
@@ -47,6 +55,12 @@ div.mapItem>div.inner>div.info {
     grid-template-columns: auto auto;
 }
 
+div.mapItem>div.inner>div.description {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
 div.mapItem>div.inner>div.info>p:nth-child(1) {
     text-align: left;
 }

public/static/js/account/account.js

@@ -0,0 +1,69 @@
+var Account = {
+    original: null,
+    countdown: null,
+
+    openGoogleAuthenticate: function () {
+        window.open('/account/googleAuthenticate', 'googleAuthenticate', 'height=600,width=600')
+    },
+
+    authenticatedWithGoogleCallback: function (authenticatedWithGoogleUntil) {
+        var password = document.getElementsByTagName('form')[0].elements.password;
+        var button = document.getElementById('authenticateWithGoogleButton');
+
+        Account.original = {
+            type: password.type,
+            placeholder: password.placeholder,
+            required: password.required,
+            disabled: password.disabled
+        };
+
+        password.type = 'text';
+        password.placeholder = 'Authenticated!'
+        password.value = '';
+        password.required = false;
+        password.disabled = true;
+
+        button.disabled = true;
+
+        Account.countdown = setInterval(function () {
+            var timeLeft = Math.ceil((authenticatedWithGoogleUntil.getTime() - new Date().getTime()) / 1000);
+
+            if (timeLeft > 30) {
+                return;
+            }
+
+            if (timeLeft <= 0) {
+                Account.resetGoogleAuthentication();
+                return;
+            }
+
+            password.placeholder = 'Authenticated! ' + timeLeft + ' seconds left...';
+        }, 1000);
+    },
+
+    resetGoogleAuthentication: function () {
+        if (Account.countdown !== null) {
+            clearInterval(Account.countdown);
+        }
+
+        var password = document.getElementsByTagName('form')[0].elements.password;
+        var button = document.getElementById('authenticateWithGoogleButton');
+
+        password.type = Account.original.type;
+        password.placeholder = Account.original.placeholder
+        password.required = Account.original.required;
+        password.disabled = Account.original.disabled;
+
+        button.disabled = false;
+    }
+};
+
+(function () {
+    document.getElementById('authenticateWithGoogleButton').onclick = function () {
+        Account.openGoogleAuthenticate();
+    };
+
+    document.getElementsByTagName('form')[0].onreset = function () {
+        Account.resetGoogleAuthentication();
+    };
+})();

public/static/js/account/google_authenticate.js

@@ -0,0 +1,10 @@
+(function () {
+    if (success) {
+        window.opener.Account.authenticatedWithGoogleCallback(authenticatedWithGoogleUntil);
+        window.close();
+    } else {
+        document.getElementById('closeWindowButton').onclick = function () {
+            window.close();
+        }
+    }
+})();

public/static/js/game.js

@@ -16,7 +16,7 @@
 
         initialize: function () {
             document.getElementById('loading').style.visibility = 'visible';
-            document.getElementById('guessCover').style.visibility = 'visible';
+            document.getElementById('panoCover').style.visibility = 'visible';
             document.getElementById('currentRound').innerHTML = '1/' + String(Game.NUMBER_OF_ROUNDS);
             document.getElementById('currentScoreSum').innerHTML = '0/0';
 
@@ -27,7 +27,7 @@
 
             MapGuesser.httpRequest('GET', '/game/' + mapId + '/newPlace.json', function () {
                 document.getElementById('loading').style.visibility = 'hidden';
-                document.getElementById('guessCover').style.visibility = 'hidden';
+                document.getElementById('panoCover').style.visibility = 'hidden';
 
                 if (this.response.error) {
                     //TODO: handle this error
@@ -98,7 +98,7 @@
                 lastRound.line.setVisible(false);
             }
 
-            document.getElementById('guessCover').style.visibility = 'hidden';
+            document.getElementById('panoCover').style.visibility = 'hidden';
             document.getElementById('showGuessButton').style.visibility = null;
             document.getElementById('guess').style.visibility = null;
             document.getElementById('guess').classList.remove('result')
@@ -152,7 +152,7 @@
                 document.getElementById('guess').classList.remove('adapt');
             }
             document.getElementById('loading').style.visibility = 'visible';
-            document.getElementById('guessCover').style.visibility = 'visible';
+            document.getElementById('panoCover').style.visibility = 'visible';
 
             var data = new FormData();
             data.append('lat', String(guessPosition.lat));
@@ -370,6 +370,14 @@
         }
     };
 
+    MapGuesser.sessionAvailableHooks.reinitializeGame = function () {
+        MapGuesser.httpRequest('GET', '/game/' + mapId + '/json', function () {
+            mapBounds = this.response.bounds;
+
+            Game.initialize();
+        });
+    };
+
     if (!('ontouchstart' in document.documentElement)) {
         Game.adaptGuess = true;
     }

public/static/js/login.js

@@ -1,40 +0,0 @@
-(function () {
-    var form = document.getElementById('loginForm');
-
-    form.onsubmit = function (e) {
-        document.getElementById('loading').style.visibility = 'visible';
-
-        e.preventDefault();
-
-        var formData = new FormData(form);
-
-        MapGuesser.httpRequest('POST', form.action, function () {
-            if (this.response.error) {
-                var errorText;
-                switch (this.response.error) {
-                    case 'user_not_found':
-                        errorText = 'No user found with the given email address. You can <a href="/signup" title="Sign up">sign up here</a>!';
-                        break;
-                    case 'user_not_active':
-                        errorText = 'User found with the given email address, but the account is not activated. Please check your email and click on the activation link!';
-                        break;
-                    case 'password_not_match':
-                        errorText = 'The given password is wrong.'
-                        break;
-                }
-
-                document.getElementById('loading').style.visibility = 'hidden';
-
-                var loginFormError = document.getElementById('loginFormError');
-                loginFormError.style.display = 'block';
-                loginFormError.innerHTML = errorText;
-
-                form.elements.email.select();
-
-                return;
-            }
-
-            window.location.replace('/');
-        }, formData);
-    };
-})();

public/static/js/login/google_signup.js

@@ -0,0 +1,9 @@
+(function () {
+    document.getElementById('cancelGoogleSignupButton').onclick = function () {
+        document.getElementById('loading').style.visibility = 'visible';
+
+        MapGuesser.httpRequest('POST', '/signup/google/reset', function () {
+            window.location.replace('/signup');
+        });
+    };
+})();

public/static/js/login/signup.js

@@ -0,0 +1,12 @@
+(function () {
+    var resetSignupButton = document.getElementById('resetSignupButton');
+    if (resetSignupButton) {
+        resetSignupButton.onclick = function () {
+            document.getElementById('loading').style.visibility = 'visible';
+
+            MapGuesser.httpRequest('POST', '/signup/reset', function () {
+                window.location.reload();
+            });
+        };
+    }
+})();

public/static/js/map_editor.js

@@ -334,11 +334,11 @@
     var Util = {
         getHighResData: function () {
             if (window.devicePixelRatio >= 4) {
-                return { ppi: 320, tileSize: 128, zoomOffset: 1 };
+                return { ppi: 320, tileSize: 128, zoomOffset: 1, minZoom: 0, maxZoom: 18 };
             } else if (window.devicePixelRatio >= 2) {
-                return { ppi: 250, tileSize: 256, zoomOffset: 0 };
+                return { ppi: 250, tileSize: 256, zoomOffset: 0, minZoom: 1, maxZoom: 19 };
             } else {
-                return { ppi: 72, tileSize: 512, zoomOffset: -1 };
+                return { ppi: 72, tileSize: 512, zoomOffset: -1, minZoom: 2, maxZoom: 20 };
             }
         }
     };
@@ -368,8 +368,8 @@
         ppi: highResData.ppi,
         tileSize: highResData.tileSize,
         zoomOffset: highResData.zoomOffset,
-        minZoom: 2,
-        maxZoom: 20
+        minZoom: highResData.minZoom,
+        maxZoom: highResData.maxZoom
     }).addTo(MapEditor.map);
 
     MapEditor.map.fitBounds(L.latLngBounds({ lat: mapBounds.south, lng: mapBounds.west }, { lat: mapBounds.north, lng: mapBounds.east }));

public/static/js/mapguesser.js

@@ -1,12 +1,58 @@
 var MapGuesser = {
+    cookiesAgreed: false,
+    sessionAvailableHooks: {},
+
+    initGoogleAnalitics: function () {
+        if (typeof GOOGLE_ANALITICS_ID === 'undefined') {
+            return;
+        }
+
+        // Global site tag (gtag.js) - Google Analytics
+        var script = document.createElement('script');
+        script.src = 'https://www.googletagmanager.com/gtag/js?id=' + GOOGLE_ANALITICS_ID;
+        script.async = true;
+
+        document.head.appendChild(script);
+
+        window.dataLayer = window.dataLayer || [];
+        function gtag() { dataLayer.push(arguments); }
+        gtag('js', new Date());
+        gtag('config', GOOGLE_ANALITICS_ID);
+    },
+
+    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.initGoogleAnalitics();
+        MapGuesser.httpRequest('GET', '/startSession.json', function () {
+            ANTI_CSRF_TOKEN = this.response.antiCsrfToken;
+
+            for (var hookId in MapGuesser.sessionAvailableHooks) {
+                if (!MapGuesser.sessionAvailableHooks.hasOwnProperty(hookId)) {
+                    continue;
+                }
+
+                MapGuesser.sessionAvailableHooks[hookId]();
+            }
+        });
+
+        MapGuesser.cookiesAgreed = true;
+    },
+
     httpRequest: function (method, url, callback, data) {
         var xhr = new XMLHttpRequest();
 
-        xhr.responseType = 'json';
         xhr.onload = callback;
 
         xhr.open(method, url, true);
 
+        xhr.responseType = 'json';
+
         if (method === 'POST') {
             if (typeof data === 'undefined') {
                 data = new FormData();
@@ -20,6 +66,52 @@ var MapGuesser = {
         }
     },
 
+    setOnsubmitForForm: function (form) {
+        form.onsubmit = function (e) {
+            e.preventDefault();
+
+            document.getElementById('loading').style.visibility = 'visible';
+
+            var formData = new FormData(form);
+            var formError = form.getElementsByClassName('formError')[0];
+            var pageLeaveOnSuccess = form.dataset.redirectOnSuccess || form.dataset.reloadOnSuccess;
+
+            MapGuesser.httpRequest('POST', form.action, function () {
+                if (!pageLeaveOnSuccess) {
+                    document.getElementById('loading').style.visibility = 'hidden';
+                }
+
+                if (this.response.error) {
+                    if (pageLeaveOnSuccess) {
+                        document.getElementById('loading').style.visibility = 'hidden';
+                    }
+
+                    formError.style.display = 'block';
+                    formError.innerHTML = this.response.error.errorText;
+
+                    return;
+                }
+
+                if (this.response.redirect) {
+                    window.location.replace(this.response.redirect.target);
+
+                    return;
+                }
+
+                if (!pageLeaveOnSuccess) {
+                    formError.style.display = 'none';
+                    form.reset();
+                } else {
+                    if (form.dataset.redirectOnSuccess) {
+                        window.location.replace(form.dataset.redirectOnSuccess);
+                    } else if (form.dataset.reloadOnSuccess) {
+                        window.location.reload();
+                    }
+                }
+            }, formData);
+        }
+    },
+
     showModal: function (id) {
         document.getElementById(id).style.visibility = 'visible';
         document.getElementById('cover').style.visibility = 'visible';
@@ -90,11 +182,35 @@ var MapGuesser = {
         document.getElementById('cover').style.visibility = 'hidden';
     },
 
-    toggleDisableOnChange: function (input, button) {
+    observeInput: function (input, buttonToToggle) {
         if (input.defaultValue !== input.value) {
-            button.disabled = false;
+            buttonToToggle.disabled = false;
         } else {
-            button.disabled = true;
+            buttonToToggle.disabled = true;
+        }
+    },
+
+    observeInputsInForm: function (form, observedInputs) {
+        for (var i = 0; i < observedInputs.length; i++) {
+            var input = form.elements[observedInputs[i]];
+
+            switch (input.tagName) {
+                case 'INPUT':
+                case 'TEXTAREA':
+                    input.oninput = function () {
+                        MapGuesser.observeInput(this, form.elements.submit);
+                    };
+                    break;
+                case 'SELECT':
+                    input.onchange = function () {
+                        MapGuesser.observeInput(this, form.elements.submit);
+                    };
+                    break;
+            }
+        }
+
+        form.onreset = function () {
+            form.elements.submit.disabled = true;
         }
     }
 };
@@ -110,7 +226,41 @@ var MapGuesser = {
         }
     }
 
+    var forms = document.getElementsByTagName('form');
+    for (var i = 0; i < forms.length; i++) {
+        var form = forms[i];
+
+        if (form.dataset.noSubmit) {
+            continue;
+        }
+
+        MapGuesser.setOnsubmitForForm(form);
+
+        if (form.dataset.observeInputs) {
+            MapGuesser.observeInputsInForm(form, form.dataset.observeInputs.split(','));
+        }
+    }
+
     document.getElementById('cover').onclick = function () {
         MapGuesser.hideModal();
     };
+
+    if (COOKIES_CONSENT) {
+        MapGuesser.initGoogleAnalitics();
+    } else {
+        // we don't want user to agree cookies when clicking on the notice itself
+        document.getElementById('cookiesNotice').onclick = function (e) {
+            e.stopPropagation();
+        };
+
+        document.getElementById('agreeCookiesButton').onclick = function () {
+            MapGuesser.agreeCookies();
+
+            document.getElementById('cookiesNotice').style.display = 'none';
+        };
+
+        window.onclick = function () {
+            MapGuesser.agreeCookies();
+        };
+    }
 })();

public/static/js/maps.js

@@ -0,0 +1,76 @@
+(function () {
+    var Maps = {
+        descriptionDivs: null,
+
+        addStaticMaps: function () {
+            var imgContainers = document.getElementById('mapContainer').getElementsByClassName('imgContainer');
+            for (var i = 0; i < imgContainers.length; i++) {
+                var imgContainer = imgContainers[i];
+
+                var imgSrc = 'https://maps.googleapis.com/maps/api/staticmap?size=350x175&' +
+                    'scale=' + (window.devicePixelRatio >= 2 ? 2 : 1) + '&' +
+                    'visible=' + imgContainer.dataset.boundSouthLat + ',' + imgContainer.dataset.boundWestLng + '|' +
+                    imgContainer.dataset.boundNorthLat + ',' + imgContainer.dataset.boundEastLng +
+                    '&key=' + GOOGLE_MAPS_JS_API_KEY;
+
+                imgContainer.style.backgroundImage = 'url("' + imgSrc + '")';
+            }
+        },
+
+        initializeDescriptionDivs: function () {
+            Maps.descriptionDivs = document.getElementById('mapContainer').getElementsByClassName('description');
+
+            for (var i = 0; i < Maps.descriptionDivs.length; i++) {
+                var description = Maps.descriptionDivs[i];
+                var boundingClientRect = description.getBoundingClientRect();
+
+                description.defaultHeight = boundingClientRect.height;
+            }
+        },
+
+        calculateDescriptionDivHeights: function () {
+            var currentY;
+            var rows = [];
+            for (var i = 0; i < Maps.descriptionDivs.length; i++) {
+                var description = Maps.descriptionDivs[i];
+                var boundingClientRect = description.getBoundingClientRect();
+
+                if (currentY !== boundingClientRect.y) {
+                    rows.push([]);
+                }
+
+                rows[rows.length - 1].push(description);
+
+                currentY = boundingClientRect.y;
+            }
+
+            for (var i = 0; i < rows.length; i++) {
+                var row = rows[i];
+
+                var maxHeight = 0;
+                for (var j = 0; j < row.length; j++) {
+                    var description = row[j];
+
+                    if (description.defaultHeight > maxHeight) {
+                        maxHeight = description.defaultHeight;
+                    }
+                }
+
+                for (var j = 0; j < row.length; j++) {
+                    var description = row[j];
+
+                    description.style.height = maxHeight + 'px';
+                }
+            }
+        }
+    };
+
+    Maps.addStaticMaps();
+
+    Maps.initializeDescriptionDivs();
+    Maps.calculateDescriptionDivHeights();
+
+    window.onresize = function () {
+        Maps.calculateDescriptionDivHeights();
+    };
+})();

public/static/js/maps_admin.js

@@ -0,0 +1,34 @@
+(function () {
+    Maps = {
+        deleteMap: function (mapId, mapName) {
+            MapGuesser.showModalWithContent('Delete map', 'Are you sure you want to delete map \'' + mapName + '\'?', [{
+                type: 'button',
+                classNames: ['red'],
+                text: 'Delete',
+                onclick: function () {
+                    document.getElementById('loading').style.visibility = 'visible';
+
+                    MapGuesser.httpRequest('POST', '/admin/deleteMap/' + mapId, function () {
+                        if (this.response.error) {
+                            document.getElementById('loading').style.visibility = 'hidden';
+
+                            //TODO: handle this error
+                            return;
+                        }
+
+                        window.location.reload();
+                    });
+                }
+            }]);
+        }
+    };
+
+    var buttons = document.getElementById('mapContainer').getElementsByClassName('deleteButton');
+    for (var i = 0; i < buttons.length; i++) {
+        var button = buttons[i];
+
+        button.onclick = function () {
+            Maps.deleteMap(this.dataset.mapId, this.dataset.mapName);
+        };
+    }
+})();

public/static/js/profile.js

@@ -1,51 +0,0 @@
-(function () {
-    var form = document.getElementById('profileForm');
-
-    form.elements.password_new.onkeyup = function () {
-        MapGuesser.toggleDisableOnChange(this, form.elements.save);
-    };
-
-    form.elements.password_new_confirm.onkeyup = function () {
-        MapGuesser.toggleDisableOnChange(this, form.elements.save);
-    };
-
-    form.onsubmit = function (e) {
-        document.getElementById('loading').style.visibility = 'visible';
-
-        e.preventDefault();
-
-        var formData = new FormData(form);
-
-        MapGuesser.httpRequest('POST', form.action, function () {
-            document.getElementById('loading').style.visibility = 'hidden';
-
-            if (this.response.error) {
-                var errorText;
-                switch (this.response.error) {
-                    case 'password_not_match':
-                        errorText = 'The given current password is wrong.'
-                        break;
-                    case 'passwords_too_short':
-                        errorText = 'The given new password is too short. Please choose a password that is at least 6 characters long!'
-                        break;
-                    case 'passwords_not_match':
-                        errorText = 'The given new passwords do not match.'
-                        break;
-                }
-
-                var profileFormError = document.getElementById('profileFormError');
-                profileFormError.style.display = 'block';
-                profileFormError.innerHTML = errorText;
-
-                form.elements.password_new.select();
-
-                return;
-            }
-
-            document.getElementById('profileFormError').style.display = 'none';
-            form.reset();
-            form.elements.save.disabled = true;
-            form.elements.password_new.focus();
-        }, formData);
-    };
-})();

public/static/js/signup.js

@@ -1,47 +0,0 @@
-(function () {
-    var form = document.getElementById('signupForm');
-
-    form.onsubmit = function (e) {
-        document.getElementById('loading').style.visibility = 'visible';
-
-        e.preventDefault();
-
-        var formData = new FormData(form);
-
-        MapGuesser.httpRequest('POST', form.action, function () {
-            document.getElementById('loading').style.visibility = 'hidden';
-
-            if (this.response.error) {
-                var errorText;
-                switch (this.response.error) {
-                    case 'passwords_too_short':
-                        errorText = 'The given password is too short. Please choose a password that is at least 6 characters long!'
-                        break;
-                    case 'passwords_not_match':
-                        errorText = 'The given passwords do not match.'
-                        break;
-                    case 'user_found':
-                        errorText = 'There is a user already registered with the given email address. Please <a href="/login" title="Login">login here</a>!';
-                        break;
-                    case 'not_active_user_found':
-                        errorText = 'There is a user already registered with the given email address. Please check your email and click on the activation link!';
-                        break;
-                }
-
-                var signupFormError = document.getElementById('signupFormError');
-                signupFormError.style.display = 'block';
-                signupFormError.innerHTML = errorText;
-
-                form.elements.email.select();
-
-                return;
-            }
-
-            document.getElementById('signupFormError').style.display = 'none';
-            form.reset();
-            form.elements.email.focus();
-
-            MapGuesser.showModalWithContent('Sign up successful', 'Sign up was successful. Please check your email and click on the activation link to activate your account!');
-        }, formData);
-    };
-})();

scripts/install.sh

@@ -21,6 +21,9 @@ echo "Migrating DB..."
 if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
     echo "Minifying JS, CSS and SVG files..."
     ${ROOT_DIR}/scripts/minify.sh
+
+    echo "Linking view files..."
+    (cd ${ROOT_DIR} && ./mapg view:link)
 fi
 
 touch ${ROOT_DIR}/installed

scripts/run-sql.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [ "$#" -lt 1 ]; then
+    echo "Usage: $0 <sql_file>"
+    exit 1
+fi
+
+SQL_FILE=$1
+
+ROOT_DIR=$(dirname $(readlink -f "$0"))/..
+
+. ${ROOT_DIR}/.env
+
+if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
+    echo "This script can only be used in DEV mode!"
+    exit 1
+fi
+
+echo "Running SQL on DB..."
+mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${SQL_FILE}

scripts/update.sh

@@ -5,7 +5,11 @@ ROOT_DIR=$(dirname $(readlink -f "$0"))/..
 . ${ROOT_DIR}/.env
 
 echo "Installing Composer packages..."
-(cd ${ROOT_DIR} && composer install)
+if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
+    (cd ${ROOT_DIR} && composer install --no-dev)
+else
+    (cd ${ROOT_DIR} && composer install --dev)
+fi
 
 echo "Installing Yarn packages..."
 (cd ${ROOT_DIR}/public/static && yarn install)
@@ -16,4 +20,7 @@ echo "Migrating DB..."
 if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
     echo "Minifying JS, CSS and SVG files..."
     ${ROOT_DIR}/scripts/minify.sh
+
+    echo "Linking view files..."
+    (cd ${ROOT_DIR} && ./mapg view:link)
 fi

src/Cli/AddUserCommand.php

@@ -1,7 +1,7 @@
 <?php namespace MapGuesser\Cli;
 
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Model\User;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\PersistentData\Model\User;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -20,20 +20,18 @@ class AddUserCommand extends Command
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $user = new User([
-            'email' => $input->getArgument('email'),
-        ]);
-
+        $user = new User();
+        $user->setEmail($input->getArgument('email'));
         $user->setPlainPassword($input->getArgument('password'));
+        $user->setActive(true);
 
         if ($input->hasArgument('type')) {
             $user->setType($input->getArgument('type'));
         }
 
         try {
-            $modify = new Modify(\Container::$dbConnection, 'users');
-            $modify->fill($user->toArray());
-            $modify->save();
+            $pdm = new PersistentDataManager();
+            $pdm->saveToDb($user);
         } catch (\Exception $e) {
             $output->writeln('<error>Adding user failed!</error>');
             $output->writeln('');

src/Cli/LinkViewCommand.php

@@ -0,0 +1,69 @@
+<?php namespace MapGuesser\Cli;
+
+use FilesystemIterator;
+use MapGuesser\View\Linker;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class LinkViewCommand extends Command
+{
+    public function configure()
+    {
+        $this->setName('view:link')
+            ->setDescription('Linking of views.')
+            ->addArgument('view', InputArgument::OPTIONAL, 'View file to be linked.');
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $views = [];
+
+        $view = $input->getArgument('view');
+
+        if ($view !== null) {
+            $views[] = $view;
+        } else {
+            $folder = ROOT . '/views';
+            $folderLength = strlen($folder) + 1;
+
+            $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($folder, FilesystemIterator::SKIP_DOTS), RecursiveIteratorIterator::SELF_FIRST);
+
+            foreach ($iterator as $file) {
+                if ($file->isDir() || $file->getExtension() !== 'php') {
+                    continue;
+                }
+
+                $view = substr($file->getPath(), $folderLength) . '/' . $file->getBasename('.php');
+
+                if (strpos($view, 'templates') === 0) {
+                    continue;
+                }
+
+                $views[] = $view;
+            }
+        }
+
+        try {
+            foreach ($views as $view) {
+                $generator = new Linker($view);
+                $generator->generate();
+            }
+        } catch (\Exception $e) {
+            $output->writeln('<error>Linking view(s) failed!</error>');
+            $output->writeln('');
+
+            $output->writeln((string) $e);
+            $output->writeln('');
+
+            return 1;
+        }
+
+        $output->writeln('<info>View(s) successfully linked!</info>');
+
+        return 0;
+    }
+}

src/Controller/GameController.php

@@ -1,7 +1,6 @@
 <?php namespace MapGuesser\Controller;
 
 use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Util\Geo\Bounds;
 use MapGuesser\Response\HtmlContent;
 use MapGuesser\Response\JsonContent;
 use MapGuesser\Interfaces\Response\IContent;
@@ -37,18 +36,16 @@ class GameController
     {
         $map = $this->mapRepository->getById($mapId);
 
-        $bounds = Bounds::createDirectly($map['bound_south_lat'], $map['bound_west_lng'], $map['bound_north_lat'], $map['bound_east_lng']);
-
         $session = $this->request->session();
 
         if (!($state = $session->get('state')) || $state['mapId'] !== $mapId) {
             $session->set('state', [
                 'mapId' => $mapId,
-                'area' => $map['area'],
+                'area' => $map->getArea(),
                 'rounds' => []
             ]);
         }
 
-        return ['mapId' => $mapId, 'mapName' => $map['name'], 'bounds' => $bounds->toArray()];
+        return ['mapId' => $mapId, 'mapName' => $map->getName(), 'bounds' => $map->getBounds()->toArray()];
     }
 }

src/Controller/GameFlowController.php

@@ -4,6 +4,7 @@ use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Util\Geo\Position;
 use MapGuesser\Response\JsonContent;
 use MapGuesser\Interfaces\Response\IContent;
+use MapGuesser\PersistentData\Model\Place;
 use MapGuesser\Repository\PlaceRepository;
 
 class GameFlowController
@@ -33,11 +34,14 @@ class GameFlowController
         }
 
         if (count($state['rounds']) === 0) {
-            $place = $this->placeRepository->getForMapWithValidPano($mapId);
-            $state['rounds'][] = $place;
+            $placesWithoutPano = [];
+            $place = $this->placeRepository->getRandomForMapWithValidPano($mapId, [], $placesWithoutPano);
+
+            $this->addNewRoundToState($state, $place, $placesWithoutPano);
+
             $session->set('state', $state);
 
-            $data = ['panoId' => $place['panoId']];
+            $data = ['panoId' => $place->getPanoIdCached()];
         } else {
             $rounds = count($state['rounds']);
             $last = $state['rounds'][$rounds - 1];
@@ -93,18 +97,20 @@ class GameFlowController
                 $exclude = array_merge($exclude, $round['placesWithoutPano'], [$round['placeId']]);
             }
 
-            $place = $this->placeRepository->getForMapWithValidPano($mapId, $exclude);
-            $state['rounds'][] = $place;
-            $session->set('state', $state);
+            $placesWithoutPano = [];
+            $place = $this->placeRepository->getRandomForMapWithValidPano($mapId, $exclude, $placesWithoutPano);
 
-            $panoId = $place['panoId'];
+            $this->addNewRoundToState($state, $place, $placesWithoutPano);
+
+            $panoId = $place->getPanoIdCached();
         } else {
             $state['rounds'] = [];
-            $session->set('state', $state);
 
             $panoId = null;
         }
 
+        $session->set('state', $state);
+
         $data = [
             'result' => [
                 'position' => $position->toArray(),
@@ -116,6 +122,16 @@ class GameFlowController
         return new JsonContent($data);
     }
 
+    private function addNewRoundToState(&$state, Place $place, array $placesWithoutPano): void
+    {
+        $state['rounds'][] = [
+            'placesWithoutPano' => $placesWithoutPano,
+            'placeId' => $place->getId(),
+            'position' => $place->getPosition(),
+            'panoId' => $place->getPanoIdCached()
+        ];
+    }
+
     private function calculateDistance(Position $realPosition, Position $guessPosition): float
     {
         return $realPosition->calculateDistanceTo($guessPosition);

src/Controller/HomeController.php

@@ -1,12 +1,30 @@
 <?php namespace MapGuesser\Controller;
 
+use MapGuesser\Interfaces\Request\IRequest;
+use MapGuesser\Interfaces\Response\IContent;
 use MapGuesser\Interfaces\Response\IRedirect;
+use MapGuesser\Response\JsonContent;
 use MapGuesser\Response\Redirect;
 
 class HomeController
 {
+    private IRequest $request;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+    }
+
     public function getIndex(): IRedirect
     {
-        return new Redirect([\Container::$routeCollection->getRoute('maps'), []], IRedirect::TEMPORARY);
+        return new Redirect(\Container::$routeCollection->getRoute('maps')->generateLink(), IRedirect::TEMPORARY);
+    }
+
+    public function startSession(): IContent
+    {
+        // session starts with the request, this method just sends valid data to the client
+
+        $data = ['antiCsrfToken' => $this->request->session()->get('anti_csrf_token')];
+        return new JsonContent($data);
     }
 }

src/Controller/LoginController.php

@@ -1,78 +1,396 @@
 <?php namespace MapGuesser\Controller;
 
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
+use MapGuesser\Http\Request;
 use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Interfaces\Response\IContent;
 use MapGuesser\Interfaces\Response\IRedirect;
-use MapGuesser\Model\User;
+use MapGuesser\Mailing\Mail;
+use MapGuesser\OAuth\GoogleOAuth;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\PersistentData\Model\UserConfirmation;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\Repository\UserConfirmationRepository;
+use MapGuesser\Repository\UserRepository;
 use MapGuesser\Response\HtmlContent;
 use MapGuesser\Response\JsonContent;
 use MapGuesser\Response\Redirect;
+use MapGuesser\Util\JwtParser;
 
 class LoginController
 {
     private IRequest $request;
 
+    private PersistentDataManager $pdm;
+
+    private UserRepository $userRepository;
+
+    private UserConfirmationRepository $userConfirmationRepository;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
+        $this->pdm = new PersistentDataManager();
+        $this->userRepository = new UserRepository();
+        $this->userConfirmationRepository = new UserConfirmationRepository();
     }
 
     public function getLoginForm()
     {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
-            return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
         }
 
         $data = [];
-        return new HtmlContent('login', $data);
+        return new HtmlContent('login/login', $data);
+    }
+
+    public function getGoogleLoginRedirect(): IRedirect
+    {
+        $state = bin2hex(random_bytes(16));
+
+        $this->request->session()->set('oauth_state', $state);
+
+        $oAuth = new GoogleOAuth(new Request());
+        $url = $oAuth->getDialogUrl($state, $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink());
+
+        return new Redirect($url, IRedirect::TEMPORARY);
+    }
+
+    public function getSignupForm()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        if ($this->request->session()->has('tmp_user_data')) {
+            $tmpUserData = $this->request->session()->get('tmp_user_data');
+
+            $data = ['email' => $tmpUserData['email']];
+        } else {
+            $data = [];
+        }
+
+        return new HtmlContent('login/signup', $data);
+    }
+
+    public function getSignupSuccess(): IContent
+    {
+        $data = [];
+        return new HtmlContent('login/signup_success', $data);
+    }
+
+    public function getSignupWithGoogleForm()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        if (!$this->request->session()->has('google_user_data')) {
+            return new Redirect(\Container::$routeCollection->getRoute('login-google')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        $userData = $this->request->session()->get('google_user_data');
+
+        $user = $this->userRepository->getByEmail($userData['email']);
+
+        $data = ['found' => $user !== null, 'email' => $userData['email']];
+        return new HtmlContent('login/google_signup', $data);
     }
 
     public function login(): IContent
     {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
+        if ($this->request->user() !== null) {
             $data = ['success' => true];
             return new JsonContent($data);
         }
 
-        $select = new Select(\Container::$dbConnection, 'users');
-        $select->columns(User::getFields());
-        $select->where('email', '=', $this->request->post('email'));
+        $user = $this->userRepository->getByEmail($this->request->post('email'));
 
-        $userData = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+        if ($user === null) {
+            if (strlen($this->request->post('password')) < 6) {
+                $data = ['error' => ['errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!']];
+                return new JsonContent($data);
+            }
 
-        if ($userData === null) {
-            $data = ['error' => 'user_not_found'];
+            $tmpUser = new User();
+            $tmpUser->setPlainPassword($this->request->post('password'));
+
+            $this->request->session()->set('tmp_user_data', ['email' => $this->request->post('email'), 'password_hashed' => $tmpUser->getPassword()]);
+
+            $data = ['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('signup')->generateLink()]];
             return new JsonContent($data);
         }
 
-        $user = new User($userData);
-
         if (!$user->getActive()) {
-            $data = ['error' => 'user_not_active'];
+            $data = ['error' => ['errorText' => 'User found with the given email address, but the account is not activated. Please check your email and click on the activation link!']];
             return new JsonContent($data);
         }
 
         if (!$user->checkPassword($this->request->post('password'))) {
-            $data = ['error' => 'password_not_match'];
+            $data = ['error' => ['errorText' => 'The given password is wrong.']];
             return new JsonContent($data);
         }
 
-        $session->set('user', $user);
+        $this->request->setUser($user);
 
         $data = ['success' => true];
         return new JsonContent($data);
     }
 
+    public function loginWithGoogle()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
+            $data = [];
+            return new HtmlContent('login/google_login', $data);
+        }
+
+        $oAuth = new GoogleOAuth(new Request());
+        $tokenData = $oAuth->getToken($this->request->query('code'), $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink());
+
+        if (!isset($tokenData['id_token'])) {
+            $data = [];
+            return new HtmlContent('login/google_login', $data);
+        }
+
+        $jwtParser = new JwtParser($tokenData['id_token']);
+        $userData = $jwtParser->getPayload();
+
+        if (!$userData['email_verified']) {
+            $data = [];
+            return new HtmlContent('login/google_login', $data);
+        }
+
+        $user = $this->userRepository->getByGoogleSub($userData['sub']);
+
+        if ($user === null) {
+            $this->request->session()->set('google_user_data', $userData);
+
+            return new Redirect(\Container::$routeCollection->getRoute('signup-google')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        $this->request->setUser($user);
+
+        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+    }
+
     public function logout(): IRedirect
     {
-        $this->request->session()->delete('user');
+        $this->request->setUser(null);
 
-        return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
+        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+    }
+
+    public function signup(): IContent
+    {
+        if ($this->request->user() !== null) {
+            $data = ['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()]];
+            return new JsonContent($data);
+        }
+
+        $user = $this->userRepository->getByEmail($this->request->post('email'));
+
+        if ($user !== null) {
+            if ($user->getActive()) {
+                if (!$user->checkPassword($this->request->post('password'))) {
+                    $data = ['error' => ['errorText' => 'There is a user already registered with the given email address, but the given password is wrong.']];
+                    return new JsonContent($data);
+                }
+
+                $this->request->setUser($user);
+
+                $data = ['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('index')->generateLink()]];
+            } else {
+                $data = ['error' => ['errorText' => 'There is a user already registered with the given email address. Please check your email and click on the activation link!']];
+            }
+            return new JsonContent($data);
+        }
+
+        if (filter_var($this->request->post('email'), FILTER_VALIDATE_EMAIL) === false) {
+            $data = ['error' => ['errorText' => 'The given email address is not valid.']];
+            return new JsonContent($data);
+        }
+
+        if ($this->request->session()->has('tmp_user_data')) {
+            $tmpUserData = $this->request->session()->get('tmp_user_data');
+
+            $tmpUser = new User();
+            $tmpUser->setPassword($tmpUserData['password_hashed']);
+
+            if (!$tmpUser->checkPassword($this->request->post('password'))) {
+                $data = ['error' => ['errorText' => 'The given passwords do not match.']];
+                return new JsonContent($data);
+            }
+        } else {
+            if (strlen($this->request->post('password')) < 6) {
+                $data = ['error' => ['errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!']];
+                return new JsonContent($data);
+            }
+
+            if ($this->request->post('password') !== $this->request->post('password_confirm')) {
+                $data = ['error' => ['errorText' => 'The given passwords do not match.']];
+                return new JsonContent($data);
+            }
+        }
+
+        $user = new User();
+        $user->setEmail($this->request->post('email'));
+        $user->setPlainPassword($this->request->post('password'));
+
+        \Container::$dbConnection->startTransaction();
+
+        $this->pdm->saveToDb($user);
+
+        $token = hash('sha256', serialize($user) . random_bytes(10) . microtime());
+
+        $confirmation = new UserConfirmation();
+        $confirmation->setUser($user);
+        $confirmation->setToken($token);
+
+        $this->pdm->saveToDb($confirmation);
+
+        \Container::$dbConnection->commit();
+
+        $this->sendConfirmationEmail($user->getEmail(), $token);
+
+        $this->request->session()->delete('tmp_user_data');
+
+        $data = ['success' => true];
+        return new JsonContent($data);
+    }
+
+    public function signupWithGoogle(): IContent
+    {
+        if ($this->request->user() !== null) {
+            $data = ['success' => true];
+            return new JsonContent($data);
+        }
+
+        $userData = $this->request->session()->get('google_user_data');
+
+        $user = $this->userRepository->getByEmail($userData['email']);
+
+        if ($user === null) {
+            $sendWelcomeEmail = true;
+
+            $user = new User();
+            $user->setEmail($userData['email']);
+        } else {
+            $sendWelcomeEmail = false;
+        }
+
+        $user->setActive(true);
+        $user->setGoogleSub($userData['sub']);
+
+        $this->pdm->saveToDb($user);
+
+        if ($sendWelcomeEmail) {
+            $this->sendWelcomeEmail($user->getEmail());
+        }
+
+        $this->request->session()->delete('google_user_data');
+        $this->request->setUser($user);
+
+        $data = ['success' => true];
+        return new JsonContent($data);
+    }
+
+    public function resetSignup(): IContent
+    {
+        $this->request->session()->delete('tmp_user_data');
+
+        $data = ['success' => true];
+        return new JsonContent($data);
+    }
+
+    public function resetGoogleSignup(): IContent
+    {
+        $this->request->session()->delete('google_user_data');
+
+        $data = ['success' => true];
+        return new JsonContent($data);
+    }
+
+    public function activate()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        $confirmation = $this->userConfirmationRepository->getByToken($this->request->query('token'));
+
+        if ($confirmation === null) {
+            $data = [];
+            return new HtmlContent('login/activate', $data);
+        }
+
+        \Container::$dbConnection->startTransaction();
+
+        $this->pdm->deleteFromDb($confirmation);
+
+        $user = $this->userRepository->getById($confirmation->getUserId());
+        $user->setActive(true);
+
+        $this->pdm->saveToDb($user);
+
+        \Container::$dbConnection->commit();
+
+        $this->request->setUser($user);
+
+        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+    }
+
+    public function cancel()
+    {
+        if ($this->request->user() !== null) {
+            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        }
+
+        $confirmation = $this->userConfirmationRepository->getByToken($this->request->query('token'));
+
+        if ($confirmation === null) {
+            $data = ['success' => false];
+            return new HtmlContent('login/cancel', $data);
+        }
+
+        \Container::$dbConnection->startTransaction();
+
+        $this->pdm->deleteFromDb($confirmation);
+
+        $user = $this->userRepository->getById($confirmation->getUserId());
+
+        $this->pdm->deleteFromDb($user);
+
+        \Container::$dbConnection->commit();
+
+        $data = ['success' => true];
+        return new HtmlContent('login/cancel', $data);
+    }
+
+    private function sendConfirmationEmail(string $email, string $token): void
+    {
+        $mail = new Mail();
+        $mail->addRecipient($email);
+        $mail->setSubject('Welcome to ' . $_ENV['APP_NAME'] . ' - Activate your account');
+        $mail->setBodyFromTemplate('signup', [
+            'EMAIL' => $email,
+            'ACTIVATE_LINK' => $this->request->getBase() . '/'. \Container::$routeCollection->getRoute('signup.activate')->generateLink(['token' => $token]),
+            'CANCEL_LINK' => $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('signup.cancel')->generateLink(['token' => $token]),
+        ]);
+        $mail->send();
+    }
+
+    private function sendWelcomeEmail(string $email): void
+    {
+        $mail = new Mail();
+        $mail->addRecipient($email);
+        $mail->setSubject('Welcome to ' . $_ENV['APP_NAME']);
+        $mail->setBodyFromTemplate('signup-noconfirm', [
+            'EMAIL' => $email,
+        ]);
+        $mail->send();
     }
 }

src/Controller/MapAdminController.php

@@ -1,13 +1,15 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Database\Query\Modify;
 use MapGuesser\Database\Query\Select;
 use MapGuesser\Interfaces\Authentication\IUser;
 use MapGuesser\Interfaces\Authorization\ISecured;
 use MapGuesser\Interfaces\Database\IResultSet;
 use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Interfaces\Response\IContent;
+use MapGuesser\PersistentData\Model\Map;
+use MapGuesser\PersistentData\Model\Place;
+use MapGuesser\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\MapRepository;
 use MapGuesser\Repository\PlaceRepository;
 use MapGuesser\Response\HtmlContent;
@@ -21,6 +23,8 @@ class MapAdminController implements ISecured
 
     private IRequest $request;
 
+    private PersistentDataManager $pdm;
+
     private MapRepository $mapRepository;
 
     private PlaceRepository $placeRepository;
@@ -28,6 +32,7 @@ class MapAdminController implements ISecured
     public function __construct(IRequest $request)
     {
         $this->request = $request;
+        $this->pdm = new PersistentDataManager();
         $this->mapRepository = new MapRepository();
         $this->placeRepository = new PlaceRepository();
     }
@@ -45,18 +50,14 @@ class MapAdminController implements ISecured
 
         if ($mapId) {
             $map = $this->mapRepository->getById($mapId);
-            $bounds = Bounds::createDirectly($map['bound_south_lat'], $map['bound_west_lng'], $map['bound_north_lat'], $map['bound_east_lng']);
-            $places = $this->getPlaces($mapId);
+            $places = $this->getPlaces($map);
         } else {
-            $map = [
-                'name' => self::$unnamedMapName,
-                'description' => ''
-            ];
-            $bounds = Bounds::createDirectly(-90.0, -180.0, 90.0, 180.0);
+            $map = new Map();
+            $map->setName(self::$unnamedMapName);
             $places = [];
         }
 
-        $data = ['mapId' => $mapId, 'mapName' => $map['name'], 'mapDescription' => str_replace('<br>', "\n", $map['description']), 'bounds' => $bounds->toArray(), 'places' => &$places];
+        $data = ['mapId' => $mapId, 'mapName' => $map->getName(), 'mapDescription' => str_replace('<br>', "\n", $map->getDescription()), 'bounds' => $map->getBounds()->toArray(), 'places' => &$places];
         return new HtmlContent('admin/map_editor', $data);
     }
 
@@ -64,9 +65,9 @@ class MapAdminController implements ISecured
     {
         $placeId = (int) $this->request->query('placeId');
 
-        $placeData = $this->placeRepository->getById($placeId);
+        $place = $this->placeRepository->getById($placeId);
 
-        $data = ['panoId' => $placeData['panoId']];
+        $data = ['panoId' => $place->getFreshPanoId()];
         return new JsonContent($data);
     }
 
@@ -76,8 +77,12 @@ class MapAdminController implements ISecured
 
         \Container::$dbConnection->startTransaction();
 
-        if (!$mapId) {
-            $mapId = $this->addNewMap();
+        if ($mapId) {
+            $map = $this->mapRepository->getById($mapId);
+        } else {
+            $map = new Map();
+            $map->setName(self::$unnamedMapName);
+            $this->pdm->saveToDb($map);
         }
 
         if (isset($_POST['added'])) {
@@ -85,11 +90,18 @@ class MapAdminController implements ISecured
             foreach ($_POST['added'] as $placeRaw) {
                 $placeRaw = json_decode($placeRaw, true);
 
-                $addedIds[] = ['tempId' => $placeRaw['id'], 'id' => $this->placeRepository->addToMap($mapId, [
-                    'lat' => (float) $placeRaw['lat'],
-                    'lng' => (float) $placeRaw['lng'],
-                    'pano_id_cached_timestamp' => $placeRaw['panoId'] === -1 ? (new DateTime('-1 day'))->format('Y-m-d H:i:s') : null
-                ])];
+                $place = new Place();
+                $place->setMap($map);
+                $place->setLat((float) $placeRaw['lat']);
+                $place->setLng((float) $placeRaw['lng']);
+
+                if ($placeRaw['panoId'] === -1) {
+                    $place->setPanoIdCachedTimestampDate(new DateTime('-1 day'));
+                }
+
+                $this->pdm->saveToDb($place);
+
+                $addedIds[] = ['tempId' => $placeRaw['id'], 'id' => $place->getId()];
             }
         } else {
             $addedIds = [];
@@ -99,10 +111,12 @@ class MapAdminController implements ISecured
             foreach ($_POST['edited'] as $placeRaw) {
                 $placeRaw = json_decode($placeRaw, true);
 
-                $this->placeRepository->modify((int) $placeRaw['id'], [
-                    'lat' => (float) $placeRaw['lat'],
-                    'lng' => (float) $placeRaw['lng']
-                ]);
+                $place = $this->placeRepository->getById((int) $placeRaw['id']);
+                $place->setLat((float) $placeRaw['lat']);
+                $place->setLng((float) $placeRaw['lng']);
+                $place->setPanoIdCachedTimestampDate(new DateTime('-1 day'));
+
+                $this->pdm->saveToDb($place);
             }
         }
 
@@ -110,45 +124,42 @@ class MapAdminController implements ISecured
             foreach ($_POST['deleted'] as $placeRaw) {
                 $placeRaw = json_decode($placeRaw, true);
 
-                $this->placeRepository->delete($placeRaw['id']);
+                $place = $this->placeRepository->getById((int) $placeRaw['id']);
+
+                $this->pdm->deleteFromDb($place);
             }
         }
 
-        $mapBounds = $this->calculateMapBounds($mapId);
+        $mapBounds = $this->calculateMapBounds($map);
 
-        $map = [
-            'bound_south_lat' => $mapBounds->getSouthLat(),
-            'bound_west_lng' => $mapBounds->getWestLng(),
-            'bound_north_lat' => $mapBounds->getNorthLat(),
-            'bound_east_lng' => $mapBounds->getEastLng(),
-            'area' => $mapBounds->calculateApproximateArea(),
-        ];
+        $map->setBounds($mapBounds);
+        $map->setArea($mapBounds->calculateApproximateArea());
 
         if (isset($_POST['name'])) {
-            $map['name'] = $_POST['name'] ? $_POST['name'] : self::$unnamedMapName;
+            $map->setName($_POST['name'] ? $_POST['name'] : self::$unnamedMapName);
         }
         if (isset($_POST['description'])) {
-            $map['description'] = str_replace(["\n", "\r\n"], '<br>', $_POST['description']);
+            $map->setDescription(str_replace(["\n", "\r\n"], '<br>', $_POST['description']));
         }
 
-        $this->saveMapData($mapId, $map);
+        $this->pdm->saveToDb($map);
 
         \Container::$dbConnection->commit();
 
-        $data = ['mapId' => $mapId, 'added' => $addedIds];
+        $data = ['mapId' => $map->getId(), 'added' => $addedIds];
         return new JsonContent($data);
     }
 
     public function deleteMap() {
         $mapId = (int) $this->request->query('mapId');
 
+        $map = $this->mapRepository->getById($mapId);
+
         \Container::$dbConnection->startTransaction();
 
-        $this->deletePlaces($mapId);
+        $this->deletePlaces($map);
 
-        $modify = new Modify(\Container::$dbConnection, 'maps');
-        $modify->setId($mapId);
-        $modify->delete();
+        $this->pdm->deleteFromDb($map);
 
         \Container::$dbConnection->commit();
 
@@ -156,26 +167,30 @@ class MapAdminController implements ISecured
         return new JsonContent($data);
     }
 
-    private function deletePlaces(int $mapId): void
+    private function deletePlaces(Map $map): void
     {
+        //TODO: relations?
         $select = new Select(\Container::$dbConnection, 'places');
-        $select->columns(['id']);
-        $select->where('map_id', '=', $mapId);
+        $select->columns(Place::getFields());
+        $select->where('map_id', '=', $map->getId());
 
         $result = $select->execute();
 
-        while ($place = $result->fetch(IResultSet::FETCH_ASSOC)) {
-            $modify = new Modify(\Container::$dbConnection, 'places');
-            $modify->setId($place['id']);
-            $modify->delete();
+        while ($placeData = $result->fetch(IResultSet::FETCH_ASSOC)) {
+            $place = new Place();
+
+            $this->pdm->fillWithData($placeData, $place);
+
+            $this->pdm->deleteFromDb($place);
         }
     }
 
-    private function calculateMapBounds(int $mapId): Bounds
+    private function calculateMapBounds(Map $map): Bounds
     {
+        //TODO: from repository or relations
         $select = new Select(\Container::$dbConnection, 'places');
         $select->columns(['lat', 'lng']);
-        $select->where('map_id', '=', $mapId);
+        $select->where('map_id', '=', $map->getId());
 
         $result = $select->execute();
 
@@ -187,35 +202,12 @@ class MapAdminController implements ISecured
         return $bounds;
     }
 
-    private function addNewMap(): int
-    {
-        $modify = new Modify(\Container::$dbConnection, 'maps');
-        $modify->fill([
-            'name' => self::$unnamedMapName,
-            'description' => '',
-            'bound_south_lat' => 0.0,
-            'bound_west_lng' => 0.0,
-            'bound_north_lat' => 0.0,
-            'bound_east_lng' => 0.0
-        ]);
-        $modify->save();
-
-        return $modify->getId();
-    }
-
-    private function saveMapData(int $mapId, array $map): void
-    {
-        $modify = new Modify(\Container::$dbConnection, 'maps');
-        $modify->setId($mapId);
-        $modify->fill($map);
-        $modify->save();
-    }
-
-    private function &getPlaces(int $mapId): array
+    private function &getPlaces(Map $map): array
     {
+        //TODO: from repository or relations
         $select = new Select(\Container::$dbConnection, 'places');
         $select->columns(['id', 'lat', 'lng', 'pano_id_cached', 'pano_id_cached_timestamp']);
-        $select->where('map_id', '=', $mapId);
+        $select->where('map_id', '=', $map->getId());
 
         $result = $select->execute();
 

src/Controller/MapsController.php

@@ -19,6 +19,7 @@ class MapsController
 
     public function getMaps(): IContent
     {
+        //TODO: from repository
         $select = new Select(\Container::$dbConnection, 'maps');
         $select->columns([
             ['maps', 'id'],

src/Controller/SignupController.php

@@ -1,192 +0,0 @@
-<?php namespace MapGuesser\Controller;
-
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
-use MapGuesser\Mailing\Mail;
-use MapGuesser\Model\User;
-use MapGuesser\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Response\Redirect;
-
-class SignupController
-{
-    private IRequest $request;
-
-    public function __construct(IRequest $request)
-    {
-        $this->request = $request;
-    }
-
-    public function getSignupForm()
-    {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
-            return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
-        }
-
-        $data = [];
-        return new HtmlContent('signup/signup', $data);
-    }
-
-    public function signup(): IContent
-    {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
-            //TODO: return with some error
-            $data = ['success' => true];
-            return new JsonContent($data);
-        }
-
-        $select = new Select(\Container::$dbConnection, 'users');
-        $select->columns(User::getFields());
-        $select->where('email', '=', $this->request->post('email'));
-
-        $userData = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
-        if ($userData !== null) {
-            $user = new User($userData);
-
-            if ($user->getActive()) {
-                $data = ['error' => 'user_found'];
-            } else {
-                $data = ['error' => 'not_active_user_found'];
-            }
-            return new JsonContent($data);
-        }
-
-        if (strlen($this->request->post('password')) < 6) {
-            $data = ['error' => 'passwords_too_short'];
-            return new JsonContent($data);
-        }
-
-        if ($this->request->post('password') !== $this->request->post('password_confirm')) {
-            $data = ['error' => 'passwords_not_match'];
-            return new JsonContent($data);
-        }
-
-        $user = new User([
-            'email' => $this->request->post('email'),
-        ]);
-
-        $user->setPlainPassword($this->request->post('password'));
-
-        \Container::$dbConnection->startTransaction();
-
-        $modify = new Modify(\Container::$dbConnection, 'users');
-        $modify->fill($user->toArray());
-        $modify->save();
-        $userId = $modify->getId();
-
-        $token = hash('sha256', serialize($user) . random_bytes(10) . microtime());
-
-        $modify = new Modify(\Container::$dbConnection, 'user_confirmations');
-        $modify->set('user_id', $userId);
-        $modify->set('token', $token);
-        $modify->save();
-
-        \Container::$dbConnection->commit();
-
-        $this->sendConfirmationEmail($user->getEmail(), $token);
-
-        $data = ['success' => true];
-        return new JsonContent($data);
-    }
-
-    public function activate()
-    {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
-            return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
-        }
-
-        $select = new Select(\Container::$dbConnection, 'user_confirmations');
-        $select->columns(['id', 'user_id']);
-        $select->where('token', '=', $this->request->query('token'));
-
-        $confirmation = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
-        if ($confirmation === null) {
-            $data = [];
-            return new HtmlContent('signup/activate', $data);
-        }
-
-        \Container::$dbConnection->startTransaction();
-
-        $modify = new Modify(\Container::$dbConnection, 'user_confirmations');
-        $modify->setId($confirmation['id']);
-        $modify->delete();
-
-        $modify = new Modify(\Container::$dbConnection, 'users');
-        $modify->setId($confirmation['user_id']);
-        $modify->set('active', true);
-        $modify->save();
-
-        \Container::$dbConnection->commit();
-
-        $select = new Select(\Container::$dbConnection, 'users');
-        $select->columns(User::getFields());
-        $select->whereId($confirmation['user_id']);
-
-        $userData = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-        $user = new User($userData);
-
-        $session->set('user', $user);
-
-        return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
-    }
-
-    public function cancel()
-    {
-        $session = $this->request->session();
-
-        if ($session->get('user')) {
-            return new Redirect([\Container::$routeCollection->getRoute('index'), []], IRedirect::TEMPORARY);
-        }
-
-        $select = new Select(\Container::$dbConnection, 'user_confirmations');
-        $select->columns(['id', 'user_id']);
-        $select->where('token', '=', $this->request->query('token'));
-
-        $confirmation = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
-        if ($confirmation === null) {
-            $data = ['success' => false];
-            return new HtmlContent('signup/cancel', $data);
-        }
-
-        \Container::$dbConnection->startTransaction();
-
-        $modify = new Modify(\Container::$dbConnection, 'user_confirmations');
-        $modify->setId($confirmation['id']);
-        $modify->delete();
-
-        $modify = new Modify(\Container::$dbConnection, 'users');
-        $modify->setId($confirmation['user_id']);
-        $modify->delete();
-
-        \Container::$dbConnection->commit();
-
-        $data = ['success' => true];
-        return new HtmlContent('signup/cancel', $data);
-    }
-
-    private function sendConfirmationEmail($email, $token): void
-    {
-        $mail = new Mail();
-        $mail->addRecipient($email);
-        $mail->setSubject('Welcome to MapGuesser - Activate your account');
-        $mail->setBodyFromTemplate('signup', [
-            'EMAIL' => $email,
-            'ACTIVATE_LINK' => $this->request->getBase() . '/signup/activate/' . $token,
-            'CANCEL_LINK' => $this->request->getBase() . '/signup/cancel/' . $token,
-        ]);
-        $mail->send();
-    }
-}

src/Controller/UserController.php

@@ -1,19 +1,36 @@
 <?php namespace MapGuesser\Controller;
 
-use MapGuesser\Database\Query\Modify;
+use DateTime;
+use MapGuesser\Database\Query\Select;
+use MapGuesser\Http\Request;
 use MapGuesser\Interfaces\Authorization\ISecured;
+use MapGuesser\Interfaces\Database\IResultSet;
 use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Interfaces\Response\IContent;
+use MapGuesser\Interfaces\Response\IRedirect;
+use MapGuesser\OAuth\GoogleOAuth;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\PersistentData\Model\UserConfirmation;
+use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Response\HtmlContent;
 use MapGuesser\Response\JsonContent;
+use MapGuesser\Response\Redirect;
+use MapGuesser\Util\JwtParser;
 
 class UserController implements ISecured
 {
     private IRequest $request;
 
+    private PersistentDataManager $pdm;
+
+    private UserConfirmationRepository $userConfirmationRepository;
+
     public function __construct(IRequest $request)
     {
         $this->request = $request;
+        $this->pdm = new PersistentDataManager();
+        $this->userConfirmationRepository = new UserConfirmationRepository();
     }
 
     public function authorize(): bool
@@ -23,42 +40,173 @@ class UserController implements ISecured
         return $user !== null;
     }
 
-    public function getProfile(): IContent
+    public function getAccount(): IContent
     {
+        /**
+         * @var User $user
+         */
         $user = $this->request->user();
 
         $data = ['user' => $user->toArray()];
-        return new HtmlContent('profile', $data);
+        return new HtmlContent('account/account', $data);
     }
 
-    public function saveProfile(): IContent
+    public function getGoogleAuthenticateRedirect(): IRedirect
     {
+        /**
+         * @var User $user
+         */
         $user = $this->request->user();
 
-        if (!$user->checkPassword($this->request->post('password'))) {
-            $data = ['error' => 'password_not_match'];
+        $state = bin2hex(random_bytes(16));
+
+        $this->request->session()->set('oauth_state', $state);
+
+        $oAuth = new GoogleOAuth(new Request());
+
+        $url = $oAuth->getDialogUrl(
+            $state,
+            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink(),
+            $user->getEmail()
+        );
+
+        return new Redirect($url, IRedirect::TEMPORARY);
+    }
+
+    public function authenticateWithGoogle(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = $this->request->user();
+
+        if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
+            $data = ['success' => false];
+            return new HtmlContent('account/google_authenticate', $data);
+        }
+
+        $oAuth = new GoogleOAuth(new Request());
+        $tokenData = $oAuth->getToken($this->request->query('code'), $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink());
+
+        if (!isset($tokenData['id_token'])) {
+            $data = ['success' => false];
+            return new HtmlContent('account/google_authenticate', $data);
+        }
+
+        $jwtParser = new JwtParser($tokenData['id_token']);
+        $userData = $jwtParser->getPayload();
+
+        if ($userData['sub'] !== $user->getGoogleSub()) {
+            $data = ['success' => false, 'errorText' => 'This Google account is not linked to your account.'];
+            return new HtmlContent('account/google_authenticate', $data);
+        }
+
+        $authenticatedWithGoogleUntil = new DateTime('+45 seconds');
+        $this->request->session()->set('authenticated_with_google_until', $authenticatedWithGoogleUntil);
+
+        $data = ['success' => true, 'authenticatedWithGoogleUntil' => $authenticatedWithGoogleUntil];
+        return new HtmlContent('account/google_authenticate', $data);
+    }
+
+    public function getDeleteAccount(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = $this->request->user();
+
+        $data = ['user' => $user->toArray()];
+        return new HtmlContent('account/delete', $data);
+    }
+
+    public function saveAccount(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = $this->request->user();
+
+        if (!$this->confirmUserIdentity(
+            $user,
+            $this->request->session()->get('authenticated_with_google_until'),
+            $this->request->post('password'),
+            $error
+        )) {
+            $data = ['error' => ['errorText' => $error]];
             return new JsonContent($data);
         }
 
         if (strlen($this->request->post('password_new')) > 0) {
             if (strlen($this->request->post('password_new')) < 6) {
-                $data = ['error' => 'passwords_too_short'];
+                $data = ['error' => ['errorText' => 'The given new password is too short. Please choose a password that is at least 6 characters long!']];
                 return new JsonContent($data);
             }
 
             if ($this->request->post('password_new') !== $this->request->post('password_new_confirm')) {
-                $data = ['error' => 'passwords_not_match'];
+                $data = ['error' => ['errorText' => 'The given new passwords do not match.']];
                 return new JsonContent($data);
             }
 
             $user->setPlainPassword($this->request->post('password_new'));
         }
 
-        $modify = new Modify(\Container::$dbConnection, 'users');
-        $modify->fill($user->toArray());
-        $modify->save();
+        $this->pdm->saveToDb($user);
+
+        $this->request->session()->delete('authenticated_with_google_until');
 
         $data = ['success' => true];
         return new JsonContent($data);
     }
+
+    public function deleteAccount(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = $this->request->user();
+
+        if (!$this->confirmUserIdentity(
+            $user,
+            $this->request->session()->get('authenticated_with_google_until'),
+            $this->request->post('password'),
+            $error
+        )) {
+            $data = ['error' => ['errorText' => $error]];
+            return new JsonContent($data);
+        }
+
+        \Container::$dbConnection->startTransaction();
+
+        foreach ($this->userConfirmationRepository->getByUser($user) as $userConfirmation) {
+            $this->pdm->deleteFromDb($userConfirmation);
+        }
+
+        $this->pdm->deleteFromDb($user);
+
+        \Container::$dbConnection->commit();
+
+        $this->request->session()->delete('authenticated_with_google_until');
+
+        $data = ['success' => true];
+        return new JsonContent($data);
+    }
+
+    private function confirmUserIdentity(User $user, ?DateTime $authenticatedWithGoogleUntil, ?string $password, &$error): bool
+    {
+        if ($authenticatedWithGoogleUntil !== null && $authenticatedWithGoogleUntil > new DateTime()) {
+            return true;
+        }
+
+        if ($password !== null) {
+            if ($user->checkPassword($password)) {
+                return true;
+            }
+
+            $error = 'The given current password is wrong.';
+            return false;
+        }
+
+        $error = 'Could not confirm your identity. Please try again!';
+        return false;
+    }
 }

src/Database/Query/Modify.php

@@ -1,7 +1,6 @@
 <?php namespace MapGuesser\Database\Query;
 
 use MapGuesser\Interfaces\Database\IConnection;
-use MapGuesser\Interfaces\Database\IResultSet;
 use MapGuesser\Database\Utils;
 
 class Modify
@@ -14,8 +13,6 @@ class Modify
 
     private array $attributes = [];
 
-    private array $original = [];
-
     private ?string $externalId = null;
 
     private bool $autoIncrement = true;
@@ -116,48 +113,15 @@ class Modify
 
     private function update(): void
     {
-        /*$diff = $this->generateDiff();
+        $attributes = $this->attributes;
+        unset($attributes[$this->idName]);
 
-        if (count($diff) === 0) {
-            return;
-        }*/
-
-        $diff = $this->attributes;
-        unset($diff[$this->idName]);
-
-        $set = $this->generateColumnsWithBinding(array_keys($diff));
+        $set = $this->generateColumnsWithBinding(array_keys($attributes));
 
         $query = 'UPDATE ' . Utils::backtick($this->table) . ' SET ' . $set . ' WHERE ' . Utils::backtick($this->idName) . '=?';
 
         $stmt = $this->connection->prepare($query);
-        $stmt->execute(array_merge($diff, [$this->idName => $this->attributes[$this->idName]]));
-    }
-
-    private function readFromDB(array $columns): void
-    {
-        $select = (new Select($this->connection, $this->table))
-            ->setIdName($this->idName)
-            ->whereId($this->attributes[$this->idName])
-            ->columns($columns);
-
-        $this->original = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-    }
-
-    private function generateDiff(): array
-    {
-        $this->readFromDB(array_keys($this->attributes));
-
-        $diff = [];
-
-        foreach ($this->attributes as $name => $value) {
-            $original = $this->original[$name];
-
-            if ($original != $value) {
-                $diff[$name] = $value;
-            }
-        }
-
-        return $diff;
+        $stmt->execute(array_merge($attributes, [$this->idName => $this->attributes[$this->idName]]));
     }
 
     public static function generateColumnsWithBinding(array $columns): string

src/Database/Query/Select.php

@@ -32,10 +32,13 @@ class Select
 
     private array $limit;
 
-    public function __construct(IConnection $connection, string $table)
+    public function __construct(IConnection $connection, ?string $table = null)
     {
         $this->connection = $connection;
-        $this->table = $table;
+
+        if ($table !== null) {
+            $this->table = $table;
+        }
     }
 
     public function setIdName(string $idName): Select
@@ -52,6 +55,13 @@ class Select
         return $this;
     }
 
+    public function from(string $table): Select
+    {
+        $this->table = $table;
+
+        return $this;
+    }
+
     public function columns(array $columns): Select
     {
         $this->columns = array_merge($this->columns, $columns);

src/Http/Request.php

@@ -1,11 +1,10 @@
 <?php namespace MapGuesser\Http;
 
-class Request
+use MapGuesser\Interfaces\Http\IRequest;
+use MapGuesser\Interfaces\Http\IResponse;
+
+class Request implements IRequest
 {
-    const HTTP_GET = 0;
-
-    const HTTP_POST = 1;
-
     private string $url;
 
     private int $method;
@@ -14,12 +13,22 @@ class Request
 
     private array $headers = [];
 
-    public function __construct(string $url, int $method = self::HTTP_GET)
+    public function __construct(string $url = '', int $method = self::HTTP_GET)
     {
         $this->url = $url;
         $this->method = $method;
     }
 
+    public function setUrl(string $url): void
+    {
+        $this->url = $url;
+    }
+
+    public function setMethod(int $method): void
+    {
+        $this->method = $method;
+    }
+
     public function setQuery($query)
     {
         if (is_string($query)) {
@@ -34,7 +43,7 @@ class Request
         $this->headers = array_merge($this->headers, $headers);
     }
 
-    public function send(): Response
+    public function send(): IResponse
     {
         $ch = curl_init();
 

src/Http/Response.php

@@ -1,6 +1,8 @@
 <?php namespace MapGuesser\Http;
 
-class Response
+use MapGuesser\Interfaces\Http\IResponse;
+
+class Response implements IResponse
 {
     private string $body;
 

src/Interfaces/Authentication/IUser.php

@@ -8,5 +8,9 @@ interface IUser
 
     public function hasPermission(int $permission): bool;
 
+    public function getUniqueId();
+
     public function getDisplayName(): string;
+
+    public function checkPassword(string $password): bool;
 }

src/Interfaces/Http/IRequest.php

@@ -0,0 +1,18 @@
+<?php namespace MapGuesser\Interfaces\Http;
+
+interface IRequest
+{
+    const HTTP_GET = 0;
+
+    const HTTP_POST = 1;
+
+    public function setUrl(string $url): void;
+
+    public function setMethod(int $method): void;
+
+    public function setQuery($query);
+
+    public function setHeaders(array $headers);
+
+    public function send(): IResponse;
+}

src/Interfaces/Http/IResponse.php

@@ -0,0 +1,8 @@
+<?php namespace MapGuesser\Interfaces\Http;
+
+interface IResponse
+{
+    public function getBody();
+
+    public function getHeaders();
+}

src/Interfaces/Request/IRequest.php

@@ -14,5 +14,7 @@ interface IRequest
 
     public function session(): ISession;
 
+    public function setUser(?IUser $user): void;
+
     public function user(): ?IUser;
 }

src/Interfaces/Response/IContent.php

@@ -4,7 +4,7 @@ interface IContent
 {
     public function &getData(): array;
 
-    public function &render(): string;
+    public function render(): void;
 
     public function getContentType(): string;
 }

src/Mailing/Mail.php

@@ -29,6 +29,13 @@ class Mail
     {
         $this->body = file_get_contents(ROOT . '/mail/' . $template . '.html');
 
+        $baseParameters = [
+            'APP_NAME' => $_ENV['APP_NAME'],
+            'BASE_URL' => \Container::$request->getBase(),
+        ];
+
+        $params = array_merge($baseParameters, $params);
+
         foreach ($params as $key => $param) {
             $this->body = str_replace('{{' . $key . '}}', $param, $this->body);
         }
@@ -58,8 +65,8 @@ class Mail
             $mailer->Mailer = 'mail';
         }
 
-        $mailer->setFrom($_ENV['MAIL_FROM'], 'MapGuesser');
-        $mailer->addReplyTo($_ENV['MAIL_FROM'], 'MapGuesser');
+        $mailer->setFrom($_ENV['MAIL_FROM'], $_ENV['APP_NAME']);
+        $mailer->addReplyTo($_ENV['MAIL_FROM'], $_ENV['APP_NAME']);
 
         $mailer->Sender = !empty($_ENV['MAIL_BOUNCE']) ? $_ENV['MAIL_BOUNCE'] : $_ENV['MAIL_FROM'];
         $mailer->Subject = $this->subject;

src/Model/BaseModel.php

@@ -1,49 +0,0 @@
-<?php namespace MapGuesser\Model;
-
-abstract class BaseModel
-{
-    protected static array $fields;
-
-    protected $id = null;
-
-    public static function getFields(): array
-    {
-        return array_merge(['id'], static::$fields);
-    }
-
-    public function __construct(array $data)
-    {
-        foreach ($data as $key => $value) {
-            $method = 'set' . str_replace('_', '', ucwords($key, '_'));
-
-            if (method_exists($this, $method)) {
-                $this->$method($value);
-            }
-        }
-    }
-
-    public function setId($id): void
-    {
-        $this->id = $id;
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    function toArray(): array
-    {
-        $array = [];
-
-        foreach (self::getFields() as $key) {
-            $method = 'get' . str_replace('_', '', ucwords($key, '_'));
-
-            if (method_exists($this, $method)) {
-                $array[$key] = $this->$method();
-            }
-        }
-
-        return $array;
-    }
-}

src/OAuth/GoogleOAuth.php

@@ -0,0 +1,53 @@
+<?php namespace MapGuesser\OAuth;
+
+use MapGuesser\Interfaces\Http\IRequest;
+
+class GoogleOAuth
+{
+    private static $dialogUrlBase = 'https://accounts.google.com/o/oauth2/v2/auth';
+
+    private static $tokenUrlBase = 'https://oauth2.googleapis.com/token';
+
+    private IRequest $request;
+
+    public function __construct(IRequest $request)
+    {
+        $this->request = $request;
+    }
+
+    public function getDialogUrl(string $state, string $redirectUrl, ?string $loginHint = null): string
+    {
+        $oauthParams = [
+            'response_type' => 'code',
+            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
+            'scope' => 'openid email',
+            'redirect_uri' => $redirectUrl,
+            'state' => $state,
+            'nonce' => hash('sha256', random_bytes(10) . microtime()),
+        ];
+
+        if ($loginHint !== null) {
+            $oauthParams['login_hint'] = $loginHint;
+        }
+
+        return self::$dialogUrlBase . '?' . http_build_query($oauthParams);
+    }
+
+    public function getToken(string $code, string $redirectUrl)
+    {
+        $tokenParams = [
+            'code' => $code,
+            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
+            'client_secret' => $_ENV['GOOGLE_OAUTH_CLIENT_SECRET'],
+            'redirect_uri' => $redirectUrl,
+            'grant_type' => 'authorization_code',
+        ];
+
+        $this->request->setUrl(self::$tokenUrlBase);
+        $this->request->setMethod(IRequest::HTTP_POST);
+        $this->request->setQuery($tokenParams);
+        $response = $this->request->send();
+
+        return json_decode($response->getBody(), true);
+    }
+}

src/PersistentData/Model/Map.php

@@ -0,0 +1,103 @@
+<?php namespace MapGuesser\PersistentData\Model;
+
+use MapGuesser\Util\Geo\Bounds;
+
+class Map extends Model
+{
+    protected static string $table = 'maps';
+
+    protected static array $fields = ['name', 'description', 'bound_south_lat', 'bound_west_lng', 'bound_north_lat', 'bound_east_lng', 'area'];
+
+    private string $name = '';
+
+    private string $description = '';
+
+    private Bounds $bounds;
+
+    private float $area = 0.0;
+
+    public function __construct()
+    {
+        $this->bounds = Bounds::createDirectly(-90.0, -180.0, 90.0, 180.0);
+    }
+
+    public function setName(string $name): void
+    {
+        $this->name = $name;
+    }
+
+    public function setDescription(string $description): void
+    {
+        $this->description = $description;
+    }
+
+    public function setBounds(Bounds $bounds): void
+    {
+        $this->bounds = $bounds;
+    }
+
+    public function setBoundSouthLat(float $bound_south_lat): void
+    {
+        $this->bounds->setSouthLat($bound_south_lat);
+    }
+
+    public function setBoundWestLng(float $bound_west_lng): void
+    {
+        $this->bounds->setWestLng($bound_west_lng);
+    }
+
+    public function setBoundNorthLat(float $bound_north_lat): void
+    {
+        $this->bounds->setNorthLat($bound_north_lat);
+    }
+
+    public function setBoundEastLng(float $bound_east_lng): void
+    {
+        $this->bounds->setEastLng($bound_east_lng);
+    }
+
+    public function setArea(float $area): void
+    {
+        $this->area = $area;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    public function getBounds(): Bounds
+    {
+        return $this->bounds;
+    }
+
+    public function getBoundSouthLat(): float
+    {
+        return $this->bounds->getSouthLat();
+    }
+
+    public function getBoundWestLng(): float
+    {
+        return $this->bounds->getWestLng();
+    }
+
+    public function getBoundNorthLat(): float
+    {
+        return $this->bounds->getNorthLat();
+    }
+
+    public function getBoundEastLng(): float
+    {
+        return $this->bounds->getEastLng();
+    }
+
+    public function getArea(): float
+    {
+        return $this->area;
+    }
+}

src/PersistentData/Model/Model.php

@@ -0,0 +1,69 @@
+<?php namespace MapGuesser\PersistentData\Model;
+
+abstract class Model
+{
+    protected static string $table;
+
+    protected static array $fields;
+
+    protected static array $relations = [];
+
+    protected $id = null;
+
+    private array $snapshot = [];
+
+    public static function getTable(): string
+    {
+        return static::$table;
+    }
+
+    public static function getFields(): array
+    {
+        return array_merge(['id'], static::$fields);
+    }
+
+    public static function getRelations(): array
+    {
+        return static::$relations;
+    }
+
+    public function setId($id): void
+    {
+        $this->id = $id;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function toArray(): array
+    {
+        $array = [];
+
+        foreach (self::getFields() as $key) {
+            $method = 'get' . str_replace('_', '', ucwords($key, '_'));
+
+            if (method_exists($this, $method)) {
+                $array[$key] = $this->$method();
+            }
+        }
+
+        return $array;
+    }
+
+    public function saveSnapshot(): void
+    {
+        $this->snapshot = $this->toArray();
+    }
+
+    public function resetSnapshot(): void
+    {
+        $this->snapshot = [];
+    }
+
+    public function getSnapshot(): array
+    {
+        return $this->snapshot;
+    }
+}

src/PersistentData/Model/Place.php

@@ -0,0 +1,150 @@
+<?php namespace MapGuesser\PersistentData\Model;
+
+use DateInterval;
+use DateTime;
+use MapGuesser\Http\Request;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\Util\Geo\Position;
+
+class Place extends Model
+{
+    protected static string $table = 'places';
+
+    protected static array $fields = ['map_id', 'lat', 'lng', 'pano_id_cached', 'pano_id_cached_timestamp'];
+
+    protected static array $relations = ['map' => Map::class];
+
+    private ?Map $map = null;
+
+    private ?int $mapId = null;
+
+    private Position $position;
+
+    private ?string $panoIdCached = null;
+
+    private ?DateTime $panoIdCachedTimestamp = null;
+
+    public function __construct()
+    {
+        $this->position = new Position(0.0, 0.0);
+    }
+
+    public function setMap(Map $map): void
+    {
+        $this->map = $map;
+    }
+
+    public function setMapId(int $mapId): void
+    {
+        $this->mapId = $mapId;
+    }
+
+    public function setPosition(Position $position): void
+    {
+        $this->position = $position;
+    }
+
+    public function setLat(float $lat): void
+    {
+        $this->position->setLat($lat);
+    }
+
+    public function setLng(float $lng): void
+    {
+        $this->position->setLng($lng);
+    }
+
+    public function setPanoIdCached(?string $panoIdCached): void
+    {
+        $this->panoIdCached = $panoIdCached;
+    }
+
+    public function setPanoIdCachedTimestampDate(?DateTime $panoIdCachedTimestamp): void
+    {
+        $this->panoIdCachedTimestamp = $panoIdCachedTimestamp;
+    }
+
+    public function setPanoIdCachedTimestamp(?string $panoIdCachedTimestamp): void
+    {
+        if ($panoIdCachedTimestamp !== null) {
+            $this->panoIdCachedTimestamp = new DateTime($panoIdCachedTimestamp);
+        }
+    }
+
+    public function getMap(): ?Map
+    {
+        return $this->map;
+    }
+
+    public function getMapId(): ?int
+    {
+        return $this->mapId;
+    }
+
+    public function getPosition(): Position
+    {
+        return $this->position;
+    }
+
+    public function getLat(): float
+    {
+        return $this->position->getLat();
+    }
+
+    public function getLng(): float
+    {
+        return $this->position->getLng();
+    }
+
+    public function getFreshPanoId(bool $canBeIndoor = false): ?string
+    {
+        if (
+            $this->panoIdCachedTimestamp !== null &&
+            (clone $this->panoIdCachedTimestamp)->add(new DateInterval('P1D')) > new DateTime()
+        ) {
+            return $this->panoIdCached;
+        }
+
+        $request = new Request('https://maps.googleapis.com/maps/api/streetview/metadata', Request::HTTP_GET);
+        $request->setQuery([
+            'key' => $_ENV['GOOGLE_MAPS_SERVER_API_KEY'],
+            'location' => $this->position->getLat() . ',' . $this->position->getLng(),
+            'source' => $canBeIndoor ? 'default' : 'outdoor'
+        ]);
+
+        $response = $request->send();
+        $panoData = json_decode($response->getBody(), true);
+        $panoId = $panoData['status'] === 'OK' ? $panoData['pano_id'] : null;
+
+        // enable indoor panos if no outdoor found
+        if ($panoId === null && !$canBeIndoor) {
+            return $this->getFreshPanoId(true);
+        }
+
+        $this->panoIdCached = $panoId;
+        $this->panoIdCachedTimestamp = new DateTime('now');
+
+        (new PersistentDataManager())->saveToDb($this);
+
+        return $panoId;
+    }
+
+    public function getPanoIdCached(): ?string
+    {
+        return $this->panoIdCached;
+    }
+
+    public function getPanoIdCachedTimestampDate(): ?DateTime
+    {
+        return $this->panoIdCachedTimestamp;
+    }
+
+    public function getPanoIdCachedTimestamp(): ?string
+    {
+        if ($this->panoIdCachedTimestamp === null) {
+            return null;
+        }
+
+        return $this->panoIdCachedTimestamp->format('Y-m-d H:i:s');
+    }
+}

src/PersistentData/Model/User.php

@@ -1,27 +1,31 @@
-<?php namespace MapGuesser\Model;
+<?php namespace MapGuesser\PersistentData\Model;
 
 use MapGuesser\Interfaces\Authentication\IUser;
 
-class User extends BaseModel implements IUser
+class User extends Model implements IUser
 {
+    protected static string $table = 'users';
+
+    protected static array $fields = ['email', 'password', 'type', 'active', 'google_sub'];
+
     private static array $types = ['user', 'admin'];
 
-    protected static array $fields = ['email', 'password', 'type', 'active'];
+    private string $email = '';
 
-    private string $email;
-
-    private string $password;
+    private ?string $password = null;
 
     private string $type = 'user';
 
     private bool $active = false;
 
+    private ?string $googleSub = null;
+
     public function setEmail(string $email): void
     {
         $this->email = $email;
     }
 
-    public function setPassword(string $hashedPassword): void
+    public function setPassword(?string $hashedPassword): void
     {
         $this->password = $hashedPassword;
     }
@@ -43,12 +47,17 @@ class User extends BaseModel implements IUser
         $this->active = (bool) $active;
     }
 
+    public function setGoogleSub(?string $googleSub): void
+    {
+        $this->googleSub = $googleSub;
+    }
+
     public function getEmail(): string
     {
         return $this->email;
     }
 
-    public function getPassword(): string
+    public function getPassword(): ?string
     {
         return $this->password;
     }
@@ -63,6 +72,11 @@ class User extends BaseModel implements IUser
         return $this->active;
     }
 
+    public function getGoogleSub(): ?string
+    {
+        return $this->googleSub;
+    }
+
     public function hasPermission(int $permission): bool
     {
         switch ($permission) {
@@ -75,6 +89,11 @@ class User extends BaseModel implements IUser
         }
     }
 
+    public function getUniqueId()
+    {
+        return $this->id;
+    }
+
     public function getDisplayName(): string
     {
         return $this->email;

src/PersistentData/Model/UserConfirmation.php

@@ -0,0 +1,46 @@
+<?php namespace MapGuesser\PersistentData\Model;
+
+class UserConfirmation extends Model
+{
+    protected static string $table = 'user_confirmations';
+
+    protected static array $fields = ['user_id', 'token'];
+
+    protected static array $relations = ['user' => User::class];
+
+    private ?User $user = null;
+
+    private ?int $userId = null;
+
+    private string $token = '';
+
+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+    }
+
+    public function setUserId(int $userId): void
+    {
+        $this->userId = $userId;
+    }
+
+    public function setToken(string $token): void
+    {
+        $this->token = $token;
+    }
+
+    public function getUser(): ?User
+    {
+        return $this->user;
+    }
+
+    public function getUserId(): ?int
+    {
+        return $this->userId;
+    }
+
+    public function getToken(): string
+    {
+        return $this->token;
+    }
+}

src/PersistentData/PersistentDataManager.php

@@ -0,0 +1,225 @@
+<?php namespace MapGuesser\PersistentData;
+
+use Generator;
+use MapGuesser\Database\Query\Modify;
+use MapGuesser\Database\Query\Select;
+use MapGuesser\Interfaces\Database\IResultSet;
+use MapGuesser\PersistentData\Model\Model;
+
+class PersistentDataManager
+{
+    public function selectFromDb(Select $select, string $type, bool $withRelations = false): ?Model
+    {
+        $select = $this->createSelect($select, $type, $withRelations);
+
+        $data = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+
+        if ($data === null) {
+            return null;
+        }
+
+        $model = new $type();
+        $this->fillWithData($data, $model);
+
+        return $model;
+    }
+
+    public function selectMultipleFromDb(Select $select, string $type, bool $withRelations = false): Generator
+    {
+        $select = $this->createSelect($select, $type, $withRelations);
+
+        while ($data = $select->execute()->fetch(IResultSet::FETCH_ASSOC)) {
+            $model = new $type();
+            $this->fillWithData($data, $model);
+
+            yield $model;
+        }
+    }
+
+    public function selectFromDbById($id, string $type, bool $withRelations = false): ?Model
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->whereId($id);
+
+        return $this->selectFromDb($select, $type, $withRelations);
+    }
+
+    public function fillWithData(array $data, Model $model): void
+    {
+        $relations = $model::getRelations();
+        $relationData = [];
+
+        foreach ($data as $key => $value) {
+            if ($this->extractRelationData($key, $value, $relationData, $relations)) {
+                continue;
+            }
+
+            $method = 'set' . str_replace('_', '', ucwords($key, '_'));
+
+            if (method_exists($model, $method)) {
+                $model->$method($value);
+            }
+        }
+
+        $this->setRelations($model, $relationData);
+
+        $model->saveSnapshot();
+    }
+
+    public function loadRelationsFromDb(Model $model, bool $recursive): void
+    {
+        foreach ($model::getRelations() as $relation => $relationType) {
+            $camel = str_replace('_', '', ucwords($relation, '_'));
+
+            $methodGet = 'get' . $camel . 'Id';
+            $methodSet = 'set' . $camel;
+
+            $relationId = $model->$methodGet();
+
+            if ($relationId !== null) {
+                $relationModel = $this->selectFromDbById($relationId, $relationType, $recursive);
+
+                $model->$methodSet($relationModel);
+            }
+        }
+    }
+
+    public function saveToDb(Model $model): void
+    {
+        $this->syncRelations($model);
+
+        $modified = $model->toArray();
+        $id = $model->getId();
+
+        $modify = new Modify(\Container::$dbConnection, $model::getTable());
+
+        if ($id !== null) {
+            $original = $model->getSnapshot();
+
+            foreach ($original as $key => $value) {
+                if ($value === $modified[$key]) {
+                    unset($modified[$key]);
+                }
+            }
+
+            if (count($modified) > 0) {
+                $modify->setId($id);
+                $modify->fill($modified);
+                $modify->save();
+            }
+        } else {
+            $modify->fill($modified);
+            $modify->save();
+
+            $model->setId($modify->getId());
+        }
+
+        $model->saveSnapshot();
+    }
+
+    public function deleteFromDb(Model $model): void
+    {
+        $modify = new Modify(\Container::$dbConnection, $model::getTable());
+        $modify->setId($model->getId());
+        $modify->delete();
+
+        $model->setId(null);
+        $model->resetSnapshot();
+    }
+
+    private function createSelect(Select $select, string $type, bool $withRelations = false): Select
+    {
+        $table = call_user_func([$type, 'getTable']);
+        $fields = call_user_func([$type, 'getFields']);
+
+        $select->from($table);
+
+        //TODO: only with some relations?
+        if ($withRelations) {
+            $relations = call_user_func([$type, 'getRelations']);
+
+            $columns = [];
+
+            foreach ($fields as $field) {
+                $columns[] = [$table, $field];
+            }
+
+            $columns = array_merge($columns, $this->getRelationColumns($relations));
+
+            $this->leftJoinRelations($select, $table, $relations);
+            $select->columns($columns);
+        } else {
+            $select->columns($fields);
+        }
+
+        return $select;
+    }
+
+    private function getRelationColumns(array $relations): array
+    {
+        $columns = [];
+
+        foreach ($relations as $relation => $relationType) {
+            $relationTable = call_user_func([$relationType, 'getTable']);
+            foreach (call_user_func([$relationType, 'getFields']) as $relationField) {
+                $columns[] = [$relationTable, $relationField, $relation . '__' . $relationField];
+            }
+        }
+
+        return $columns;
+    }
+
+    private function leftJoinRelations(Select $select, string $table, array $relations): void
+    {
+        foreach ($relations as $relation => $relationType) {
+            $relationTable = call_user_func([$relationType, 'getTable']);
+            $select->leftJoin($relationTable, [$relationTable, 'id'], '=', [$table, $relation . '_id']);
+        }
+    }
+
+    private function extractRelationData(string $key, $value, array &$relationData, array $relations): bool
+    {
+        $found = false;
+
+        foreach ($relations as $relation => $relationType) {
+            if (substr($key, 0, strlen($relation . '__')) === $relation . '__') {
+                $found = true;
+                $relationData[$relation][substr($key, strlen($relation . '__'))] = $value;
+                break;
+            }
+        }
+
+        return $found;
+    }
+
+    private function setRelations(Model $model, array &$relations): void
+    {
+        foreach ($model::getRelations() as $relation => $relationType) {
+            if (isset($relations[$relation])) {
+                $object = new $relationType();
+
+                $this->fillWithData($relations[$relation], $object);
+
+                $method = 'set' . str_replace('_', '', ucwords($relation, '_'));
+
+                $model->$method($object);
+            }
+        }
+    }
+
+    private function syncRelations(Model $model): void
+    {
+        foreach ($model::getRelations() as $relation => $relationType) {
+            $camel = str_replace('_', '', ucwords($relation, '_'));
+
+            $methodGet = 'get' . $camel;
+            $methodSet = 'set' . $camel . 'Id';
+
+            $relationModel = $model->$methodGet();
+
+            if ($relationModel !== null) {
+                $model->$methodSet($relationModel->getId());
+            }
+        }
+    }
+}

src/Repository/MapRepository.php

@@ -1,16 +1,19 @@
 <?php namespace MapGuesser\Repository;
 
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
+use MapGuesser\PersistentData\Model\Map;
+use MapGuesser\PersistentData\PersistentDataManager;
 
 class MapRepository
 {
-    public function getById(int $mapId)
-    {
-        $select = new Select(\Container::$dbConnection, 'maps');
-        $select->columns(['id', 'name', 'description', 'bound_south_lat', 'bound_west_lng', 'bound_north_lat', 'bound_east_lng', 'area']);
-        $select->whereId($mapId);
+    private PersistentDataManager $pdm;
 
-        return $select->execute()->fetch(IResultSet::FETCH_ASSOC);
+    public function __construct()
+    {
+        $this->pdm = new PersistentDataManager();
+    }
+
+    public function getById(int $mapId): ?Map
+    {
+        return $this->pdm->selectFromDbById($mapId, Map::class);
     }
 }

src/Repository/PlaceRepository.php

@@ -1,95 +1,43 @@
 <?php namespace MapGuesser\Repository;
 
-use MapGuesser\Util\Geo\Position;
 use MapGuesser\Database\Query\Select;
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Http\Request;
-use MapGuesser\Interfaces\Database\IResultSet;
-use DateTime;
-use DateInterval;
+use MapGuesser\PersistentData\Model\Place;
+use MapGuesser\PersistentData\PersistentDataManager;
 
 class PlaceRepository
 {
-    public function getById(int $placeId)
+    private PersistentDataManager $pdm;
+
+    public function __construct()
     {
-        $place = $this->selectFromDbById($placeId);
-
-        $panoId = $this->requestPanoId($place);
-
-        $position = new Position($place['lat'], $place['lng']);
-
-        return [
-            'position' => $position,
-            'panoId' => $panoId
-        ];
+        $this->pdm = new PersistentDataManager();
     }
 
-    public function getForMapWithValidPano(int $mapId, array $exclude = []): array
+    public function getById(int $placeId): ?Place
+    {
+        return $this->pdm->selectFromDbById($placeId, Place::class);
+    }
+
+    public function getRandomForMapWithValidPano(int $mapId, array $exclude = [], array &$placesWithoutPano): Place
     {
         $placesWithoutPano = [];
 
         do {
-            $place = $this->selectFromDbForMap($mapId, $exclude);
+            $place = $this->selectRandomFromDbForMap($mapId, $exclude);
 
-            $panoId = $this->requestPanoId($place);
+            $panoId = $place->getFreshPanoId();
 
             if ($panoId === null) {
-                $placesWithoutPano[] = $exclude[] = $place['id'];
+                $placesWithoutPano[] = $exclude[] = $place->getId();
             }
         } while ($panoId === null);
 
-        $position = new Position($place['lat'], $place['lng']);
-
-        return [
-            'placesWithoutPano' => $placesWithoutPano,
-            'placeId' => $place['id'],
-            'position' => $position,
-            'panoId' => $panoId
-        ];
-    }
-
-    public function addToMap(int $mapId, array $place): int
-    {
-        $modify = new Modify(\Container::$dbConnection, 'places');
-        $modify->set('map_id', $mapId);
-        $modify->fill($place);
-        $modify->save();
-
-        return $modify->getId();
-    }
-
-    public function modify(int $id, array $place): void
-    {
-        $modify = new Modify(\Container::$dbConnection, 'places');
-        $modify->setId($id);
-        $modify->set('pano_id_cached', null);
-        $modify->set('pano_id_cached_timestamp', null);
-        $modify->fill($place);
-        $modify->save();
-    }
-
-    public function delete(int $id): void
-    {
-        $modify = new Modify(\Container::$dbConnection, 'places');
-        $modify->setId($id);
-        $modify->delete();
-    }
-
-    private function selectFromDbById(int $placeId): array
-    {
-        $select = new Select(\Container::$dbConnection, 'places');
-        $select->columns(['id', 'lat', 'lng', 'pano_id_cached', 'pano_id_cached_timestamp']);
-        $select->whereId($placeId);
-
-        $place = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
         return $place;
     }
 
-    private function selectFromDbForMap(int $mapId, array $exclude): array
+    private function selectRandomFromDbForMap(int $mapId, array $exclude): ?Place
     {
         $select = new Select(\Container::$dbConnection, 'places');
-        $select->columns(['id', 'lat', 'lng', 'pano_id_cached', 'pano_id_cached_timestamp']);
         $select->where('id', 'NOT IN', $exclude);
         $select->where('map_id', '=', $mapId);
 
@@ -99,49 +47,6 @@ class PlaceRepository
         $select->orderBy('id');
         $select->limit(1, $randomOffset);
 
-        $place = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
-        return $place;
-    }
-
-    private function requestPanoId(array $place, bool $canBeIndoor = false): ?string
-    {
-        if (
-            $place['pano_id_cached_timestamp'] &&
-            (new DateTime($place['pano_id_cached_timestamp']))->add(new DateInterval('P1D')) > new DateTime()
-        ) {
-            return $place['pano_id_cached'];
-        }
-
-        $request = new Request('https://maps.googleapis.com/maps/api/streetview/metadata', Request::HTTP_GET);
-        $request->setQuery([
-            'key' => $_ENV['GOOGLE_MAPS_SERVER_API_KEY'],
-            'location' => $place['lat'] . ',' . $place['lng'],
-            'source' => $canBeIndoor ? 'default' : 'outdoor'
-        ]);
-
-        $response = $request->send();
-
-        $panoData = json_decode($response->getBody(), true);
-
-        $panoId = $panoData['status'] === 'OK' ? $panoData['pano_id'] : null;
-
-        // enable indoor panos if no outdoor found
-        if ($panoId === null && !$canBeIndoor) {
-            return $this->requestPanoId($place, true);
-        }
-
-        $this->saveCachedPanoId($place['id'], $panoId);
-
-        return $panoId;
-    }
-
-    private function saveCachedPanoId(int $placeId, ?string $panoId): void
-    {
-        $modify = new Modify(\Container::$dbConnection, 'places');
-        $modify->setId($placeId);
-        $modify->set('pano_id_cached', $panoId);
-        $modify->set('pano_id_cached_timestamp', (new DateTime())->format('Y-m-d H:i:s'));
-        $modify->save();
+        return $this->pdm->selectFromDb($select, Place::class);
     }
 }

src/Repository/UserConfirmationRepository.php

@@ -0,0 +1,39 @@
+<?php namespace MapGuesser\Repository;
+
+use Generator;
+use MapGuesser\Database\Query\Select;
+use MapGuesser\Interfaces\Database\IResultSet;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\PersistentData\Model\UserConfirmation;
+use MapGuesser\PersistentData\PersistentDataManager;
+
+class UserConfirmationRepository
+{
+    private PersistentDataManager $pdm;
+
+    public function __construct()
+    {
+        $this->pdm = new PersistentDataManager();
+    }
+
+    public function getById(int $userConfirmationId): ?UserConfirmation
+    {
+        return $this->pdm->selectFromDbById($userConfirmationId, UserConfirmation::class);
+    }
+
+    public function getByToken(string $token): ?UserConfirmation
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('token', '=', $token);
+
+        return $this->pdm->selectFromDb($select, UserConfirmation::class);
+    }
+
+    public function getByUser(User $user): Generator
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('user_id', '=', $user->getId());
+
+        yield from $this->pdm->selectMultipleFromDb($select, UserConfirmation::class);
+    }
+}

src/Repository/UserRepository.php

@@ -0,0 +1,36 @@
+<?php namespace MapGuesser\Repository;
+
+use MapGuesser\Database\Query\Select;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\PersistentData\PersistentDataManager;
+
+class UserRepository
+{
+    private PersistentDataManager $pdm;
+
+    public function __construct()
+    {
+        $this->pdm = new PersistentDataManager();
+    }
+
+    public function getById(int $userId): ?User
+    {
+        return $this->pdm->selectFromDbById($userId, User::class);
+    }
+
+    public function getByEmail(string $email): ?User
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('email', '=', $email);
+
+        return $this->pdm->selectFromDb($select, User::class);
+    }
+
+    public function getByGoogleSub(string $sub): ?User
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('google_sub', '=', $sub);
+
+        return $this->pdm->selectFromDb($select, User::class);
+    }
+}

src/Request/Request.php

@@ -3,6 +3,9 @@
 use MapGuesser\Interfaces\Authentication\IUser;
 use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Interfaces\Request\ISession;
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\PersistentData\PersistentDataManager;
+use MapGuesser\Repository\UserRepository;
 
 class Request implements IRequest
 {
@@ -16,12 +19,24 @@ class Request implements IRequest
 
     private Session $session;
 
+    private UserRepository $userRepository;
+
+    private ?User $user = null;
+
     public function __construct(string $base, array &$get, array &$post, array &$session)
     {
         $this->base = $base;
         $this->get = &$get;
         $this->post = &$post;
         $this->session = new Session($session);
+
+        $this->userRepository = new UserRepository();
+
+        $userId = $this->session->get('userId');
+
+        if ($userId !== null) {
+            $this->user = $this->userRepository->getById($userId);
+        }
     }
 
     public function setParsedRouteParams(array &$routeParams)
@@ -61,8 +76,18 @@ class Request implements IRequest
         return $this->session;
     }
 
+    public function setUser(?IUser $user): void
+    {
+        if ($user === null) {
+            $this->session->delete('userId');
+            return;
+        }
+
+        $this->session->set('userId', $user->getUniqueId());
+    }
+
     public function user(): ?IUser
     {
-        return $this->session->get('user');
+        return $this->user;
     }
 }

src/Response/ContentBase.php

@@ -11,7 +11,7 @@ abstract class ContentBase implements IContent
         return $this->data;
     }
 
-    abstract public function &render(): string;
+    abstract public function render(): void;
 
     abstract public function getContentType(): string;
 }

src/Response/HtmlContent.php

@@ -1,25 +1,29 @@
 <?php namespace MapGuesser\Response;
 
+use MapGuesser\View\Linker;
+
 class HtmlContent extends ContentBase
 {
-    private string $template;
+    private string $view;
 
-    public function __construct(string $template, array &$data = [])
+    public function __construct(string $view, array &$data = [])
     {
-        $this->template = $template;
+        $this->view = $view;
         $this->data = &$data;
     }
 
-    public function &render(): string
+    public function render(): void
     {
+        if (!empty($_ENV['DEV'])) {
+            $generator = new Linker($this->view);
+            $generator->generate();
+        }
+
         extract($this->data);
 
-        ob_start();
-        require ROOT . '/views/' . $this->template . '.php';
-        $content = ob_get_contents();
-        ob_end_clean();
+        require ROOT . '/cache/views/' . $this->view . '.php';
 
-        return $content;
+        echo '<!-- __debug__runtime: ' . round((hrtime(true) - SCRIPT_STARTED) / 1e+6, 1) . ' -->';
     }
 
     public function getContentType(): string

src/Response/JsonContent.php

@@ -7,11 +7,11 @@ class JsonContent extends ContentBase
         $this->data = &$data;
     }
 
-    public function &render(): string
+    public function render(): void
     {
-        $content = json_encode($this->data);
+        $this->data['__debug__runtime'] = round((hrtime(true) - SCRIPT_STARTED) / 1e+6, 1);
 
-        return $content;
+        echo json_encode($this->data);
     }
 
     public function getContentType(): string

src/Response/Redirect.php

@@ -4,11 +4,11 @@ use MapGuesser\Interfaces\Response\IRedirect;
 
 class Redirect implements IRedirect
 {
-    private $target;
+    private string $target;
 
     private int $type;
 
-    public function __construct($target, int $type = IRedirect::TEMPORARY)
+    public function __construct(string $target, int $type = IRedirect::TEMPORARY)
     {
         $this->target = $target;
         $this->type = $type;
@@ -16,10 +16,10 @@ class Redirect implements IRedirect
 
     public function getUrl(): string
     {
-        if (is_array($this->target)) {
-            $link = $this->target[0]->generateLink($this->target[1]);
-        } else {
+        if (preg_match('/^http(s)?/', $this->target)) {
             $link = $this->target;
+        } else {
+            $link = \Container::$request->getBase() . '/' . $this->target;
         }
 
         return $link;

src/Routing/RouteCollection.php

@@ -45,6 +45,11 @@ class RouteCollection
     {
         $groupNumber = count($uri);
 
+        // response to HEAD request with the GET content
+        if ($method === 'head') {
+            $method = 'get';
+        }
+
         if (!isset($this->searchTable[$method][$groupNumber])) {
             return null;
         }
@@ -64,7 +69,7 @@ class RouteCollection
             throw new \Exception('Route already exists: ' . $id);
         }
 
-        $pattern = array_merge($this->groupStack, explode('/', $pattern));
+        $pattern = array_merge($this->groupStack, $pattern === '' ? [] : explode('/', $pattern));
         $route = new Route($id, $pattern, $handler);
 
         $groupNumber = count($pattern);

src/Util/Geo/Bounds.php

@@ -59,6 +59,26 @@ class Bounds
         }
     }
 
+    public function setSouthLat(float $southLat): void
+    {
+        $this->southLat = $southLat;
+    }
+
+    public function setWestLng(float $westLng): void
+    {
+        $this->westLng = $westLng;
+    }
+
+    public function setNorthLat(float $northLat): void
+    {
+        $this->northLat = $northLat;
+    }
+
+    public function setEastLng(float $eastLng): void
+    {
+        $this->eastLng = $eastLng;
+    }
+
     public function getSouthLat(): float
     {
         return $this->southLat;

src/Util/Geo/Position.php

@@ -13,6 +13,16 @@ class Position
         $this->lng = $lng;
     }
 
+    public function setLat(float $lat): void
+    {
+        $this->lat = $lat;
+    }
+
+    public function setLng(float $lng): void
+    {
+        $this->lng = $lng;
+    }
+
     public function getLat(): float
     {
         return $this->lat;

src/Util/JwtParser.php

@@ -0,0 +1,33 @@
+<?php namespace MapGuesser\Util;
+
+class JwtParser
+{
+    private array $token;
+
+    public function __construct(?string $token = null)
+    {
+        if ($token !== null) {
+            $this->setToken($token);
+        }
+    }
+
+    public function setToken(string $token)
+    {
+        $this->token = explode('.', str_replace(['_', '-'], ['/', '+'], $token));
+    }
+
+    public function getHeader(): array
+    {
+        return json_decode(base64_decode($this->token[0]), true);
+    }
+
+    public function getPayload(): array
+    {
+        return json_decode(base64_decode($this->token[1]), true);
+    }
+
+    public function getSignature(): string
+    {
+        return base64_decode($this->token[2]);
+    }
+}

src/View/Linker.php

@@ -0,0 +1,152 @@
+<?php namespace MapGuesser\View;
+
+class Linker
+{
+    const INLINE_ASSET_LIMIT = 2000;
+
+    private string $view;
+
+    public function __construct(string $view)
+    {
+        $this->view = $view;
+    }
+
+    public function generate(): void
+    {
+        $input = ROOT . '/views/' . $this->view . '.php';
+
+        $temporaryFiles = [];
+        $sections = ['externalCss' => '', 'inlineCss' => '', 'externalJs' => '', 'inlineJs' => ''];
+        $extra = ['', ''];
+
+        do {
+            $parser = new Parser($input);
+            $fragment = $parser->parse();
+
+            $extends = $fragment->getExtends();
+
+            $this->generateAssets($fragment, $sections);
+
+            $sections = array_merge($sections, $fragment->getSections()); //TODO: detect if section defined multiple times
+            $extra[0] = $fragment->getExtra()[0] . $extra[0];
+            $extra[1] = $extra[1] . $fragment->getExtra()[1];
+
+            if ($extends === null) {
+                $this->writeFinal($extra, $input, ROOT . '/cache/views/' . $this->view . '.php');
+                break;
+            }
+
+            $tmpFile = tempnam(sys_get_temp_dir(), 'mapg-view-');
+            $temporaryFiles[] = $tmpFile;
+
+            $this->extendTemplate($sections, ROOT . '/views/' . $extends . '.php', $tmpFile);
+
+            $input = $tmpFile;
+        } while (true);
+
+        foreach ($temporaryFiles as $tmpFile) {
+            unlink($tmpFile);
+        }
+    }
+
+    private function extendTemplate(array $sections, string $file, string $output): void
+    {
+        $inputFileHandle = fopen($file, 'r');
+        if (!$inputFileHandle) {
+            throw new \Exception('Cannot open file ' . $file);
+        }
+
+        $outputFileHandle = fopen($output, 'w');
+        if (!$outputFileHandle) {
+            throw new \Exception('Cannot open file ' . $output . 'for writing.');
+        }
+
+        $lineNumber = 0;
+        while (($line = fgets($inputFileHandle)) !== false) {
+            ++$lineNumber;
+
+            if (preg_match('/^\s*@yields\(\'([\w\/]+)\'\)\s*$/', $line, $matches)) {
+                if (isset($sections[$matches[1]])) {
+                    fwrite($outputFileHandle, $sections[$matches[1]]);
+                }
+            } else {
+                fwrite($outputFileHandle, $line);
+            }
+        }
+
+        fclose($inputFileHandle);
+        fclose($outputFileHandle);
+    }
+
+    private function writeFinal(array $extra, string $file, string $output): void
+    {
+        $dirname = pathinfo($output, PATHINFO_DIRNAME);
+        if (!is_dir($dirname)) {
+            mkdir($dirname, 0755, true);
+        }
+
+        $inputFileHandle = fopen($file, 'r');
+        if (!$inputFileHandle) {
+            throw new \Exception('Cannot open file ' . $file);
+        }
+
+        $outputFileHandle = fopen($output, 'w');
+        if (!$outputFileHandle) {
+            throw new \Exception('Cannot open file ' . $output . 'for writing.');
+        }
+
+        fwrite($outputFileHandle, $extra[0]);
+        while (($line = fgets($inputFileHandle)) !== false) {
+            fwrite($outputFileHandle, $line);
+        }
+        fwrite($outputFileHandle, $extra[1]);
+
+        fclose($inputFileHandle);
+        fclose($outputFileHandle);
+    }
+
+    private function generateAssets(ParsedFragment $fragment, array &$sections)
+    {
+        foreach ($fragment->getCss() as $cssFile) {
+            $asset = $this->parseAsset($cssFile);
+            if (isset($asset['code'])) {
+                $sections['inlineCss'] .= '<style>' . PHP_EOL;
+                $sections['inlineCss'] .= $asset['code'];
+                $sections['inlineCss'] .= '</style>' . PHP_EOL;
+            } elseif (isset($asset['file'])) {
+                $sections['externalCss'] .= '<link href="' . $asset['file'] . '" rel="stylesheet">' . PHP_EOL;
+            }
+        }
+
+        foreach ($fragment->getJs() as $jsFile) {
+            $asset = $this->parseAsset($jsFile);
+            if (isset($asset['code'])) {
+                $sections['inlineJs'] .= '<script>' . PHP_EOL;
+                $sections['inlineJs'] .= $asset['code'];
+                $sections['inlineJs'] .= '</script>' . PHP_EOL;
+            } elseif (isset($asset['file'])) {
+                $sections['externalJs'] .= '<script src="' . $asset['file'] . '"></script>' . PHP_EOL;
+            }
+        }
+    }
+
+    private function parseAsset(string $asset): array
+    {
+        $output = [];
+
+        if (preg_match('/^[\w\/\.]+$/', $asset)) {
+            if (
+                empty($_ENV['DEV']) &&
+                filesize(ROOT . '/public/static/' . $asset) < self::INLINE_ASSET_LIMIT
+            ) {
+                $output['code'] = file_get_contents(ROOT . '/public/static/' . $asset);
+            } else {
+                $output['file'] = '<?= $_ENV[\'STATIC_ROOT\'] ?>/' . $asset . '?rev=<?= REVISION ?>';
+            }
+        } else {
+            $output['file'] = $asset;
+        }
+
+        return $output;
+    }
+}

src/View/ParsedFragment.php

@@ -0,0 +1,48 @@
+<?php namespace MapGuesser\View;
+
+class ParsedFragment
+{
+    private ?string $extends;
+
+    private array $css;
+
+    private array $js;
+
+    private array $sections;
+
+    private array $extra;
+
+    public function __construct(?string $extends, array $css, array $js, array $sections, array $extra)
+    {
+        $this->extends = $extends;
+        $this->css = $css;
+        $this->js = $js;
+        $this->sections = $sections;
+        $this->extra = $extra;
+    }
+
+    public function getExtends(): ?string
+    {
+        return $this->extends;
+    }
+
+    public function getCss(): array
+    {
+        return $this->css;
+    }
+
+    public function getJs(): array
+    {
+        return $this->js;
+    }
+
+    public function getSections(): array
+    {
+        return $this->sections;
+    }
+
+    public function getExtra(): array
+    {
+        return $this->extra;
+    }
+}

src/View/Parser.php

@@ -0,0 +1,159 @@
+<?php namespace MapGuesser\View;
+
+class Parser
+{
+    private string $file;
+
+    public function __construct(string $file)
+    {
+        $this->file = $file;
+    }
+
+    public function parse(): ParsedFragment
+    {
+        $sectionOpen = null;
+        $extraOpen = false;
+
+        $extends = null;
+        $js = [];
+        $css = [];
+        $sections = [];
+        $extra = ['', ''];
+
+        $fileHandle = fopen($this->file, 'r');
+        if (!$fileHandle) {
+            throw new \Exception('Cannot open file ' . $this->file);
+        }
+
+        $lineNumber = 0;
+        while (($line = fgets($fileHandle)) !== false) {
+            ++$lineNumber;
+
+            if (($cssMatched = $this->matchCss($line)) !== null) {
+                $css[] = $cssMatched;
+
+                continue;
+            }
+
+            if (($jsMatched = $this->matchJs($line)) !== null) {
+                $js[] = $jsMatched;
+
+                continue;
+            }
+
+            if (($extendsMatched = $this->matchExtends($line)) !== null) {
+                if ($extends !== null) {
+                    throw new \Exception('Error in file ' . $this->file . ' in line ' . $lineNumber . ' - There is already an \'@extends\' declared.');
+                }
+
+                $extends = $extendsMatched;
+
+                continue;
+            }
+
+            if (($sectionMatched = $this->matchSection($line)) !== null) {
+                if ($extends === null) {
+                    throw new \Exception('Error in file ' . $this->file . ' in line ' . $lineNumber . ' - \'@section\' has no meaning if view extends nothing.');
+                }
+                if ($sectionOpen !== null) {
+                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - A \'@section\' is already open (no \'@endsection\' found).');
+                }
+
+                $sectionOpen = $sectionMatched;
+                $sections[$sectionOpen] = '';
+
+                continue;
+            }
+
+            if ($this->matchEndSection($line)) {
+                if ($sectionOpen === null) {
+                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - Cannot end section until no \'@section\' is open.');
+                }
+
+                $sectionOpen = null;
+            }
+
+            if ($this->matchExtra($line)) {
+                if ($extraOpen) {
+                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - An \'@extra\' is already open (no \'@endextra\' found).');
+                }
+
+                $extraOpen = true;
+
+                continue;
+            }
+
+            if ($this->matchEndExtra($line)) {
+                if (!$extraOpen) {
+                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - Cannot end extra until no \'@extra\' is open.');
+                }
+
+                $extraOpen = false;
+            }
+
+            if ($sectionOpen !== null) {
+                $sections[$sectionOpen] .= $line;
+            }
+
+            if ($extraOpen) {
+                $offset = $extends === null ? 0 : 1;
+                $extra[$offset] .= $line;
+            }
+        }
+
+        fclose($fileHandle);
+
+        return new ParsedFragment($extends, $css, $js, $sections, $extra);
+    }
+
+    private function matchCss(string $line): ?string
+    {
+        if (preg_match('/^\s*@css\((.*)\)\s*$/', $line, $matches)) {
+            return $matches[1];
+        }
+
+        return null;
+    }
+
+    private function matchJs(string $line): ?string
+    {
+        if (preg_match('/^\s*@js\((.*)\)\s*$/', $line, $matches)) {
+            return $matches[1];
+        }
+
+        return null;
+    }
+
+    private function matchExtends(string $line): ?string
+    {
+        if (preg_match('/^\s*@extends\(([\w\/]+)\)\s*$/', $line, $matches)) {
+            return $matches[1];
+        }
+
+        return null;
+    }
+
+    private function matchSection(string $line): ?string
+    {
+        if (preg_match('/^\s*@section\((\w+)\)\s*$/', $line, $matches)) {
+            return $matches[1];
+        }
+
+        return null;
+    }
+
+    private function matchEndSection(string $line): bool
+    {
+        return preg_match('/^\s*@endsection(?:\(\))?\s*$/', $line);
+    }
+
+    private function matchExtra(string $line): bool
+    {
+        return preg_match('/^\s*@extra(?:\(\))?\s*$/', $line);
+    }
+
+    private function matchEndExtra(string $line): bool
+    {
+        return preg_match('/^\s*@endextra(?:\(\))?\s*$/', $line);
+    }
+}

tests/OAuth/GoogleOAuthTest.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace MapGuesser\Tests\OAuth;
+
+use MapGuesser\Interfaces\Http\IRequest;
+use MapGuesser\Interfaces\Http\IResponse;
+use MapGuesser\OAuth\GoogleOAuth;
+use PHPUnit\Framework\TestCase;
+
+final class GoogleOAuthTest extends TestCase
+{
+    public function testCanCreateDialogUrl(): void
+    {
+        $_ENV['GOOGLE_OAUTH_CLIENT_ID'] = 'xyz';
+        $state = 'random_state_string';
+        $redirectUrl = 'http://example.com/oauth';
+
+        $requestMock = $this->getMockBuilder(IRequest::class)
+            ->setMethods(['setUrl', 'setMethod', 'setQuery', 'setHeaders', 'send'])
+            ->getMock();
+        $googleOAuth = new GoogleOAuth($requestMock);
+
+        $dialogUrl = $googleOAuth->getDialogUrl($state, $redirectUrl);
+        $dialogUrlParsed = explode('?', $dialogUrl);
+
+        $this->assertEquals('https://accounts.google.com/o/oauth2/v2/auth', $dialogUrlParsed[0]);
+
+        parse_str($dialogUrlParsed[1], $dialogUrlQueryParams);
+
+        $expectedQueryParams = [
+            'response_type' => 'code',
+            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
+            'scope' => 'openid email',
+            'redirect_uri' => $redirectUrl,
+            'state' => $state,
+            'nonce' => hash('sha256', random_bytes(10) . microtime()),
+        ];
+
+        $this->assertEquals($expectedQueryParams['response_type'], $dialogUrlQueryParams['response_type']);
+        $this->assertEquals($expectedQueryParams['client_id'], $dialogUrlQueryParams['client_id']);
+        $this->assertEquals($expectedQueryParams['scope'], $dialogUrlQueryParams['scope']);
+        $this->assertEquals($expectedQueryParams['redirect_uri'], $dialogUrlQueryParams['redirect_uri']);
+        $this->assertEquals($expectedQueryParams['state'], $dialogUrlQueryParams['state']);
+        $this->assertMatchesRegularExpression('/^[a-f0-9]{64}$/', $dialogUrlQueryParams['nonce']);
+    }
+
+    public function testCanRequestToken(): void
+    {
+        $_ENV['GOOGLE_OAUTH_CLIENT_ID'] = 'abc';
+        $_ENV['GOOGLE_OAUTH_CLIENT_SECRET'] = 'xxx';
+        $code = 'code_from_google';
+        $redirectUrl = 'http://example.com/oauth';
+
+        $requestMock = $this->getMockBuilder(IRequest::class)
+            ->setMethods(['setUrl', 'setMethod', 'setQuery', 'setHeaders', 'send'])
+            ->getMock();
+        $responseMock = $this->getMockBuilder(IResponse::class)
+            ->setMethods(['getBody', 'getHeaders'])
+            ->getMock();
+        $googleOAuth = new GoogleOAuth($requestMock);
+
+        $expectedQueryParams = [
+            'code' => $code,
+            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
+            'client_secret' => $_ENV['GOOGLE_OAUTH_CLIENT_SECRET'],
+            'redirect_uri' => $redirectUrl,
+            'grant_type' => 'authorization_code',
+        ];
+
+        $requestMock->expects($this->once())
+            ->method('setUrl')
+            ->with($this->equalTo('https://oauth2.googleapis.com/token'));
+        $requestMock->expects($this->once())
+            ->method('setMethod')
+            ->with($this->equalTo(IRequest::HTTP_POST));
+        $requestMock->expects($this->once())
+            ->method('setQuery')
+            ->with($this->equalTo($expectedQueryParams));
+        $requestMock->expects($this->once())
+            ->method('send')
+            ->will($this->returnValue($responseMock));
+        $responseMock->expects($this->once())
+            ->method('getBody')
+            ->will($this->returnValue('{"test":"json"}'));
+
+        $token = $googleOAuth->getToken($code, $redirectUrl);
+
+        $this->assertEquals(['test' => 'json'], $token);
+    }
+}

tests/PersistentData/Model/ModelTest.php

@@ -0,0 +1,89 @@
+<?php namespace MapGuesser\Tests\Util;
+
+use MapGuesser\PersistentData\Model\Model;
+use PHPUnit\Framework\TestCase;
+
+class DummyModel extends Model
+{
+    protected static string $table = 'test_table';
+
+    protected static array $fields = ['name', 'valid'];
+
+    protected static array $relations = ['other_model' => OtherModel::class];
+
+    private string $name;
+
+    private bool $valid;
+
+    public function setName(string $name): void
+    {
+        $this->name = $name;
+    }
+
+    public function setValid(bool $valid): void
+    {
+        $this->valid = $valid;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function getValid(): bool
+    {
+        return $this->valid;
+    }
+}
+
+final class ModelTest extends TestCase
+{
+    public function testCanReturnTable(): void
+    {
+        $this->assertEquals('test_table', DummyModel::getTable());
+    }
+
+    public function testCanReturnFields(): void
+    {
+        $this->assertEquals(['id', 'name', 'valid'], DummyModel::getFields());
+    }
+
+    public function testCanReturnRelations(): void
+    {
+        $this->assertEquals(['other_model' => OtherModel::class], DummyModel::getRelations());
+    }
+
+    public function testCanBeConvertedToArray(): void
+    {
+        $model = new DummyModel();
+        $model->setId(123);
+        $model->setName('John');
+        $model->setValid(true);
+
+        $this->assertEquals([
+            'id' => 123,
+            'name' => 'John',
+            'valid' => true
+        ], $model->toArray());
+    }
+
+    public function testCanSaveAndResetSnapshot(): void
+    {
+        $model = new DummyModel();
+        $model->setId(123);
+        $model->setName('John');
+        $model->setValid(true);
+
+        $model->saveSnapshot();
+
+        $this->assertEquals([
+            'id' => 123,
+            'name' => 'John',
+            'valid' => true
+        ], $model->getSnapshot());
+
+        $model->resetSnapshot();
+
+        $this->assertEquals([], $model->getSnapshot());
+    }
+}

tests/Util/Geo/BoundsTest.php

@@ -0,0 +1,98 @@
+<?php namespace MapGuesser\Tests\Util\Geo;
+
+use MapGuesser\Util\Geo\Bounds;
+use MapGuesser\Util\Geo\Position;
+use PHPUnit\Framework\TestCase;
+
+final class BoundsTest extends TestCase
+{
+    public function testCanBeCreatedEmpty(): void
+    {
+        $bounds = new Bounds();
+
+        $this->assertEquals(90.0, $bounds->getSouthLat());
+        $this->assertEquals(180.0, $bounds->getWestLng());
+        $this->assertEquals(-90.0, $bounds->getNorthLat());
+        $this->assertEquals(-180.0, $bounds->getEastLng());
+    }
+
+    public function testCanBeCreatedWithPosition(): void
+    {
+        $position = new Position(45.25, 18.12);
+
+        $bounds = new Bounds($position);
+
+        $this->assertEquals($position->getLat(), $bounds->getSouthLat());
+        $this->assertEquals($position->getLng(), $bounds->getWestLng());
+        $this->assertEquals($position->getLat(), $bounds->getNorthLat());
+        $this->assertEquals($position->getLng(), $bounds->getEastLng());
+    }
+
+    public function testCanBeCreatedDirectly(): void
+    {
+        $bounds = Bounds::createDirectly(44.12, 7.33, 50.12, 15.11);
+
+        $this->assertEquals(44.12, $bounds->getSouthLat());
+        $this->assertEquals(7.33, $bounds->getWestLng());
+        $this->assertEquals(50.12, $bounds->getNorthLat());
+        $this->assertEquals(15.11, $bounds->getEastLng());
+    }
+
+    public function testExtendingWithOnePositionIsTheSameAsCreatingWithPosition(): void
+    {
+        $position = new Position(45.25, 18.12);
+
+        $bounds1 = new Bounds();
+        $bounds1->extend($position);
+
+        $bounds2 = new Bounds($position);
+
+        $this->assertEquals($bounds1, $bounds2);
+    }
+
+    public function testCanBeExtendedWithTwoPositions(): void
+    {
+        $bounds = new Bounds();
+
+        $position1 = new Position(45.25, 18.12);
+        $position2 = new Position(43.15, 19.28);
+
+        $bounds->extend($position1);
+        $bounds->extend($position2);
+
+        $this->assertEquals($position2->getLat(), $bounds->getSouthLat());
+        $this->assertEquals($position1->getLng(), $bounds->getWestLng());
+        $this->assertEquals($position1->getLat(), $bounds->getNorthLat());
+        $this->assertEquals($position2->getLng(), $bounds->getEastLng());
+
+        $bounds = new Bounds();
+
+        $position1 = new Position(43.15, 18.12);
+        $position2 = new Position(45.25, 19.28);
+
+        $bounds->extend($position1);
+        $bounds->extend($position2);
+
+        $this->assertEquals($position1->getLat(), $bounds->getSouthLat());
+        $this->assertEquals($position1->getLng(), $bounds->getWestLng());
+        $this->assertEquals($position2->getLat(), $bounds->getNorthLat());
+        $this->assertEquals($position2->getLng(), $bounds->getEastLng());
+    }
+
+    public function testCanCalculateApproximateArea(): void
+    {
+        $bounds = Bounds::createDirectly(44.12, 7.33, 50.12, 15.11);
+
+        $this->assertEqualsWithDelta(391766.09, $bounds->calculateApproximateArea(), 0.01);
+    }
+
+    public function testCanBeConvertedToArray(): void
+    {
+        $bounds = Bounds::createDirectly(44.12, 7.33, 50.12, 15.11);
+
+        $this->assertEquals(
+            ['south' => 44.12, 'west' => 7.33, 'north' => 50.12, 'east' => 15.11],
+            $bounds->toArray()
+        );
+    }
+}

tests/Util/Geo/PositionTest.php

@@ -0,0 +1,33 @@
+<?php namespace MapGuesser\Tests\Util\Geo;
+
+use MapGuesser\Util\Geo\Position;
+use PHPUnit\Framework\TestCase;
+
+final class PositionTest extends TestCase
+{
+    public function testCanBeCreatedWithLatAndLng(): void
+    {
+        $position = new Position(45.25, 18.12);
+
+        $this->assertEquals(45.25, $position->getLat());
+        $this->assertEquals(18.12, $position->getLng());
+    }
+
+    public function testCanCalculateDistanceToAnotherPosition(): void
+    {
+        $position1 = new Position(44.12, 7.33);
+        $position2 = new Position(50.12, 15.11);
+
+        $this->assertEqualsWithDelta(888785.73, $position1->calculateDistanceTo($position2), 0.01);
+    }
+
+    public function testCanBeConvertedToArray(): void
+    {
+        $position = new Position(45.25, 18.12);
+
+        $this->assertEquals(
+            ['lat' => 45.25, 'lng' => 18.12],
+            $position->toArray()
+        );
+    }
+}

tests/Util/JwtParserTest.php

@@ -0,0 +1,51 @@
+<?php namespace MapGuesser\Tests\Util;
+
+use MapGuesser\Util\JwtParser;
+use PHPUnit\Framework\TestCase;
+
+final class JwtParserTest extends TestCase
+{
+    private JwtParser $jwtParser;
+
+    protected function setUp(): void
+    {
+        $this->jwtParser = new JwtParser(
+            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c'
+        );
+    }
+
+    public function testSettingTokenIsTheSameAsCreatingWithToken(): void
+    {
+        $jwtParser2 = new JwtParser();
+        $jwtParser2->setToken(
+            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c'
+        );
+
+        $this->assertEquals($this->jwtParser, $jwtParser2);
+    }
+
+    public function testCanParseTokenHeader(): void
+    {
+        $this->assertEquals([
+            'alg' => 'HS256',
+            'typ' => 'JWT'
+        ], $this->jwtParser->getHeader());
+    }
+
+    public function testCanParseTokenPayload(): void
+    {
+        $this->assertEquals([
+            'sub' => '1234567890',
+            'name' => 'John Doe',
+            'iat' => 1516239022
+        ], $this->jwtParser->getPayload());
+    }
+
+    public function testCanParseTokenSignature(): void
+    {
+        $this->assertEquals(
+            '49f94ac7044948c78a285d904f87f0a4c7897f7e8f3a4eb2255fda750b2cc397',
+            bin2hex($this->jwtParser->getSignature())
+        );
+    }
+}

tests/View/ParserTest.php

@@ -0,0 +1,144 @@
+<?php namespace MapGuesser\Tests\View\Parser;
+
+use MapGuesser\View\ParsedFragment;
+use MapGuesser\View\Parser;
+use PHPUnit\Framework\TestCase;
+
+final class ParserTest extends TestCase
+{
+    const TEST_VIEWS_PATH = __DIR__ . '/../assets/views';
+
+    public function testCanParseViewWithoutExtends(): void
+    {
+        $file = realpath(self::TEST_VIEWS_PATH . '/view_without_extends.php');
+
+        $parser = new Parser($file);
+        $fragment = $parser->parse();
+
+        $expected = new ParsedFragment(
+            null,
+            [],
+            [],
+            [],
+            ['', '']
+        );
+
+        $this->assertEquals($expected, $fragment);
+    }
+
+    public function testCanParseViewWithAssets(): void
+    {
+        $file = realpath(self::TEST_VIEWS_PATH . '/view_with_assets.php');
+
+        $parser = new Parser($file);
+        $fragment = $parser->parse();
+
+        $expected = new ParsedFragment(
+            null,
+            [
+                'test.css'
+            ],
+            [
+                'test.js',
+                'test_<?= $some[\'expression\'] ?>'
+            ],
+            [],
+            ['', '']
+        );
+
+        $this->assertEquals($expected, $fragment);
+    }
+
+    public function testCanParseViewWithExtends(): void
+    {
+        $file = realpath(self::TEST_VIEWS_PATH . '/view_with_extends.php');
+
+        $parser = new Parser($file);
+        $fragment = $parser->parse();
+
+        $expected = new ParsedFragment(
+            'parent',
+            [],
+            [],
+            [
+                'section1' => '<div>Test HTML with @extends</div>' . "\n"
+            ],
+            ['', '']
+        );
+
+        $this->assertEquals($expected, $fragment);
+    }
+
+    public function testCanParseComplexView(): void
+    {
+        $file = realpath(self::TEST_VIEWS_PATH . '/view_complex.php');
+
+        $parser = new Parser($file);
+        $fragment = $parser->parse();
+
+        $expected = new ParsedFragment(
+            'parent',
+            [
+                'test1.css'
+            ],
+            [
+                'test1.js',
+                'test2_<?= $some[\'expression\'] ?>'
+            ],
+            [
+                'section1' => '<div>Test HTML with @extends - section 1</div>' . "\n",
+                'section2' => '<div>Test HTML with @extends - section 2</div>' . "\n"
+            ],
+            [
+                '<?php phpinfo() ?>' . "\n",
+                '<?php $a = \'test_string\' ?>' . "\n" . 'EXTRA' . "\n",
+            ]
+        );
+
+        $this->assertEquals($expected, $fragment);
+    }
+
+    public function testFailsIfMultipleExtendsGiven(): void
+    {
+        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_multiple_extends.php');
+
+        $parser = new Parser($file);
+
+        $this->expectExceptionMessage('Error in file ' . $file . ' in line 3 - There is already an \'@extends\' declared.');
+
+        $parser->parse();
+    }
+
+    public function testFailsIfSectionWithoutExtendsGiven(): void
+    {
+        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_section_without_extends.php');
+
+        $parser = new Parser($file);
+
+        $this->expectExceptionMessage('Error in file ' . $file . ' in line 1 - \'@section\' has no meaning if view extends nothing.');
+
+        $parser->parse();
+    }
+
+    public function testFailsIfOpeningSectionBeforePreviousClosed(): void
+    {
+        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_multiple_sections_open.php');
+
+        $parser = new Parser($file);
+
+        $this->expectExceptionMessage('Parse error in file ' . $file . ' in line 4 - A \'@section\' is already open (no \'@endsection\' found).');
+
+        $parser->parse();
+    }
+
+    public function testFailsIfClosingSectionWhenNoSectionIsOpen(): void
+    {
+        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_section_not_open.php');
+
+        $parser = new Parser($file);
+
+        $this->expectExceptionMessage('Parse error in file ' . $file . ' in line 4 - Cannot end section until no \'@section\' is open.');
+
+        $parser->parse();
+    }
+}

tests/assets/views/view_complex.php

@@ -0,0 +1,22 @@
+@css(test1.css)
+@js(test1.js)
+@js(test2_<?= $some['expression'] ?>)
+
+@extra
+<?php phpinfo() ?>
+@endextra
+
+@extends(parent)
+
+@section(section1)
+<div>Test HTML with @extends - section 1</div>
+@endsection
+
+@section(section2)
+<div>Test HTML with @extends - section 2</div>
+@endsection
+
+@extra
+<?php $a = 'test_string' ?>
+EXTRA
+@endextra

tests/assets/views/view_invalid_multiple_extends.php

@@ -0,0 +1,5 @@
+@extends(parent1)
+
+@extends(parent2)
+
+<div>Test HTML with multiple @extends</div>

tests/assets/views/view_invalid_multiple_sections_open.php

@@ -0,0 +1,6 @@
+@extends(parent)
+
+@section(section1)
+@section(section2)
+
+<div>Test HTML with opening @section before previous closed</div>

tests/assets/views/view_invalid_section_not_open.php

@@ -0,0 +1,4 @@
+@extends(parent)
+
+<div>Test HTML with @endsection when no section is open</div>
+@endsection

tests/assets/views/view_invalid_section_without_extends.php

@@ -0,0 +1,3 @@
+@section(section1)
+
+<div>Test HTML with @section but without @extends</div>

tests/assets/views/view_with_assets.php

@@ -0,0 +1,4 @@
+@css(test.css)
+@js(test.js)
+@js(test_<?= $some['expression'] ?>)
+<div>Test HTML with @css and @js</div>

tests/assets/views/view_with_extends.php

@@ -0,0 +1,5 @@
+@extends(parent)
+
+@section(section1)
+<div>Test HTML with @extends</div>
+@endsection

tests/assets/views/view_without_extends.php

@@ -0,0 +1 @@
+<div>Test HTML without @extends</div>

views/account/account.php

@@ -0,0 +1,40 @@
+@js(js/account/account.js)
+
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>Account</h2>
+    <div class="box">
+        <form id="accountForm" action="/account" method="post" data-observe-inputs="password_new,password_new_confirm">
+            <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
+                <p class="justify small">Please confirm your identity with your password or with Google to modify your account.</p>
+                <div class="inputWithButton">
+                    <input type="password" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                 --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
+                </div>
+            <?php elseif ($user['password'] !== null): ?>
+                <p class="justify small">Please confirm your identity with your password to modify your account.</p>
+                <input class="big fullWidth" type="password" name="password" placeholder="Current password" required minlength="6" autofocus>
+            <?php elseif ($user['google_sub'] !== null): ?>
+                <p class="justify small">Please confirm your identity with Google to modify your account.</p>
+                <div class="inputWithButton">
+                    <input type="text" name="password" placeholder="Authenticate with Google..." disabled><!--
+                 --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
+                </div>
+            <?php endif; ?>
+            <hr>
+            <?php /* TODO: disabled for the time being, email modification should be implemented */ ?>
+            <input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
+            <input class="big fullWidth marginTop" type="password" name="password_new" placeholder="New password" minlength="6">
+            <input class="big fullWidth marginTop" type="password" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
+            <p id="accountFormError" class="formError justify marginTop"></p>
+            <div class="right marginTop">
+                <button type="submit" name="submit" disabled>Save</button>
+            </div>
+            <hr>
+            <div class="center">
+                <a class="button red" href="/account/delete" title="Delete account">Delete account</a>
+            </div>
+        </form>
+    </div>
+@endsection

views/account/delete.php

@@ -0,0 +1,33 @@
+@js(js/account/account.js)
+
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>Delete account</h2>
+    <div class="box">
+        <form id="deleteAccountForm" action="/account/delete" method="post" data-redirect-on-success="/">
+            <p class="justify marginBottom">Are you sure you want to delete your account? This cannot be undone!</p>
+            <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
+                <p class="justify small">Please confirm your identity with your password or with Google to delete your account.</p>
+                <div class="inputWithButton">
+                    <input type="password" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                 --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
+                </div>
+            <?php elseif ($user['password'] !== null): ?>
+                <p class="justify small">Please confirm your identity with your password to delete your account.</p>
+                <input class="big fullWidth" type="password" name="password" placeholder="Current password" required minlength="6" autofocus>
+            <?php elseif ($user['google_sub'] !== null): ?>
+                <p class="justify small">Please confirm your identity with Google to delete your account.</p>
+                <div class="inputWithButton">
+                    <input type="text" name="password" placeholder="Authenticate with Google..." disabled><!--
+                 --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
+                </div>
+            <?php endif; ?>
+            <p id="deleteAccountFormError" class="formError justify marginTop"></p>
+            <div class="right marginTop">
+                <button class="red marginRight" type="submit" name="submit">Delete account</button><!--
+             --><a class="button gray marginTop" href="/account" title="Back to account">Cancel</a>
+            </div>
+        </form>
+    </div>
+@endsection

views/account/google_authenticate.php

@@ -0,0 +1,28 @@
+@js(js/account/google_authenticate.js)
+
+@extends(templates/layout_minimal)
+
+@section(main)
+    <h2>Authenticate with Google</h2>
+    <?php if (!$success): ?>
+    <div class="box">
+        <p class="error justify">
+            <?php if (isset($errorText)): ?>
+                <?= $errorText ?>
+            <?php else: ?>
+                Authentication with Google failed.
+            <?php endif; ?>
+            Please <a id="closeWindowButton" href="javascript:;" title="Close">close this window/tab</a> and try again!
+        </p>
+    </div>
+    <?php endif; ?>
+@endsection
+
+@section(pageScript)
+<script>
+    var success = <?= $success ? 'true' : 'false' ?>;
+    <?php if (isset($authenticatedWithGoogleUntil)): ?>
+        var authenticatedWithGoogleUntil = new Date('<?= $authenticatedWithGoogleUntil->format('c') ?>');
+    <?php endif; ?>
+</script>
+@endsection

views/admin/map_editor.php

@@ -1,56 +1,47 @@
-<?php
-$cssFiles = [
-    'node_modules/leaflet/dist/leaflet.css',
-    'css/map_editor.css',
-    'node_modules/leaflet.markercluster/dist/MarkerCluster.css',
-    'node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css'
-];
-$jsFiles = [
-    'node_modules/leaflet/dist/leaflet.js',
-    'node_modules/leaflet.markercluster/dist/leaflet.markercluster.js',
-    'https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'],
-    'js/map_editor.js',
-];
-?>
-<?php require ROOT . '/views/templates/main_header.php'; ?>
-<div class="header small">
-    <h1>
-        <a href="/maps" title="Back to playable maps">
-            <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>">
-            <span>MapGuesser</span>
-        </a>
-    </h1>
-    <p class="header">
-        <span><a href="javascript:;" id="mapName" title="Edit map data"><?= $mapName ?></a></span><!--
+@css(node_modules/leaflet/dist/leaflet.css)
+@css(css/map_editor.css)
+@css(node_modules/leaflet.markercluster/dist/MarkerCluster.css)
+@css(node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css)
+
+@js(node_modules/leaflet/dist/leaflet.js)
+@js(node_modules/leaflet.markercluster/dist/leaflet.markercluster.js)
+@js(https://maps.googleapis.com/maps/api/js?key=<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>)
+@js(js/map_editor.js)
+
+@extends(templates/layout_full)
+
+@section(subheader)
+           <span><a href="javascript:;" id="mapName" title="Edit map data"><?= $mapName ?></a></span><!--
         --><span><!--
             <?php /* Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. */ ?>
             --><svg class="inline" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M8 3.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H4a.5.5 0 0 1 0-1h3.5V4a.5.5 0 0 1 .5-.5z"/>
                 <path fill-rule="evenodd" d="M7.5 8a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1H8.5V12a.5.5 0 0 1-1 0V8z"/>
                 <path fill-rule="evenodd" d="M14 1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
-            </svg>
-            <span id="added" class="bold">0</span><!--
+            </svg><!--
+         --><span id="added" class="bold">0</span><!--
         --></span><!--
         --><span><!--
             <?php /* Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. */ ?>
             --><svg class="inline" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path d="M15.502 1.94a.5.5 0 0 1 0 .706a.5.5 0 0 1 .707 0l1.293 1.293zm-1.75 2.456l-2-2L4.939 9.21a.5.5 0 0 0-.121.196l-.805 2.414a.25.25 0 0 0 .316.316l2.414-.805a.5.5 0 0 0 .196-.12l6.813-6.814z"/>                    <path fill-rule="evenodd" d="M14 1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
-            </svg>
-            <span id="edited" class="bold">0</span><!--
+            </svg><!--
+         --><span id="edited" class="bold">0</span><!--
         --></span><!--
         --><span><!--
             <?php /* Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. */ ?>
             --><svg class="inline" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
                 <path fill-rule="evenodd" d="M3.5 8a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 0 1H4a.5.5 0 0 1-.5-.5z"/>
                 <path fill-rule="evenodd" d="M14 1H2a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/>
-            </svg>
-            <span id="deleted" class="bold">0</span><!--
+            </svg><!--
+         --><span id="deleted" class="bold">0</span><!--
         --></span>
-    </p>
-</div>
+@endsection
+
+@section(pagemodal)
 <div id="metadata" class="modal">
     <h2>Edit map data</h2>
-    <form id="metadataForm" class="marginTop">
+    <form id="metadataForm" class="marginTop" data-no-submit="true">
         <input class="fullWidth" type="text" name="name" value="<?= $mapName ?>" placeholder="Name of the map">
         <textarea  class="fullWidth marginTop" name="description" rows="4" placeholder="Description of the map"><?= $mapDescription ?></textarea>
         <div class="right">
@@ -59,19 +50,25 @@ $jsFiles = [
         </div>
     </form>
 </div>
-<div id="map"></div>
-<div id="control">
-    <button id="saveButton" class="fullWidth" disabled>Save</button>
-</div>
-<div id="panorama"></div>
-<div id="noPano">
-    <p class="bold">No panorama is available for this location.</p>
-</div>
-<div id="placeControl">
-    <button id="applyButton" class="fullWidth">Apply</button>
-    <button id="closeButton" class="gray fullWidth marginTop">Close</button>
-    <button id="deleteButton" class="red fullWidth marginTop">Delete</button>
-</div>
+@endsection
+
+@section(main)
+    <div id="map"></div>
+    <div id="panorama"></div>
+    <div id="noPano">
+        <p class="bold">No panorama is available for this location.</p>
+    </div>
+    <div id="control">
+        <button id="saveButton" class="fullWidth" disabled>Save</button>
+    </div>
+    <div id="placeControl">
+        <button id="applyButton" class="fullWidth">Apply</button>
+        <button id="closeButton" class="gray fullWidth marginTop">Close</button>
+        <button id="deleteButton" class="red fullWidth marginTop">Delete</button>
+    </div>
+@endsection
+
+@section(pageScript)
 <script>
     var tileUrl = '<?= $_ENV['LEAFLET_TILESERVER_URL'] ?>';
     var tileAttribution = '<?= $_ENV['LEAFLET_TILESERVER_ATTRIBUTION'] ?>';
@@ -79,4 +76,4 @@ $jsFiles = [
     var mapBounds = <?= json_encode($bounds) ?>;
     var places = <?= json_encode($places, JSON_FORCE_OBJECT) ?>;
 </script>
-<?php require ROOT . '/views/templates/main_footer.php'; ?>
+@endsection

views/error/404.php

@@ -1,7 +1,6 @@
-<?php require ROOT . '/views/templates/main_header.php'; ?>
-<?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
+@extends(templates/layout_normal)
+
+@section(main)
     <h2>404 | Page not found</h2>
-    <p>The requested URL was not found on this server. <a href="/" title="MapGuesser">Back to start.</a></p>
-</div>
-<?php require ROOT . '/views/templates/main_footer.php'; ?>
+    <p>The requested URL was not found on this server. <a href="/" title="<?= $_ENV['APP_NAME'] ?>">Back to start.</a></p>
+@endsection

views/game.php

@@ -1,62 +1,56 @@
-<?php
-$cssFiles = [
-    'css/game.css'
-];
-$jsFiles = [
-    'https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'],
-    'js/game.js',
-];
-?>
-<?php require ROOT . '/views/templates/main_header.php'; ?>
-<div class="header small">
-    <h1>
-        <a href="/maps" title="Back to playable maps">
-            <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>">
-            <span>MapGuesser</span>
-        </a>
-    </h1>
-    <p class="header">
+@css(css/game.css)
+
+@js(https://maps.googleapis.com/maps/api/js?key=<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>)
+@js(js/game.js)
+
+@extends(templates/layout_full)
+
+@section(subheader)
         <span id="mapName" class="bold"><?= $mapName ?></span><!--
         --><span>Round <span id="currentRound" class="bold"></span></span><!--
         --><span>Score <span id="currentScoreSum" class="bold"></span></span>
-    </p>
-</div>
-<div id="guessCover"></div>
-<div id="panorama"></div>
-<div id="showGuessButtonContainer">
-    <button id="showGuessButton" class="fullWidth">Show guess map</button>
-</div>
-<div id="guess">
-    <div id="closeGuessButtonContainer" class="buttonContainer marginBottom">
-        <button id="closeGuessButton" class="fullWidth gray">Close</button>
+@endsection
+
+@section(main)
+    <div id="panoCover"></div>
+    <div id="panorama"></div>
+    <div id="showGuessButtonContainer">
+        <button id="showGuessButton" class="fullWidth">Show guess map</button>
     </div>
-    <div id="map"></div>
-    <div id="guessButtonContainer" class="buttonContainer marginTop">
-        <button id="guessButton" class="fullWidth" disabled>Guess</button>
-    </div>
-    <div id="resultInfo">
-        <div id="distanceInfo">
-            <p>You were <span id="distance" class="bold"></span> close.</p>
-            <p class="bold">Game finished.</p>
+    <div id="guess">
+        <div id="closeGuessButtonContainer" class="buttonContainer marginBottom">
+            <button id="closeGuessButton" class="fullWidth gray">Close</button>
         </div>
-        <div id="scoreInfo">
-            <p>You earned <span id="score" class="bold"></span> points.</p>
-            <p>You got <span id="scoreSum" class="bold"></span> points in total.</p>
+        <div id="map"></div>
+        <div id="guessButtonContainer" class="buttonContainer marginTop">
+            <button id="guessButton" class="fullWidth" disabled>Guess</button>
         </div>
-        <div>
-            <div id="scoreBarBase">
-                <div id="scoreBar"></div>
+        <div id="resultInfo">
+            <div id="distanceInfo">
+                <p>You were <span id="distance" class="bold"></span> close.</p>
+                <p class="bold">Game finished.</p>
+            </div>
+            <div id="scoreInfo">
+                <p>You earned <span id="score" class="bold"></span> points.</p>
+                <p>You got <span id="scoreSum" class="bold"></span> points in total.</p>
+            </div>
+            <div>
+                <div id="scoreBarBase">
+                    <div id="scoreBar"></div>
+                </div>
             </div>
         </div>
+        <div id="continueButtonContainer" class="buttonContainer marginTop">
+            <button id="continueButton" class="fullWidth">Continue</button>
+            <button id="showSummaryButton" class="fullWidth">Show summary</button>
+            <button id="startNewGameButton" class="fullWidth">Play this map again</button>
+        </div>
     </div>
-    <div id="continueButtonContainer" class="buttonContainer marginTop">
-        <button id="continueButton" class="fullWidth">Continue</button>
-        <button id="showSummaryButton" class="fullWidth">Show summary</button>
-        <button id="startNewGameButton" class="fullWidth">Play this map again</button>
-    </div>
-</div>
+@endsection
+
+@section(pageScript)
 <script>
     var mapId = <?= $mapId ?>;
     var mapBounds = <?= json_encode($bounds) ?>;
 </script>
-<?php require ROOT . '/views/templates/main_footer.php'; ?>
+@endsection

views/login.php

@@ -1,21 +0,0 @@
-<?php
-$jsFiles = [
-    'js/login.js',
-];
-?>
-<?php require ROOT . '/views/templates/main_header.php'; ?>
-<?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
-    <h2>Login</h2>
-    <div class="box">
-        <form id="loginForm" action="/login" method="post">
-            <input class="big fullWidth" type="email" name="email" placeholder="Email address" autofocus>
-            <input class="big fullWidth marginTop" type="password" name="password" placeholder="Password">
-            <p id="loginFormError" class="formError justify marginTop"></p>
-            <div class="right marginTop">
-                <button type="submit">Login</button>
-            </div>
-        </form>
-    </div>
-</div>
-<?php require ROOT . '/views/templates/main_footer.php'; ?>

views/login/activate.php

@@ -1,9 +1,8 @@
-<?php require ROOT . '/views/templates/main_header.php'; ?>
-<?php require ROOT . '/views/templates/header.php'; ?>
-<div class="main">
+@extends(templates/layout_normal)
+
+@section(main)
     <h2>Account activation</h2>
     <div class="box">
         <p class="error justify">Activation failed. Please check the link you entered or retry <a href="/signup" title="Sign up">sign up</a>!</p>
     </div>
-</div>
-<?php require ROOT . '/views/templates/main_footer.php'; ?>
+@endsection