Merge branch 'master' into new-torrent

2025-12-19 21:46:11 +05:00 · 2021-09-10 04:57:33 +03:00
parent 0094f417ca 1a1c32ec25
commit a3fc3d5f49
53 changed files with 759 additions and 122 deletions
--- a/web/public/android-chrome-192x192.png
+++ b/web/public/android-chrome-192x192.png
--- a/web/public/android-chrome-512x512.png
+++ b/web/public/android-chrome-512x512.png
--- a/web/public/apple-touch-icon.png
+++ b/web/public/apple-touch-icon.png
--- a/web/public/browserconfig.xml
+++ b/web/public/browserconfig.xml
@@ -3,7 +3,7 @@
    <msapplication>
        <tile>
            <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#da532c</TileColor>
+            <TileColor>#00a300</TileColor>
        </tile>
    </msapplication>
 </browserconfig>
--- a/web/public/dlnaicon-120.jpg
+++ b/web/public/dlnaicon-120.jpg
--- a/web/public/dlnaicon-120.png
+++ b/web/public/dlnaicon-120.png
--- a/web/public/dlnaicon-48.jpg
+++ b/web/public/dlnaicon-48.jpg
--- a/web/public/dlnaicon-48.png
+++ b/web/public/dlnaicon-48.png
--- a/web/public/favicon-16x16.png
+++ b/web/public/favicon-16x16.png
--- a/web/public/favicon-32x32.png
+++ b/web/public/favicon-32x32.png
--- a/web/public/favicon.ico
+++ b/web/public/favicon.ico
--- a/web/public/index.html
+++ b/web/public/index.html
@@ -3,20 +3,19 @@

 <head>
  <meta charset="utf-8" />
-  <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-  <link rel="icon" type="image/png" sizes="192x192" href="/android-chrome-192x192.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
  <link rel="manifest" href="/site.webmanifest">
-  <meta name="msapplication-TileColor" content="#da532c">
+  <meta name="msapplication-TileColor" content="#00a572">
  <meta name="theme-color" content="#ffffff">
+
  <link rel="preconnect" href="https://fonts.gstatic.com">
  <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;400;600&display=swap" rel="stylesheet">
  <meta name="viewport" content="width=device-width, shrink-to-fit=no">
  <meta name="description" content="TorrServer - torrent to http stream" />

-  <title>TorrServer</title>
+  <title>TorrServer MatriX</title>
 </head>

 <body>
@@ -42,4 +41,4 @@
  </script>
 </body>

-</html>
+</html>
--- a/web/public/mstile-150x150.png
+++ b/web/public/mstile-150x150.png
--- a/web/public/site.webmanifest
+++ b/web/public/site.webmanifest
@@ -1,19 +1,19 @@
 {
-  "name": "",
-  "short_name": "",
-  "icons": [
-    {
-      "src": "/android-chrome-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "/android-chrome-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    }
-  ],
-  "theme_color": "#ffffff",
-  "background_color": "#ffffff",
-  "display": "standalone"
-}
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
--- a/web/src/utils/useChangeLanguage.js
+++ b/web/src/utils/useChangeLanguage.js
@@ -2,7 +2,12 @@ import { useTranslation } from 'react-i18next'

 export default () => {
  const { i18n } = useTranslation()
-  const currentLanguage = i18n.language === 'en-US' || i18n.language === 'en' ? 'en' : i18n.language
+  const currentLanguage =
+    i18n.language === 'en-US' || i18n.language === 'en'
+      ? 'en'
+      : i18n.language === 'ru-RU' || i18n.language === 'ru'
+      ? 'ru'
+      : i18n.language

  return [currentLanguage, lang => i18n.changeLanguage(lang)]
 }