notherbase-fs 1.5.2 → 2.0.0

package/public/styles/main.css

@@ -55,6 +55,7 @@ main {
     align-content: center;
     align-items: flex-start;
     background-color: var(--bgColor);
+    position: relative;
 }
 
 footer {
@@ -81,6 +82,10 @@ footer a {
     height: 100%;
 }
 
+h1, h2, h3, h4, h5, h6 {
+    width: 100%;
+}
+
 hr {
     border: none;
     border-bottom: 1px solid var(--textColor);
@@ -122,107 +127,12 @@ input[type=submit]:hover, button:hover, a:hover {
     cursor: pointer;
 }
 
-.locked {
-    background-color: var(--bgColor);
-    padding: 10px;
-    border-radius: 5px;
-    border: 1px solid var(--textColor);
-    color: var(--textColor);
-    margin: 5px;
-    margin-top: 20px;
-    text-decoration: none;
-    text-align: center;
-    filter: brightness(.5);
-    user-select: none;
-}
-
-.to {
-    width: 100%;
-    height: 200px;
-    display: flex;
-    justify-content: flex-end;
-    align-items: flex-end;
-    padding: 20px;
-}
-
-.return {
-    width: 100%;
-    height: 75px;
-    display: flex;
-    justify-content: flex-end;
-    align-items: flex-end;
-    padding: 20px;
-}
-
-.do {
-    width: 100%;
-    height: 200px;
-    display: flex;
-    justify-content: flex-end;
-    align-items: flex-end;
-    padding: 20px;
-}
-
-h2, h3 {
-    color: var(--textColor);
-    width: 100%;
-}
-
-ul {
-    margin: 10px;
-}
-
-.door {
-    border: 1px solid var(--darkWoodColor);
-    width: 100px;
-    height: 150px;
-    background-color: var(--woodColor);
-    position: relative;
-}
-
-.knob {
+.login-cover {
     position: absolute;
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    right: 5px;
-    top: 50%;
-    background-color: var(--darkWoodColor);
-}
-
-iframe {
-    border: none;
-}
-
-.auth-form {
-    height: 100%;
+    left: 0;
+    top: 0;
     width: 100%;
-    padding: 40px 5px;
-    overflow: hidden;
-    display: flex;
-    justify-content: center;
-    flex-wrap: wrap;
-}
-
-.auth-form h3 {
-    width: calc(100% - 20px);
-    text-align: center;
-    margin: 10px;
-    font-size: 15px;
-}
-
-.auth-form h1 {
-    width: calc(100% - 20px);
-    text-align: center;
-    margin: 10px;
-    font-size: 20px;
-}
-
-.auth-form p {
-    width: calc(100% - 20px);
-    text-align: center;
-    margin: 10px;
-    font-size: 12px;
+    height: 100%;
 }
 
 @media only screen and (max-width: 1000px) {

package/test/explorer/coast/tall-beach/nono-cove/server-scripts/emailTime.js

@@ -1,8 +1,12 @@
-export default async function emailTime(db, route, user, params) {
+export default async function emailTime(req, user) {
     try {
-        await db.sendMail.send(params.toEmail, params.subject, params.html);
+        await req.db.SendMail.send(
+            req.body.data.toEmail, 
+            req.body.data.subject, 
+            req.body.data.html
+        );
 
-        return "Sent"
+        return "Sent";
     } 
     catch(err) {
         console.log(err);

package/test/explorer/coast/tall-beach/nono-cove/views/index.ejs

@@ -4,73 +4,27 @@
 
 <hr>
 
-<div class="chat-box" id="test-chat">
+<h3>chat</h3>
 
-</div>
-
-<div class="chat-box" id="test-chat-2">
-
-</div>
-
-<div class="chat-box" id="test-chat-3">
-
-</div>
+<div class="chat-box" id="test-chat"></div>
+<div class="chat-box" id="test-chat-2"></div>
+<div class="chat-box" id="test-chat-3"></div>
 
 <hr>
 
-<h3>memories Test</h3>
+<h3>serve, memories and institution Test</h3>
 
 <button onclick="setTime()">Add</button>
 <p id="timer">0:00</p>
+<p id="timer-g">0:00</p>
+<p id="u">N</p>
 <button onclick="emailTime()">email</button>
 
 <hr>
 
 <button onclick="tradeForDoll()" id="trade">Trade 5g for a doll</button>
 
-<hr>
-
-<section class="floor" id="items">
-    <h2>Items</h2>
-    <button id="toggle">Toggle</button>
 
-    <div class="content invisible">
-        <ul class="items">
-
-        </ul>
-    
-        <div class="editor">
-            <div class="edit invisible">
-                <h5>Item Name:</h5>
-                <input type="text" id="name">
-            
-                <h5>Short Item Description:</h5>
-                <textarea id="short" name="short" cols="30" rows="3"></textarea>
-            
-                <h5>Full Item Description:</h5>
-                <textarea id="full" name="full" cols="30" rows="10"></textarea>
-
-                <button id="cancel" onclick="itemFloor.cancelEdit()">Cancel</button>
-                <button id="save" onclick="itemFloor.saveSelectedItem()">Save</button>
-            </div>
-
-            <div class="read">
-                <h5 id="name">Item Name</h5>
-            
-                <h5>Short Item Description:</h5>
-                <p id="short"></p>
-            
-                <h5>Full Item Description:</h5>
-                <p id="full"></p>
-
-                <button id="new" onclick="itemFloor.createNewItem()">Create New</button>
-                <button id="edit" onclick="itemFloor.editSelectedItem()">Edit</button>
-                <button id="delete" onclick="itemFloor.deleteSelectedItem()">Delete</button>
-                <button id="refresh" onclick="itemFloor.updateItems()">Refresh List</button>
-            </div>
-        </div>
-    </div>
-</section>
 
 <hr>
 
@@ -99,7 +53,8 @@
             
             if (paid) {
                 bought = true;
-                await playerInventory.change("Rag Doll", 1);
+                let received = await playerInventory.change("Rag Doll", 1);
+                if (!received) playerInventory.change("Gold Coin", 5);
             }
             else {
                 $("#trade").removeClass("invisible");
@@ -108,15 +63,20 @@
     }
 
     let time = 0;
+    let gtime = 0;
 
     (async () => {
         let load = await memories.load("time", "/void/test");
-        console.log(load);
+        let loadg = await establishment.load("time", "/void/test");
+        console.log(load, loadg);
         time = load.time;
+        $("p#u").text(`Last: ${loadg.u}`);
+        gtime = loadg.time;
     })();
 
     let setTime = async function setTime() {
         time = Date.now();
+        gtime = time;
         
         await memories.save("time", {
             time: time,
@@ -132,20 +92,38 @@
                 arrray: [32, "sg", 45]
             }
         }, "/void/test");
+
+        await establishment.save("time", {
+            time: time,
+            u: "<%= user.username %>",
+            a: "dabfb",
+            bln: false,
+            numba: 4236,
+            arrray: [32, "sg", 45],
+            check: {
+                time: time,
+                a: "dabfb",
+                bln: false,
+                numba: 4236,
+                arrray: [32, "sg", 45]
+            }
+        }, "/void/test");
+
+        $("p#u").text("Last: <%= user.username %>");
     }
     
     let updateTime = function updateTime() {
-        $("#timer").text(Math.floor((Date.now() - time) / 1000));
+        $("#timer").text(`Local: ${Math.floor((Date.now() - time) / 1000)}`);
+        $("#timer-g").text(`Global: ${Math.floor((Date.now() - gtime) / 1000)}`);
     }
 
     let emailTime = async () => {
-        $.post("/coast/tall-beach/nono-cove/index/serve/emailTime", {
+        await commune("serveExplorer", {
+            script: "emailTime",
             toEmail: "wyattsushi@gmail.com",
             subject: "New Time Update!",
             html: `New Time: ${time}`
-        }, (res) => {
-            console.log(res);
-        })
+        }, { route: currentRoute });
     }
 
     setInterval(updateTime, 1000);

package/test/pages/server-scripts/emailTime.js

@@ -0,0 +1,15 @@
+export default async function emailTime(req, user) {
+    try {
+        await req.db.SendMail.send(
+            req.body.data.toEmail, 
+            req.body.data.subject, 
+            req.body.data.html
+        );
+
+        return "Sent";
+    } 
+    catch(err) {
+        console.log(err);
+        return false;
+    }
+}

package/test/pages/test.ejs

@@ -2,11 +2,38 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
+    <title>Test</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <!-- font-family: 'Roboto' or 'Roboto Condensed', sans-serif; -->
+    <link href="https://fonts.googleapis.com/css2?family=Roboto&family=Roboto+Condensed:wght@700&display=swap" rel="stylesheet">
+    <!-- 'Redacted Script', cursive; -->
+    <link href="https://fonts.googleapis.com/css2?family=Redacted+Script:wght@300&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
+    <link rel="stylesheet" href="/styles/main.css">
+    <link rel="stylesheet" href="/styles/menu.css">
+    <link rel="stylesheet" href="/styles/inventory.css">
+    <link rel="stylesheet" href="/styles/player.css">
+    <link rel="stylesheet" href="/styles/account.css">
+    <link rel="stylesheet" href="/styles/more.css">
+    <link rel="stylesheet" href="/styles/chat.css">
 </head>
 <body>
     Test hahahahahah
+    <button onclick="emailTime()">email</button>
 </body>
+
+<script src="/js/commune.js"></script>
+<script>
+    let emailTime = async () => {
+        await commune("servePages", {
+            script: "emailTime",
+            toEmail: "wyattsushi@gmail.com",
+            subject: "New Time Update!",
+            html: `New Time: 358970976`
+        }, { route: "/test" });
+    }
+</script>
 </html>

package/test/the-front/server-scripts/emailTime.js

@@ -1,8 +1,12 @@
-export default async function emailTime(db, route, user, params) {
+export default async function emailTime(req, user) {
     try {
-        await db.sendMail.send(params.toEmail, params.subject, params.html);
+        await req.db.SendMail.send(
+            req.body.data.toEmail, 
+            req.body.data.subject, 
+            req.body.data.html
+        );
 
-        return "Sent"
+        return "Sent";
     } 
     catch(err) {
         console.log(err);

package/test/the-front/server-scripts/migrateBig.js

@@ -0,0 +1,3 @@
+export default async (req, user) => {
+    
+}

package/test/the-front/views/check.ejs

@@ -1,7 +1,93 @@
-<p>Hello</p>
+<h1>The Big Check</h1>
+
+<hr>
+
+<h4>Creation</h4>
+
+<p>Page Loaded: True</p>
+<% if (user) { %>
+    <p>User: <%= user.username %></p>
+<% } else { %>
+    <p>User: not logged in</p>
+<% } %>
+
+<hr>
+
+<h4>Spirit World</h4>
+
+<p class="info" id="spirit-world"></p>
+
+<h5>Establishment</h5>
+
+<p id="establish">not loaded</p>
+<input type="text" id="establish" onkeyup="saveEstablishment(event)">
+
+<h5>Memories</h5>
+
+<p id="memory">not loaded</p>
+<input type="text" id="memory" onkeyup="saveMemories(event)">
+
+<h5>Serve Scripts</h5>
+
+<button onclick="emailTime()">Email Wyatt</button>
 
 <hr>
 
 <a href="/the-front">
     Go to The Front
-</a>
+</a>
+
+<script>
+    let saveEstablishment = async (e) => {
+        let $send = $("input#establish");
+
+        if (e.key === "Enter") {
+            await establishment.save("test", {
+                line: $send.val()
+            });
+            
+            $("p#establish").text($send.val());
+            $send.val("");
+        }
+    }
+
+    let loadEstablishment = async () => {
+        let load = await establishment.load("test");
+
+        $("p#establish").text(load.line);
+    }
+
+    loadEstablishment();
+
+    let saveMemories = async (e) => {
+        let $send = $("input#memory");
+
+        if (e.key === "Enter") {
+            let response = await memories.save("test", {
+                line: $send.val()
+            });
+            
+            if (response.status === "success") {
+                $("p#memory").text($send.val());
+                $send.val("");
+            }
+        }
+    }
+
+    let loadMemories = async () => {
+        let load = await memories.load("test");
+
+        $("p#memory").text(load.line);
+    }
+
+    loadMemories();
+
+    let emailTime = async () => {
+        await commune("serveFront", {
+            script: "emailTime",
+            toEmail: "wyattsushi@gmail.com",
+            subject: "New Time Update!",
+            html: `New Time: From the Big Check!`
+        }, { route: currentRoute });
+    }
+</script>

package/test/the-front/views/index.ejs

@@ -6,6 +6,13 @@
 
 <button onclick="emailTime()">email</button>
 
+<input type="text" id="general">
+
+<button onclick="newItem()">newItem</button>
+<button onclick="deleteItem()">deleteItem</button>
+<button onclick="playerInventory.change($('#general').val(), 3)">add Item to inv</button>
+<button onclick="emailTime()">email time</button>
+
 <hr>
 
 <h3>Register Account</h3>
@@ -17,19 +24,9 @@
 
 <hr>
 
-<div class="auth-form" id="login-form">
-    <h1>NotherBase</h1>
-    <h3>Login to Your Account</h3>
-    <input type="email" name="email" placeholder="user@email.com" id="login-email">
-    <input type="password" name="password" placeholder="password" id="login-pass">
-    <button id="login-button">Login</button>
-    <button id="reset-password">Reset Password</button>
-    <p id="login-info"></p>
-</div>
-
 <div class="auth-form" id="reset-form">
     <h1>NotherBase</h1>
-    <h3>Login to Your Account</h3>
+    <h3>Reset your Password</h3>
     <input type="number" name="token" placeholder="Your Reset Code" id="token">
     <input type="password" name="password" placeholder="Type Your New Password Here" minlength="8" required id="password">
     <input type="password" name="confirmation" placeholder="Type Your New Password Here Again" minlength="8" required id="confirmation">
@@ -39,11 +36,7 @@
 
 <hr>
 
-<div class="locked to nother-base">
-    Go to Nono Cove
-</div>
-
-<a href="/coast/tall-beach/nono-cove" class="invisible to nother-base">
+<a href="/coast/tall-beach/nono-cove" class="to nother-base">
     Go inside
 </a>
 
@@ -53,8 +46,6 @@
 
 <script>
     let $resetPassword = $("#reset-password");
-    let $loginButton = $("#login-button");
-    let $loginInfo = $("#login-info");
     let $registerButton = $("#register-button");
     let $registerInfo = $("#register-info");
     let $changePasswordButton = $("button#change-password");
@@ -62,110 +53,61 @@
     let $toNonoButton = $(".locked.to.nother-base");
     let $toNonoLink = $(".invisible.to.nother-base");
 
-    <% if (user) { %>
-        $toNonoButton.addClass("invisible");
-        $toNonoLink.removeClass("invisible");
-    <% } %>
-
-    $loginButton.on("click", async function () {
-        try {
-            await $.post("/user/login", {
-                email: $("#login-email").val(),
-                password: $("#login-pass").val()
-            }, (data) => {
-                $loginInfo.text("To your right you hear the sound of a bang against a chain-link fence. You've logged in.");
-                $toNonoButton.addClass("invisible");
-                $toNonoLink.removeClass("invisible");
-                
-                playerInventory.refresh();
-                playerAttributes.refresh();
-                accountServices.refresh();
-            });
-        } catch (error) {
-            if (error.status === 401) {
-                $loginInfo.text("Login Error: Email or password incorrect!");
-            }
-            else if (error.status === 500) {
-                $loginInfo.text("Server Error: Try again later!");
-            }
-        }
-    });
-
     $registerButton.on("click", async function () {
-        try {
-            await $.post("/user/register", {
+        await $.post("/s", JSON.stringify({
+            action: "register",
+            data: {
                 username: $("#register-user").val(),
                 password: $("#register-pass").val(),
                 email: $("#register-email").val()
-            }, (data) => {
-                $registerInfo.text("Account registered.");
-            });
-        } catch (error) {
-            //console.log(error);
-            if (error.status === 400) {
-                $registerInfo.text("Login Error: Username already taken!");
-            }
-            else if (error.status === 500) {
-                $registerInfo.text("Server Error: Try again later!");
             }
-        }
-    });
-
-    $resetPassword.on("click", async function () {
-        try {
-            await $.get("/user/password-reset", { email: $("#login-email").val() });
-            $loginInfo.text("Reset link sent to your email.");
-        } 
-        catch(err) {
-            if (error.status === 401) {
-                $loginInfo.text("Reset Error: Email not found!");
-            }
-            else if (error.status === 500) {
-                $loginInfo.text("Server Error: Try again later!");
-            }
-        }
+        }), (data) => {
+            if (data.status === "success") $registerInfo.text("Account registered.");
+            else console.log(data);
+        });
     });
 
     $changePasswordButton.on("click", async function () {
-        try {
-            let token = $("#reset-form #token").val();
+        let token = $("#reset-form #token").val();
 
-            await $.post(`/user/password-reset/${token}`, {
+        await $.post("/s", JSON.stringify({
+            action: "changePassword",
+            data: { 
                 token: token,
                 password: $("#reset-form #password").val(),
                 confirmation: $("#reset-form #confirmation").val()
-            }, (data) => {
-                $changeInfo.text("Password changed.");
-            });
-        } catch (error) {
-            if (error.status === 498) {
-                $changeInfo.text("Change Error: Your reset code expired! Please request a new one.");
-            }
-            else if (error.status === 400) {
-                $changeInfo.text("Change Error: Passwords must match!");
-            }
-            else if (error.status === 404) {
-                $changeInfo.text("Change Error: Reset code not valid!");
             }
-            else if (error.status === 500) {
-                $changeInfo.text("Server Error: Try again later!");
-            }
-        }
+        }), (data) => {
+            if (data.status === "success") $changeInfo.text("Password changed.");
+            else console.log(data);
+        });
     });
 
     let addGold = function addGold(params) {
-        playerInventory.change(itemIDs[0], 2);
+        playerInventory.change("Gold Coin", 23);
     }
 
-    let time = 0;
+    let newItem = async () => {
+        await commune("newItem", {
+            name: $("#general").val()
+        });
+
+        let items = await commune("getAllItems");
+        console.log(items);
+    }
+
+    let deleteItem = async () => {
+        await commune("deleteItem", {
+            name: $("#general").val()
+        });
+    }
 
     let emailTime = async () => {
-        $.post("/coast/tall-beach/nono-cove/index/serve/emailTime", {
+        await commune("serveFront", {
+            script: "emailTime",
             toEmail: "wyattsushi@gmail.com",
             subject: "New Time Update!",
-            html: `New Time: ${time}`
-        }, (res) => {
-            console.log(res);
-        })
+            html: `New Time: 3       0976`
+        }, { route: currentRoute });
     }
 </script>

package/test-index.js

@@ -0,0 +1,5 @@
+import NotherBaseFS from "./notherbase-fs.js";
+import { fileURLToPath } from 'node:url';
+const __dirname = fileURLToPath(new URL('./test', import.meta.url));
+
+const notherBaseFS = new NotherBaseFS(__dirname);