h

z1g-project · Apr 22, 2024 · c09ebda · c09ebda
1 parent e64d4be
commit c09ebda
Show file tree

Hide file tree

Showing 9 changed files with 151 additions and 28 deletions.
diff --git a/index.html b/index.html
@@ -19,7 +19,7 @@
     <link id="favicon" rel="icon" type="image/png" href="favicon.ico">
   </head>
   <body>
-    <script type="module" src="/src/main.tsx"></script>
+    <script type="module" src="/src/routes.tsx"></script>
     <div class="app"></div>
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "@mercuryworkshop/epoxy-transport": "^1.1.0",
     "@mercuryworkshop/libcurl-transport": "^1.3.1",
     "@nebula-services/dynamic": "0.7.2-patch.2",
+    "@ruffle-rs/ruffle": "0.1.0-nightly.2024.4.22",
     "@titaniumnetwork-dev/ultraviolet": "^3.0.2",
     "@tomphttp/bare-server-node": "^2.0.3",
     "@typescript-eslint/eslint-plugin": "^7.7.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/assets/css/frames.css b/public/assets/css/frames.css
@@ -0,0 +1,64 @@
+iframe {
+    position: fixed;
+    top: 40px;
+    left: 0;
+    width: 100%;
+    height: calc(100% - 6.5%);
+    border: none;
+    display: none;
+  }
+
+  .show-iframe iframe {
+    display: block;
+  }
+
+  #loading-overlay {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: -999;
+  }
+
+  .loading-content {
+    text-align: center;
+    color: #fff;
+  }
+
+  .loading-title {
+    font-size: 24px;
+    margin-bottom: 10px;
+  }
+
+  .loading-message {
+    font-size: 18px;
+  }
+
+  .info-menu {
+    display: block;
+  }
+
+  .info-menu-item {
+    font-size: 12px;
+  }
+
+  #container {
+    position: absolute;
+    top: 50px;
+    bottom: 50px;
+    left: 0;
+    right: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  #container object {
+    width: 100%;
+    height: 100%;
+  }
diff --git a/sodium-static/public/sitemap.xml → public/sitemap.xml b/sodium-static/public/sitemap.xml → public/sitemap.xml
diff --git a/src/appframe.tsx b/src/appframe.tsx
@@ -0,0 +1,16 @@
+// @ts-expect-error stfu
+import Nav from "@components/nav.tsx"
+// @ts-expect-error stfu
+import Footer from "@components/footer"
+// @ts-expect-error stfu
+import { regSW } from "@components/modules/sw"
+//import "/public/assets/css/frames.css"
+export default function Appframe() {
+    return (
+        <div>
+            <Nav />
+
+            <Footer />
+        </div>
+    )
+}
diff --git a/src/main.tsx b/src/main.tsx
@@ -7,15 +7,6 @@ import loadSettings from "@components/modules/settings"
 // @ts-expect-error stfu
 import { regSW } from "@components/modules/sw"
 import "../public/assets/css/home.css"
-import { Route } from "dreamland-router"; 
-import Notfound from "./404";
-import Settings from "./settings";
-import Apps from "./apps";
-import NoSW from "./proxy-invalid";
-import WispBG from "./wisp";
-import CreditsPage from "./credits";
-import About from "./about";
-import Games from "./games"
 export default function Home() {
     loadSettings()
     regSW()
@@ -34,7 +25,7 @@ export default function Home() {
                         <li>Fix slow load times</li>
                         <li>More Minor Changes & Bug Fixes view <a style="color:white;" href="https://github.com/z1g-project/sodium">here</a></li>
                     </ul>
-                    <p>Version 2.0.0 - The 2024 Refresh</p>
+                    <p>Version 2.4.0 - The AliceJS Reboot</p>
                     <button class="ok-button">OK</button>
                 </div>
                 </div>
@@ -70,20 +61,3 @@ export default function Home() {
         </div>
     )
 }
-
-export const router = (
-    <Route path="/">
-        <Route path="" show={<Home />} />
-        <Route path="apps" show={<Apps />} />
-        <Route path="sw" show={<NoSW />} />
-        <Route path="service" show={<NoSW />} />
-        <Route path="wisp" show={<WispBG />} />
-        <Route path="games" show={<Games />} />
-        <Route path="settings" show={<Settings />} />
-        <Route path="credits" show={<CreditsPage />} />
-        <Route path="about" show={<About />} />
-        <Route regex path=".*" show={<Notfound />} />
-    </Route>
-).$
-
-router.render(document.querySelector('.app'));
diff --git a/src/routes.tsx b/src/routes.tsx
@@ -0,0 +1,29 @@
+import { Route } from "dreamland-router"; 
+import Notfound from "./404";
+import Settings from "./settings";
+import Apps from "./apps";
+import NoSW from "./proxy-invalid";
+import WispBG from "./wisp";
+import CreditsPage from "./credits";
+import About from "./about";
+import Games from "./games"
+import Home from "./main"
+import Appframe from "./appframe";
+
+export const router = (
+    <Route path="/">
+        <Route path="" show={<Home />} />
+        <Route path="apps" show={<Apps />} />
+        <Route path="sw" show={<NoSW />} />
+        <Route path="service" show={<NoSW />} />
+        <Route path="wisp" show={<WispBG />} />
+        <Route path="games" show={<Games />} />
+        <Route path="settings" show={<Settings />} />
+        <Route path="credits" show={<CreditsPage />} />
+        <Route path="about" show={<About />} />
+        <Route path="appframe" show={<Appframe />} />
+        <Route regex path=".*" show={<Notfound />} />
+    </Route>
+).$
+
+router.render(document.querySelector('.app'));
diff --git a/src/ruffleframe.tsx b/src/ruffleframe.tsx
@@ -0,0 +1,32 @@
+// @ts-expect-error stfu
+import Nav from "@components/nav.tsx"
+// @ts-expect-error stfu
+import Footer from "@components/footer"
+// @ts-expect-error stfu
+import { regSW } from "@components/modules/sw"
+import "/public/assets/css/frames.css"
+export default function RuffleFrame() {
+    // @ts-expect-error stfu
+    window.RufflePlayer = new ruffle || {};
+    // @ts-ignore
+    window.addEventListener("load", (event: event) => {
+        // @ts-expect-error stfu
+        const ruffle = window.RufflePlayer.newest();
+        const player = ruffle.createPlayer();
+        player.style.width = "100%"; player.style.height = "100%";
+        // @ts-expect-error stfu
+        const container: HTMLDivElement = document.getElementById("container");
+        container.appendChild(player);
+        const flashgame = sessionStorage.getItem('flashswf')
+        player.load({
+            url: flashgame,
+        });
+    });
+    return (
+        <div>
+            <Nav />
+            <div id="container"></div>
+            <Footer />
+        </div>
+    )
+}