Code refactoring after #1099

AlexxIT · May 13, 2024 · 9776e09 · 9776e09
1 parent 1b1bdb3
commit 9776e09
Show file tree

Hide file tree

Showing 23 changed files with 41 additions and 130 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -4,9 +4,7 @@ name: Deploy static content to Pages
 on:
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
-  push:
-    paths:
-      - 'website/icons/**'
+
 # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
 permissions:
   contents: read

diff --git a/website/icons/android-chrome-192x192.png b/website/icons/android-chrome-192x192.png
diff --git a/website/icons/android-chrome-256x256.png b/website/icons/android-chrome-256x256.png
diff --git a/website/icons/android-chrome-512x512.png b/website/icons/android-chrome-512x512.png
diff --git a/website/icons/apple-touch-icon-180x180.png b/website/icons/apple-touch-icon-180x180.png
diff --git a/website/icons/apple-touch-icon.png b/website/icons/apple-touch-icon.png
diff --git a/website/icons/browserconfig.xml b/website/icons/browserconfig.xml
diff --git a/website/icons/favicon-16x16.png b/website/icons/favicon-16x16.png
diff --git a/website/icons/favicon-32x32.png b/website/icons/favicon-32x32.png
diff --git a/website/icons/mstile-150x150.png b/website/icons/mstile-150x150.png
diff --git a/website/icons/safari-pinned-tab.svg b/website/icons/safari-pinned-tab.svg
diff --git a/website/icons/site.webmanifest b/website/icons/site.webmanifest
diff --git a/website/manifest.json b/website/manifest.json
@@ -0,0 +1,18 @@
+{
+  "name": "go2rtc",
+  "icons": [
+    {
+      "src": "https://alexxdev.duckdns.org/local/icons/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "https://alexxdev.duckdns.org/local/icons/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#000000"
+}
diff --git a/www/README.md b/www/README.md
@@ -72,6 +72,22 @@ User-Agent: `Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/537.36 (KHTML, like Gec
 
 https://webrtc.org/getting-started/unified-plan-transition-guide?hl=en
 
+## Web Icons
+
+[Favicon checker](https://realfavicongenerator.net/), skip:
+
+- Windows 8 and 10 (`browserconfig.xml`)
+- Mac OS X El Capitan Safari
+
+```html
+    <!-- iOS Safari -->
+    <link rel="apple-touch-icon" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon-180x180.png" sizes="180x180">
+    <!-- Classic, desktop browsers -->
+    <link rel="icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
+    <!-- Android Chrome -->
+    <link rel="manifest" href="https://alexxit.github.io/go2rtc/manifest.json">
+```
+
 ## Useful links
 
 - https://www.webrtc-experiment.com/DetectRTC/

diff --git a/www/add.html b/www/add.html
@@ -4,14 +4,6 @@
     <title>go2rtc - Add Stream</title>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <style>
         body {
             margin: 0;

diff --git a/www/codecs.html b/www/codecs.html
@@ -2,14 +2,6 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <title>go2rtc - WebRTC</title>
     <style>
         body {

diff --git a/www/editor.html b/www/editor.html
@@ -4,14 +4,6 @@
     <title>go2rtc - File Editor</title>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <script src="https://unpkg.com/[email protected]/src-min/ace.js"></script>
     <style>
         body {

diff --git a/www/index.html b/www/index.html
@@ -4,14 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
+    <link rel="apple-touch-icon" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon-180x180.png" sizes="180x180">
+    <link rel="icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
+    <link rel="manifest" href="https://alexxit.github.io/go2rtc/manifest.json">
     <title>go2rtc</title>
     <style>
         body {

diff --git a/www/links.html b/www/links.html
@@ -4,14 +4,6 @@
     <title>go2rtc - links</title>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <style>
 
         body {

diff --git a/www/log.html b/www/log.html
@@ -4,14 +4,6 @@
     <title>go2rtc - Logs</title>
     <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1, maximum-scale=1">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <style>
         body {
             font-family: Arial, Helvetica, sans-serif;

diff --git a/www/stream.html b/www/stream.html
@@ -2,14 +2,9 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
+    <link rel="apple-touch-icon" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon-180x180.png" sizes="180x180">
+    <link rel="icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
+    <link rel="manifest" href="https://alexxit.github.io/go2rtc/manifest.json">
     <title>go2rtc - Stream</title>
     <style>
         body {

diff --git a/www/webrtc-sync.html b/www/webrtc-sync.html
@@ -2,14 +2,6 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <title>go2rtc - WebRTC</title>
     <style>
         body {

diff --git a/www/webrtc.html b/www/webrtc.html
@@ -2,14 +2,6 @@
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://alexxit.github.io/go2rtc/icons/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://alexxit.github.io/go2rtc/icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://alexxit.github.io/go2rtc/icons/favicon-16x16.png">
-    <link rel="manifest" href="https://alexxit.github.io/go2rtc/icons/site.webmanifest">
-    <link rel="mask-icon" href="https://alexxit.github.io/go2rtc/icons/safari-pinned-tab.svg" color="#5bbad5">
-    <link rel="shortcut icon" href="https://alexxit.github.io/go2rtc/icons/favicon.ico">
-    <meta name="msapplication-TileColor" content="#da532c">
-    <meta name="msapplication-config" content="https://alexxit.github.io/go2rtc/icons/browserconfig.xml">
     <title>go2rtc - WebRTC</title>
     <style>
         body {