Signle page app server update
This commit is contained in:
@@ -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')
|
|
||||||
print(f"Web Server starting on port {port}")
|
|
||||||
httpd = HTTPServer(('', port), SimpleHTTPRequestHandler)
|
|
||||||
print(f"Web Server started on port {port}")
|
|
||||||
httpd.serve_forever()
|
httpd.serve_forever()
|
||||||
@@ -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
|
||||||
@@ -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.">
|
|
||||||
|
|
||||||
<!-- iOS meta tags & icons -->
|
<style id="splash-screen-style">
|
||||||
<meta name="apple-mobile-web-app-capable" content="yes">
|
html {
|
||||||
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
height: 100%
|
||||||
<meta name="apple-mobile-web-app-title" content="Mzansi Innovation Hub">
|
}
|
||||||
<link rel="apple-touch-icon" href="icons/apple-touch-icon.png">
|
|
||||||
|
|
||||||
<!-- Favicon -->
|
body {
|
||||||
<link rel="icon" href="favicon.ico">
|
margin: 0;
|
||||||
|
min-height: 100%;
|
||||||
|
background-color: #3A4454;
|
||||||
|
background-size: 100% 100%;
|
||||||
|
}
|
||||||
|
|
||||||
<title>Mzansi Innovation Hub</title>
|
.center {
|
||||||
<link rel="manifest" href="manifest.json">
|
margin: 0;
|
||||||
<!-- <style>
|
position: absolute;
|
||||||
.bg{
|
top: 50%;
|
||||||
background-color: #3A4454;
|
left: 50%;
|
||||||
overflow: hidden
|
-ms-transform: translate(-50%, -50%);
|
||||||
}
|
transform: translate(-50%, -50%);
|
||||||
</style> -->
|
}
|
||||||
|
|
||||||
|
.contain {
|
||||||
|
display:block;
|
||||||
|
width:100%; height:100%;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
|
||||||
<!-- <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport"> -->
|
.stretch {
|
||||||
|
display:block;
|
||||||
|
width:100%; height:100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cover {
|
||||||
|
display:block;
|
||||||
|
width:100%; height:100%;
|
||||||
|
object-fit: cover;
|
||||||
|
}
|
||||||
|
|
||||||
<style id="splash-screen-style">
|
.bottom {
|
||||||
html {
|
position: absolute;
|
||||||
height: 100%
|
bottom: 0;
|
||||||
}
|
left: 50%;
|
||||||
|
-ms-transform: translate(-50%, 0);
|
||||||
|
transform: translate(-50%, 0);
|
||||||
|
}
|
||||||
|
|
||||||
body {
|
.bottomLeft {
|
||||||
margin: 0;
|
position: absolute;
|
||||||
min-height: 100%;
|
bottom: 0;
|
||||||
background-color: #3A4454;
|
left: 0;
|
||||||
background-size: 100% 100%;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.center {
|
.bottomRight {
|
||||||
margin: 0;
|
position: absolute;
|
||||||
position: absolute;
|
bottom: 0;
|
||||||
top: 50%;
|
right: 0;
|
||||||
left: 50%;
|
}
|
||||||
-ms-transform: translate(-50%, -50%);
|
</style>
|
||||||
transform: translate(-50%, -50%);
|
<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>
|
||||||
|
|
||||||
.contain {
|
<!-- Versioning -->
|
||||||
display:block;
|
<!-- <script src="flutter_bootstrap.js?v0.0.0.40" async></script> -->
|
||||||
width:100%; height:100%;
|
<script>
|
||||||
object-fit: contain;
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
.stretch {
|
if ('serviceWorker' in navigator) {
|
||||||
display:block;
|
// Service workers are supported. Use them.
|
||||||
width:100%; height:100%;
|
window.addEventListener('load', function () {
|
||||||
}
|
// Wait for registration to finish before dropping the <script> tag.
|
||||||
|
// Otherwise, the browser will load the script multiple times,
|
||||||
.cover {
|
// potentially different versions.
|
||||||
display:block;
|
var serviceWorkerUrl = 'flutter_service_worker.js?v=' + serviceWorkerVersion;
|
||||||
width:100%; height:100%;
|
navigator.serviceWorker.register(serviceWorkerUrl)
|
||||||
object-fit: cover;
|
.then((reg) => {
|
||||||
}
|
function waitForActivation(serviceWorker) {
|
||||||
|
serviceWorker.addEventListener('statechange', () => {
|
||||||
.bottom {
|
if (serviceWorker.state == 'activated') {
|
||||||
position: absolute;
|
console.log('Installed new service worker.');
|
||||||
bottom: 0;
|
loadMainDartJs();
|
||||||
left: 50%;
|
}
|
||||||
-ms-transform: translate(-50%, 0);
|
});
|
||||||
transform: translate(-50%, 0);
|
}
|
||||||
}
|
if (!reg.active && (reg.installing || reg.waiting)) {
|
||||||
|
// No active web worker and we have installed or are installing
|
||||||
.bottomLeft {
|
// one for the first time. Simply wait for it to activate.
|
||||||
position: absolute;
|
waitForActivation(reg.installing || reg.waiting);
|
||||||
bottom: 0;
|
} else if (!reg.active.scriptURL.endsWith(serviceWorkerVersion)) {
|
||||||
left: 0;
|
// When the app updates the serviceWorkerVersion changes, so we
|
||||||
}
|
// need to ask the service worker to update.
|
||||||
|
console.log('New service worker available.');
|
||||||
.bottomRight {
|
reg.update();
|
||||||
position: absolute;
|
waitForActivation(reg.installing);
|
||||||
bottom: 0;
|
} else {
|
||||||
right: 0;
|
// Existing service worker is still good.
|
||||||
}
|
console.log('Loading app from service worker.');
|
||||||
</style>
|
|
||||||
<script id="splash-screen-script" defer>
|
|
||||||
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>
|
|
||||||
|
|
||||||
|
|
||||||
<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
|
||||||
}, 4000);
|
// 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.
|
||||||
if (serviceWorker.state == 'activated') {
|
const confirmed = alert('New version of the app is available. Refresh now');
|
||||||
console.log('Installed new service worker.');
|
if (confirmed == true) {
|
||||||
loadMainDartJs();
|
window.location.reload();
|
||||||
// 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();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
else {
|
||||||
} else {
|
// Service workers not supported. Just drop the <script> tag.
|
||||||
// Service workers not supported. Just drop the <script> tag.
|
loadMainDartJs();
|
||||||
loadMainDartJs();
|
}
|
||||||
}
|
</script>
|
||||||
</script>
|
|
||||||
|
|
||||||
</body></html>
|
</body>
|
||||||
|
</html>
|
||||||
Reference in New Issue
Block a user