Merge pull request #230 from dburr/add_pwa_stuff

Make the RASCSI web app into a proper mobile web app (sorta)
2024-11-22 16:33:17 +00:00 · 2021-09-14 13:54:51 -07:00 · 2021-09-14 13:54:51 -07:00 · 96108d9cf1
commit 96108d9cf1
parent 62f6c8d948 62487e8e0e
30 changed files with 68 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@ __pycache__
 src/web/current
 src/oled_monitor/current
 src/raspberrypi/hfdisk/
+*~
--- a/src/web/pwa/android-icon-144x144.png
+++ b/src/web/pwa/android-icon-144x144.png
--- a/src/web/pwa/android-icon-192x192.png
+++ b/src/web/pwa/android-icon-192x192.png
--- a/src/web/pwa/android-icon-36x36.png
+++ b/src/web/pwa/android-icon-36x36.png
--- a/src/web/pwa/android-icon-48x48.png
+++ b/src/web/pwa/android-icon-48x48.png
--- a/src/web/pwa/android-icon-72x72.png
+++ b/src/web/pwa/android-icon-72x72.png
--- a/src/web/pwa/android-icon-96x96.png
+++ b/src/web/pwa/android-icon-96x96.png
--- a/src/web/pwa/apple-icon-114x114.png
+++ b/src/web/pwa/apple-icon-114x114.png
--- a/src/web/pwa/apple-icon-120x120.png
+++ b/src/web/pwa/apple-icon-120x120.png
--- a/src/web/pwa/apple-icon-144x144.png
+++ b/src/web/pwa/apple-icon-144x144.png
--- a/src/web/pwa/apple-icon-152x152.png
+++ b/src/web/pwa/apple-icon-152x152.png
--- a/src/web/pwa/apple-icon-180x180.png
+++ b/src/web/pwa/apple-icon-180x180.png
--- a/src/web/pwa/apple-icon-57x57.png
+++ b/src/web/pwa/apple-icon-57x57.png
--- a/src/web/pwa/apple-icon-60x60.png
+++ b/src/web/pwa/apple-icon-60x60.png
--- a/src/web/pwa/apple-icon-72x72.png
+++ b/src/web/pwa/apple-icon-72x72.png
--- a/src/web/pwa/apple-icon-76x76.png
+++ b/src/web/pwa/apple-icon-76x76.png
--- a/src/web/pwa/apple-icon-precomposed.png
+++ b/src/web/pwa/apple-icon-precomposed.png
--- a/src/web/pwa/apple-icon.png
+++ b/src/web/pwa/apple-icon.png
--- a/src/web/pwa/browserconfig.xml
+++ b/src/web/pwa/browserconfig.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/pwa/ms-icon-70x70.png"/><square150x150logo src="/pwa/ms-icon-150x150.png"/><square310x310logo src="/pwa/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
--- a/src/web/pwa/favicon-16x16.png
+++ b/src/web/pwa/favicon-16x16.png
--- a/src/web/pwa/favicon-32x32.png
+++ b/src/web/pwa/favicon-32x32.png
--- a/src/web/pwa/favicon-96x96.png
+++ b/src/web/pwa/favicon-96x96.png
--- a/src/web/pwa/favicon.ico
+++ b/src/web/pwa/favicon.ico
--- a/src/web/pwa/manifest.json
+++ b/src/web/pwa/manifest.json
@ -0,0 +1,41 @@
+{
+ "name": "RaSCSI",
+ "icons": [
+  {
+   "src": "\/pwa\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/pwa\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/pwa\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/pwa\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/pwa\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/pwa\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}
--- a/src/web/pwa/ms-icon-144x144.png
+++ b/src/web/pwa/ms-icon-144x144.png
--- a/src/web/pwa/ms-icon-150x150.png
+++ b/src/web/pwa/ms-icon-150x150.png
--- a/src/web/pwa/ms-icon-310x310.png
+++ b/src/web/pwa/ms-icon-310x310.png
--- a/src/web/pwa/ms-icon-70x70.png
+++ b/src/web/pwa/ms-icon-70x70.png
--- a/src/web/templates/base.html
+++ b/src/web/templates/base.html
@ -1,5 +1,25 @@
 <!doctype html>
 <title>RaSCSI Control Page</title>
+
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+<link rel="apple-touch-icon" sizes="57x57" href="/pwa/apple-icon-57x57.png">
+<link rel="apple-touch-icon" sizes="60x60" href="/pwa/apple-icon-60x60.png">
+<link rel="apple-touch-icon" sizes="72x72" href="/pwa/apple-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="76x76" href="/pwa/apple-icon-76x76.png">
+<link rel="apple-touch-icon" sizes="114x114" href="/pwa/apple-icon-114x114.png">
+<link rel="apple-touch-icon" sizes="120x120" href="/pwa/apple-icon-120x120.png">
+<link rel="apple-touch-icon" sizes="144x144" href="/pwa/apple-icon-144x144.png">
+<link rel="apple-touch-icon" sizes="152x152" href="/pwa/apple-icon-152x152.png">
+<link rel="apple-touch-icon" sizes="180x180" href="/pwa/apple-icon-180x180.png">
+<link rel="icon" type="image/png" sizes="192x192"  href="/pwa/android-icon-192x192.png">
+<link rel="icon" type="image/png" sizes="32x32" href="/pwa/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="96x96" href="/pwa/favicon-96x96.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/pwa/favicon-16x16.png">
+<link rel="manifest" href="/pwa/manifest.json">
+<meta name="msapplication-TileColor" content="#ffffff">
+<meta name="msapplication-TileImage" content="/pwa/ms-icon-144x144.png">
+<meta name="theme-color" content="#ffffff">
+
 <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">

 <div class="content">
--- a/src/web/web.py
+++ b/src/web/web.py
@ -1,7 +1,7 @@
 import io
 import re

-from flask import Flask, render_template, request, flash, url_for, redirect, send_file
+from flask import Flask, render_template, request, flash, url_for, redirect, send_file, send_from_directory

 from file_cmds import (
    create_new_image,
@ -49,6 +49,9 @@ def index():
        version=running_version(),
    )

+@app.route('/pwa/<path:path>')
+def send_pwa_files(path):
+    return send_from_directory('pwa', path)

@app.route("/config/save", methods=["POST"])
 def config_save():