npm - notherbase-fs - Versions diffs - 3.2.6 → 3.2.8 - Mend

notherbase-fs 3.2.6 → 3.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/controllers/spirit-world.js +4 -1
package/package.json +1 -1
package/public/js/base.js +2 -9
package/test/coast/tall-beach/nono-cove/index.ejs +1 -0
package/test/pages/void/index.ejs +32 -1
package/test/the-front/check/emailTime.js +0 -2
package/test/the-front/check/index.ejs +1 -1
package/test/the-front/index.ejs +0 -4
package/views/explorer.ejs +0 -2
package/views/footer.ejs +1 -1
package/test/the-front/add-gold.js +0 -23
package/test/the-front/check/add-more-gold.js +0 -3
package/test/the-front/check/subtract-gold.js +0 -3
package/test/the-front/checks.js +0 -11
package/test/the-front/incTranslation.js +0 -9
package/test/the-front/load-groups.js +0 -46
package/views/basic-footer.ejs +0 -2
package/views/menu.ejs +0 -43

package/controllers/spirit-world.js CHANGED Viewed

@@ -96,7 +96,10 @@ export default class SpiritWorld {
             if (req.body.scope === "local") {
                 let user = await req.db.User.recallOne(req.session.currentUser);
                 if (user?.id) parent = user.id;
-                else throw new Error("User had no id on load(): ", user);
+                else {
+                    fail(res, "User had no id on load()");
+                    return;
+                }
             }
             let spirit = await req.db.Spirit.recallOne(req.body.service, parent);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "3.2.6",
+  "version": "3.2.8",
   "description": "Functions to help make developing for NotherBase easier.",
   "exports": "./notherbase-fs.js",
   "scripts": {

package/public/js/base.js CHANGED Viewed

@@ -21,8 +21,6 @@ class Base {
             this.username = "";
             this.email = "";
             this.lastUpdate = 0;
-            this.refresh();
         }
         /**
@@ -79,7 +77,8 @@ class Base {
     logout = async () => {
         let response = await Base.commune("logout");
-        return response;
+        location.reload();
+        //return response;
     }
     /**
@@ -110,11 +109,8 @@ class Base {
         });
         if (response.status === "success") {
-            this.playerInventory.refresh();
             this.playerAccount.username = response.data;
             this.playerAccount.email = email;
-            this.playerAccount.refresh();
-            this.playerAttributes.refresh();
         }
         return response;
@@ -160,9 +156,6 @@ class Base {
         }));
         if (response.status != "success") console.log(`${window.location.pathname} - ${response.message}`);
-        this.playerInventory.refresh();
-        this.playerAttributes.refresh();
         return response;
     }

package/test/coast/tall-beach/nono-cove/index.ejs CHANGED Viewed

@@ -20,6 +20,7 @@
     Go to Nono Cove
 </a>
+<script src="/js/chat-box.js"></script>
 <script>
     let chatTest = new ChatBox("<%= user.username %>", "test-chat");
     let chatTest2 = new ChatBox("<%= user.username %>", "test-chat-2");

package/test/pages/void/index.ejs CHANGED Viewed

@@ -1,5 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <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">
+    <script src="/js/base.js"></script>
+</head>
+<script>
+    const currentRoute = "<%- route %>";
+</script>
 <style>
     <%- include("./void.css"); %>
 </style>
-<a href="/">Leave the Void</a>
+<body>
+    <main>
+        <a href="/">Leave the Void</a>
+    </main>
+</body>
+</html>

package/test/the-front/check/emailTime.js CHANGED Viewed

@@ -5,7 +5,5 @@ export default async function emailTime(req, user) {
         'sdntndtjln l'
     );
-    console.log(req.body);
     return "Sent";
 }

package/test/the-front/check/index.ejs CHANGED Viewed

@@ -25,7 +25,7 @@
     base.load("test-save3").then((res) => {
         if (res.text) $inp.attr("placeholder", res.text);
         else  $inp.attr("placeholder", "No Input Saved");
-    })
+    });
     const saveInput = function saveInput() {
         let inp = $inp.val();

package/test/the-front/index.ejs CHANGED Viewed

@@ -104,8 +104,4 @@
     }
     let test = new Test();
-    base.do("load-groups").then((res) => {
-        console.log(res);
-    });
 </script>

package/views/explorer.ejs CHANGED Viewed

@@ -9,8 +9,6 @@
     const base = new Base();
 </script>
 <main class="override">
     <% if (requireUser && !user) { %>
         <div class="login-cover">

package/views/footer.ejs CHANGED Viewed

@@ -1,6 +1,6 @@
 <footer>
+    <%- user ? `<p class="login-status">Logged In: ${user.username}</p><button onclick="base.logout()">Logout</button>` : `<p class="login-status">Not Logged In</p>` %>
 </footer>
 </body>

package/test/the-front/add-gold.js DELETED Viewed

@@ -1,23 +0,0 @@
-export default async (req, user) => {
-    let gold = await req.db.Item.recallOne("Gold Coin");
-    if (!gold) {
-        //console.log(gold);
-        await req.db.Item.create("Gold Coin", "Gold Coin", "Long Gold Coin");
-    }
-    await user.offsetItem("Gold Coin", 15);
-    // await req.db.Spirit.delete("gold");
-    let local = await req.db.Spirit.recallOne("gold", user.id);
-    if (!local.memory.data.gold) local.memory.data.gold = 0;
-    local.memory.data.gold += 15;
-    await local.commit();
-    let global = await req.db.Spirit.recallOne("gold");
-    if (!global.memory.data.gold) global.memory.data.gold = 0;
-    global.memory.data.gold += 15;
-    await global.commit();
-}

package/test/the-front/check/add-more-gold.js DELETED Viewed

@@ -1,3 +0,0 @@
-export default async (req, user) => {
-    await user.offsetItem("Gold Coin", 3);
-}

package/test/the-front/check/subtract-gold.js DELETED Viewed

@@ -1,3 +0,0 @@
-export default async (req, user) => {
-    await user.offsetItem("Gold Coin", -30);
-}

package/test/the-front/checks.js DELETED Viewed

@@ -1,11 +0,0 @@
-export default async function emailTime(req, user) {
-    let goldCheck = req.db.Item.recall("Gold Coin");
-    if (!goldCheck) req.db.Item.create("Gold Coin", "Gold Coin Short", "Gold Coin Long");
-    let inv = user.memory.data.inventory;
-    return "Sent";
-}

package/test/the-front/incTranslation.js DELETED Viewed

@@ -1,9 +0,0 @@
-export default async (req, user) => {
-    let att = await user.incrementAttribute("translation", 5);
-    console.log(att);
-    let check = await user.checkAttribute("translation", 4);
-    console.log(check);
-}

package/test/the-front/load-groups.js DELETED Viewed

@@ -1,46 +0,0 @@
-export default async function (req, user) {
-    let spirit = await req.db.Spirit.recallAll("group");
-    let inGroups = [];
-    for (let i = 0; i < spirit.memory.length; i++) {
-        if (!spirit.memory[i].data) spirit.memory.splice(i, 1);
-        else {
-            if (Array.isArray(spirit.memory[i].data.members)) {
-                if (spirit.memory[i].data.members.includes(`${user.id}`)) {
-                    let groupInfo = {
-                        id: spirit.memory[i].id,
-                        ...spirit.memory[i].data
-                    }
-                    for (let j = 0; j < spirit.memory[i].data.members.length; j++) {
-                        let user = await req.db.User.recallOne(null, null, spirit.memory[i].data.members[j]);
-                        groupInfo.members[j] = {
-                            id: spirit.memory[i].data.members[j],
-                            name: user.memory.data.username
-                        }
-                    }
-                    if (Array.isArray(spirit.memory[i].data.joinRequests)) {
-                        for (let j = 0; j < spirit.memory[i].data.joinRequests.length; j++) {
-                            let user = await req.db.User.recallOne(null, null, spirit.memory[i].data.joinRequests[j].id);
-                            groupInfo.joinRequests[j] = {
-                                id: spirit.memory[i].data.joinRequests[j].id,
-                                name: user.memory.data.username,
-                                note: spirit.memory[i].data.joinRequests[j].note
-                            }
-                        }
-                    }
-                    else spirit.memory[i].data.joinRequests = [];
-                    inGroups.push(groupInfo);
-                }
-            }
-            else spirit.memory[i].data.members = [];
-        }
-    }
-    spirit.commit();
-    return inGroups;
-}

package/views/basic-footer.ejs DELETED Viewed

	@@ -1,2 +0,0 @@
1	- </body>
2	- </html>

package/views/menu.ejs DELETED Viewed

@@ -1,43 +0,0 @@
-<div class="fade invisible" onclick="base.closeMenu()">
-</div>
-<div class="menu invisible">
-    <div class="tabs">
-        <button id="inventory" onclick="base.switchTab('inventory')">
-            Inventory
-        </button>
-        <button id="player" onclick="base.switchTab('player')">
-            Player
-        </button>
-        <button id="account" onclick="base.switchTab('account')">
-            Account
-        </button>
-        <button id="more" onclick="base.switchTab('more')">
-            More
-        </button>
-    </div>
-    <button id="close" onclick="base.closeMenu()">
-        X
-    </button>
-    <div id="content-window">
-        <%- include("./menu/inventory.ejs"); %>
-        <%- include("./menu/player.ejs"); %>
-        <%- include("./menu/account.ejs", { user: user }); %>
-        <%- include("./menu/more.ejs"); %>
-    </div>
-    <button id="logout" onclick="logoutViaMenu()">Logout</button>
-    <script>
-        const logoutViaMenu = async () => {
-            let response = await base.logout();
-            console.log(response);
-            location.reload();
-        }
-    </script>
-</div>
-<button id="menu" onclick="base.openMenu()"><i class="fas fa-cog"></i></button>