notherbase-fs 2.0.3 → 3.0.1

package/models/user.js

@@ -0,0 +1,189 @@
+import Spirit from "./spirit.js";
+import Item from "./item.js";
+import bcrypt from "bcrypt";
+
+export default class User extends Spirit {
+    static recallOne = async (target = null, username = null, id = null) => {
+        let spirit = new User(target, id);
+
+        let query = null;
+
+        if (target) {
+            query = Spirit.buildQuery({
+                route: "/",
+                service: "user",
+                scope: "global",
+                parent: null
+            }, { email: target });
+        }
+        else if (username) {
+            query = Spirit.buildQuery({
+                route: "/",
+                service: "user",
+                scope: "global",
+                parent: null
+            }, { username: username });
+        }
+        else if (id) {
+            query = Spirit.buildQuery({
+                route: "/",
+                service: "user",
+                scope: "global",
+                parent: null
+            }, null, id);
+        }
+        
+        let found = null;
+
+        if (query) found = await Spirit.db.findOne(query);
+
+        if (found) {
+            spirit.memory = found;
+            spirit.id = found._id;
+            
+            return spirit;
+        }
+        else return null;
+    }
+
+    static create = async (username, password, email) => {
+        let spirit = new User(email);
+
+        const salt = await bcrypt.genSalt(10);
+        const hash = await bcrypt.hash(password, salt);
+
+        spirit.memory = await Spirit.db.create({
+            route: "/",
+            service: "user",
+            scope: "global",
+            parent: null,
+            _lastUpdate: Date.now(),
+            data: {
+                username: username,
+                password: hash,
+                email: email,
+                resetToken: null,
+                resetExp: null,
+                coin: 0,
+                home: "/",
+                authLevels: [ "Basic" ],
+                location: "/the-front",
+                attributes: {
+                    translation: 0,
+                    strength: 0,
+                    agility: 0,
+                    defense: 0
+                },
+                inventory: []
+            }
+        });
+
+        return spirit;
+    }
+
+    static delete = async (target) => {
+        let found = await Spirit.db.findAndDelete(Spirit.buildQuery({
+            route: "/",
+            service: "user",
+            scope: "global",
+            parent: null
+        }, { email: target }));
+
+        return found.deletedCount;
+    }
+
+    constructor(email, id = null) {
+        super();
+        this.email = email;
+        this.id = id;
+    }
+
+    offsetItem = async (name, offset) => {
+        let item = Item.recallOne(name);
+    
+        if (!item) return "Item not found in database.";
+    
+        let inv = this.memory.data.inventory;
+    
+        let holding = false;
+    
+        for (let j = 0; j < inv.length; j++) {
+            if (inv[j].name === name) {
+                holding = true;
+    
+                if (inv[j].amount >= -Math.floor(offset)) {
+                    inv[j].amount += Math.floor(offset);
+    
+                    if (inv[j].amount === 0) {
+                        let empty = inv[j];
+    
+                        inv.splice(j, 1);
+
+                        this.memory._lastUpdate = Date.now();
+                        await this.commit();
+    
+                        return "Item emptied.";
+                    }
+                    else {
+                        this.memory._lastUpdate = Date.now();
+                        await this.commit();
+    
+                        return inv[j];
+                    }
+                }
+                else {
+                    return `Unable to remove ${-offset} ${name} 
+                        from inventory because the inventory has only ${inv[j].amount}.`;
+                }
+            }
+        }
+        
+        if (!holding) {
+            if (offset > 0) {
+                inv.push({
+                    name: name,
+                    amount: offset
+                });
+
+                this.memory._lastUpdate = Date.now();
+    
+                await this.commit();
+    
+                return inv[inv.length - 1];
+            }
+            else {
+                return `Unable to remove ${-offset} ${name} 
+                    from inventory because the inventory has none.`;
+            }
+        };
+    }
+
+    checkAttribute = async (check, against) => {
+        let att = this.memory.data.attributes;
+    
+        return att[check] >= against;
+    }
+
+    setAttribute = async (change, to) => {
+        let att = this.memory.data.attributes;
+    
+        att[change] = to;
+        this.memory._lastUpdate = Date.now();
+        await this.commit();
+    
+        return "Attributes set.";
+    }
+
+    incrementAttribute = async (change, max) => {
+        let att = this.memory.data.attributes;
+    
+        if (att[change] < max) {
+            att[change]++;
+            this.memory._lastUpdate = Date.now();
+            await this.commit();
+        } 
+        
+        return att[change];
+    }
+}
+

package/notherbase-fs.js

@@ -54,6 +54,7 @@ class NotherBaseFS {
         this.app.use((req, res, next) => {
             req.db = Models;
             req.contentPath = contentPath;
+            req.lock = false;
             next();
         });
 

package/package.json

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

package/public/styles/main.css

@@ -42,7 +42,7 @@ body {
 }
 
 main {
-    width: 1000px;
+    width: 800px;
     min-height: 500px;
     box-shadow: 5px 5px 5px 5px var(--shadowColor);
     padding: 20px;
@@ -64,7 +64,7 @@ footer {
     align-content: center;
     align-items: flex-start;
     min-height: 25px;
-    width: 1000px;
+    width: 800px;
     background-color: var(--veryDarkBgColor);
     border-radius: 0px 0px 5px 5px;
     box-shadow: 5px 5px 5px 5px var(--shadowColor);
@@ -127,6 +127,15 @@ input[type=submit]:hover, button:hover, a:hover {
     cursor: pointer;
 }
 
+.header-link {
+    border: none;
+    padding: 0;
+}
+
+.header-link:hover {
+    border: none;
+}
+
 .login-cover {
     position: absolute;
     left: 0;
@@ -135,7 +144,7 @@ input[type=submit]:hover, button:hover, a:hover {
     height: 100%;
 }
 
-@media only screen and (max-width: 1000px) {
+@media only screen and (max-width: 800px) {
     main {
         width: 100%;
     }

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

@@ -0,0 +1,29 @@
+<p>
+    nono
+</p>
+
+<hr>
+
+<h3>chat</h3>
+
+<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>
+
+<a href="/the-front" class="to">
+    Go to The Front
+</a>
+
+<a href="/coast/tall-beach/nono-cove/nono-og" class="to">
+    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");
+    let chatTest3 = new ChatBox("<%= user.username %>", "test-chat-3");
+</script>

package/test/{explorer/coast/tall-beach/nono-cove/views/nono-og.ejs → coast/tall-beach/nono-cove/nono-og/index.ejs}

@@ -1,5 +1,5 @@
 <style>
-    <%- include("../styles/nono.css"); %>
+    <%- include("./nono.css"); %>
 </style>
 
 <p>
@@ -39,5 +39,5 @@
 
     setInterval(moveNono, 2000);
 
-    <%- include("../local-scripts/nono.js"); %>
+    <%- include("./nono.js"); %>
 </script>

package/test/{explorer/coast/tall-beach/nono-cove/local-scripts → coast/tall-beach/nono-cove/nono-og}/nono.js

@@ -64,7 +64,7 @@ class NonoGame {
         this.$board.css("width", this.dimensions[0] * (tileSize) + this.nonoSize + 5);
         this.$board.css("height", this.dimensions[1] * (tileSize) + this.nonoSize + 5);
 
-        let $nono = this.$board.append(`<img class="nono" src="/img/nono-${Math.floor(Math.random() * (this.maxNonoId + 1))}.png">`).children().last();
+        let $nono = this.$board.append(`<img class="nono" src="/img/logo.png">`).children().last();
         $nono.css("width", this.nonoSize);
         $nono.css("height", this.nonoSize);
 

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

@@ -0,0 +1,35 @@
+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);
+
+    let local = await req.db.Spirit.recallOrCreate({
+        route: req.body.route,
+        scope: "local",
+        parent: user.id,
+        service: "gold"
+    }, {}, {
+        gold: 0
+    });
+
+    if (!local.memory.data.gold) local.memory.data.gold = 0;
+    local.memory.data.gold += 15;
+    await local.commit();
+
+    let global = await req.db.Spirit.recallOrCreate({
+        route: req.body.route,
+        scope: "global",
+        parent: null,
+        service: "gold"
+    }, {}, {
+        gold: 0
+    });
+
+    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

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

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

@@ -0,0 +1,11 @@
+export default async function emailTime(req, user) {
+    await req.db.SendMail.send(
+        'wyattsushi@gmail.com',
+        'Test',
+        'sdntndtjln l'
+    );
+
+    console.log(req.body);
+
+    return "Sent";
+}

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

@@ -0,0 +1,13 @@
+<h1>The Big Check</h1>
+
+<hr>
+
+<button onclick="base.do('add-more-gold')">+3</button>
+<button onclick="base.do('subtract-gold')">-30</button>
+<button onclick="base.do('emailTime')">email</button>
+
+<hr>
+
+<a href="/the-front">
+    Go to The Front
+</a>

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

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

package/test/the-front/checks.js

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,9 @@
+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/index.ejs

@@ -0,0 +1,107 @@
+<h1>NotherBase</h1>
+
+<p>
+    Welcome to The Front Test.
+</p>
+
+<p id="gold">0 Gold Added</p>
+
+<hr>
+
+<h3>Test Accounts</h3>
+<button onclick="test.runTest()">Run Test</button>
+
+<p id="info"></p>
+
+<input type="number" id="token">
+<button onclick="test.continueTest()">Continue Test</button>
+<button onclick="base.do('incTranslation')">inc trans</button>
+
+<hr>
+
+<a href="/coast/tall-beach/nono-cove" class="to nother-base">
+    Go inside
+</a>
+
+<a href="/the-front/check">
+    Go to The Check
+</a>
+
+<script>
+    class Test {
+        constructor() {
+            this.$info = $("main #info");
+            this.$gold = $("#gold");
+
+            this.oldID = Math.floor(Math.random() * 1000);
+            this.oldUsername = `testuser${this.oldID}`;
+            this.oldEmail = `${this.oldID}@testmail.com`;
+            this.oldPassword = `${this.oldID}password`;
+
+            this.newID = Math.floor(Math.random() * 1000);
+            this.newUsername = `testuser${this.newID}`;
+            this.newEmail = `${this.newID}@testmail.com`;
+            this.newPassword = `${this.newID}password`;
+
+            this.prepTest();
+        }
+
+        prepTest = async () => {
+            this.$info.empty();
+
+            this.$info.append(this.oldUsername + "<br>");
+            this.$info.append(this.oldEmail + "<br>");
+            this.$info.append(this.oldPassword + "<br>");
+
+            this.$info.append(this.newUsername + "<br>");
+            this.$info.append(this.newEmail + "<br>");
+            this.$info.append(this.newPassword + "<br>");
+
+            let loaded = await base.load("gold", "global");
+            this.$gold.text(`?/${loaded.gold ? loaded.gold : 0} Gold Added`);
+        }
+
+        runTest = async () => {
+            let response = await base.attemptRegister(
+                this.oldEmail,
+                this.oldUsername,
+                this.oldPassword
+            );
+            this.$info.append(response.message + "<br>");
+
+            response = await base.attemptLogin(this.oldEmail, this.oldPassword);
+            this.$info.append(response.message + "<br>");
+
+            response = await base.do("add-gold", null, "/the-front");
+            this.$info.append(response.message + "<br>");
+
+            let amountLocal = await base.load("gold");
+            let amountGlobal = await base.load("gold", "global");
+            this.$gold.text(`${amountLocal.gold}/${amountGlobal.gold} Gold Added`);
+
+            response = await base.resetPassword(this.oldEmail, true);
+            this.$info.append(response.message + "<br>");
+        }
+
+        continueTest = async () => {
+            let response = await base.logout();
+            this.$info.append(response.message + "<br>");
+
+            response = await base.changePassword(
+                $("#token").val(), 
+                this.oldEmail,
+                this.newPassword, 
+                this.newPassword
+            );
+            this.$info.append(response.message + "<br>");
+
+            response = await base.attemptLogin(this.oldEmail, this.newPassword);
+            this.$info.append(response.message + "<br>");
+
+            response = await base.logout();
+            this.$info.append(response.message + "<br>");
+        }
+    }
+
+    let test = new Test();
+</script>

package/test/void/index.ejs

@@ -1 +1,5 @@
+<style>
+    <%- include("./void.css"); %>
+</style>
+
 <a href="/">Leave the Void</a>

package/test/void/void.css

@@ -0,0 +1,3 @@
+:root {
+    --bgColor: purple;
+}

package/views/explorer.ejs

@@ -1,64 +1,55 @@
 <%- include("./head.ejs"); %>
 
+<script src="/socket.io/socket.io.js"></script>
+
+<div class="ui">
+    <%- include("./menu.ejs", {user: user}); %>
+</div>
+
 <script>
     const currentRoute = "<%- route %>";
+
+    <%- include("./scripts/base.js", {user: user}); %>
 </script>
-<script src="/js/commune.js"></script>
-<script src="/socket.io/socket.io.js"></script>
-<script src="/js/memories.js"></script>
-<script src="/js/establishment.js"></script>
+
+
 
 <main class="override">
     <% if (requireUser && !user) { %>
         <div class="login-cover">
-            <a href="/">
+            <a class="header-link" href="/">
                 <h1>NotherBase</h1>
             </a>
             <h3>Login to Your Account</h3>
             <input type="email" placeholder="user@email.com" id="email">
             <input type="password" placeholder="password" id="pass">
-            <button id="login" onclick="attemptLogin()">Login</button>
-            <button id="reset" onclick="resetPassword()">Reset Password</button>
+            <button id="login" onclick="coverLogin()">Login</button>
+            <button id="reset" onclick="coverReset()">Reset Password</button>
             <p class="info"></p>
-        </div>
-        <script>
-            const $loginEmail = $(".login-cover #email");
-            const $loginPassword = $(".login-cover #pass");
-            const $loginInfo = $(".login-cover .info");
 
-            const attemptLogin = async () => {
-                return $.post("/s", JSON.stringify({
-                    action: "login",
-                    data: {
-                        email: $loginEmail.val(),
-                        password: $loginPassword.val()
-                    }
-                }), (data) => {
-                    if (data.status === "success") {
-                        $loginInfo.text("You've logged in.");
-                        location.reload();
-                    }
-                    else $loginInfo.text(data.message);
-                });
-            };
+            <script>
+                const coverLogin = async () => {
+                    let response = await base.attemptLogin(
+                        $(".login-cover #email").val(),
+                        $(".login-cover #pass").val()
+                    );
+
+                    if (response.status === "success") location.reload();
+                    $(".login-cover .info").text(response.data);
+                };
 
-            const resetPassword = async () => {
-                return $.post("/s", JSON.stringify({
-                    action: "sendPasswordReset",
-                    data: { email: $loginEmail.val() }
-                }), (data) => {
-                    if (data.status === "success") $loginInfo.text("A reset code has been sent to your email.");
-                    else $loginInfo.text(data.message);
-                });
-            }
-        </script>
+                const coverReset = async () => {
+                    let response = await base.resetPassword(
+                        $(".login-cover #email").val()
+                    );
+
+                    $(".login-cover .info").text(response.data);
+                };
+            </script>
+        </div>
     <% } else { %>
         <%- include(`${main}.ejs`); %>
     <% } %>
 </main>
 
-<div class="ui">
-    <%- include("./menu.ejs", {user: user}); %>
-</div>
-
 <%- include("./footer.ejs"); %>

package/views/menu/account.ejs

@@ -0,0 +1,39 @@
+<div id="account" class="invisible content">
+    <p id="please-login">Please login to view your account settings.</p>
+
+    <div class="invisible settings">
+        <h3>Email:</h3>
+        <div class="setting" id="email">
+            <p></p>
+            <button onclick="base.playerAccount.editEmail()">Change Email</button>
+        </div>
+        <div class="edit invisible" id="email">
+            <input type="email" name="email">
+            <button onclick="base.playerAccount.updateEmail()">Update</button>
+            <button onclick="base.playerAccount.cancelEmail()">Cancel</button>
+        </div>
+    
+        <hr>
+    
+        <h3>Username:</h3>
+        <div class="setting" id="username">
+            <p></p>
+            <button onclick="base.playerAccount.editUsername()">Change Username</button>
+        </div>
+        <div class="edit invisible" id="username">
+            <input type="text" name="username">
+            <button onclick="base.playerAccount.updateUsername()">Update</button>
+            <button onclick="base.playerAccount.cancelUsername()">Cancel</button>
+        </div>
+    
+        <hr>
+    
+        <h3>Password:</h3>
+        <div class="setting" id="password">
+            <p>*********</p>
+            <p>Visit the Keeper to Change Your Password</p>
+        </div>
+
+        <p id="info"></p>
+    </div>
+</div>

package/views/menu/inventory.ejs

@@ -0,0 +1,8 @@
+<div class="inventory content invisible" id="inventory">
+    <div id="error">
+        Please login to view your inventory.
+    </div>
+
+    <div class="item-list">
+    </div>
+</div>