vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anders 2020-11-27 11:30:10 +01:00
parent c3ca99c9e0 a082ac9cea
commit 489e0ca0e4
6 changed files with 174 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
skolehjem/public/js/serviceWorkerCachedWebpags.js vendored
View File

@ -1,81 +0,0 @@
const staticCacheName = 'site-static-v2';
const dynamicCacheName = 'site-dynamic-v1';
const assets = [
'/',
'/css/app.css',
'/css/normalize.css',
'/css/webapp.css',
'/css/webappdark.css',
'/home',
'/events'
];
// install event
self.addEventListener('install', evt => {
//console.log('service worker installed');
evt.waitUntil(
caches.open(staticCacheName).then((cache) => {
console.log('caching shell assets');
return cache.addAll(assets);
})
);
});
// activate event
self.addEventListener('activate', evt => {
//console.log('service worker activated');
evt.waitUntil(
caches.keys().then(keys => {
//console.log(keys);
return Promise.all(keys
.filter(key => key !== staticCacheName && key !== dynamicCacheName)
.map(key => caches.delete(key))
);
})
);
});
// fetch event
self.addEventListener('fetch', evt => {
//console.log('fetch event', evt);
evt.respondWith(
caches.match(evt.request).then(cacheRes => {
return cacheRes || fetch(evt.request).then(fetchRes => {
return caches.open(dynamicCacheName).then(cache => {
cache.put(evt.request.url, fetchRes.clone()).then(r => {
return fetchRes;
});
})
});
})
);
});
//Push notification, this is more of a demo you can test in the dev tool
self.addEventListener('push', evt => {
const title = "Test Notification";
const body = "Det her et en demo på hvordan en notification kan se ud! ";
const icon = "/icons/browserFavIcon.svg"
const tag = "simple-push-example-tag";
evt.waitUntil(
self.registration.showNotification(title, {
body : body,
icon : icon,
tag : tag
})
);
});
function displayNotification(){
if(Notification.permission === 'granted'){
navigator.serviceWorker.getRegistration()
.then(function (reg){
reg.showNotification('Helloe ')
})
}
}

27
skolehjem/public/offline.html Normal file
View File

@ -0,0 +1,27 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>@yield("title")</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link type="text/css" rel="stylesheet" href="/css/webappdark.css">
<link type="text/css" rel="stylesheet" href="/css/webapp.css">
<script type="text/javascript">
function setMain() {
var main = document.getElementsByTagName("main")[0];
var header = document.getElementsByTagName("header")[0];
main.style.minHeight = 'calc(100% - ' + header.clientHeight + 'px)';
}
</script>
</head>
<body>
<main style="height: 100%; justify-content: unset">
<h1 class="sde-blue" style="font-size: 12vw; text-align: center">ERROR: NO NETWORK</h1>
<p class="mb-0" style="text-align: center; font-size: 4vw;">Du har ikke cachet denne side</p>
<button onclick="window.history.back()" class="btn-sde-blue btn w-100 mt-auto mb-1">Tilbage</button>
</main>
<script src="/js/app.js"></script>
</body>
</html>

142
skolehjem/public/serviceWorkerCachedWebpags.js vendored Normal file
View File

@ -0,0 +1,142 @@
const staticCacheName = 'site-static-v2';
const dynamicCacheName = 'site-dynamic-v1';
const assets = [
'/offline.html',
'/css/app.css',
'/css/normalize.css',
'/css/webapp.css',
'/css/webappdark.css',
'/images/icons/Vagttelefon-normal.svg',
'/images/icons/Vagttelefon-hvid.svg',
'/images/icons/about.svg',
'/images/icons/Aktiviteter.svg',
'/images/icons/Home.svg',
'/images/icons/Kontoret.svg',
'/images/icons/location.svg',
'/images/icons/Menuplan.svg',
'/images/icons/news.svg',
'/images/icons/phone.svg',
'/images/icons/questionmark.svg',
'/images/icons/settings-hvid.svg',
'/images/icons/user.svg',
'/images/icons/user-hvid.svg',
'/images/icons/Vejledninger.svg',
'/images/icons/watermelon.svg',
'/images/logos/Logo-hvid.svg',
'/images/logos/Logo-normal.svg',
'/images/icons/Logout.svg'
];
// install event
self.addEventListener('install', evt => {
//console.log('service worker installed');
evt.waitUntil(
caches.open(staticCacheName).then((cache) => {
//console.log('caching shell assets');
return cache.addAll(assets);
}).catch((r) => {
console.log("I dont workkkkk");
})
);
});
// activate event
self.addEventListener('activate', evt => {
//console.log('service worker activated');
evt.waitUntil(
caches.keys().then(keys => {
//console.log(keys);
return Promise.all(keys
.filter(key => key !== staticCacheName && key !== dynamicCacheName)
.map(key => caches.delete(key))
);
})
);
});
// fetch event
/*
self.addEventListener('fetch', evt => {
console.log('fetch event');
evt.respondWith(
caches.match(evt.request).then(async function (cacheRes) {
return cacheRes || fetch(evt.request).then(fetchRes => {
return caches.open(dynamicCacheName).then(cache => {
cache.put(evt.request.url, fetchRes.clone()).then(r => {
return fetchRes;
});
}).catch((r) => {
console.log("I dont work");
});
});
})
);
});*/
self.addEventListener('fetch', evt => {
console.log('fetch event', evt);
evt.respondWith(
caches.match(evt.request).then(cacheRes => {
return cacheRes || fetch(evt.request).then(fetchRes => {
return caches.open(dynamicCacheName).then(cache => {
cache.put(evt.request.url, fetchRes.clone());
return fetchRes;
})
});
}).catch(function () {
return caches.match('/offline.html');
})
);
});
/*
self.addEventListener('fetch', evt => {
console.log("ARGHHHH");
if(navigator.onLine) {
evt.respondWith(async function() {
return fetch(evt.request).then((fetchRes) => {
caches.open(dynamicCacheName).then(cache => {
cache.put(evt.request.url, fetchRes.clone());
})
})
});
} else {
console.log('fetch event');
evt.respondWith(async function () {
let cachedResponse = await caches.match(evt.request);
if(cachedResponse) return cachedResponse;
else return caches.match("/offline.html");
});
}
});*/
/*
self.addEventListener('push', evt => {
const title = "Test Notification";
const body = "Det her et en demo på hvordan en notification kan se ud! ";
const icon = "/icons/browserFavIcon.svg"
const tag = "simple-push-example-tag";
evt.waitUntil(
self.registration.showNotification(title, {
body : body,
icon : icon,
tag : tag
})
);
});
function displayNotification(){
if(Notification.permission === 'granted'){
navigator.serviceWorker.getRegistration()
.then(function (reg){
reg.showNotification('Helloe ')
})
}
}
*/

2
skolehjem/public/js/serviceWorkerRegistration.js → skolehjem/public/serviceWorkerRegistration.js vendored
View File

@ -7,7 +7,7 @@ Make sure that we support service worker :)
if('serviceWorker' in navigator){ if('serviceWorker' in navigator){
window.addEventListener('load', () => { window.addEventListener('load', () => {
navigator.serviceWorker navigator.serviceWorker
.register('/js/serviceWorkerCachedWebpags.js') .register('/serviceWorkerCachedWebpags.js')
.then(reg => console.log("Service Worker has been: registered")) .then(reg => console.log("Service Worker has been: registered"))
.catch(err => console.log(`Service Worker error: ${err}`)) .catch(err => console.log(`Service Worker error: ${err}`))
}) })

4
skolehjem/resources/views/app/layout/base.blade.php
View File

@ -14,7 +14,7 @@
<meta name="msapplication-navbutton-color" content="00788a"> <meta name="msapplication-navbutton-color" content="00788a">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="msapplication-starturl" content="/login"> <meta name="msapplication-starturl" content="/login">
<link rel="apple-touch-icon" type="images/svg" sizes="150x150" href="appIcon.svg"> <link rel="apple-touch-icon" type="images/svg" sizes="150x150" href="/images/icons/appIcon.svg">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" type="images/svg" sizes="72x72" href="/images/icons/img72x72.svg"> <link rel="shortcut icon" type="images/svg" sizes="72x72" href="/images/icons/img72x72.svg">
<link rel="shortcut icon" type="images/svg" sizes="96x96" href="/images/icons/img96x96.svg"> <link rel="shortcut icon" type="images/svg" sizes="96x96" href="/images/icons/img96x96.svg">
@ -121,7 +121,7 @@
</style> </style>
@yield("content") @yield("content")
<script src="{{ mix("/js/app.js") }}"></script> <script src="{{ mix("/js/app.js") }}"></script>
<script src="/js/serviceWorkerRegistration.js"></script> <script src="/serviceWorkerRegistration.js"></script>
<!--We have a service worker on the login pages, dont know if he works on the rest of the website, it looks like he does :) --> <!--We have a service worker on the login pages, dont know if he works on the rest of the website, it looks like he does :) -->
@if(request()->cookie("mode") == "dark") @if(request()->cookie("mode") == "dark")
<script type="text/javascript"> <script type="text/javascript">

3
skolehjem/resources/views/user/layout/base.blade.php
View File

@ -24,12 +24,13 @@
<link rel="shortcut icon" type="images/svg" sizes="192x192" href="/images/icons/img192x192.svg"> <link rel="shortcut icon" type="images/svg" sizes="192x192" href="/images/icons/img192x192.svg">
<link rel="shortcut icon" type="images/svg" sizes="383x383" href="/images/icons/img383x383.svg"> <link rel="shortcut icon" type="images/svg" sizes="383x383" href="/images/icons/img383x383.svg">
<link rel="shortcut icon" type="images/svg" sizes="512x512" href="/images/icons/img512X512.svg"> <link rel="shortcut icon" type="images/svg" sizes="512x512" href="/images/icons/img512X512.svg">
<link rel="apple-touch-icon" type="images/svg" sizes="150x150" href="appIcon.svg"> <link rel="apple-touch-icon" type="images/svg" sizes="150x150" href="/images/icons/appIcon.svg">
</head> </head>
<body style="background-color: #00788a;"> <body style="background-color: #00788a;">
@yield("content") @yield("content")
<script src="{{ mix("/js/app.js") }}"></script> <script src="{{ mix("/js/app.js") }}"></script>
<!--<script src="/serviceWorkerRegistration.js"></script>-->
@yield("scripts") @yield("scripts")
</body> </body>
</html> </html>