notherbase-fs 2.0.3 → 3.0.1

package/views/menu/more.ejs

@@ -0,0 +1,5 @@
+<div class="content invisible" id="more">
+    <h4>Message Nother</h4>
+    <textarea id="content"></textarea>
+    <button id="send" onclick="sendMessageToNother()">Send Message</button>
+</div>

package/views/menu/player.ejs

@@ -0,0 +1,3 @@
+<div class="content invisible" id="player">
+    <p id="please-login">Please login to view your player stats.</p>
+</div>

package/views/menu.ejs

@@ -1,85 +1,43 @@
-<div class="fade invisible">
+<div class="fade invisible" onclick="base.closeMenu()">
 
 </div>
 
 <div class="menu invisible">
     <div class="tabs">
-        <button id="inventory">
+        <button id="inventory" onclick="base.switchTab('inventory')">
             Inventory
         </button>
-        <button id="player">
+        <button id="player" onclick="base.switchTab('player')">
             Player
         </button>
-        <button id="account">
+        <button id="account" onclick="base.switchTab('account')">
             Account
         </button>
-        <button id="more">
+        <button id="more" onclick="base.switchTab('more')">
             More
         </button>
     </div>
 
-    <button id="close">
+    <button id="close" onclick="base.closeMenu()">
         X
     </button>
 
     <div id="content-window">
-        <%- include("./inventory.ejs"); %>
-        <%- include("./player.ejs"); %>
-        <%- include("./account.ejs", { user: user }); %>
-        <%- include("./more.ejs"); %>
+        <%- include("./menu/inventory.ejs"); %>
+        <%- include("./menu/player.ejs"); %>
+        <%- include("./menu/account.ejs", { user: user }); %>
+        <%- include("./menu/more.ejs"); %>
     </div>
 
-    <button onclick="logout()">Logout</button>
-</div>
-
-<button id="menu"><i class="fas fa-cog"></i></button>
-
-<script>
-    let $menu = $(".menu");
-    let $fade = $(".ui .fade");
-    let menuClosing = false;
-
-    let closeMenu = function closeMenu() {
-        menuClosing = true;
-        $fade.addClass("camo");
-        
-        setTimeout(() => { 
-            $menu.addClass("invisible");
-            $fade.addClass("invisible");
-            menuClosing = false;
-        }, 100);
-    }
-
-    $("button#menu").on("click", function () {
-        $menu.toggleClass("invisible");
-        $fade.removeClass("camo");
-        $fade.removeClass("invisible");
-    });
+    <button onclick="logoutViaMenu()">Logout</button>
 
-    $fade.on("click", function () {
-        if (!menuClosing) closeMenu();
-    });
-
-    $(".menu button#close").on("click", function () {
-        closeMenu();
-    });
-
-    $(".menu .tabs button").on("click", function (e) {
-        switchTab(e.currentTarget.id);
-    });
-
-    let switchTab = function switchTab(id) {
-        $("#content-window .content").addClass("invisible");
-        $(".menu .tabs button").removeClass("selected");
-        $(`#content-window #${id}`).removeClass("invisible");
-        $(`.menu .tabs #${id}`).addClass("selected");
-    }
-
-    let logout = () => {
-        $.post("/s", JSON.stringify({
-            action: "logout"
-        }), () => {location.reload();});
-    }
+    <script>
+        const logoutViaMenu = async () => {
+            let response = await base.logout();
+            console.log(response);
+            location.reload();
+        }
+    </script>
+</div>
 
-    switchTab("inventory");
-</script>
+<button id="menu" onclick="base.openMenu()"><i class="fas fa-cog"></i></button>

package/views/scripts/base.js

@@ -0,0 +1,314 @@
+class Base {
+    static commune = async (route, data = null, options = null) => {
+        let body = { data, ...options };
+    
+        let response = null;
+
+        await $.post(route, JSON.stringify(body), (res) => {
+            response = res;
+            if (res.status != "success") console.log(`${route} - ${res}`);
+        });
+    
+        return response;
+    }
+
+    #Inventory = class Inventory {
+        constructor() {
+            this.items = [];
+            this.lastUpdate = 0;
+    
+            <% if (user) { %>
+                this.refresh();
+            <% } %>
+        }
+        
+        async refresh() {
+            let $list = $(".inventory .item-list");
+
+            let response = await Base.commune("/s/user/getInventory", {}, { _lastUpdate: this.lastUpdate });
+
+            if (response.status === "success") {
+                this.items = response.data;
+                this.lastUpdate = response.lastUpdate;
+                $list.empty();
+                
+                for (let i = 0; i < this.items.length; i++) {
+                    let $new = $list.append(
+                        `<div class="item-card">
+                            <h5>${this.items[i].name}</h5>
+                            <button id="${i}">X</button>
+                            <hr>
+                            <p>${this.items[i].amount}</p>
+                        </div>`
+                    ).children().last();
+        
+                    $new.find("button").on("click", this.reduceItem);
+                }
+
+                this.clearError();
+            }
+        }
+        
+        clearError() {
+            let $error = $("#inventory #error");
+
+            $error.addClass("invisible");
+        }
+    
+        setError(text) {
+            let $error = $("#inventory #error");
+
+            $error.text(text);
+            $error.removeClass("invisible");
+        }
+    }
+
+    #PlayerAttributes = class PlayerAttributes {
+        constructor() {
+            this.attributes = [];
+            this.lastUpdate = 0;
+
+            <% if (user) { %>
+                this.refresh();
+            <% } %>
+        }
+
+        async refresh() {
+            let response = await Base.commune("/s/user/getAttributes", {}, { _lastUpdate: this.lastUpdate });
+            if (response.status === "success") {
+                this.lastUpdate = response.lastUpdate;
+                this.attributes = response.data;
+    
+                this.render();
+            }
+        }
+
+        render() {
+            let $content = $(".menu .content#player");
+
+            $content.empty();
+
+            if (this.attributes) {
+                for (const [key, value] of Object.entries(this.attributes)) {
+                    $content.append(`<h3 id="${key}">${key}: ${value}</h3>`);
+                }
+            }
+        }
+    }
+
+    #AccountServices = class AccountServices {
+        constructor() {
+            this.username = "";
+            this.email = "";
+            
+            <% if (user) { %>
+                this.username = "<%= user.username %>";
+                this.email = "<%= user.email %>";
+    
+                this.refresh();
+            <% } %>
+        }
+    
+        refresh() {
+            let $email = $(".content#account .setting#email p");
+            let $emailInput = $(".content#account .edit#email input");
+            let $username = $(".content#account .setting#username p");
+            let $usernameInput = $(".content#account .edit#username input");
+            
+            $email.text(this.email);
+            $emailInput.val(this.email);
+            $username.text(this.username);
+            $usernameInput.val(this.username);
+    
+            $(".content#account .settings").removeClass("invisible");
+            $(".content#account #please-login").addClass("invisible");
+        }
+    
+        editEmail() {
+            let $emailSetting = $(".content#account .setting#email");
+            let $emailEdit = $(".content#account .edit#email");
+
+            $emailSetting.addClass("invisible");
+            $emailEdit.removeClass("invisible");
+        }
+    
+        cancelEmail() {
+            let $email = $(".content#account .setting#email p");
+            let $emailSetting = $(".content#account .setting#email");
+            let $emailEdit = $(".content#account .edit#email");
+            let $emailInput = $(".content#account .edit#email input");
+
+            $emailSetting.removeClass("invisible");
+            $emailEdit.addClass("invisible");
+            $emailInput.val($email.text());
+        }
+    
+        async updateEmail() {
+            let $info = $(".content#account #info");
+            let $email = $(".content#account .setting#email p");
+            let $emailInput = $(".content#account .edit#email input");
+
+            let response = await Base.commune("/s/user/changeEmail", { email: $emailInput.val() });
+    
+            if (response.status === "success") {
+                $email.text($emailInput.val());
+                $info.text("Email Updated.");
+            }
+            else {
+                $info.text("Email Not Updated!");
+            }
+            this.cancelEmail();
+        }
+    
+        editUsername() {
+            let $usernameSetting = $(".content#account .setting#username");
+            let $usernameEdit = $(".content#account .edit#username");
+
+            $usernameSetting.addClass("invisible");
+            $usernameEdit.removeClass("invisible");
+        }
+    
+        cancelUsername() {
+            let $usernameSetting = $(".content#account .setting#username");
+            let $usernameEdit = $(".content#account .edit#username");
+            let $usernameInput = $(".content#account .edit#username input");
+            let $username = $(".content#account .setting#username p");
+
+            $usernameSetting.removeClass("invisible");
+            $usernameEdit.addClass("invisible");
+            $usernameInput.val($username.text());
+        }
+    
+        async updateUsername() {
+            let $info = $(".content#account #info");
+            let $username = $(".content#account .setting#username p");
+            let $usernameInput = $(".content#account .edit#username input");
+
+            let response = await Base.commune("/s/user/changeUsername", { username: $usernameInput.val() });
+    
+            if (response.status === "success") {
+                $username.text($usernameInput.val());
+                $info.text("Username Updated.");
+            }
+            else {
+                $info.text("Username Not Updated!");
+            }
+            this.cancelUsername();
+        }
+    }
+    
+    constructor() {
+        this.playerInventory = new this.#Inventory();
+        this.playerAttributes = new this.#PlayerAttributes();
+        this.playerAccount = new this.#AccountServices();
+        this.menuClosing = false;
+    }
+
+    closeMenu = () => {
+        let $menu = $(".ui .menu");
+        let $fade = $(".ui .fade");
+
+        if (!this.menuClosing) {
+            this.menuClosing = true;
+            $fade.addClass("camo");
+            
+            setTimeout(() => { 
+                $menu.addClass("invisible");
+                $fade.addClass("invisible");
+                this.menuClosing = false;
+            }, 100);
+        }
+    }
+
+    openMenu = () => {
+        let $menu = $(".ui .menu");
+        let $fade = $(".ui .fade");
+
+        $menu.removeClass("invisible");
+        $fade.removeClass("camo");
+        $fade.removeClass("invisible");
+    }
+
+    switchTab = function switchTab(id) {
+        $("#content-window .content").addClass("invisible");
+        $(".menu .tabs button").removeClass("selected");
+        $(`#content-window #${id}`).removeClass("invisible");
+        $(`.menu .tabs #${id}`).addClass("selected");
+    }
+    
+    logout = async () => {
+        let response = await Base.commune("/s/user/logout");
+
+        return response;
+    }
+    
+    sendMessageToNother = async () => {
+        await Base.commune("contactNother", {
+            content: $(".menu .content#more #content").val(),
+            route: currentRoute
+        });
+    
+        $(".menu .content#more #content").val("");
+    }
+
+    attemptRegister = async (email, username, password) => {
+        let response = await Base.commune("/s/user/register", { 
+            email, username, password 
+        });
+        
+        return response;
+    }
+
+    attemptLogin = async (email, password) => {
+        let response = await Base.commune("/s/user/login", {
+            email: email,
+            password: password
+        });
+
+        if (response.status === "success") {
+            this.playerInventory.refresh();
+            this.playerAccount.username = response.data;
+            this.playerAccount.email = email;
+            this.playerAccount.refresh();
+            this.playerAttributes.refresh();
+        }
+        
+        return response;
+    };
+
+    resetPassword = async (email, test = false) => {
+        let response = await Base.commune("/s/user/sendPasswordReset", { email, test });
+        
+        return response;
+    }
+
+    changePassword = async (token, email, password, confirmation) => {
+        let response = await Base.commune("/s/user/changePassword", { token, email, password, confirmation });
+        
+        return response;
+    }
+
+    do = async (what, data = null, route = window.location.pathname) => {
+        let response = await Base.commune("/s/serve", {
+            script: what,
+            ...data
+        }, {
+            route
+        });
+
+        this.playerInventory.refresh();
+        this.playerAttributes.refresh();
+
+        return response;
+    }
+
+    load = async (service, scope = "local") => {
+        let response = await $.get("/s/load", { service, scope, route: window.location.pathname });
+
+        return response;
+    }
+}
+
+const base = new Base();
+
+base.switchTab("inventory");

package/controllers/spirits/attribute.js

@@ -1,47 +0,0 @@
-import {loginCheck, check, findUser, fail, success} from "./util.js";
-
-export default {
-    attributes: async (req) => {
-        loginCheck(req);
-
-        let user = await findUser(req);
-
-        return success("Got user attributes.", user.memory.data.attributes);
-    },
-    checkAttribute: async (req) => {
-        loginCheck(req);
-
-        let user = await findUser(req);
-        let att = user.memory.data.attributes;
-
-        if (att[req.body.data.check] >= req.body.data.against) {
-            return success("Passed check.")
-        }
-        else return fail("Failed check.");
-    },
-    setAttribute: async (req) => {
-        loginCheck(req);
-
-        let user = await findUser(req);
-
-        user.memory.data.attributes[req.body.data.change] = req.body.data.to;
-        await user.commit();
-
-        return success("Attributes set.", user.memory.data.attributes);
-    },
-    incrementAttribute: async (req) => {
-        loginCheck(req);
-
-        let user = await findUser(req);
-        let att = user.memory.data.attributes;
-
-        if (att[req.body.data.change] < req.body.data.max) {
-            att[req.body.data.change]++;
-            await user.commit();
-
-            return success("Attribute incremented.", att[req.body.data.change]);
-        } 
-        else return fail("Attribute maxed.", att[req.body.data.change]);
-    }
-}
-

package/controllers/spirits/inventory.js

@@ -1,71 +0,0 @@
-import { success, check, loginCheck, findUser } from "./util.js";
-
-export default {
-    getUserInventory: async (req) => {
-        loginCheck(req);
-        let user = await findUser(req);
-        let inv = user.memory.data.inventory;
-
-        check(inv, "User inventory not found.");
-    
-        return success("User inventory found.", inv);
-    },
-    updateItemInInventory: async (req) => {
-        check(req.body.data.name && req.body.data.amount, `${req.body.data.name} ${req.body.data.amount} Check Input!`);
-
-        let item = new req.db.Item(req.body.data.name);
-        let itemData = await item.recall();
-
-        check(itemData, "Item not found in database.");
-
-        let user = await findUser(req);
-        let inv = user.memory.data.inventory;
-
-        let holding = false;
-
-        for (let j = 0; j < inv.length; j++) {
-            if (inv[j].name === req.body.data.name) {
-                holding = true;
-
-                if (inv[j].amount >= -Math.floor(req.body.data.amount)) {
-                    inv[j].amount += Math.floor(req.body.data.amount);
-
-                    if (inv[j].amount === 0) {
-                        let empty = inv[j];
-
-                        inv.splice(j, 1);
-                        await user.commit();
-
-                        return success("Item emptied.", empty);
-                    }
-                    else {
-                        await user.commit();
-
-                        return success("Item offset.", inv[j]);
-                    }
-                }
-                else {
-                    return fail(`Unable to remove ${req.body.data.amount} ${req.body.data.name} 
-                        from inventory because the inventory has only ${inv[j].amount}.` );
-                }
-            }
-        }
-        
-        if (!holding) {
-            if (req.body.data.amount > 0) {
-                inv.push({
-                    name: req.body.data.name,
-                    amount: req.body.data.amount
-                });
-
-                await user.commit();
-
-                return success("Item offset.", inv[inv.length - 1]);
-            }
-            else {
-                return fail(`Unable to remove ${req.body.data.amount} ${req.body.data.name} 
-                    from inventory because the inventory has none.`);
-            }
-        };
-    }
-}

package/controllers/spirits/item.js

@@ -1,41 +0,0 @@
-import { success, check } from "./util.js";
-
-export default {
-    getAllItems: async (req) => {
-        let items = new req.db.Item();
-        let all = await items.getAll();
-
-        check(all, "Items not found.");
-
-        return success("Found items.", all);
-    },
-    getItem: async (req) => {
-        let item = new req.db.Item(req.body.data.name);
-
-        let itemData = await item.recall();
-
-        check(itemData, `Item not found: ${req.body.data.name}`);
-
-        return success("Found item.", itemData);
-    },
-    setItem: async (req) => {
-        let item = new req.db.Item(req.body.data.name);
-
-        await item.commit(req.body.data);
-
-        return success();
-    },
-    newItem: async (req) => {
-        let item = new req.db.Item(req.body.data.name);
-
-        await item.create(req.body.data);
-
-        return success();
-    },
-    deleteItem: async (req) => {
-        let item = new req.db.Item(req.body.data.name);
-        item.delete();
-
-        return success("Item deleted.");
-    }
-}

package/controllers/spirits/serve.js

@@ -1,33 +0,0 @@
-import { findUser, success, fail } from "./util.js";
-import fs from "fs";
-
-let serve = async (req, scriptPath) => {
-    let script, result = null;
-
-    if (fs.existsSync(scriptPath)) {
-        let user = await findUser(req);
-
-        script = await import(scriptPath);
-        result = await script.default(req, user);
-        return success("Served.", result);
-    }
-    else return fail(`Script not found: ${req.body.data.script} at ${scriptPath}`);
-}
-
-export default {
-    serveExplorer: async (req) => {
-        let scriptPath = `${req.contentPath}/explorer${req.body.route}/server-scripts/${req.body.data.script}.js`;
-        
-        return serve(req, scriptPath);
-    },
-    serveFront: async (req) => {
-        let scriptPath = `${req.contentPath}/the-front/server-scripts/${req.body.data.script}.js`;
-        
-        return serve(req, scriptPath);
-    },
-    servePages: async (req) => {
-        let scriptPath = `${req.contentPath}/pages/server-scripts/${req.body.data.script}.js`;
-        
-        return serve(req, scriptPath);
-    }
-}

package/public/js/commune.js

@@ -1,22 +0,0 @@
-const commune = async (action, data = null, options) => {
-    try {
-        let body = {
-            action,
-            data,
-            ...options
-        };
-    
-        let response = null;
-    
-        let onResponse = (res) => {
-            response = res;
-            if (res.status != "success") console.log(`${res.status}: ${res.message}`, res.data);
-        };
-    
-        await $.post("/s", JSON.stringify(body), onResponse);
-    
-        return response;
-    } catch (error) {
-        return error;
-    }
-}

package/public/js/establishment.js

@@ -1,44 +0,0 @@
-class Establishment {
-    constructor() {
-        this._lastUpdate = 0;
-        this.data = {};
-    }
-    
-    load = async (service, route = currentRoute) => {
-        if (!this.data[service]) this.data[service] = { _lastUpdate: 0 };
-
-        let response = await commune("recall", {}, {
-            service: service,
-            _lastUpdate: this.data[service]._lastUpdate,
-            route: route,
-            scope: "global",
-            parent: null
-        });
-
-        if (!response.isUpToDate) {
-            this.data[service] = response.data;
-            this._lastUpdate = this.data[service]._lastUpdate;
-        }
-
-        return this.data[service];
-    }
-    
-    save = async (service, dataToSave, route = currentRoute) => {
-        this._lastUpdate = Date.now();
-        dataToSave._lastUpdate = this._lastUpdate;
-
-        let response = await commune("commit", dataToSave, {
-            service: service,
-            _lastUpdate: this._lastUpdate,
-            route: route,
-            scope: "global",
-            parent: null
-        });
-
-        this.data[service] = dataToSave;
-
-        return response;
-    }
-}
-
-const establishment = new Establishment();