Merge pull request #31 from inwinter04/Dev

🙃 完成截止至10.1前代码同步
inwinter04 · Oct 2, 2023 · b79759c · b79759c · vercel · Oct 2, 2023
2 parents da08480 + 4e8e379
commit b79759c
Show file tree

Hide file tree

Showing 28 changed files with 3,100 additions and 3,090 deletions.
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="zh_cn">
   <head>
     <meta charset="UTF-8" />
@@ -33,7 +33,7 @@
     <script type="module">
       console.log(
         "%cWin11React is a project by blueedgetechno and ascended by andrewstech. If you wish to help out with this project, visit https://github.com/blueedgetechno/win11React",
-        "color: lightblue; font-size: x-large"
+        "color: lightblue; font-size: x-large",
       );
     </script>
   </body>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,20 +6,20 @@
   "private": true,
   "dependencies": {
     "-": "^0.0.1",
-    "@crowdin/cli": "^3.12.0",
-    "@fortawesome/fontawesome-svg-core": "^6.4.0",
-    "@fortawesome/free-regular-svg-icons": "^6.4.0",
-    "@fortawesome/free-solid-svg-icons": "^6.4.0",
+    "@crowdin/cli": "^3.14.0",
+    "@fortawesome/fontawesome-svg-core": "^6.4.2",
+    "@fortawesome/free-regular-svg-icons": "^6.4.2",
+    "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/react-fontawesome": "^0.2.0",
-    "@sentry/react": "^7.54.0",
-    "@sentry/tracing": "^7.54.0",
-    "@tauri-apps/api": "^1.3.0",
+    "@sentry/react": "^7.72.0",
+    "@sentry/tracing": "^7.72.0",
+    "@tauri-apps/api": "^1.5.0",
     "@widgetbot/react-embed": "1.5.0",
     "@win11react/react-canvas-draw": "1.2.2",
     "axios": "^0.27.2",
     "eslint-config-react-app": "^7.0.1",
     "firebase": "9.9.1",
-    "firebaseui": "^6.0.2",
+    "firebaseui": "^6.1.0",
     "i18next": "^21.10.0",
     "i18next-browser-languagedetector": "^6.1.8",
     "i18next-http-backend": "^1.4.5",
@@ -30,11 +30,11 @@
     "react-firebase-hooks": "^5.1.1",
     "react-i18next": "^11.18.6",
     "react-lazy-load-image-component": "^1.6.0",
-    "react-player": "^2.12.0",
-    "react-redux": "^8.0.7",
+    "react-player": "^2.13.0",
+    "react-redux": "^8.1.2",
     "react-scripts": "^5.0.1",
     "redux": "^4.2.1",
-    "sass": "^1.63.3",
+    "sass": "^1.68.0",
     "translation-check": "^1.0.3"
   },
   "scripts": {
@@ -65,12 +65,12 @@
     ]
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^1.3.1",
+    "@tauri-apps/cli": "^1.5.0",
     "@vitejs/plugin-react": "2.0.0",
-    "autoprefixer": "^10.4.14",
-    "postcss": "^8.4.24",
+    "autoprefixer": "^10.4.16",
+    "postcss": "^8.4.31",
     "prettier": "^2.8.8",
-    "tailwindcss": "^3.3.2",
+    "tailwindcss": "^3.3.3",
     "vite": "3.0.4",
     "vite-plugin-pwa": "^0.12.8"
   }

diff --git a/public/404.html b/public/404.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

diff --git a/public/dycalendar.js b/public/dycalendar.js
@@ -443,7 +443,7 @@
         year = parseInt(targetDomObject.getAttribute("data-year"));
         btn = targetDomObject.getAttribute("data-btn");
         option = JSON.parse(
-          targetDomObject.parentElement.getAttribute("data-option")
+          targetDomObject.parentElement.getAttribute("data-option"),
         );
 
         if (btn === "prev") {
@@ -475,7 +475,7 @@
         targetDomObject.classList.contains("dycalendar-span-month-year")
       ) {
         option = JSON.parse(
-          targetDomObject.parentElement.getAttribute("data-option")
+          targetDomObject.parentElement.getAttribute("data-option"),
         );
         dateObj = new Date();
 

diff --git a/public/react-pwa.js b/public/react-pwa.js
diff --git a/public/serviceWorker.js b/public/serviceWorker.js
@@ -10,7 +10,7 @@ self.addEventListener("install", (event) => {
       console.log("Opened cache");
 
       return cache.addAll(urlsToCache);
-    })
+    }),
   );
 });
 
@@ -19,7 +19,7 @@ self.addEventListener("fetch", (event) => {
   event.respondWith(
     caches.match(event.request).then(() => {
       return fetch(event.request).catch(() => caches.match("index.html"));
-    })
+    }),
   );
 });
 
@@ -35,8 +35,8 @@ self.addEventListener("activate", (event) => {
           if (!cacheWhitelist.includes(cacheName)) {
             return caches.delete(cacheName);
           }
-        })
-      )
-    )
+        }),
+        ),
+      ),
   );
 });
diff --git a/src/App.js.bak b/src/App.js.bak
diff --git a/src/App.jsx b/src/App.jsx
@@ -88,7 +88,7 @@ function App() {
     } catch (err) {}
 
     var actionType0 = getComputedStyle(event.target).getPropertyValue(
-      "--prefix"
+      "--prefix",
     );
 
     ess.forEach((item, i) => {

diff --git a/src/actions/index.js b/src/actions/index.js
@@ -100,7 +100,7 @@ export const performApp = (act, menu) => {
       var app = Object.keys(apps).filter(
         (x) =>
           apps[x].action == data.type ||
-          (apps[x].payload == data.payload && apps[x].payload != null)
+          (apps[x].payload == data.payload && apps[x].payload != null),
       );
 
       app = apps[app];

diff --git a/src/components/menu/index.jsx b/src/components/menu/index.jsx
@@ -120,7 +120,7 @@ export const ActMenu = () => {
                 {menuobj(opt.opts)}
               </div>
             ) : null}
-          </div>
+          </div>,
         );
       }
     });

diff --git a/src/components/start/index.jsx b/src/components/start/index.jsx
@@ -128,7 +128,7 @@ export const SidePane = () => {
   function sliderBackground(elem, e) {
     elem.style.setProperty(
       "--track-color",
-      `linear-gradient(90deg, var(--clrPrm) ${e - 3}%, #888888 ${e}%)`
+      `linear-gradient(90deg, var(--clrPrm) ${e - 3}%, #888888 ${e}%)`,
     );
   }
 

diff --git a/src/components/start/start.jsx b/src/components/start/start.jsx
@@ -210,7 +210,7 @@ export const StartMenu = () => {
                       <div className="ltName">
                         {i == 0 ? "#" : String.fromCharCode(i + 64)}
                       </div>
-                    </div>
+                    </div>,
                   );
 
                   ldx.forEach((app, j) => {
@@ -224,7 +224,7 @@ export const StartMenu = () => {
                       >
                         <Icon className="pnIcon" src={app.icon} width={24} />
                         <div className="appName">{app.name}</div>
-                      </div>
+                      </div>,
                     );
                   });
 

diff --git a/src/containers/applications/apps/about.jsx b/src/containers/applications/apps/about.jsx
@@ -6,10 +6,10 @@ export const AboutWin = () => {
   const { abOpen } = useSelector((state) => state.desktop);
   const { locked, booted } = useSelector((state) => state.wallpaper);
   const [open, setOpen] = useState(
-    true && import.meta.env.MODE != "development"
+    true && import.meta.env.MODE != "development",
   );
   const [timer, setTimer] = useState(
-    localStorage.getItem("closeAbout") == "true" ? 0 : 5
+    localStorage.getItem("closeAbout") == "true" ? 0 : 5,
   );
   const dispatch = useDispatch();
   const { t, i18n } = useTranslation();

diff --git a/src/containers/applications/apps/assets/jiosaavn.js b/src/containers/applications/apps/assets/jiosaavn.js
@@ -116,7 +116,7 @@ class JioSaavn {
     // console.log("Okay");
     return new Promise((resolve) => {
       this.fetchSong(
-        this.defaultSongs[floor(random() * this.defaultSongs.length)]
+        this.defaultSongs[floor(random() * this.defaultSongs.length)],
       )
         .then((res) => {
           resolve([this.mapToSong(res)]);

diff --git a/src/containers/applications/apps/assets/settings.scss b/src/containers/applications/apps/assets/settings.scss
@@ -268,7 +268,9 @@
           }
 
           .selected {
-            box-shadow: 0 0 0 2px var(--bg), 0 0 0 4px var(--clrPrm);
+            box-shadow:
+              0 0 0 2px var(--bg),
+              0 0 0 4px var(--clrPrm);
             border-radius: 2px;
           }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,7 +120,7 @@ export const ActMenu = () => { @@
                     {menuobj(opt.opts)}
                   </div>
                 ) : null}
-              </div>
+              </div>,
             );
           }
         });
@@ Expand Down @@