From 4887cdb7566c6231a3d1879e94d49c6d6a76b4ba Mon Sep 17 00:00:00 2001
From: csf <csf@breakbeat.cn>
Date: Tue, 17 May 2022 22:51:40 +0800
Subject: [PATCH] refactor web dir
---
flutter/web/.gitignore | 5 +-
flutter/web/index.html | 67 ++++++++++--------
flutter/web/js/.gitignore | 1 +
flutter/web/js/index.html | 27 +++----
.../{assets => libs}/firebase-analytics.js | 0
flutter/web/{assets => libs}/firebase-app.js | 0
flutter/web/{ => libs}/yuv.js | 0
flutter/web/{ => libs}/yuv.wasm | Bin
8 files changed, 53 insertions(+), 47 deletions(-)
rename flutter/web/{assets => libs}/firebase-analytics.js (100%)
rename flutter/web/{assets => libs}/firebase-app.js (100%)
rename flutter/web/{ => libs}/yuv.js (100%)
rename flutter/web/{ => libs}/yuv.wasm (100%)
diff --git a/flutter/web/.gitignore b/flutter/web/.gitignore
index cee114d7e..716b75f62 100644
--- 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
\ No newline at end of file
+yuv-canvas*
\ No newline at end of file
diff --git a/flutter/web/index.html b/flutter/web/index.html
index 2c233600b..28990548d 100644
--- 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,12 +32,12 @@
<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>
- <style>
+ <script src="libs/yuv-canvas-1.2.6.js"></script>
+ <style>
.loading {
display: flex;
justify-content: center;
@@ -48,11 +49,11 @@
-ms-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
}
-
+
.loader {
border: 16px solid #f3f3f3;
border-radius: 50%;
- border: 15px solid ;
+ border: 15px solid;
border-top: 16px solid #024eff;
border-right: 16px solid white;
border-bottom: 16px solid #024eff;
@@ -62,20 +63,22 @@
-webkit-animation: spin 2s linear infinite;
animation: spin 2s linear infinite;
}
-
+
@-webkit-keyframes spin {
0% {
-webkit-transform: rotate(0deg);
}
+
100% {
-webkit-transform: rotate(360deg);
}
}
-
+
@keyframes spin {
0% {
transform: rotate(0deg);
}
+
100% {
transform: rotate(360deg);
}
@@ -83,10 +86,11 @@
</style>
</head>
+
<body>
-<div class="loading">
- <div class="loader"></div>
-</div>
+ <div class="loading">
+ <div class="loader"></div>
+ </div>
<!-- This script installs service_worker.js to provide PWA functionality to
application. For more information, see:
https://developers.google.com/web/fundamentals/primers/service-workers -->
@@ -154,26 +158,27 @@
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
- // For Firebase JS SDK v7.20.0 and later, measurementId is optional
- const firebaseConfig = {
- apiKey: "AIzaSyCgehIZk1aFP0E7wZtYRRqrfvNiNAF39-A",
- authDomain: "rustdesk.firebaseapp.com",
- databaseURL: "https://rustdesk.firebaseio.com",
- projectId: "rustdesk",
- storageBucket: "rustdesk.appspot.com",
- messagingSenderId: "768133699366",
- appId: "1:768133699366:web:d50faf0792cb208d7993e7",
- measurementId: "G-9PEH85N6ZQ"
- };
+ <script>
+ // Your web app's Firebase configuration
+ // For Firebase JS SDK v7.20.0 and later, measurementId is optional
+ const firebaseConfig = {
+ apiKey: "AIzaSyCgehIZk1aFP0E7wZtYRRqrfvNiNAF39-A",
+ authDomain: "rustdesk.firebaseapp.com",
+ databaseURL: "https://rustdesk.firebaseio.com",
+ projectId: "rustdesk",
+ storageBucket: "rustdesk.appspot.com",
+ messagingSenderId: "768133699366",
+ appId: "1:768133699366:web:d50faf0792cb208d7993e7",
+ measurementId: "G-9PEH85N6ZQ"
+ };
- // Initialize Firebase
- firebase.initializeApp(firebaseConfig);
- firebase.analytics();
-</script>
+ // Initialize Firebase
+ firebase.initializeApp(firebaseConfig);
+ firebase.analytics();
+ </script>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/flutter/web/js/.gitignore b/flutter/web/js/.gitignore
index 620c5689f..8737dbba5 100644
--- a/flutter/web/js/.gitignore
+++ b/flutter/web/js/.gitignore
@@ -6,3 +6,4 @@ dist-ssr
*log
ogvjs
.vscode
+.yarn
diff --git a/flutter/web/js/index.html b/flutter/web/js/index.html
index 0ae0a2410..06691f255 100644
--- 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>
+
+<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" />
+ <title>Vite App</title>
+</head>
+
+<body>
+ <div id="app"></div>
+ <script type="module" src="/src/main.ts"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/flutter/web/assets/firebase-analytics.js b/flutter/web/libs/firebase-analytics.js
similarity index 100%
rename from flutter/web/assets/firebase-analytics.js
rename to flutter/web/libs/firebase-analytics.js
diff --git a/flutter/web/assets/firebase-app.js b/flutter/web/libs/firebase-app.js
similarity index 100%
rename from flutter/web/assets/firebase-app.js
rename to flutter/web/libs/firebase-app.js
diff --git a/flutter/web/yuv.js b/flutter/web/libs/yuv.js
similarity index 100%
rename from flutter/web/yuv.js
rename to flutter/web/libs/yuv.js
diff --git a/flutter/web/yuv.wasm b/flutter/web/libs/yuv.wasm
similarity index 100%
rename from flutter/web/yuv.wasm
rename to flutter/web/libs/yuv.wasm