notherbase-fs 3.3.14 → 3.4.0

package/controllers/creation.js

@@ -52,9 +52,9 @@ export default class Creation {
     explore = async (req, res, next) => {
         try {
             if (fs.existsSync(req.main + ".ejs")) {
-                let stats = await req.db.Spirit.recallOne("stats");
-                if (stats.memory.data[req.path]) stats.memory.data[req.path].visits++;
-                else stats.memory.data[req.path] = { visits: 1 };
+                let stats = await req.db.Spirit.recallOrCreateOne("stats", null, { route: req.path });
+                if (stats.memory.data.visits) stats.memory.data.visits++;
+                else stats.memory.data.visits = 1;
                 await stats.commit();
 
                 let context = {
@@ -67,11 +67,9 @@ export default class Creation {
                     requireUser: req.lock
                 }
 
-                let user = await req.db.User.recallOne(req.session.currentUser);
-                if (user) {
-                    context.userID = user.id;
-                    context.user = user.data;
-                };
+                if (req.session.currentUser) {
+                    context.user = await req.db.Spirit.recallOne("user",  null, { email: req.session.currentUser });
+                }
 
                 res.render(req.toRender, context);
             }

package/controllers/spirit-world.js

@@ -98,7 +98,7 @@ export default class SpiritWorld {
 
             // if the scope is local, the parent is the user's id
             if (req.body.scope === "local") {
-                let user = await req.db.User.recallOne(req.session.currentUser);
+                let user = await req.db.Spirit.recallOne("user",  null, { email: req.session.currentUser });
                 if (user?.id) parent = user.id;
                 else {
                     fail(res, "User had no id on load()");
@@ -107,21 +107,9 @@ export default class SpiritWorld {
             } 
 
             // recall all spirits with the given service name and parent
-            let spirit = await req.db.Spirit.recallAll(req.body.service, parent, data, id);
+            let spirits = await req.db.Spirit.recallAll(req.body.service, parent, data, id);
 
-            // if the spirit is not an array, it's a single spirit
-            if (!Array.isArray(spirit.memory)) {
-                let togo = spirit.memory;
-                res.send(togo);
-            }
-            // if the spirit is an array, it's multiple spirits
-            else {
-                let togo = [];
-                for (let i = 0; i < spirit.memory.length; i++) {
-                    togo.push(spirit.memory[i]);
-                }
-                res.send(togo);
-            }
+            res.send(spirits);
         } catch (error) {
             console.log(error);
             fail(res, "Server error");
@@ -140,7 +128,7 @@ export default class SpiritWorld {
             let script, result = null;
 
             if (fs.existsSync(scriptPath)) {
-                let user = await req.db.User.recallOne(req.session.currentUser);
+                let user = await req.db.Spirit.recallOne("user",  null, { email: req.session.currentUser });
 
                 script = await import(scriptPath);
                 result = await script.default(req, user, this.io);

package/controllers/user.js

@@ -17,8 +17,6 @@ export default class User {
         this.router.post("/changeEmail", this.changeEmail);
         this.router.post("/changeUsername", this.changeUsername);
         this.router.post("/deletePermanently", this.deletePermanently);
-        this.router.post("/getInventory", this.getInventory);
-        this.router.post("/getAttributes", this.getAttributes);
         this.router.post("/getInfo", this.getInfo);
         this.router.post("/getView", this.getView);
         this.router.post("/setView", this.setView);
@@ -41,7 +39,7 @@ export default class User {
      * @param {Object} res An Express.js response.
      */
     sendPasswordReset = async (req, res) => {
-        let spirit = await req.db.User.recallOne(req.body.email);
+        let spirit = await req.db.Spirit.recallOne("user",  null, { email: req.body.email });
 
         if (spirit) {
             let token = Math.floor(Math.random() * 9999);
@@ -65,7 +63,7 @@ export default class User {
      */
     changePassword = async (req, res) => {
         if (check(res, req.body.token, "No token provided!")){
-            let spirit = await req.db.User.recallOne(req.body.email);
+            let spirit = await req.db.Spirit.recallOne("user",  null, { email: req.body.email });
     
             if (check(res, spirit, "User not found!") &&
                 check(res, spirit.memory.data.resetToken == req.body.token, "Reset token not valid!") &&
@@ -79,7 +77,7 @@ export default class User {
         
                 spirit.memory.data.password = hash;
                 spirit.addBackup({
-                    ...spirit.memory.data.backups[0].data,
+                    ...spirit.memory.data,
                     password: hash
                 });
                 
@@ -100,10 +98,30 @@ export default class User {
             check(res, req.body.email.length > 7, "Email too short.") &&
             check(res, req.body.username.length > 2, "Username too short.")) 
         {
-            let spirit = await req.db.User.recallOne(req.body.email);
+            let spirit = await req.db.Spirit.recallOne("user",  null, { email: req.body.email });
     
             if (check(res, !spirit, "Email already in use!")) {
-                spirit = await req.db.User.create(req.body.username, req.body.password, req.body.email);
+                const salt = await bcrypt.genSalt(10);
+                const hash = await bcrypt.hash(req.body.password, salt);
+
+                spirit = await req.db.Spirit.create("user", { 
+                    username: req.body.username, 
+                    email: req.body.email,
+                    password: hash,
+                    resetToken: null,
+                    resetExp: null,
+                    coin: 0,
+                    home: "/",
+                    authLevels: [ "Basic" ],
+                    location: "/the-front",
+                    attributes: {
+                        translation: 0,
+                        strength: 0,
+                        agility: 0,
+                        defense: 0
+                    },
+                    inventory: []
+                });
         
                 success(res, "Registration successful!");
             }
@@ -116,15 +134,15 @@ export default class User {
      * @param {Object} res An Express.js response.
      */
     login = async (req, res) => {
-        let spirit = await req.db.User.recallOne(req.body.email);
+        let spirit = await req.db.Spirit.recallOne("user",  null, { email: req.body.email });
 
         if (check(res, spirit, "User not found.")) {
-            let passResult = await bcrypt.compare(req.body.password, spirit.data.password);
+            let passResult = await bcrypt.compare(req.body.password, spirit.memory.data.password);
             
             if (check(res, passResult, "Password doesn't match the email.")) {
                 req.session.currentUser = req.body.email;
         
-                success(res, "Logged in.", spirit.data.username);
+                success(res, "Logged in.", spirit.memory.data.username);
             }
         }
     }
@@ -136,10 +154,10 @@ export default class User {
      */
     changeEmail = async (req, res) => {
         if (loginCheck(req, res)) {
-            let spirit = await req.db.User.recallOne(req.body.email);
+            let spirit = await req.db.Spirit.recallOne("user",  null, { email: req.body.email });
     
             if (check(res, !spirit, "Email already in use!")) {
-                spirit = await req.db.User.recallOne(req.session.currentUser);
+                spirit = await req.db.Spirit.recallOne("user",  null, { email: req.session.currentUser });
         
                 spirit.memory.data.email = req.body.email;
                 await spirit.commit();
@@ -158,10 +176,10 @@ export default class User {
      */
     changeUsername = async (req, res) => {
         if (loginCheck(req, res)) {
-            let spirit = await req.db.User.recallOne(null, req.body.username);
+            let spirit = await req.db.Spirit.recallOne("user",  null, { username: req.body.username });
     
             if (check(res, !spirit, "Username already in use!")) {
-                spirit = await req.db.User.recallOne(req.session.currentUser);
+                spirit = await req.db.Spirit.recallOne("user",  null, { email: req.session.currentUser });
         
                 spirit.memory.data.username = req.body.username;
                 await spirit.commit();
@@ -178,7 +196,7 @@ export default class User {
      */
     deletePermanently = async (req, res) => {
         if (loginCheck(req, res)) {
-            let deleted = await req.db.User.delete(req.session.currentUser);
+            let deleted = await req.db.Spirit.delete("user",  null, { email: req.session.currentUser });
     
             if (check(res, deleted > 0, "No account deleted")) {
                 await req.session.destroy();
@@ -188,42 +206,6 @@ export default class User {
         }
     }
 
-    /**
-     * Gets a user's inventory.
-     * @param {Object} req An Express.js request.
-     * @param {Object} res An Express.js response.
-     */
-    getInventory = async (req, res) => {
-        if (loginCheck(req, res)) {
-            let spirit = await req.db.User.recallOne(req.session.currentUser);
-
-            if (check(res, spirit, "Account not found!")) {
-                if (check(res, spirit.memory._lastUpdate > req.body._lastUpdate, "Inventory up to date.")) {
-                    let inv = spirit.memory.data.inventory;
-                
-                    success(res, "Inventory found", inv, spirit.memory._lastUpdate);
-                }
-            }
-        }
-    }
-
-    /**
-     * Gets a user attributes.
-     * @param {Object} req An Express.js request.
-     * @param {Object} res An Express.js response.
-     */
-    getAttributes = async (req, res) => {
-        if (loginCheck(req, res)) {
-            let user = await req.db.User.recallOne(req.session.currentUser);
-    
-            if(check(res, user, "Account not found!")) {
-                if (check(res, user.memory._lastUpdate > req.body._lastUpdate, "Attributes up to date.")) {
-                    success(res, "Attributes found", user.memory.data.attributes);
-                }
-            }
-        }
-    }
-
     /**
      * Gets basic account information.
      * @param {Object} req An Express.js request.
@@ -231,7 +213,7 @@ export default class User {
      */
     getInfo = async (req, res) => {
         if (loginCheck(req, res)) {
-            let user = await req.db.User.recallOne(req.session.currentUser);
+            let user = await req.db.Spirit.recallOne("user",  null, { email: req.session.currentUser });
     
             if (check(res, user, "Account not found!")) {
                 if (check(res, user.memory._lastUpdate > req.body._lastUpdate, "Info up to date.")) {
@@ -249,7 +231,7 @@ export default class User {
      */
     getView = async (req, res) => {
         if (loginCheck(req, res)) {
-            let user = await req.db.User.recallOne(req.session.currentUser);
+            let user = await req.db.Spirit.recallOne("user",  null, { email: req.session.currentUser });
 
             if (check(res, user, "Account not found!")) {
                 success(res, "View found", user.memory.data.view);
@@ -262,7 +244,7 @@ export default class User {
      */
     setView = async (req, res) => {
         if (loginCheck(req, res)) {
-            let user = await req.db.User.recallOne(req.session.currentUser);
+            let user = await req.db.Spirit.recallOne("user",  null, { email: req.session.currentUser });
 
             if (check(res, user, "Account not found!")) {
                 user.memory.data.view = req.body.view;

package/models/index.js

@@ -2,8 +2,6 @@ import mongoose from "mongoose";
 import dotenv from "dotenv";
 dotenv.config();
 import Spirit from "./spirit.js";
-import Item from "./item.js";
-import User from "./user.js";
 import SendMail from "./send-mail.js";
 
 mongoose.set('strictQuery', true);
@@ -30,86 +28,7 @@ catch (err) {
     console.log(`Mongoose on connect: ${err}`);
 }
 
-// let migrate = function () {
-//     // migrate
-
-//     const user = mongoose.model('users', new mongoose.Schema({
-//         username: String,
-//         password: String,
-//         email: String,
-//         coin: Number,
-//         home: String,
-//         authLevels: [ String ],
-//         location: String,
-//         attributes: {
-//             translation: Number,
-//             strength: Number,
-//             agility: Number,
-//             defense: Number
-//         },
-//         reset: {
-//             token: Number,
-//             exp: Number
-//         }
-//     }));
-//     const page = mongoose.model('pages', new mongoose.Schema({
-//     	name: String,
-//     	type: String,
-//         user: { 
-//             type: mongoose.Schema.Types.ObjectId, 
-//             ref: "users",
-//             required: false
-//         },
-//         data: {}
-//     }));
-    
-//     user.find({}, async (err, users) => {
-//         for (let i = 0; i < users.length; i++) {
-//             let userSpirit = await Spirit.create({
-//                 route: "/",
-//                 service: "user",
-//                 scope: "global",
-//                 parent: null,
-//                 _lastUpdate: Date.now()
-//             }, {
-//                 username: users[i].username,
-//                 password: users[i].password,
-//                 email: users[i].email,
-//                 resetToken: null,
-//                 resetExp: null,
-//                 coin: 0,
-//                 home: "/",
-//                 authLevels: [ "Basic" ],
-//                 location: "/the-front",
-//                 attributes: {
-//                     translation: 0,
-//                     strength: 0,
-//                     agility: 0,
-//                     defense: 0
-//                 },
-//                 inventory: []
-//             });
-            
-//             let foundPages = await page.find({ user: users[i]._id });
-    
-//             for (let i = 0; i < foundPages.length; i++) {
-//                 let spirit = await Spirit.create({
-//                     route: `/${foundPages[i].name}`,
-//                     service: foundPages[i].name,
-//                     scope: foundPages[i].type,
-//                     parent: userSpirit.memory._id,
-//                     _lastUpdate: 0
-//                 }, foundPages[i].data.tickets);
-//             }
-//         }
-//     });
-// }
-
-// migrate();
-
 export default {
     SendMail: SendMail,
-    Spirit: Spirit,
-    User: User,
-    Item: Item
+    Spirit: Spirit
 }

package/models/spirit.js

@@ -13,7 +13,11 @@ export default class Spirit {
             ref: "spirits",
             required: false
         },
-        data: {}
+        data: {},
+        backups: [{
+            _lastUpdate: Number,
+            data: {}
+        }]
     }));
 
     /**
@@ -41,30 +45,30 @@ export default class Spirit {
         return query;
     }
 
-    static buildBackupQuery = (service, data = null, parent = null, id = null) => {
-        let query = {
-            service: service,
-            parent: parent
-        };
+    // static buildBackupQuery = (service, data = null, parent = null, id = null) => {
+    //     let query = {
+    //         service: service,
+    //         parent: parent
+    //     };
         
-        if (id) query._id = id;
-        else if (data){
-            let keys = Object.keys(data);
-            for (let i = 0; i < keys.length; i++) {
+    //     if (id) query._id = id;
+    //     else if (data){
+    //         let keys = Object.keys(data);
+    //         for (let i = 0; i < keys.length; i++) {
                 
-                query[`data.backups.0.data.${keys[i]}`] = data[keys[i]];
-            }
-        }
+    //             query[`data.backups.0.data.${keys[i]}`] = data[keys[i]];
+    //         }
+    //     }
     
-        return query;
-    }
+    //     return query;
+    // }
 
     /**
      * Creates a spirit in the database.
      * @param {String} service The name of the spirit.
      * @param {Object} data An object with data to create the spirit with.
      * @param {ObjectID} parent The MongoDB id of the parent of the spirit to be created.
-     * @returns A new user spirit.
+     * @returns A new spirit.
      */
     static create = async (service, data = {}, parent = null) => {
         let spirit = new Spirit();
@@ -73,7 +77,8 @@ export default class Spirit {
             service,
             parent,
             _lastUpdate: Date.now(),
-            data: data
+            data: data,
+            backups: []
         });
 
         return spirit;
@@ -82,56 +87,86 @@ export default class Spirit {
     /**
      * Recalls all spirits in the database with a given name.
      * @param {String} service The name of the spirit.
-     * @returns All spirits of the given name.
+     * @param {ObjectID} parent The MongoDB id of the parent spirit to search by.
+     * @param {Object} data An object with data to query the spirit by.
+     * @param {ObjectID} id The exact id of the MongoDB document.
+     * @returns All spirits found.
      */
     static recallAll = async (service, parent = null, data = {}, id = null) => {
-        let spirit = new Spirit();
+        let spirits = [];
 
         let query = Spirit.buildQuery(service, data, parent, id);
 
         let found = await Spirit.db.find(query);
 
         if (found) {
-            spirit.memory = found;
-            return spirit;
+            for (let i = 0; i < found.length; i++) {
+                let spirit = new Spirit(found[i]);
+                spirits.push(spirit);
+                // convert old backups to new format
+                if (spirit.memory.data?._backupsEnabled) {
+                    spirit.memory.backups = spirit.memory.data.backups;
+                    spirit.memory.data = spirit.memory.backups[0].data;
+                }
+            }
+
+            return spirits;
         }
         else return null;
     }
 
     /**
-     * Recalls any spirit from the database.
+     * Recalls one spirit from the database or creates a new one.
      * @param {String} service The name of the spirit.
-     * @returns Any spirit found.
+     * @param {ObjectID} parent The MongoDB id of the parent spirit to search by.
+     * @param {Object} data An object with data to query the spirit by.
+     * @param {ObjectID} id The exact id of the MongoDB document.
+     * @returns The spirit found or a new one created in the database.
      */
-    static recallAny = async (service) => {
-        let spirit = new Spirit();
+    static recallOne = async (service, parent = null, data = {}, id = null) => {
+        let spirit = null;
 
-        let found = await Spirit.db.find({ service: service });
+        let query = Spirit.buildQuery(service, data, parent, id);
 
+        let found = await Spirit.db.findOne(query);
+        
         if (found) {
-            spirit.memory = found;
+            spirit = new Spirit(found);
+
+            // convert old backups to new format
+            if (spirit.memory.data?._backupsEnabled) {
+                spirit.memory.backups = spirit.memory.data.backups;
+                spirit.memory.data = spirit.memory.backups[0].data;
+            }
+
             return spirit;
         }
         else return null;
     }
 
     /**
-     * Recalls one spirit from the database or creates a new one.
+     * Recalls or creates a spirit in the database.
      * @param {String} service The name of the spirit.
      * @param {ObjectID} parent The MongoDB id of the parent spirit to search by.
      * @param {Object} data An object with data to query the spirit by.
      * @param {ObjectID} id The exact id of the MongoDB document.
-     * @returns The spirit found or a new one created in the database..
+     * @returns The spirit found or a new one created in the database.
      */
-    static recallOne = async (service, parent = null, data = {}, id = null) => {
-        let spirit = new Spirit();
+    static recallOrCreateOne = async (service, parent = null, data = {}, id = null) => {
+        let spirit = null;
 
         let query = Spirit.buildQuery(service, data, parent, id);
 
         let found = await Spirit.db.findOne(query);
-        
-        if (found) spirit.memory = found;
-        else spirit = await Spirit.create(service, {}, parent);
+
+        if (found) spirit = new Spirit(found);
+        else spirit = await Spirit.create(service, data, parent);
+
+        // convert old backups to new format
+        if (spirit.memory.data?._backupsEnabled) {
+            spirit.memory.backups = spirit.memory.data.backups;
+            spirit.memory.data = spirit.memory.backups[0].data;
+        }
 
         return spirit;
     }
@@ -139,21 +174,19 @@ export default class Spirit {
     /**
      * Deletes all of the specified spirit.
      * @param {String} service The name of the spirit.
-     * @param {Object} data An object with data to query the spirit by.
      * @param {ObjectID} parent The MongoDB id of the parent spirit to search with.
+     * @param {Object} data An object with data to query the spirit by.
      * @param {ObjectID} id The exact id of the MongoDB document.
      * @returns The number of documents deleted.
      */
-    static delete = async (service, data = {}, parent = null, id = null) => {
+    static delete = async (service, parent = null, data = {}, id = null) => {
         let found = await Spirit.db.deleteMany(Spirit.buildQuery(service, data, parent, id));
 
         return found.deletedCount;
     }
 
-    constructor() {
-        this.memory = {
-            data: {}
-        };
+    constructor(memory = {}) {
+        this.memory = memory;
     }
 
     /**
@@ -161,25 +194,12 @@ export default class Spirit {
      * @param {Object} data Data to save.
      * @returns Updated
      */
-    commit = async (data = this.memory.data, which = -1) => {
+    commit = async (data = this.memory.data) => {
         this.memory._lastUpdate = Date.now();
 
-        if (!Array.isArray(this.memory)) {
-            this.memory.data = data;
-            this.memory.markModified("data");
-            await this.memory.save();
-        }
-        else {
-            for (let i = 0; i < this.memory.length; i++) {
-                if (data) {
-                    if (which < 0) this.memory[i].data = data;
-                    else if (which === i) this.memory[i].data = data;
-                }
-                
-                this.memory[i].markModified("data");
-                await this.memory[i].save();
-            }
-        }
+        this.memory.data = data;
+        this.memory.markModified("data");
+        await this.memory.save();
 
         return "Updated";
     }
@@ -193,25 +213,20 @@ export default class Spirit {
 
     /**
      * Adds a new backup to the spirit's data.
-     * If backups have not already been enabled, the old dat will be moved to a backup.
      * @param {Object} data Data to add to the backup.
      */
-    addBackup = async (data, max = 5) => {
-        if (!this.memory.data?._backupsEnabled) {
-            let oldData = this.memory.data;
-            this.memory.data = {
-                _backupsEnabled: true,
-                backups: [{ _lastUpdate: Date.now(), data: oldData }]
-            };
-        }
-
-        this.memory.data.backups.unshift({
+    addBackup = (data, max = 5) => {
+        this.memory.backups.unshift({
             _lastUpdate: Date.now(),
-            data: data
+            data: this.memory.data
         });
 
+        this.memory.data = data;
+
         if (max > 1) {
-            while (this.memory.data.backups.length > max) this.memory.data.backups.pop();
+            while (this.memory.backups.length > max) this.memory.backups.pop();
         }
+
+        this.memory.markModified("backups");
     }
 };

package/package.json

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

package/public/js/base.js

@@ -12,73 +12,23 @@ class Base {
     
         return response;
     }
-
-    /**
-     * Services for the player's account.
-     */
-    #AccountServices = class AccountServices {
-        constructor() {
-            this.username = "";
-            this.email = "";
-            this.lastUpdate = 0;
-        }
-    
-        /**
-         * Confirms and submits an email edit.
-         */
-        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("changeEmail", { email: $emailInput.val() });
-    
-            if (response.status === "success") {
-                this.email = $emailInput.val();
-                $email.text($emailInput.val());
-                $info.text("Email Updated.");
-            }
-            else {
-                $info.text("Email Not Updated!");
-            }
-            this.cancelEmail();
-        }
-    
-        /**
-         * Confirms and submits a username edit.
-         */
-        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("changeUsername", { username: $usernameInput.val() });
-    
-            if (response.status === "success") {
-                this.username = $usernameInput.val();
-                $username.text($usernameInput.val());
-                $info.text("Username Updated.");
-            }
-            else {
-                $info.text("Username Not Updated!");
-            }
-            this.cancelUsername();
-        }
-    }
     
     constructor() {
-        this.playerAccount = new this.#AccountServices();
+        this.playerAccount = {
+            username: null,
+            email: null
+        };
     }
 
     /**
      * Communes to logout.
      * @returns Communion response.
      */
-    logout = async () => {
+    logout = async (test = false) => {
         let response = await Base.commune("logout");
 
-        location.reload();
-        //return response;
+        if (!test) location.reload();
+        else return response;
     }
 
     /**
@@ -172,6 +122,9 @@ class Base {
         return response;
     }
 
+    /**
+     * Creates the toggle view button.
+     */
     createToggleViewButton = async () => {
         Base.commune("getView").then((res) => {
             // add a button to the footer for toggling between compact and full view
@@ -185,6 +138,10 @@ class Base {
         });
     }
 
+    /**
+     * Toggles the view between compact and full.
+     * @param {Boolean} save Whether or not to save the view state.
+     */
     toggleView = async (save = true) => {
         if (this.$viewToggle.text() === ">") {
             this.$viewToggle.text("<");

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

@@ -0,0 +1,8 @@
+export default async (req, user, io) => {
+    // let deleted = await req.db.Spirit.delete("gold");
+    let spirit = await req.db.Spirit.recallOrCreateOne("gold");
+    spirit.addBackup({
+        amount: spirit.memory?.data?.amount != null ? spirit.memory.data.amount + 1 : 0
+    });
+    await spirit.commit();
+}

package/test/the-front/index.ejs

@@ -15,7 +15,7 @@
 
 <input type="number" id="token">
 <button onclick="test.continueTest()">Continue Test</button>
-<button onclick="base.do('incTranslation')">inc trans</button>
+<button onclick="base.do('add-gold', { route: '/the-front' })">add gold</button>
 
 <hr>
 
@@ -57,8 +57,9 @@
             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`);
+            let loaded = await base.loadAll("gold", "global");
+            console.log(loaded);
+            this.$gold.text(`?/${loaded[0]?.memory?.data?.amount !== null ? loaded[0].memory.data.amount : 0} Gold Added`);
         }
 
         runTest = async () => {
@@ -72,7 +73,7 @@
             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");
@@ -84,7 +85,7 @@
         }
 
         continueTest = async () => {
-            let response = await base.logout();
+            let response = await base.logout(true);
             this.$info.append(response.message + "<br>");
 
             response = await base.changePassword(
@@ -98,7 +99,7 @@
             response = await base.attemptLogin(this.oldEmail, this.newPassword);
             this.$info.append(response.message + "<br>");
 
-            response = await base.logout();
+            response = await base.logout(true);
             this.$info.append(response.message + "<br>");
         }
     }

package/views/explorer.ejs

@@ -10,7 +10,7 @@
 </script>
 
 <main class="override">
-    <% if (requireUser && !user) { %>
+    <% if (requireUser && !user?.memory) { %>
         <div class="login-cover">
             <a class="header-link" href="/">
                 <img src="/img/logo.png">
@@ -41,16 +41,16 @@
                     $pass.val("");
 
                     let $form = $(".login-cover .form");
-                    $form.css("display", "none");
+                    $form.addClass("invisible");
                     let $info = $(".login-cover .info");
                     $info.text("Attempting to login...");
 
                     let response = await base.attemptLogin(email, pass);
 
-                    $form.css("display", "initial");
                     $info.text(response.message);
                     if (response.status === "success") location.reload();
                     else {
+                        $form.removeClass("invisible");
                         $email.focus();
                         $email.val(email);
                     }

package/views/footer.ejs

@@ -1,7 +1,10 @@
 
 <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>` %>
+    <% if (user) { %> 
+        <p class="login-status">Logged In: <%= user.memory.data.username %></p><button onclick="base.logout()">Logout</button>
+    <% } else { %>
+        <p class="login-status">Not Logged In</p>
+    <% } %>
 </footer>
-
 </body>
 </html>

package/models/item.js

@@ -1,83 +0,0 @@
-import Spirit from "./spirit.js";
-
-export default class Item extends Spirit {
-    /**
-     * Creates an item in the database.
-     * @param {String} name The item name.
-     * @param {String} short A short descrption.
-     * @param {String} long A long description.
-     * @returns The item created.
-     */
-    static create = async (name, short, long) => {
-        let spirit = new Item(name);
-
-        spirit.memory = await Spirit.db.create({
-            service: "items",
-            parent: null,
-            _lastUpdate: Date.now(),
-            data: {
-                name,
-                short,
-                long
-            }
-        });
-
-        return spirit;
-    }
-
-    /**
-     * Recalls all items.
-     * @returns The items found or null.
-     */
-    static recallAll = async () => {
-        let items = new Item();
-
-        let found = await Spirit.db.find({
-            service: "items",
-            parent: null
-        });
-
-        if (found) {
-            items.memory = found;
-            
-            return items;
-        }
-        else return null;
-    }
-
-    /**
-     * Recalls one item by name.
-     * @param {String} name The item name.
-     * @returns The item found or null.
-     */
-    static recallOne = async (name) => {
-        let spirit = new Item(name);
-
-        let query = Spirit.buildQuery("items", { name });
-
-        let found = await Spirit.db.findOne(query);
-
-        if (found) {
-            spirit.memory = found;
-            
-            return spirit;
-        }
-        else return null;
-    }
-
-    /**
-     * Deletes items by name.
-     * @param {String} name The item name.
-     * @returns Number of documents deleted.
-     */
-    static delete = async (name) => {
-        let found = await Spirit.db.findAndDelete(Spirit.buildQuery("items", { name }));
-
-        return found.deletedCount;
-    }
-
-    constructor(name = "") {
-        super();
-        this.name = name;
-    }
-}

package/models/user.js

@@ -1,120 +0,0 @@
-import Spirit from "./spirit.js";
-import Item from "./item.js";
-import bcrypt from "bcrypt";
-
-/**
- * A user spirit.
- * @extends Spirit
- */
-export default class User extends Spirit {
-    /**
-     * Recalls one user from the database.
-     * @param {String} email Email address of the user.
-     * @param {String} username The user's name.
-     * @param {ObjectID} id The MongoDB id of the user.
-     * @returns A user found or null.
-     */
-    static recallOne = async (email = null, username = null, id = null) => {
-        let user = new User(email, id);
-
-        let query = null;
-
-        if (id) {
-            query = Spirit.buildBackupQuery("user", null, null, id);
-        }
-        else if (username) {
-            query = Spirit.buildBackupQuery("user", { username: username });
-        }
-        else if (email) {
-            query = Spirit.buildBackupQuery("user", { email: email });
-        }
-        else return null;
-        
-        let found = await Spirit.db.findOne(query);
-
-        if (found) {
-            user.memory = found;
-            user.id = found._id;
-            user.data = found.data.backups[0].data;
-            user.email = found.data.backups[0].data.email;
-            user.username = found.data.backups[0].data.username;
-            
-            return user;
-        }
-        else return null;
-    }
-
-    /**
-     * Creates one user in the database.
-     * @param {String} email Email address of the user.
-     * @param {String} password The user's ****.
-     * @param {String} username The user's name.
-     * @returns The user created.
-     */
-    static create = async (username, password, email) => {
-        let user = new User(email);
-
-        const salt = await bcrypt.genSalt(10);
-        const hash = await bcrypt.hash(password, salt);
-
-        user.memory = await Spirit.db.create({
-            service: "user",
-            parent: null,
-            _lastUpdate: Date.now(),
-            data: {}
-        });
-        user.addBackup({
-            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: []
-        });
-        user.id = user.memory._id;
-        user.data = user.memory.data.backups[0].data;
-        user.email = user.data.email;
-        await user.commit();
-
-        return user;
-    }
-
-    /**
-     * Delete a user account.
-     * @param {String} email Email address of the account to delete.
-     * @returns 
-     */
-    static delete = async (email) => {
-        let found = await Spirit.db.findAndDelete(Spirit.buildQuery({
-            service: "user",
-            parent: null
-        }, { email: email }));
-
-        return found.deletedCount;
-    }
-
-    constructor(email, id = null) {
-        super();
-        this.email = email;
-        this.id = id;
-    }
-
-    /**
-     * Checks if a user is logged in.
-     */
-    loggedIn = () => {
-        if (this.id) return true;
-        else return false;
-    }
-}
-