Signle page app server update

This commit is contained in:
2024-09-04 15:50:20 +02:00
parent 3afe83f3ad
commit cc0b252b81
3 changed files with 193 additions and 206 deletions

View File

@@ -1,23 +1,30 @@
from http.server import HTTPServer, BaseHTTPRequestHandler #!/usr/bin/env python
# Inspired by https://gist.github.com/jtangelder/e445e9a7f5e31c220be6
# Python3 http.server for Single Page Application
import urllib.parse
import http.server
import socketserver
import re
from pathlib import Path
port = 83 port = 83
class SimpleHTTPRequestHandler(BaseHTTPRequestHandler): HOST = ('', port)
pattern = re.compile('.png|.jpg|.jpeg|.js|.css|.ico|.gif|.svg|.ico', re.IGNORECASE)
class Handler(http.server.SimpleHTTPRequestHandler):
def do_GET(self): def do_GET(self):
# if self.path == '/': url_parts = urllib.parse.urlparse(self.path)
self.path = '/index.html' request_file_path = Path(url_parts.path.strip("/"))
try:
file_to_open = open(self.path[1:]).read() ext = request_file_path.suffix
self.send_response(200) if not request_file_path.is_file() and not pattern.match(ext):
self.send_header('Content-type', 'text/html') self.path = 'index.html'
self.end_headers()
self.wfile.write(bytes(file_to_open, 'utf-8')) return http.server.SimpleHTTPRequestHandler.do_GET(self)
except:
self.send_response(404)
self.send_header('Content-type', 'text/html') httpd = socketserver.TCPServer(HOST, Handler)
self.end_headers() print(f"Starting Web App Server on pot: {port}")
self.wfile.write(b'404 - Not Found') httpd.serve_forever()
print(f"Web Server starting on port {port}")
httpd = HTTPServer(('', port), SimpleHTTPRequestHandler)
print(f"Web Server started on port {port}")
httpd.serve_forever()

View File

@@ -14,4 +14,5 @@ PORT=83
cd /app/build/web/ cd /app/build/web/
# Start the web server on the specified port # Start the web server on the specified port
#python3 -m http.server 83
python3 -u ../../server/MIH_web_server.py python3 -u ../../server/MIH_web_server.py

View File

@@ -1,210 +1,189 @@
<!DOCTYPE html><html><head> <!DOCTYPE html>
<!-- <html>
If you are serving your web app in a path other than the root, change the <head>
href value below to reflect the base path you are serving from. <base href="/">
The path provided below has to start and end with a slash "/" in order for <!-- APP Description -->
it to work correctly. <meta charset="UTF-8">
<meta content="IE=Edge" http-equiv="X-UA-Compatible">
<meta name="description" content="Digitizing Mzansi one process at a time. Discover essential Mzansi apps to streamline your personal and professional life. Simplify your daily tasks with our user-friendly solutions.">
For more details: <!-- iOS meta tags & icons -->
* https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base <meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="Mzansi Innovation Hub">
<link rel="apple-touch-icon" href="icons/apple-touch-icon.png">
This is a placeholder for base href that will be replaced by the value of <!-- Favicon -->
the `--base-href` argument provided to `flutter build`. <link rel="icon" href="favicon.ico">
-->
<base href="/">
<meta charset="UTF-8"> <title>Mzansi Innovation Hub</title>
<meta content="IE=Edge" http-equiv="X-UA-Compatible"> <link rel="manifest" href="manifest.json">
<meta name="description" content="Digitizing Mzansi one process at a time. Discover essential Mzansi apps to streamline your personal and professional life. Simplify your daily tasks with our user-friendly solutions.">
<style id="splash-screen-style">
html {
height: 100%
}
<!-- iOS meta tags & icons --> body {
<meta name="apple-mobile-web-app-capable" content="yes"> margin: 0;
<meta name="apple-mobile-web-app-status-bar-style" content="black"> min-height: 100%;
<meta name="apple-mobile-web-app-title" content="Mzansi Innovation Hub"> background-color: #3A4454;
<link rel="apple-touch-icon" href="icons/apple-touch-icon.png"> background-size: 100% 100%;
}
<!-- Favicon --> .center {
<link rel="icon" href="favicon.ico"> margin: 0;
position: absolute;
top: 50%;
left: 50%;
-ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}
<title>Mzansi Innovation Hub</title> .contain {
<link rel="manifest" href="manifest.json"> display:block;
<!-- <style> width:100%; height:100%;
.bg{ object-fit: contain;
background-color: #3A4454; }
overflow: hidden
}
</style> -->
<!-- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport"> -->
<style id="splash-screen-style">
html {
height: 100%
}
body { .stretch {
margin: 0; display:block;
min-height: 100%; width:100%; height:100%;
background-color: #3A4454; }
background-size: 100% 100%;
}
.center { .cover {
margin: 0; display:block;
position: absolute; width:100%; height:100%;
top: 50%; object-fit: cover;
left: 50%; }
-ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}
.contain { .bottom {
display:block; position: absolute;
width:100%; height:100%; bottom: 0;
object-fit: contain; left: 50%;
} -ms-transform: translate(-50%, 0);
transform: translate(-50%, 0);
}
.stretch { .bottomLeft {
display:block; position: absolute;
width:100%; height:100%; bottom: 0;
} left: 0;
}
.cover { .bottomRight {
display:block; position: absolute;
width:100%; height:100%; bottom: 0;
object-fit: cover; right: 0;
} }
</style>
<script id="splash-screen-script">
function removeSplashFromWeb() {
document.getElementById("splash")?.remove();
document.getElementById("splash-branding")?.remove();
document.body.style.background = "transparent";
}
</script>
</head>
<body>
<picture id="splash-branding">
<source srcset="splash/img/branding-1x.png 1x, splash/img/branding-2x.png 2x, splash/img/branding-3x.png 3x, splash/img/branding-4x.png 4x" media="(prefers-color-scheme: light)">
<source srcset="splash/img/branding-dark-1x.png 1x, splash/img/branding-dark-2x.png 2x, splash/img/branding-dark-3x.png 3x, splash/img/branding-dark-4x.png 4x" media="(prefers-color-scheme: dark)">
<img class="bottom" aria-hidden="true" src="splash/img/branding-1x.png" alt="">
</picture>
<picture id="splash">
<source srcset="splash/img/light-1x.png 1x, splash/img/light-2x.png 2x, splash/img/light-3x.png 3x, splash/img/light-4x.png 4x" media="(prefers-color-scheme: light)">
<source srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x" media="(prefers-color-scheme: dark)">
<img class="center" aria-hidden="true" src="splash/img/light-1x.png" alt="">
</picture>
<!-- File Picker & PDF viewer -->
<script src="//cdnjs.cloudflare.com/ajax/libs/pdf.js/2.11.338/pdf.min.js"></script>
<script type="text/javascript">
pdfjsLib.GlobalWorkerOptions.workerSrc = "//cdnjs.cloudflare.com/ajax/libs/pdf.js/2.11.338/pdf.worker.min.js";
</script>
.bottom { <!-- Versioning -->
position: absolute; <!-- <script src="flutter_bootstrap.js?v0.0.0.40" async></script> -->
bottom: 0; <script>
left: 50%; var serviceWorkerVersion = '{{flutter_service_worker_version}}';
-ms-transform: translate(-50%, 0); var scriptLoaded = false;
transform: translate(-50%, 0); function loadMainDartJs() {
} if (scriptLoaded) {
return;
}
scriptLoaded = true;
var scriptTag = document.createElement('script');
scriptTag.src = 'flutter_bootstrap.js';
scriptTag.type = 'application/javascript';
document.body.append(scriptTag);
}
.bottomLeft { if ('serviceWorker' in navigator) {
position: absolute; // Service workers are supported. Use them.
bottom: 0; window.addEventListener('load', function () {
left: 0; // Wait for registration to finish before dropping the <script> tag.
} // Otherwise, the browser will load the script multiple times,
// potentially different versions.
.bottomRight { var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
position: absolute; navigator.serviceWorker.register(serviceWorkerUrl)
bottom: 0; .then((reg) => {
right: 0; function waitForActivation(serviceWorker) {
} serviceWorker.addEventListener('statechange', () => {
</style> if (serviceWorker.state == 'activated') {
<script id="splash-screen-script" defer> console.log('Installed new service worker.');
function removeSplashFromWeb() { loadMainDartJs();
document.getElementById("splash")?.remove(); }
document.getElementById("splash-branding")?.remove(); });
document.body.style.background = "transparent"; }
} if (!reg.active && (reg.installing || reg.waiting)) {
</script> // No active web worker and we have installed or are installing
</head> // one for the first time. Simply wait for it to activate.
<body> waitForActivation(reg.installing || reg.waiting);
<picture id="splash-branding"> } else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
<source srcset="splash/img/branding-1x.png 1x, splash/img/branding-2x.png 2x, splash/img/branding-3x.png 3x, splash/img/branding-4x.png 4x" media="(prefers-color-scheme: light)"> // When the app updates the serviceWorkerVersion changes, so we
<source srcset="splash/img/branding-dark-1x.png 1x, splash/img/branding-dark-2x.png 2x, splash/img/branding-dark-3x.png 3x, splash/img/branding-dark-4x.png 4x" media="(prefers-color-scheme: dark)"> // need to ask the service worker to update.
<img class="bottom" aria-hidden="true" src="splash/img/branding-1x.png" alt=""> console.log('New service worker available.');
</picture> reg.update();
<picture id="splash"> waitForActivation(reg.installing);
<source srcset="splash/img/light-1x.png 1x, splash/img/light-2x.png 2x, splash/img/light-3x.png 3x, splash/img/light-4x.png 4x" media="(prefers-color-scheme: light)"> } else {
<source srcset="splash/img/dark-1x.png 1x, splash/img/dark-2x.png 2x, splash/img/dark-3x.png 3x, splash/img/dark-4x.png 4x" media="(prefers-color-scheme: dark)"> // Existing service worker is still good.
<img class="center" aria-hidden="true" src="splash/img/light-1x.png" alt=""> console.log('Loading app from service worker.');
</picture>
<script src="flutter_bootstrap.js" defer></script>
<!-- File Picker & PDF viewer -->
<script src="//cdnjs.cloudflare.com/ajax/libs/pdf.js/2.11.338/pdf.min.js"></script>
<script type="text/javascript">
pdfjsLib.GlobalWorkerOptions.workerSrc = "//cdnjs.cloudflare.com/ajax/libs/pdf.js/2.11.338/pdf.worker.min.js";
</script>
<!-- Versioning -->
<script defer>
var serviceWorkerVersion = '{{flutter_service_worker_version}}';
var scriptLoaded = false;
function loadMainDartJs() {
if (scriptLoaded) {
return;
}
scriptLoaded = true;
var scriptTag = document.createElement('script');
scriptTag.src = 'flutter_bootstrap.js';
scriptTag.type = 'application/javascript';
document.body.append(scriptTag);
}
if ('serviceWorker' in navigator) {
// Service workers are supported. Use them.
window.addEventListener('load', function () {
// Wait for registration to finish before dropping the <script> tag.
// Otherwise, the browser will load the script multiple times,
// potentially different versions.
var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
navigator.serviceWorker.register(serviceWorkerUrl)
.then((reg) => {
function waitForActivation(serviceWorker) {
serviceWorker.addEventListener('statechange', () => {
if (serviceWorker.state == 'activated') {
console.log('Installed new service worker.');
loadMainDartJs(); loadMainDartJs();
} }
}); });
}
if (!reg.active && (reg.installing || reg.waiting)) { // If service worker doesn't succeed in a reasonable amount of time,
// No active web worker and we have installed or are installing // fallback to plaint <script> tag.
// one for the first time. Simply wait for it to activate. setTimeout(() => {
waitForActivation(reg.installing || reg.waiting); if (!scriptLoaded) {
} else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) { console.warn(
// When the app updates the serviceWorkerVersion changes, so we 'Failed to load app from a service worker. Falling back to plain <script> tag.',
// need to ask the service worker to update. );
console.log('New service worker available.'); loadMainDartJs();
reg.update(); }
waitForActivation(reg.installing); }, 4000);
} else {
// Existing service worker is still good.
console.log('Loading app from service worker.');
loadMainDartJs();
}
}); });
// If service worker doesn't succeed in a reasonable amount of time, if (navigator.serviceWorker.state == 'activated') {
// fallback to plaint <script> tag. console.log('Installed new service worker.');
setTimeout(() => {
if (!scriptLoaded) {
console.warn(
'Failed to load app from a service worker. Falling back to plain <script> tag.',
);
loadMainDartJs(); loadMainDartJs();
// if there's an existing controller (previous Service Worker), show the prompt
// you can tweak this and delay the notification once the page is load you can show a notification and ask for a new refresh
if (navigator.serviceWorker.controller) {
// you have a better UI here, reloading is not a great user experince here.
const confirmed = alert('New version of the app is available. Refresh now');
if (confirmed == true) {
window.location.reload();
}
}
} }
}, 4000); }
}); else {
// Service workers not supported. Just drop the <script> tag.
if (serviceWorker.state == 'activated') { loadMainDartJs();
console.log('Installed new service worker.');
loadMainDartJs();
// if there's an existing controller (previous Service Worker), show the prompt
// you can tweak this and delay the notification once the page is load you can show a notification and ask for a new refresh
if (navigator.serviceWorker.controller) {
// you have a better UI here, reloading is not a great user experince here.
const confirmed = alert('New version of the app is available. Refresh now');
if (confirmed == true) {
window.location.reload();
}
} }
} </script>
} else {
// Service workers not supported. Just drop the <script> tag.
loadMainDartJs();
}
</script>
</body></html> </body>
</html>