Commit 374da871 authored by Daniel Friesel's avatar Daniel Friesel
Browse files

hide status countdown when offline

parent 66a35a35

public/service-worker.js

+9 −9
Original line number Diff line number Diff line 
const CACHE_NAME = 'static-cache-v15';

const CACHE_NAME = 'static-cache-v16';

const FILES_TO_CACHE = [

  '/offline.html',

  '/static/v15/css/materialize.min.css',

  '/static/v15/css/material-icons.css',

  '/static/v15/css/local.css',

  '/static/v15/js/jquery-3.4.1.min.js',

  '/static/v15/js/materialize.min.js',

  '/static/v15/js/travelynx-actions.min.js',

  '/static/v15/js/autocomplete.min.js',

  '/static/v15/js/geolocation.min.js',

  '/static/v16/css/materialize.min.css',

  '/static/v16/css/material-icons.css',

  '/static/v16/css/local.css',

  '/static/v16/js/jquery-3.4.1.min.js',

  '/static/v16/js/materialize.min.js',

  '/static/v16/js/travelynx-actions.min.js',

  '/static/v16/js/autocomplete.min.js',

  '/static/v16/js/geolocation.min.js',

];



self.addEventListener('install', (evt) => {

public/static/css/material-icons.css

+4 −4
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ 
  font-family: 'Material Icons';

  font-style: normal;

  font-weight: 400;

  src: url(/static/v15/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */

  src: url(/static/v16/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */

  src: local('Material Icons'),

       local('MaterialIcons-Regular'),

       url(/static/v15/fonts/MaterialIcons-Regular.woff2) format('woff2'),

       url(/static/v15/fonts/MaterialIcons-Regular.woff) format('woff'),

       url(/static/v15/fonts/MaterialIcons-Regular.ttf) format('truetype');

       url(/static/v16/fonts/MaterialIcons-Regular.woff2) format('woff2'),

       url(/static/v16/fonts/MaterialIcons-Regular.woff) format('woff'),

       url(/static/v16/fonts/MaterialIcons-Regular.ttf) format('truetype');

}



.material-icons {

public/static/js/travelynx-actions.js

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ function tvly_update() { 
		setTimeout(tvly_update, 20000);

	}).fail(function() {

		$('.sync-failed-marker').css('display', 'block');

		$('.countdown').html(' ');

		setTimeout(tvly_update, 5000);

	});

}
@@ -37,6 +38,7 @@ function tvly_update_public() { 
		setTimeout(tvly_update_public, 20000);

	}).fail(function() {

		$('.sync-failed-marker').css('display', 'block');

		$('.countdown').html(' ');

		setTimeout(tvly_update_public, 5000);

	});

}

public/static/js/travelynx-actions.min.js

+1 −1
Original line number Diff line number Diff line 
function tvly_run(a,t,e){var c='<i class="material-icons">error</i>',n=$('<div class="progress"><div class="indeterminate"></div></div>');a.hide(),a.after(n),$.post("/action",t,function(t){t.success?$(location).attr("href",t.redirect_to):(M.toast({html:c+" "+t.error}),n.remove(),e&&e(),a.append(" "+c),a.show())})}function tvly_update(){$.get("/ajax/status_card.html",function(t){$(".statuscol").html(t),tvly_reg_handlers(),setTimeout(tvly_update,2e4)}).fail(function(){$(".sync-failed-marker").css("display","block"),setTimeout(tvly_update,5e3)})}function tvly_update_public(){var t;$(".publicstatuscol").each(function(){t=$(this).data("user")}),$.get("/ajax/status/"+t+".html",function(t){$(".publicstatuscol").html(t),setTimeout(tvly_update_public,2e4)}).fail(function(){$(".sync-failed-marker").css("display","block"),setTimeout(tvly_update_public,5e3)})}function tvly_reg_handlers(){$(".action-checkin").click(function(){var t=$(this);tvly_run(t,{action:"checkin",station:t.data("station"),train:t.data("train")})}),$(".action-checkout").click(function(){var t=$(this),a={action:"checkout",station:t.data("station"),force:t.data("force")};tvly_run(t,a,function(){t.append(" – Ohne Echtzeitdaten auschecken?"),t.data("force",!0)})}),$(".action-undo").click(function(){var t=$(this);tvly_run(t,{action:"undo",undo_id:t.data("id")})}),$(".action-cancelled-from").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_from",station:t.data("station"),train:t.data("train")})}),$(".action-cancelled-to").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_to",station:t.data("station"),force:!0})}),$(".action-delete").click(function(){var t=$(this),a={action:"delete",id:t.data("id"),checkin:t.data("checkin"),checkout:t.data("checkout")};really_delete=confirm("Diese Zugfahrt wirklich löschen? Der Eintrag wird sofort aus der Datenbank entfernt und kann nicht wiederhergestellt werden."),really_delete&&tvly_run(t,a)})}$(document).ready(function(){tvly_reg_handlers(),$(".statuscol .autorefresh").length&&setTimeout(tvly_update,2e4),$(".publicstatuscol .autorefresh").length&&setTimeout(tvly_update_public,2e4),$("a[href]").click(function(){$("nav .preloader-wrapper").addClass("active")})});
 
function tvly_run(a,t,e){var n='<i class="material-icons">error</i>',c=$('<div class="progress"><div class="indeterminate"></div></div>');a.hide(),a.after(c),$.post("/action",t,function(t){t.success?$(location).attr("href",t.redirect_to):(M.toast({html:n+" "+t.error}),c.remove(),e&&e(),a.append(" "+n),a.show())})}function tvly_update(){$.get("/ajax/status_card.html",function(t){$(".statuscol").html(t),tvly_reg_handlers(),setTimeout(tvly_update,2e4)}).fail(function(){$(".sync-failed-marker").css("display","block"),$(".countdown").html("&nbsp;"),setTimeout(tvly_update,5e3)})}function tvly_update_public(){var t;$(".publicstatuscol").each(function(){t=$(this).data("user")}),$.get("/ajax/status/"+t+".html",function(t){$(".publicstatuscol").html(t),setTimeout(tvly_update_public,2e4)}).fail(function(){$(".sync-failed-marker").css("display","block"),$(".countdown").html("&nbsp;"),setTimeout(tvly_update_public,5e3)})}function tvly_reg_handlers(){$(".action-checkin").click(function(){var t=$(this);tvly_run(t,{action:"checkin",station:t.data("station"),train:t.data("train")})}),$(".action-checkout").click(function(){var t=$(this),a={action:"checkout",station:t.data("station"),force:t.data("force")};tvly_run(t,a,function(){t.append(" – Ohne Echtzeitdaten auschecken?"),t.data("force",!0)})}),$(".action-undo").click(function(){var t=$(this);tvly_run(t,{action:"undo",undo_id:t.data("id")})}),$(".action-cancelled-from").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_from",station:t.data("station"),train:t.data("train")})}),$(".action-cancelled-to").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_to",station:t.data("station"),force:!0})}),$(".action-delete").click(function(){var t=$(this),a={action:"delete",id:t.data("id"),checkin:t.data("checkin"),checkout:t.data("checkout")};really_delete=confirm("Diese Zugfahrt wirklich löschen? Der Eintrag wird sofort aus der Datenbank entfernt und kann nicht wiederhergestellt werden."),really_delete&&tvly_run(t,a)})}$(document).ready(function(){tvly_reg_handlers(),$(".statuscol .autorefresh").length&&setTimeout(tvly_update,2e4),$(".publicstatuscol .autorefresh").length&&setTimeout(tvly_update_public,2e4),$("a[href]").click(function(){$("nav .preloader-wrapper").addClass("active")})});

public/static/manifest.json

+6 −6
Original line number Diff line number Diff line
@@ -3,27 +3,27 @@ 
  "short_name": "Travelynx",

  "scope": "/",

  "icons": [{

    "src": "/static/v15/icons/icon-128x128.png",

    "src": "/static/v16/icons/icon-128x128.png",

      "sizes": "128x128",

      "type": "image/png"

    }, {

      "src": "/static/v15/icons/icon-144x144.png",

      "src": "/static/v16/icons/icon-144x144.png",

      "sizes": "144x144",

      "type": "image/png"

    }, {

      "src": "/static/v15/icons/icon-152x152.png",

      "src": "/static/v16/icons/icon-152x152.png",

      "sizes": "152x152",

      "type": "image/png"

    }, {

      "src": "/static/v15/icons/icon-192x192.png",

      "src": "/static/v16/icons/icon-192x192.png",

      "sizes": "192x192",

      "type": "image/png"

    }, {

      "src": "/static/v15/icons/icon-256x256.png",

      "src": "/static/v16/icons/icon-256x256.png",

      "sizes": "256x256",

      "type": "image/png"

    }, {

      "src": "/static/v15/icons/icon-512x512.png",

      "src": "/static/v16/icons/icon-512x512.png",

      "sizes": "512x512",

      "type": "image/png"

    }],