notherbase-fs 3.2.4 → 3.2.6

package/notherbase-fs.js

@@ -17,7 +17,7 @@ import SpiritWorld from "./controllers/spirit-world.js";
  * The engine that runs a nother base.
  */
 class NotherBaseFS {
-    constructor(contentPath) {
+    constructor(contentPath, globals = null) {
         this.app = express();
         this.server = http.createServer(this.app);
         this.io = new Server(this.server);
@@ -56,6 +56,7 @@ class NotherBaseFS {
 
         //provide database access and etc to use in routes
         this.app.use((req, res, next) => {
+            req.globals = globals;
             req.db = Models;
             req.contentPath = contentPath;
             req.lock = false;

package/package.json

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

package/public/js/base.js

@@ -13,108 +13,6 @@ class Base {
         return response;
     }
 
-    /**
-     * The player's inventory.
-     */
-    #Inventory = class Inventory {
-        constructor() {
-            this.items = [];
-            this.lastUpdate = 0;
-    
-            this.refresh();
-        }
-        
-        /**
-         * Reloads the inventory.
-         */
-        async refresh() {
-            let $list = $(".inventory .item-list");
-
-            let response = await Base.commune("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();
-            }
-        }
-        
-        /**
-         * Clears the error on screen.
-         */
-        clearError() {
-            let $error = $("#inventory #error");
-
-            $error.addClass("invisible");
-        }
-    
-        /**
-         * Shows an error on screen.
-         * @param {String} text The error message.
-         */
-        setError(text) {
-            let $error = $("#inventory #error");
-
-            $error.text(text);
-            $error.removeClass("invisible");
-        }
-    }
-
-    /**
-     * The player's attributes.
-     */
-    #PlayerAttributes = class PlayerAttributes {
-        constructor() {
-            this.attributes = [];
-            this.lastUpdate = 0;
-
-            this.refresh();
-        }
-
-        /**
-         * Reloads the player's attributes.
-         */
-        async refresh() {
-            let response = await Base.commune("getAttributes", { _lastUpdate: this.lastUpdate });
-            if (response.status === "success") {
-                this.lastUpdate = response.lastUpdate;
-                this.attributes = response.data;
-    
-                this.render();
-            }
-        }
-
-        /**
-         * Renders the attributes.
-         */
-        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>`);
-                }
-            }
-        }
-    }
-
     /**
      * Services for the player's account.
      */
@@ -127,56 +25,6 @@ class Base {
             this.refresh();
         }
     
-        /**
-         * Reloads the player's basic info.
-         */
-        async refresh() {
-            let response = await Base.commune("getInfo", { _lastUpdate: this.lastUpdate });
-            if (response.status === "success") {
-                this.lastUpdate = response.lastUpdate;
-                this.email = response.data.email;
-                this.username = response.data.username;
-            }
-
-            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");
-        }
-    
-        /**
-         * Initiates email editing.
-         */
-        editEmail() {
-            let $emailSetting = $(".content#account .setting#email");
-            let $emailEdit = $(".content#account .edit#email");
-
-            $emailSetting.addClass("invisible");
-            $emailEdit.removeClass("invisible");
-        }
-    
-        /**
-         * Cancels editing the email.
-         */
-        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());
-        }
-    
         /**
          * Confirms and submits an email edit.
          */
@@ -198,31 +46,6 @@ class Base {
             this.cancelEmail();
         }
     
-        /**
-         * Initiates username editing.
-         */
-        editUsername() {
-            let $usernameSetting = $(".content#account .setting#username");
-            let $usernameEdit = $(".content#account .edit#username");
-
-            $usernameSetting.addClass("invisible");
-            $usernameEdit.removeClass("invisible");
-        }
-    
-        /**
-         * Cancels username editing.
-         */
-        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());
-        }
-    
         /**
          * Confirms and submits a username edit.
          */
@@ -246,56 +69,9 @@ class Base {
     }
     
     constructor() {
-        this.playerInventory = new this.#Inventory();
-        this.playerAttributes = new this.#PlayerAttributes();
         this.playerAccount = new this.#AccountServices();
-        this.menuClosing = false;
-
-        this.switchTab("inventory");
-    }
-
-    /**
-     * Closes the menu.
-     */
-    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);
-        }
     }
 
-    /**
-     * Opens the menu.
-     */
-    openMenu = () => {
-        let $menu = $(".ui .menu");
-        let $fade = $(".ui .fade");
-
-        $menu.removeClass("invisible");
-        $fade.removeClass("camo");
-        $fade.removeClass("invisible");
-    }
-
-    /**
-     * Switches tabs in the menu.
-     * @param {String} id The name of the tab to switch to.
-     */
-    switchTab = function switchTab(id) {
-        $("#content-window .content").addClass("invisible");
-        $(".menu .tabs button").removeClass("selected");
-        $(`#content-window #${id}`).removeClass("invisible");
-        $(`.menu .tabs #${id}`).addClass("selected");
-    }
-    
     /**
      * Communes to logout.
      * @returns Communion response.

package/views/explorer.ejs

@@ -2,10 +2,6 @@
 
 <script src="/socket.io/socket.io.js"></script>
 
-<div class="ui">
-    <%- include("./menu.ejs", {user: user}); %>
-</div>
-
 <script src="/js/base.js"></script>
 <script>
     const currentRoute = "<%- route %>";

package/views/head.ejs

@@ -13,11 +13,6 @@
     <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>
 

package/public/styles/account.css

@@ -1,45 +0,0 @@
-.content#account {
-    padding: 20px;
-}
-
-.content#account h3 {
-    padding: 10px;
-}
-
-.content#account hr {
-    margin: 10px 0;
-}
-
-.content#account #info {
-    text-align: center;
-    width: 100%;
-    margin-top: 40px;
-}
-
-.content#account .setting {
-    background: var(--darkBgColor);
-    padding: 25px;
-    border-radius: 5px;
-    display: flex;
-    justify-content: center;
-    text-align: center;
-    flex-wrap: wrap;
-}
-
-.content#account p {
-    width: 100%;
-}
-
-.content#account button {
-    width: 40%;
-}
-
-.content#account .edit {
-    background: var(--darkWoodColor);
-    padding: 25px;
-    border-radius: 5px;
-    display: flex;
-    justify-content: center;
-    text-align: center;
-    flex-wrap: wrap;
-}

package/public/styles/inventory.css

@@ -1,76 +0,0 @@
-.inventory .item-list {
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-    border: none;
-    align-content: flex-start;
-    justify-content: center;
-    padding: 0;
-}
-
-.inventory .item-spawner {
-    width: 100%;
-    border: 1px solid var(--textColor);
-}
-
-.item-spawner .search-results {
-    width: 100%;
-    border: 1px solid var(--textColor);
-    overflow: auto;
-}
-
-.search-results p {
-    width: 100%;
-    cursor: pointer;
-}
-
-.search-results p:hover {
-    background-color: var(--woodColor);
-}
-
-.item-card {
-    margin: var(--margin);
-    width: var(--fillFromMargin);
-    height: 70px;
-    border: var(--standardBorder);
-    background-color: var(--bgColor);
-    display: flex;
-    align-items: center;
-    flex-wrap: nowrap;
-}
-
-.item-card h5 {
-    width: 70%;
-    text-align: left;
-    padding: 5px;
-}
-
-.item-card p {
-    width: 27%;
-    text-align: right;
-}
-
-.item-card hr {
-    border: none;
-    border-right: var(--standardBorder);
-    height: 100%;
-    width: 1px;
-    margin: 0;
-}
-
-.item-card button {
-    margin: 0;
-    padding: 0 3px;
-    border-radius: 0;
-    border-bottom: none;
-    height: 50%;
-    width: 75px;
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    display: none;
-}
-
-@media only screen and (max-width: 1000px) {
-
-}

package/public/styles/menu.css

@@ -1,135 +0,0 @@
-.menu {
-    width: 75%;
-    height: 50%;
-    border: 1px solid var(--textColor);
-    color: var(--textColor);
-    position: fixed;
-    left: 12.5%;
-    top: 5%;
-    background-color: var(--bgColor);
-    backdrop-filter: blur(3px);
-    border-radius: 5px;
-    z-index: 500;
-    padding: 0;
-}
-
-.menu hr {
-    margin: 0;
-}
-
-.ui .fade {
-    background-color: var(--veryDarkBgColorTransparent);
-    backdrop-filter: blur(3px);
-    width: 100%;
-    height: 130%;
-    position: fixed;
-    left: 0;
-    top: 0;
-    z-index: 400;
-}
-
-.ui button {
-    background-color: var(--bgColor);
-    border: 1px solid var(--textColor);
-    margin: 0;
-
-}
-
-.ui button:hover {
-    border: 1px solid var(--textColorBright);
-    color: var(--textColorBright);
-    cursor: pointer;
-}
-
-.ui button#menu {
-    position: fixed;
-    bottom: 15px;
-    right: 15px;
-    width: 64px;
-    height: 64px;
-    border-radius: 5px;
-    z-index: 100;
-    padding: var(--padding);
-}
-
-.menu button#close {
-    top: 0;
-    right: 0;
-    width: 32px;
-    height: 30px;
-    position: fixed;
-    border-radius: 0;
-    padding: 0 3px;
-}
-
-.menu .tabs {
-    width: 100%;
-    height: 30px;
-    border: 1px solid var(--textColor);
-    border-top: none;
-    padding: 0;
-    margin: 0;
-    display: flex;
-}
-
-.menu .tabs button {
-    height: 30px;
-    border-radius: 0;
-    padding: 0 10px;
-}
-
-.menu .tabs .selected {
-    border: 2px solid var(--textColorBright);
-}
-
-.menu #content-window {
-    width: var(--fillFromMargin);
-    margin: var(--margin);
-    height: calc(100% - 30px - 2 * var(--margin));
-    border: 1px solid var(--textColor);
-    overflow: auto;
-    padding: 0;
-}
-
-.menu .content {
-    border: none;
-    color: var(--textColor);
-    width: 100%;
-    height: 100%;
-    padding: 0;
-    z-index: 500;
-    overflow: auto;
-}
-
-.menu a {
-    margin: 0;
-    padding: 5px;
-}
-
-.menu #logout {
-    position: absolute;
-    width: 50%;
-    height: 40px;
-    bottom: -40px;
-    left: calc(25%);
-    background-color: var(--bgColor);
-    border: var(--standardBorder);
-    border-top: none;
-    border-radius: 0 0 5px 5px;
-    text-align: center;
-    padding: 5px;
-}
-
-@media only screen and (max-width: 1300px) {
-    .menu {
-        width: 100%;
-        height: 80vh;
-        top: 0;
-        left: 0;
-    }
-
-    .ui button#menu {
-        bottom: 5px;
-        right: 5px;
-    }
-}

package/public/styles/more.css

@@ -1,17 +0,0 @@
-.content#more {
-    padding: 10px;
-    position: relative;
-    height: 100%;
-    overflow: auto;
-}
-
-.content#more h4 {
-    padding: 10px;
-    font-size: xx-large;
-}
-
-.content#more button {
-    position: absolute;
-    bottom: 5px;
-    right: 5px;
-}

package/public/styles/player.css

@@ -1,36 +0,0 @@
-.content#player {
-    padding: 10px;
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    justify-content: space-around;
-}
-
-.content#player h3 {
-    width: 100%;
-    text-transform: capitalize;
-    border: 1px solid var(--textColor);
-    padding: 5px 30px;
-    height: 100px;
-    position: relative;
-    font-size: 25px;
-    display: flex;
-    align-items: center;
-}
-
-.content#player input {
-    width: 100px;
-    text-transform: capitalize;
-    position: absolute;
-    right: 0;
-    top: 0;
-    margin: 2px;
-}
-
-.content#player h3 button {
-    width: 100px;
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    margin: 2px;
-}

package/views/menu/account.ejs

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

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

package/views/menu/more.ejs

@@ -1,2 +0,0 @@
-<div class="content invisible" id="more">
-</div>

package/views/menu/player.ejs

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