Merge branch 'hotfix/site_build_logging'

client/scripts/custom.js.php

@@ -6,6 +6,8 @@
 
 ?>
 
+log('Script "custom.js" loaded');
+
 var loaderCount = 2;
 var showLoader = function() {
 	if (loaderCount < 1) {
@@ -19,6 +21,7 @@ var hideLoader = function() {
 	if (loaderCount < 1) {
 		$('#preloader').addClass('preloader-hide');
 		loaderCount = 0;
+		log('Loader hidden');
 	}
 }
 
@@ -35,11 +38,15 @@ function eraseCookie(e) {createCookie(e, "", -1)}
 $(document).ready(function(){
 	'use strict'
 
+	log('Document ready');
+
 	var isAJAX = false; //Enables or disable AJAX page transitions and loading.
 	var isDevelopment = false; // Enables development mode. Clean cache & Stops BG & Highlights from changing defaults.
 
 	function init_template(){
 
+		log('Initializing template...');
+
 		//ADD YOUR CUSTOM JAVASCRIPT CODES HERE!
 		//Do not put inside HTML files.
 		//The init_template() function will be triggered when pages open.
@@ -1345,6 +1352,9 @@ $(document).ready(function(){
 		$('#menu-welcome-a-okay').click(welcomeOk);
 		showWelcome();
 
+		log('Template initialized');
+		log('Initializing app');
+
 		initRegatten();
 
 		hideLoader();

client/scripts/database.js

@@ -445,6 +445,7 @@ async function updateSyncStatus() {
 }
 
 async function runPageScript() {
+	log('running page script...')
 	if (canUseLocalDB) {
 		var osUpdateTimes = db.transaction('update_times').objectStore('update_times');
 		osUpdateTimes.get('loggedin').onsuccess = function (event) {
@@ -473,8 +474,10 @@ async function runPageScript() {
 	}
 
 	if (typeof siteScript === 'function') {
+		log('loading site script');
 		siteScript();
 	} else {
+		log('no site script');
 		hideLoader();
 	}
 }
@@ -928,6 +931,7 @@ function checkSync() {
 }
 
 function initDatabase() {
+	log('Initializing DB...');
 	if (window.indexedDB) {
 		var request = window.indexedDB.open('regatten_app_db_' + BOATCLASS, DB_VERSION);
 		request.onerror = function (event) {

client/scripts/regatten.js.php

@@ -440,8 +440,12 @@ async function updateNewsBadge() {
 var initRegatten = function() {
 	showLoader();
 
+	log('Initializing DB...');
+
 	initDatabase();
 
+	log('Loading app specific code...');
+
 	if (isLoggedIn()) {
 		$('.show-loggedin').show();
 		$('.show-notloggedin').hide();
@@ -461,6 +465,7 @@ var initRegatten = function() {
 }
 
 var onServiceWorkerLoaded = function() {
+	log('sW loaded');
 	if ((swRegistration !== null) && canUseLocalDB) {
 		pushesPossible = true;
 		updatePushBadge();
@@ -470,6 +475,7 @@ var onServiceWorkerLoaded = function() {
 }
 
 var onDatabaseLoaded = function() {
+	log('DB loaded');
 	if (!canUseLocalDB && !$('#menu-welcome').hasClass('menu-active')) {
 		function NoDbWarningOk() {
 			createCookie('regatten_nodb_banner', true, 1);
@@ -500,13 +506,13 @@ var addConsoleOpenerToPreloader = function() {
 	var preloader = document.getElementById('preloader');
 	var button = document.createElement('a');
 	button.href = '#';
-	button.classList = 'btn btn-full rounded-s text-uppercase font-900 shadow-m bg-highlight m-3';
+	button.classList = 'btn rounded-s text-uppercase font-900 shadow-m m-3';
 	button.style.position = 'fixed';
 	button.style.bottom = 0;
-	button.style.left = 0;
 	button.style.right = 0;
-	button.innerHTML = 'Show Console';
+	button.innerHTML = '</>';
 	button.onclick = function(){
+		alert('CONSOLE OPENED\nDir werden jetzt einige Entwickler-Informationen angezeigt. Du kannst die Console über das X oben rechts wieder schließen.');
 		mobileConsole.displayConsole();
 		return false;
 	}

server/version.php

@@ -1,5 +1,5 @@
 <?php
 
-	define('PWA_VERSION', '1.10.3');
+	define('PWA_VERSION', '1.10.3h2');
 
 ?>

service-worker.js.php

@@ -311,3 +311,16 @@ self.addEventListener('notificationclick', function(event) {
 		clients.openWindow(url)
 	);
 });
+
+self.addEventListener('pushsubscriptionchange', function(event) {
+	var formData = new URLSearchParams();
+	formData.append('old', JSON.stringify(event.oldSubscription));
+	formData.append('new', JSON.stringify(event.newSubscription));
+	event.waitUntil(
+		fetch('<?php echo QUERY_URL; ?>update_subscription', {
+			method: 'POST',
+			cache: 'no-cache',
+			body: formData
+		})
+	);
+});