Merge pull request #547 from Heap-Hop/master

refactor web dir
2022-05-17 23:01:33 +08:00 · 2022-05-17 23:01:33 +08:00 · 6de6d6c7a7
commit 6de6d6c7a7
parent 7a3e95eddd 4887cdb756
8 changed files with 53 additions and 47 deletions
--- a/flutter/web/.gitignore
+++ b/flutter/web/.gitignore
@ -2,8 +2,7 @@ assets
 js/src/gen_js_from_hbb.ts
 js/src/message.ts
 js/src/rendezvous.ts
-ogvjs-1.8.6
+ogvjs*
 libopus.js
 libopus.wasm
-yuv-canvas-1.2.6.js
-.yarn
+yuv-canvas*
--- a/flutter/web/index.html
+++ b/flutter/web/index.html
@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
  <!--
    If you are serving your web app in a path other than the root, change the
@ -31,11 +32,11 @@

  <title>RustDesk</title>
  <link rel="manifest" href="manifest.json">
-  <script src="ogvjs-1.8.6/ogv.js"></script>
-  <script src="yuv.js"></script>
+  <script src="libs/ogvjs-1.8.6/ogv.js"></script>
+  <script src="libs/yuv.js"></script>
  <script type="module" crossorigin src="js/dist/index.js"></script>
  <link rel="modulepreload" href="js/dist/vendor.js">
-  <script src="yuv-canvas-1.2.6.js"></script>
+  <script src="libs/yuv-canvas-1.2.6.js"></script>
  <style>
    .loading {
      display: flex;
@ -67,6 +68,7 @@
      0% {
        -webkit-transform: rotate(0deg);
      }
+
      100% {
        -webkit-transform: rotate(360deg);
      }
@ -76,6 +78,7 @@
      0% {
        transform: rotate(0deg);
      }
+
      100% {
        transform: rotate(360deg);
      }
@ -83,6 +86,7 @@
  </style>

 </head>
+
 <body>
  <div class="loading">
    <div class="loader"></div>
@ -154,8 +158,8 @@
      loadMainDartJs();
    }
  </script>
-  <script src="assets/firebase-app.js?8.10.1"></script>
-  <script src="assets/firebase-analytics.js?8.10.1"></script>
+  <script src="libs/firebase-app.js?8.10.1"></script>
+  <script src="libs/firebase-analytics.js?8.10.1"></script>

  <script>
    // Your web app's Firebase configuration
@ -176,4 +180,5 @@
    firebase.analytics();
  </script>
 </body>
+
 </html>
--- a/flutter/web/js/.gitignore
+++ b/flutter/web/js/.gitignore
@ -6,3 +6,4 @@ dist-ssr
 *log
 ogvjs
 .vscode
+.yarn
--- a/flutter/web/js/index.html
+++ b/flutter/web/js/index.html
@ -1,15 +1,16 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
  <meta charset="UTF-8" />
  <link rel="icon" type="image/svg+xml" href="favicon.svg?v2" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <script src="ogvjs-1.8.6/ogv.js"></script>
-    <script src="./yuv-canvas-1.2.6.js"></script>
  <title>Vite App</title>
 </head>
+
 <body>
  <div id="app"></div>
  <script type="module" src="/src/main.ts"></script>
 </body>
+
 </html>
--- a/flutter/web/assets/firebase-analytics.js
+++ b/flutter/web/assets/firebase-analytics.js
--- a/flutter/web/assets/firebase-app.js
+++ b/flutter/web/assets/firebase-app.js
--- a/flutter/web/libs/yuv.js
+++ b/flutter/web/libs/yuv.js
--- a/flutter/web/libs/yuv.wasm
+++ b/flutter/web/libs/yuv.wasm