hotfix

DuckyGit · Nov 24, 2022 · 8429bc8 · 8429bc8
1 parent 2305617
commit 8429bc8
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 13 deletions.
diff --git a/index.js b/index.js
@@ -1,7 +1,9 @@
 import createBareServer from "@tomphttp/bare-server-node";
 import http from "node:http";
+import nodeStatic from "node-static";
 
 const httpServer = http.createServer();
+const serve = new nodeStatic.Server('static/');
 
 const bareServer = createBareServer("/", {
   logErrors: false,

diff --git a/static/index.css b/static/index.css
@@ -119,7 +119,6 @@
     /* shell */
     --shell-background: #1e1e1e;
     --shell-outline-color: #272727;
-    --shell-border-color: #1e1e1e;
     --shell-color: #cecece;
     --button-app-close-color: #ffaaaa;
     --button-app-close-hover-background: #da4343;
@@ -218,7 +217,6 @@
     /* shell */
     --shell-background: #161062;
     --shell-outline-color: #efe688;
-    --shell-border-color: #161062;
     --shell-color: #fff7a5;
     --button-app-close-color: #ffaaaa;
     --button-app-close-hover-background: #da4343;
@@ -317,7 +315,6 @@
     /* shell */
     --shell-background: #313131;
     --shell-outline-color: #ff40f7;
-    --shell-border-color: #313131;
     --shell-color: #ff40f7;
     --button-app-close-color: #ffaaaa;
     --button-app-close-hover-background: #da4343;
@@ -977,7 +974,6 @@ li {
     background-color: var(--shell-background);
     border-bottom-left-radius: 13px;
     border-bottom-right-radius: 13px;
-    border-bottom: 1px solid var(--shell-border-color);
     font-size: 21px;
     font-family: prod;
     z-index: 4;

diff --git a/static/index.js b/static/index.js
@@ -384,9 +384,14 @@ appsOpen.onclick = () => {
     shell.classList.add("noShadow");
     document.querySelector("#appSearch").value = "";
     for(let i = 0; i < apps.length; i++) {
-        apps[i].classList.remove("appShow")
-        apps[i].classList.remove("appHide")
+        apps[i].classList.remove("appShow");
+        apps[i].classList.remove("appHide");
     }
+    let pos = appsOpen.getBoundingClientRect();
+    let posTop = pos.top + 6;
+    let posLeft = pos.left + 6;
+    appsClose.style.top = posTop + "px";
+    appsClose.style.left = posLeft + "px";
 }
 
 appsClose.onclick = () => {
@@ -425,7 +430,6 @@ if(localStorage.getItem("powd") == null) {
 
 if(localStorage.getItem("dockPos").toLowerCase() == "left") {
     const acs = document.querySelectorAll(".activeSpan");
-    console.log(acs);
     for (let i = 0; i < acs.length; i++) {
         const element = acs[i];
         element.classList.add(`left`);

diff --git a/static/js/windows.js b/static/js/windows.js
@@ -919,6 +919,7 @@ function windows(link, icn, title, browser = Boolean, os = Boolean, fullscreen =
     localStorage.setItem(appName, a++);
     newwin.querySelector('.mini').onclick = () => {
         newwin.classList.add("winmini");
+        document.querySelector(`[data-appid="${windowID}"]`).classList.remove("active");
         if(maxState === true) {
             newwin.classList.remove("maxiY");
         }
@@ -1224,8 +1225,34 @@ var availableApps = ["browser", "hypertabs", "code", "youtube", "apple music", "
 
 window.addEventListener("keydown", (e) => {
     if(e.altKey && e.key === "w") {
-        const openApps = document.querySelector("#appsOpen");
-        openApps.click();
+        if(document.querySelector("#main").classList.contains("closedA")) {
+            document.querySelector(".appsDesk").classList.toggle("openA");
+            main.classList.toggle("open");
+            main.classList.toggle("closedA");
+            document.querySelector(".showDesk").classList.add("noBorderRadius");
+            shell.classList.add("noShadow");
+            document.querySelector("#appSearch").value = "";
+            for(let i = 0; i < apps.length; i++) {
+                apps[i].classList.remove("appShow");
+                apps[i].classList.remove("appHide");
+            }
+            let pos = appsOpen.getBoundingClientRect();
+            let posTop = pos.top + 6;
+            let posLeft = pos.left + 6;
+            appsClose.style.top = posTop + "px";
+            appsClose.style.left = posLeft + "px";
+        } else if(!document.querySelector("#main").classList.contains("closedA")) {
+            document.querySelector(".appsDesk").classList.toggle("openA");
+            main.classList.toggle("open");
+            main.classList.toggle("closedA");
+            document.querySelector(".showDesk").classList.remove("noBorderRadius");
+            shell.classList.remove("noShadow");
+            document.querySelector("#appSearch").value = "";
+            for(let i = 0; i < apps.length; i++) {
+                apps[i].classList.remove("appShow")
+                apps[i].classList.remove("appHide")
+            }
+        }
     }
     if(e.ctrlKey && e.altKey && e.key == "q") {
         e.preventDefault();
@@ -1295,6 +1322,9 @@ window.addEventListener("keydown", (e) => {
         currentWindow.classList.add("winNotFocus");
         nextWindow.classList.remove("winNotFocus");
         nextWindow.classList.add("winFocus");
+        if(nextWindow.classList.contains("winmini")) {
+            nextWindow.classList.remove("winmini");
+        }
         const appItem = document.querySelectorAll(".appItem");
         for (let i = 0; i < appItem.length; i++) {
             const element = appItem[i];

diff --git a/static/styles/settings.css b/static/styles/settings.css
@@ -71,7 +71,7 @@
     --cat-background: #0e0a40;
     --title-border-color: #ffe688;
     --white: #ffe688;
-    --button-background: #0e0a40;
+    --button-background: #3b3497;
     --button-boxShadow: none;
     --button-boxShadow-hover: 0 0 8px 4px #ffe688;
     --button-color: #ffe688;
@@ -83,7 +83,7 @@
     --switch-back: #332c84;
     --switch-back-shadow: #ffe6887d;
     --dropdown-boxShadow-hover: #ffe688;
-    --dropdown-button-background: #0e0a40;
+    --dropdown-button-background: #19126c;
     --dropdown-button-background-hover: #ffe688;
     --dropdown-button-color-hover: #0e0a40;
 }
@@ -264,7 +264,7 @@ body {
 }
 
 .btn.night {
-    background-color: #0e0a40;
+    background-color: #3b3497;
     box-shadow: none;
     color: #ffe688;
     border-radius: 4px;
@@ -425,7 +425,7 @@ input[type=number] {
 }
 
 .dropbtn {
-    background-color: #ff3ff5;
+    background-color: var(--dropdown-button-background-hover);
     box-shadow: 0 0 8px 2px var(--dropdown-boxShadow-hover);
     color: var(--dropdown-button-color-hover);
     border: none;