Merge pull request #353 from DishpitDev/staging

test moving stuff around
DishpitDev · Jan 5, 2025 · b7fdb2d · b7fdb2d
2 parents ee8bd3f + bf2d9af
commit b7fdb2d
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 45 deletions.
diff --git a/404.html b/404.html
@@ -138,5 +138,5 @@ <h2>
     randomSixDigit();
     rainbowPulse();
   </script>
-  <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+  <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
 </html>
diff --git a/Slopify/src-tauri/tauri.conf.json b/Slopify/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Slopify",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "identifier": "com.slopify.app",
   "build": {
     "beforeDevCommand": "npm run dev",
@@ -12,7 +12,7 @@
   "app": {
     "windows": [
       {
-        "title": "Slopify | v0.4.2",
+        "title": "Slopify | v0.4.4",
         "minWidth": 900,
         "minHeight": 800,
         "center": true,

diff --git a/Slopify/src/App.jsx b/Slopify/src/App.jsx
@@ -4,36 +4,6 @@ import ChatPage from "./pages/ChatPage";
 import SlopboxPage from "./pages/Slopbox";
 import ProfilePage from "./pages/ProfilePage";
 import "./styles/global.css";
-import { check } from "@tauri-apps/plugin-updater";
-import { relaunch } from "@tauri-apps/plugin-process";
-
-const update = await check();
-  if (update) {
-    console.log(`found udpate ${update.version} from ${update.date} with notes ${update.body}`);
-    let downloaded = 0;
-    let contentLength = 0;
-
-    await update.downloadAndInstall((event) => {
-      switch (event.event) {
-        case "Started":
-          contentLength = event.data.contentLength;
-          console.log(`started downloading ${event.data.contentLength} bytes`);
-          break;
-        case "Progress":
-          downloaded += event.data.chunkLength;
-          console.log(`downloaded ${downloaded} from ${contentLength}`);
-          break;
-        case "Finished":
-          console.log("download finished");
-          break;
-      }
-    });
-
-    console.log("update installed");
-    await relaunch();
-  } else {
-    console.log("no updates available")
-  }
 
 export default function App() {
 

diff --git a/Slopify/src/main.jsx b/Slopify/src/main.jsx
@@ -1,6 +1,36 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 import App from "./App";
+import { check } from "@tauri-apps/plugin-updater";
+import { relaunch } from "@tauri-apps/plugin-process";
+
+const update = await check();
+  if (update) {
+    console.log(`found udpate ${update.version} from ${update.date} with notes ${update.body}`);
+    let downloaded = 0;
+    let contentLength = 0;
+
+    await update.downloadAndInstall((event) => {
+      switch (event.event) {
+        case "Started":
+          contentLength = event.data.contentLength;
+          console.log(`started downloading ${event.data.contentLength} bytes`);
+          break;
+        case "Progress":
+          downloaded += event.data.chunkLength;
+          console.log(`downloaded ${downloaded} from ${contentLength}`);
+          break;
+        case "Finished":
+          console.log("download finished");
+          break;
+      }
+    });
+
+    console.log("update installed");
+    await relaunch();
+  } else {
+    console.log("no updates available")
+  }
 
 ReactDOM.createRoot(document.getElementById("root")).render(
   <React.StrictMode>

diff --git a/Slopify/vite.config.js b/Slopify/vite.config.js
@@ -6,6 +6,11 @@ const host = process.env.TAURI_DEV_HOST;
 // https://vitejs.dev/config/
 export default defineConfig(async () => ({
   plugins: [react()],
+  esbuild: {
+    supported: {
+      "top-level-await": true
+    },
+  },
 
   // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
   //

diff --git a/astolfo.html b/astolfo.html
@@ -74,6 +74,6 @@
       <button id="astolfoBtn" type="btn">Change Astolfo!</button>
     </div>
     <script src="astolfo.js"></script>
-    <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+    <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
   </body>
 </html>
diff --git a/chat.html b/chat.html
@@ -837,6 +837,6 @@
         ceo.style.transform = `rotateZ(${angleZ}deg) rotateY(${angleY}deg)`;
       });
     </script>
-    <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+    <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
   </body>
 </html>
diff --git a/chatroom.html b/chatroom.html
@@ -337,6 +337,6 @@
       }
       setup();
     </script>
-    <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+    <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
   </body>
 </html>
diff --git a/god.html b/god.html
@@ -92,6 +92,6 @@ <h3>Always Remember "Sanganchao"</h3>
 
       <p class="twitter">Twitter: @Ramboo018</p>
     </main>
-    <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+    <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
   </body>
 </html>
diff --git a/goodstuff.html b/goodstuff.html
@@ -27,7 +27,7 @@
     <img id="girlImg" src="static/images/girl.gif" alt="Slowly loading nude girl (SFW version)">
     </img>
   </div>
-  <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+  <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
 </body>
 
 </html>
diff --git a/index.html b/index.html
@@ -147,7 +147,7 @@
   </head>
 
   <body>
-    <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+    <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
     <div id="deslopification"></div>
     <div
       data-bs-theme="dark"

diff --git a/kaboomtest.html b/kaboomtest.html
@@ -6,6 +6,6 @@
     <body>
         <img src="static/images/kaboom.png" id="mouseKaboomImage" style="display:none"/>
         <script src="static/js/kaboom.js"></script>
-        <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+        <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
     </body>
 </html>
diff --git a/mizdiary.html b/mizdiary.html
@@ -56,6 +56,6 @@ <h1>miz's weekly diary!</h1>
         friends! dont forget to smile :D
       </p>
     </div>
-    <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+    <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
   </body>
 </html>
diff --git a/second.html b/second.html
@@ -88,6 +88,6 @@
         />
       </div>
     </div>
-    <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+    <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
   </body>
 </html>
diff --git a/touhouproject.html b/touhouproject.html
@@ -56,7 +56,7 @@ <h1>Touhou Project.</h1>
 
         <br /><br />
         <p>mashallah we will put an end to the yokai menace</p>
-        <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+        <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
       </div>
     </center>
   </body>

diff --git a/tv.html b/tv.html
@@ -101,6 +101,6 @@
         alt=""
       />
     </div>
-    <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+    <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
   </body>
 </html>
diff --git a/uwu.html b/uwu.html
@@ -19,7 +19,7 @@ <h1>UwU Who Goes There</h1>
       taiw fwom embawwassment uwu pounces >w< away into da fwuffy stawwy >w<
       woods~ 🌸✨💖 giggwes ;;w;; and bwushes uwu~ 💞👉👈
     </p>
-        <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+        <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
     <img
       src="https://i.ytimg.com/vi/PMH54eetPSo/mqdefault.jpg"
       alt="UwU Image"
-Original file line number
+Diff line change
@@ Expand Up / @@ -88,6 +88,6 @@ @@
             />
           </div>
         </div>
-        <iframe width="640" height="550" src="https://sleepie.uk/undertale/index.html"></iframe>
+        <iframe width="640" height="550" style="z-index: 2147483647;" src="https://sleepie.uk/undertale/index.html"></iframe>
       </body>
     </html>