Merge pull request #48 from inwinter04/Dev

🔧 尝试修复BUG
inwinter04 · Jan 30, 2024 · cf1c3a1 · cf1c3a1 · vercel · Jan 30, 2024
2 parents dd2b4bd + 4f7ffd2
commit cf1c3a1
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 40 deletions.
diff --git a/public/serviceWorker.js b/public/serviceWorker.js
@@ -36,7 +36,7 @@ self.addEventListener("activate", (event) => {
             return caches.delete(cacheName);
           }
         }),
-        ),
       ),
+    ),
   );
 });
diff --git a/src/components/start/index.jsx b/src/components/start/index.jsx
@@ -81,28 +81,28 @@ export const BandPane = () => {
     >
       <div className="bandContainer">
         <Icon
-            className="hvlight"
-            width={17}
-            click="CALCUAPP"
-            payload="togg"
-            open="true"
-            src="calculator"
-          />
-          <Icon
-            className="hvlight"
-            width={17}
-            click="SPOTIFY"
-            payload="togg"
-            open="true"
-            src="spotify"
-          />
-          <Icon
-            className="hvlight"
-            width={17}
-            click="NOTEPAD"
-            payload="togg"
-            src="notepad"
-          />
+          className="hvlight"
+          width={17}
+          click="CALCUAPP"
+          payload="togg"
+          open="true"
+          src="calculator"
+        />
+        <Icon
+          className="hvlight"
+          width={17}
+          click="SPOTIFY"
+          payload="togg"
+          open="true"
+          src="spotify"
+        />
+        <Icon
+          className="hvlight"
+          width={17}
+          click="NOTEPAD"
+          payload="togg"
+          src="notepad"
+        />
       </div>
     </div>
   );
@@ -150,7 +150,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}%)`,
     );
   }
 
@@ -179,7 +179,7 @@ export const SidePane = () => {
       },
     });
     sliderBackground(bSlider, brgt);
-  };
+  }
 
   useEffect(() => {
     sidepane.quicks.map((item, i) => {

diff --git a/src/containers/applications/apps/explorer.jsx b/src/containers/applications/apps/explorer.jsx
@@ -342,7 +342,7 @@ const NavPane = ({}) => {
             notoggle
             pinned
           />
-          <Dropdown icon="user" title="Blue Edge" spid="%user%" notoggle pinned />
+          <Dropdown icon="user" title="此电脑" spid="%user%" notoggle pinned />
           <Dropdown
             icon="docs"
             title="文档"

diff --git a/src/containers/applications/apps/settings.jsx b/src/containers/applications/apps/settings.jsx
@@ -13,7 +13,7 @@ export const Settings = () => {
 
   const wall = useSelector((state) => state.wallpaper);
 
-  const [page, setPage] = useState("System"); // default System
+  const [page, setPage] = useState("系统"); // default System
   const [nav, setNav] = useState("");
   const [updating, setUpdating] = useState(false);
   const [upmodalOpen, setUpmodalOpen] = useState(false);
@@ -134,12 +134,26 @@ export const Settings = () => {
                                 </div>
                               </div>
                               <div className="right">
+                                <div className="column">
+                                  <img
+                                    src="https://upload.wikimedia.org/wikipedia/commons/2/25/Microsoft_icon.svg"
+                                    height={20}
+                                    alt=""
+                                  />
+                                  <p>
+                                    Microsoft 365
+                                    <br />
+                                    <span className="column_lower">
+                                      浏览优势
+                                    </span>
+                                  </p>
+                                </div>
                                 <div
                                   className="column"
                                   onClick={() => setPage("Windows 更新")}
                                 >
                                   <img
-                                    src="img/settings/Windows Update.webp"
+                                    src="img/settings/Windows 更新.webp"
                                     alt=""
                                     height={20}
                                   />
@@ -180,8 +194,7 @@ export const Settings = () => {
                                 <div>
                                   <h3>数据使用量</h3>
                                   <p>
-                                    {Math.round(Math.random() * 100)}GB, last 30
-                                    days
+                                    {Math.round(Math.random() * 100)}GB, 过去30天
                                   </p>
                                 </div>
                               </div>

diff --git a/src/containers/applications/wnapp.scss b/src/containers/applications/wnapp.scss
@@ -147,6 +147,10 @@ body[data-theme="dark"] .calcApp {
   background: rgb(24, 24, 24);
 }
 
+.discordWn {
+  background: #36393f;
+}
+
 .lightWindow {
   background: #e7eaec;
 }

diff --git a/src/index.jsx b/src/index.jsx
@@ -4,8 +4,6 @@ import App from "./App";
 import store from "./reducers";
 import { Provider } from "react-redux";
 
-
-
 const root = createRoot(document.getElementById("root"));
 
 root.render(

diff --git a/src/reducers/dir.json b/src/reducers/dir.json
@@ -76,7 +76,7 @@
           },
           "Blue": {
             "type": "folder",
-            "name": "此电脑",
+            "name": "´ËµçÄÔ",
             "info": {
               "spid": "%user%",
               "icon": "user"

diff --git a/src/reducers/settings.js b/src/reducers/settings.js
@@ -72,9 +72,9 @@ const settReducer = (state = defState, action) => {
       tmpState = changeVal(tmpState, action.payload.path, action.payload.value);
       break;
     case "SETTLOAD":
-	  changed = true;
+      changed = true;
       tmpState = { ...action.payload };
-	  break;
+      break;
     case "TOGGAIRPLNMD":
       changed = true;
       const airPlaneModeStatus = tmpState.network.airplane;

diff --git a/src/reducers/startmenu.js b/src/reducers/startmenu.js
@@ -10,8 +10,8 @@ const defState = {
   pwctrl: false,
   curAlpha: "A",
   qksrch: [
-    ["faClock", 1, "历史的今天"], 
-    ["faChartLine", null, "今日市场"],  //emmm，似乎是股票。这咋翻译哇（冬天
+    ["faClock", 1, "历史上的今天"], 
+    ["faChartLine", null, "今日行情"],
     ["faFilm", null, "近期电影"],
     ["faNewspaper", 1, "头条新闻"],
   ],

diff --git a/src/reducers/taskbar.js b/src/reducers/taskbar.js
@@ -25,13 +25,13 @@ const taskReducer = (state = defState, action) => {
         align: "center",
       };
     case "TASKLEF":
-	  localStorage.setItem("taskbar-align", "left");
+      localStorage.setItem("taskbar-align", "left");
       return {
         ...state,
         align: "left",
       };
     case "TASKTOG":
-	  const alignment = state.align == "left" ? "center" : "left";
+      const alignment = state.align == "left" ? "center" : "left";
       localStorage.setItem("taskbar-align", alignment);
       return {
         ...state,

diff --git a/src/utils/apps.js b/src/utils/apps.js
@@ -225,6 +225,11 @@ const apps = [
     icon: "tips",
     type: "app",
   },
+  {
+    name: "To Do",
+    icon: "todo",
+    type: "app",
+  },
   {
     name: "地图",
     icon: "maps",

diff --git a/src/utils/general.jsx b/src/utils/general.jsx
@@ -41,7 +41,7 @@ export const Icon = (props) => {
 
   const clickDispatch = (event) => {
     if (!sidepane.banhide) dispatch({ type: "BANDHIDE" });
-    
+
     var action = {
       type: event.currentTarget.dataset.action,
       payload: event.currentTarget.dataset.payload,

diff --git a/vercel.json b/vercel.json
@@ -0,0 +1,13 @@
+{
+  "headers": [
+    {
+      "source": "/(.*)",
+      "headers": [
+        {
+          "key": "X-Content-Type-Options",
+          "value": "nosniff"
+        }
+      ]
+    }
+  ]
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ self.addEventListener("activate", (event) => { @@
                 return caches.delete(cacheName);
               }
             }),
-            ),
           ),
+        ),
       );
     });