From 82fa4e1c5ffa266d339c603efab89a05e6cd383c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 30 May 2020 23:16:31 +0200 Subject: [PATCH 1/4] MAPG-81 update .gitattributes to store PNG files with Git LFS --- .gitattributes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index fe357d6..24a8e87 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -*.gif filter=lfs diff=lfs merge=lfs -text - +*.png filter=lfs diff=lfs merge=lfs -text From 2e2524474fca442c5d4757259b3e924dfb9b78e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 30 May 2020 23:16:42 +0200 Subject: [PATCH 2/4] MAPG-81 add favicons --- public/static/img/favicon/16x16.png | 3 +++ public/static/img/favicon/192x192.png | 3 +++ public/static/img/favicon/32x32.png | 3 +++ public/static/img/favicon/96x96.png | 3 +++ public/static/img/favicon/favicon.svg | 5 +++++ views/game.php | 4 ++++ views/maps.php | 4 ++++ 7 files changed, 25 insertions(+) create mode 100644 public/static/img/favicon/16x16.png create mode 100644 public/static/img/favicon/192x192.png create mode 100644 public/static/img/favicon/32x32.png create mode 100644 public/static/img/favicon/96x96.png create mode 100644 public/static/img/favicon/favicon.svg diff --git a/public/static/img/favicon/16x16.png b/public/static/img/favicon/16x16.png new file mode 100644 index 0000000..5600d45 --- /dev/null +++ b/public/static/img/favicon/16x16.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a294790b57f274ec8833d3abbdb8fd7e8e39b60cfa7ad27e01267dcbf0692b66 +size 713 diff --git a/public/static/img/favicon/192x192.png b/public/static/img/favicon/192x192.png new file mode 100644 index 0000000..a80322c --- /dev/null +++ b/public/static/img/favicon/192x192.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e74142bd65248bce22e250b3f5ee5a229a7fe7bed138cc9e9461f29ad4c75a76 +size 2018 diff --git a/public/static/img/favicon/32x32.png b/public/static/img/favicon/32x32.png new file mode 100644 index 0000000..22a91e1 --- /dev/null +++ b/public/static/img/favicon/32x32.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36a1b35e1b197b2aafd347e82a8f4ccd99224f7b2e4d67f9077c53184098773c +size 789 diff --git a/public/static/img/favicon/96x96.png b/public/static/img/favicon/96x96.png new file mode 100644 index 0000000..47e0387 --- /dev/null +++ b/public/static/img/favicon/96x96.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8306b2942d75f1d864e53f77b623462729d91d61cc852df6ccee82961d56ee78 +size 1295 diff --git a/public/static/img/favicon/favicon.svg b/public/static/img/favicon/favicon.svg new file mode 100644 index 0000000..b08c37a --- /dev/null +++ b/public/static/img/favicon/favicon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/views/game.php b/views/game.php index 1e17b03..e654686 100644 --- a/views/game.php +++ b/views/game.php @@ -6,6 +6,10 @@ MapGuesser + + + +
diff --git a/views/maps.php b/views/maps.php index 2df5482..9b45134 100644 --- a/views/maps.php +++ b/views/maps.php @@ -6,6 +6,10 @@ MapGuesser + + + +
From ea272582eb1f6220c920625ec3dcba879c89d11d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sat, 30 May 2020 23:19:10 +0200 Subject: [PATCH 3/4] MAPG-81 modify Bootstrap Icon copyright not to be in generated code --- views/game.php | 2 +- views/maps.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/views/game.php b/views/game.php index e654686..118607f 100644 --- a/views/game.php +++ b/views/game.php @@ -19,7 +19,7 @@

- + @@ -36,14 +36,14 @@

- + places

- + From 9a4d9435d93234947356395d0f2ec8a2e9a4d574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=91cze=20Bence?= Date: Sun, 31 May 2020 00:21:29 +0200 Subject: [PATCH 4/4] MAPG-82 introduce very basic templating --- views/game.php | 110 ++++++++++++---------------- views/maps.php | 122 +++++++++++++------------------- views/templates/icon.php | 4 ++ views/templates/main_footer.php | 2 + views/templates/main_header.php | 17 +++++ 5 files changed, 119 insertions(+), 136 deletions(-) create mode 100644 views/templates/icon.php create mode 100644 views/templates/main_footer.php create mode 100644 views/templates/main_header.php diff --git a/views/game.php b/views/game.php index 118607f..5732766 100644 --- a/views/game.php +++ b/views/game.php @@ -1,73 +1,53 @@ - - - - - - MapGuesser - - - - - - - - -

- + +
+ - +
+
+
+ +
+
+
+
-
-
-
- +
+
+
-
-
- +
+
+

You were close.

+

Game finished.

-
-
- +
+

You earned points.

+

You got points in total.

-
-
-

You were close.

-

Game finished.

-
-
-

You earned points.

-

You got points in total.

-
-
-
-
-
+
+
+
-
- - - -
- - - - - +
+ + + +
+
+ + + + \ No newline at end of file diff --git a/views/maps.php b/views/maps.php index 67531e7..2aa4b18 100644 --- a/views/maps.php +++ b/views/maps.php @@ -1,74 +1,54 @@ - - - - - - MapGuesser - - - - - - - - -
- -
-
-

- - - - - MapGuesser -

-
-
-

Playable maps

-
- -
-
-

-
- -
-
-

- - - - - places -

-

- - - - - - ~ 2 -

-
-

-
- Play this map + +
+

+ + MapGuesser +

+
+
+

Playable maps

+
+ +
+
+

- - - -
- - -
+ +
+
+

+ + + + + places +

+

+ + + + + + ~ 2 +

+
+

+
+ Play this map +
+ + + +
+ +
- - - + window.addEventListener('beforeunload', function (e) { + document.getElementById('loading').style.visibility = 'visible'; + }); + + \ No newline at end of file diff --git a/views/templates/icon.php b/views/templates/icon.php new file mode 100644 index 0000000..85fba48 --- /dev/null +++ b/views/templates/icon.php @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/views/templates/main_footer.php b/views/templates/main_footer.php new file mode 100644 index 0000000..691287b --- /dev/null +++ b/views/templates/main_footer.php @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/views/templates/main_header.php b/views/templates/main_header.php new file mode 100644 index 0000000..30ccb9f --- /dev/null +++ b/views/templates/main_header.php @@ -0,0 +1,17 @@ + + + + + + MapGuesser + + + + + + + + +
+ +
\ No newline at end of file