Commit Graph
100 Commits
Author SHA1 Message Date
bence 41b989d6e3 MAPG-41 don't re-load pano when clicking again on the selected marker 2020-06-01 23:46:43 +02:00
bence aa68e748dd Merged in bugfix/MAPG-99-fix-redirect-bug (pull request #78)
MAPG-99 use HTTP_HOST instead of SERVER_NAME to prevent wrong redirection
2020-06-01 20:45:14 +00:00
bence 637ed5d0ac MAPG-99 use HTTP_HOST instead of SERVER_NAME to prevent wrong redirection 2020-06-01 22:44:44 +02:00
bence b4de510a65 Merged in feature/MAPG-97-integrate-leaflet (pull request #77)
MAPG-97 switch off motion tracking in map editor
2020-06-01 20:07:39 +00:00
bence c51c023357 MAPG-97 switch off motion tracking in map editor 2020-06-01 22:07:13 +02:00
bence 150bc5be20 Merged in feature/MAPG-97-integrate-leaflet (pull request #75)
Feature/MAPG-97 integrate leaflet
2020-06-01 20:01:33 +00:00
bence 9085793c9f MAPG-97 add initial map editor with Leaflet (works as map viewer now) 2020-06-01 21:56:57 +02:00
bence a82b27cb90 MAPG-97 add Leaflet 2020-06-01 21:56:57 +02:00
bence f7d37b8513 MAPG-97 add and use new markers 2020-06-01 21:56:57 +02:00
bence b823af1f7d MAPG-97 make better split up of JSs, CSSs, SVGs, templates 2020-06-01 21:56:57 +02:00
bence 601598367e Merged in master (pull request #76)
MAPG-88 fix js file name in minifier
2020-06-01 19:53:01 +00:00
bence ebda08095b Merged in develop (pull request #74)
Develop
2020-05-31 19:56:46 +00:00
bence 9e9ada9478 Merged in feature/MAPG-86-make-routing-better (pull request #73)
Feature/MAPG-86 make routing better
2020-05-31 19:02:17 +00:00
bence 665eb7e4d1 MAPG-86 adapt URLs in HTML and JS 2020-05-31 21:00:23 +02:00
bence 28464fc4ac MAPG-86 add 404 error page 2020-05-31 21:00:23 +02:00
bence b2eabfb9b8 MAPG-86 adapt index.php to the new routing structure 2020-05-31 21:00:23 +02:00
bence 44db217e8b MAPG-86 add home controller (only redirects now) 2020-05-31 21:00:23 +02:00
bence 927b34956f MAPG-86 adapt controller classes to the new controller structure 2020-05-31 21:00:23 +02:00
bence 88fe7b7a03 MAPG-86 refactor view-controller 2020-05-31 21:00:23 +02:00
bence b0b244712f MAPG-86 add RouteCollection to global Container 2020-05-31 21:00:23 +02:00
bence 6835db5e1f MAPG-86 add classes for routing 2020-05-31 21:00:23 +02:00
bence 7a924c5257 Merged in feature/MAPG-92-use-nginx-instead-of-apache-in-docker (pull request #71)
MAPG-92 use Nginx instead of Apache in Docker environment
2020-05-31 12:47:59 +00:00
bence 6115dc7bc6 MAPG-92 use Nginx instead of Apache in Docker environment 2020-05-31 14:41:53 +02:00
bence 02c258d1c0 Merged in develop (pull request #70)
MAPG-90 disable unload prevention and unify onbeforeunload script (loading animation)
2020-05-31 01:51:13 +00:00
bence 0ca7ea75b2 Merged in feature/MAPG-90-switch-off-unload-prevention (pull request #69)
MAPG-90 disable unload prevention and unify onbeforeunload script (loading animation)
2020-05-31 01:50:50 +00:00
bence fe095cf435 MAPG-90 disable unload prevention and unify onbeforeunload script (loading animation) 2020-05-31 03:50:06 +02:00
bence 65a6099a96 Merged in develop (pull request #68)
Develop
2020-05-30 22:38:43 +00:00
bence 098f34ca0a Merged in feature/MAPG-82-create-html-template (pull request #67)
MAPG-82 introduce very basic templating
2020-05-30 22:24:56 +00:00
bence 9a4d9435d9 MAPG-82 introduce very basic templating 2020-05-31 00:21:29 +02:00
bence 2a14be7c3a Merged in feature/MAPG-81-create-favicon (pull request #66)
Feature/MAPG-81 create favicon
2020-05-30 21:22:22 +00:00
bence ea272582eb MAPG-81 modify Bootstrap Icon copyright not to be in generated code 2020-05-30 23:19:10 +02:00
bence 2e2524474f MAPG-81 add favicons 2020-05-30 23:18:05 +02:00
bence 82fa4e1c5f MAPG-81 update .gitattributes to store PNG files with Git LFS 2020-05-30 23:16:31 +02:00
bence c61121f63d Merged in hotfix/MAPG-88-fix-the-name-of-the-js-in-minifi (pull request #65)
MAPG-88 fix js file name in minifier
2020-05-30 18:51:47 +00:00
bence c615f00d03 MAPG-88 fix js file name in minifier 2020-05-30 20:51:15 +02:00
bence 74dd30178d Merged in develop (pull request #64)
Develop
2020-05-30 18:48:47 +00:00
bence 2d088f1108 Merged in feature/MAPG-83-format-map-area-value-more-properly (pull request #63)
MAPG-83 format area value with decimal separator and superscript in unit
2020-05-30 18:41:24 +00:00
bence 77238a6ead MAPG-83 format area value with decimal separator and superscript in unit 2020-05-30 20:40:47 +02:00
bence 4f422b2b29 Merged in feature/MAPG-64-create-cover-div-over-panorama (pull request #62)
MAPG-64 create cover div when user should not click on the pano or guess map
2020-05-30 18:14:08 +00:00
bence 88a1d5ab8e MAPG-64 create cover div when user should not click on the pano or guess map
add loading animation to maps page too
CSS fixes
2020-05-30 20:13:00 +02:00
bence 8a433abe9f Merged in bugfix/MAPG-85-fix-map-divs-width-on-mobile (pull request #61)
MAPG-85 make static map's width mobile friendly
2020-05-30 17:12:09 +00:00
bence b9a36e5ccf MAPG-85 make static map's width mobile friendly
further style improvements on map selection page
2020-05-30 19:11:38 +02:00
bence 5bc2d73ceb Merged in feature/MAPG-72-revision-of-the-confirmation (pull request #60)
MAPG-72 prevent to show 'beforeonload' confirmation panel if we already have the real position (guess is evaluated)
2020-05-30 16:15:40 +00:00
bence 1e7b106689 MAPG-72 prevent to show 'beforeonload' confirmation panel if we already have the real position (guess is evaluated) 2020-05-30 18:14:50 +02:00
bence 136d4fe655 Merged in bugfix/MAPG-71-guess-button-stays-disabled (pull request #59)
MAPG-71 remove guessMarker from map when resetting the game
2020-05-30 16:06:00 +00:00
bence 5ff42b0849 MAPG-71 remove guessMarker from map when resetting the game 2020-05-30 18:05:22 +02:00
bence a27aece4fa Merged in feature/MAPG-73-implement-map-selection (pull request #58)
Feature/MAPG-73 implement map selection
2020-05-30 15:43:05 +00:00
bence 8afcde393f MAPG-73 show header with link on the gaming screen
move round info to the new header
2020-05-30 17:39:45 +02:00
bence c773240512 MAPG-73 add license of Boostrap Icons 2020-05-30 17:39:45 +02:00
bence 9ffedf6030 MAPG-73 introduce map selection
unify CSS
2020-05-30 17:39:45 +02:00
bence 92c35a2087 MAPG-73 pass mapId to GameController and PositionController
adapt JS to send mapId
make separate JS for the game
2020-05-30 15:33:28 +02:00
bence 7129459d72 Merged in develop (pull request #57)
Develop
2020-05-29 23:59:45 +00:00
bence 1ca023e612 Merged in feature/MAPG-79-replace-the-non-free-svg (pull request #56)
Feature/MAPG-79 replace the non free svg
2020-05-29 23:55:08 +00:00
bence 675dd7cd07 MAPG-78 [fix] add missing return types to some methods 2020-05-30 01:53:39 +02:00
bence d55caefda0 MAPG-78 use svgo instead of html-minifier 2020-05-30 01:53:39 +02:00
bence f4e9930093 MAPG-78 replace loading SVG to an own version 2020-05-30 01:53:39 +02:00
bence 7ac7694fc6 Merged in feature/MAPG-78-change-license-to-agpl (pull request #55)
MAPG-78 change license to AGPL and include the license
2020-05-29 23:43:01 +00:00
bence d5a17e1050 MAPG-78 change license to AGPL and include the license 2020-05-30 01:42:14 +02:00
bence 647f5a1392 Merged in feature/MAPG-43-workout-concept-for-handling-db (pull request #54)
Feature/MAPG-43 workout concept for handling db
2020-05-28 22:21:29 +00:00
bence 81d2c9e3fb MAPG-43 rewrite controllers to use the new http classes 2020-05-29 00:12:35 +02:00
bence a33244fb56 MAPG-43 rewrite controllers to use the new DB classes 2020-05-29 00:12:35 +02:00
bence 5a41348cc3 MAPG-43 connect to MySQL database in main.php 2020-05-29 00:12:35 +02:00
bence d1c28e2d91 MAPG-43 add classes to handle http queries
remove romanpitak/php-rest-client from composer.json
2020-05-29 00:12:35 +02:00
bence 5738be5c98 MAPG-43 move existing interfaces into separate namespace 2020-05-28 21:07:59 +02:00
bence 17c0ec73df MAPG-43 initial classes for DB handling 2020-05-28 21:07:59 +02:00
bence 46c9819502 Merged in develop (pull request #53)
Develop
2020-05-26 21:35:18 +00:00
bence b821d4a045 Merged in master (pull request #52)
MAPG-65 create variable so it can be a reference
2020-05-26 21:27:15 +00:00
bence 2bb0d33ae3 Merged in feature/MAPG-67-handle-expiring-session (pull request #51)
Feature/MAPG-67 handle expiring session
2020-05-26 21:26:40 +00:00
bence a3665c5a6a MAPG-67 make it possible to reset the game on error in JS
refactor JS to make round and game resetting unified
2020-05-26 23:25:21 +02:00
bence 6f8f2cf9cf MAPG-67 make GameController able to return JSON response 2020-05-26 23:19:23 +02:00
bence 9582c93ec1 Merged in hotfix/MAPG-65-fix-php-error (pull request #50)
MAPG-65 create variable so it can be a reference
2020-05-26 19:44:25 +00:00
bence 59b93e0078 MAPG-65 create variable so it can be a reference 2020-05-26 21:27:15 +02:00
bence 98f975bf91 Merged in develop (pull request #49)
Develop
2020-05-25 19:05:28 +00:00
bence 7633f793d6 Merged in feature/MAPG-47-install-composer-packages-at-update (pull request #48)
MAPG-47 install Composer packages at update
2020-05-25 18:13:59 +00:00
bence eef7f03166 MAPG-47 install Composer packages at update 2020-05-25 20:13:07 +02:00
bence ebebff2c02 Merged in feature/MAPG-47-store-session-on-server-side (pull request #47)
Feature/MAPG-47 store session on server side
2020-05-25 18:08:07 +00:00
bence 5e068e0aed MAPG-47 refactor JS to be adapted to the new PositionController 2020-05-25 19:51:02 +02:00
bence 72a79d4267 MAPG-47 introduce PositionController which replaces GetNewPosition and also calculates results 2020-05-25 19:46:31 +02:00
bence 567238c979 MAPG-47 refactor GameController and its view 2020-05-25 19:14:49 +02:00
bence 8eb3dcf2e2 MAPG-47 add toArray() method to Bounds 2020-05-25 18:54:37 +02:00
bence 55d5cad40a MAPG-47 add GOOGLE_MAPS_SERVER_API_KEY to .env.example 2020-05-25 18:53:01 +02:00
bence e56361274c MAPG-47 start server-side session 2020-05-25 18:52:42 +02:00
bence 2d22d14817 MAPG-47 make possible to pass GET parameters to URL 2020-05-25 18:52:31 +02:00
bence 41e8564872 MAPG-47 install romanpitak/php-rest-client 2020-05-25 18:51:44 +02:00
bence e9f4de99e7 MAPG-47 add php-curl to Dockerfile 2020-05-25 18:51:15 +02:00
bence 7037bad313 Merged in develop (pull request #46)
MAPG-63 query only outdoor panos from StreetViewService
2020-05-24 20:05:21 +00:00
bence a36428f54d Merged in feature/MAPG-63-show-only-outdoor-panos (pull request #45)
MAPG-63 query only outdoor panos from StreetViewService
2020-05-24 16:02:34 +00:00
bence 46abd1fb63 MAPG-63 query only outdoor panos from StreetViewService 2020-05-24 17:59:26 +02:00
bence c9c23e912f Merged in develop (pull request #44)
Develop
2020-05-24 13:46:59 +00:00
bence 4dbb8a7cba Merged in feature/MAPG-62-minify-svg-after-deployment (pull request #43)
Feature/MAPG-62 minify svg after deployment
2020-05-24 13:44:00 +00:00
bence 334038dc97 MAPG-62 add html-minifier to Dockerfile 2020-05-24 15:43:22 +02:00
bence 0b7012b4d2 MAPG-62 minify SVG files with html-minifier
put minify calls into separate sh script
2020-05-24 15:42:29 +02:00
bence 0c97d0301d Merged in bugfix/MAPG-59-avoid-overlapping-markers-on-summary (pull request #42)
MAPG-59 fix overlapping markers
2020-05-24 13:01:43 +00:00
bence a6541d1152 MAPG-59 fix overlapping markers
- real markers are always over guess markers
- latest marker is always over the old marker in real/guess group
2020-05-24 15:00:58 +02:00
bence b32cfacdad Merged in feature/MAPG-61-prevent-leaving-page-accidentall (pull request #41)
MAPG-61 add onbeforeunload function to prevent accidental leave
2020-05-24 12:47:48 +00:00
bence 92408d6f02 MAPG-61 add onbeforeunload function to prevent accidental leave 2020-05-24 14:47:15 +02:00
bence 830989dc4c Merged in master (pull request #40)
MAPG-60 fix JS syntax error
2020-05-24 12:12:12 +00:00
bence 605149ab71 Merged in feature/MAPG-52-find-new-loading-animation (pull request #39)
MAPG-52 replace loading animation
2020-05-24 12:04:43 +00:00
bence 4641aa81f8 MAPG-52 replace loading animation 2020-05-24 14:02:42 +02:00
bence 9ef0a9ac79 Merged in hotfix/MAPG-60-fix-js-syntax-error (pull request #38)
MAPG-60 fix JS syntax error
2020-05-23 00:35:27 +00:00