notherbase-fs 1.2.3 → 1.2.6

package/controllers/explorer.js

@@ -1,4 +1,4 @@
-const { inventory, game, item } = require("../models");
+const { inventory, game, item, user } = require("../models");
 
 let router = require("express").Router();;
 let dir = "";
@@ -63,6 +63,7 @@ let complete = function complete(explorerBuild) {
                 
                     router.get(currentRoute, async function(req, res) {
                         try {
+                            const foundUser = await user.findById(req.session.currentUser);
                             const foundInventory = await inventory.findOne({ user: req.session.currentUser }).populate("items.item");
                         
                             let serverScriptReturns = [];
@@ -84,7 +85,7 @@ let complete = function complete(explorerBuild) {
 
                             let context = {
                                 siteTitle: "NotherBase",
-                                user: req.session.currentUserFull,
+                                user: foundUser,
                                 styles: detail.options.styles,
                                 externalStyles: detail.options.externalStyles,
                                 main: detail.options.main,

package/controllers/user.js

@@ -1,7 +1,6 @@
 const express = require("express");
 const router = express.Router();
 const bcrypt = require("bcrypt");
-const nodemailer = require("nodemailer");
 
 // Import my Data
 const { user, inventory, sendMail } = require("../models");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "1.2.3",
+  "version": "1.2.6",
   "description": "Functions to help make developing for NotherBase easier.",
   "main": "index.js",
   "scripts": {

package/public/styles/inventory.css

@@ -3,7 +3,6 @@
     color: var(--textColor);
     width: 100%;
     height: 100%;
-    /* background-color: var(--bgColor); */
     padding: 5px;
     z-index: 500;
     overflow: auto;
@@ -46,6 +45,7 @@
     padding: 5px;
     margin: 2.5px;
     position: relative;
+    background-color: var(--bgColor);
 }
 
 .item-card button {

package/public/styles/main.css

@@ -41,7 +41,7 @@ body {
 }
 
 main {
-    width: 500px;
+    width: 1000px;
     min-height: 500px;
     box-shadow: 5px 5px 5px 5px var(--shadowColor);
     padding: 20px;
@@ -62,7 +62,7 @@ footer {
     align-content: center;
     align-items: flex-start;
     min-height: 25px;
-    width: 500px;
+    width: 1000px;
     background-color: var(--veryDarkBgColor);
     border-radius: 0px 0px 5px 5px;
     box-shadow: 5px 5px 5px 5px var(--shadowColor);
@@ -224,8 +224,12 @@ iframe {
     font-size: 12px;
 }
 
-@media only screen and (max-width: 500px) {
+@media only screen and (max-width: 1000px) {
     main {
         width: 100%;
     }
+
+    footer {
+        width: 100%;
+    }
 }

package/public/styles/menu.css

@@ -42,8 +42,8 @@
 
 .ui button#menu {
     position: fixed;
-    bottom: 30px;
-    right: 5px;
+    bottom: 15px;
+    right: 15px;
     width: 64px;
     height: 64px;
     border-radius: 5px;
@@ -96,4 +96,18 @@
     border-top: none;
     border-radius: 0 0 5px 5px;
     text-align: center;
+}
+
+@media only screen and (max-width: 1000px) {
+    .menu {
+        width: 100%;
+        height: 90vh;
+        top: 0;
+        left: 0;
+    }
+
+    .ui button#menu {
+        bottom: 5px;
+        right: 5px;
+    }
 }

package/views/account.ejs

@@ -31,12 +31,7 @@
         <h3>Password:</h3>
         <div class="setting" id="password">
             <p>*********</p>
-            <button onclick="accountServices.editPassword()">Change Password</button>
-        </div>
-        <div class="edit invisible" id="password">
-            <input type="password" name="password">
-            <button onclick="accountServices.updatePassword()">Update</button>
-            <button onclick="accountServices.cancelPassword()">Cancel</button>
+            <p>Visit the Keeper to Change Your Password</p>
         </div>
 
         <p id="info"></p>
@@ -132,29 +127,6 @@
                 else this.$info.text("Server Error");
             }
         }
-
-        editPassword() {
-            this.$passwordSetting.addClass("invisible");
-            this.$passwordEdit.removeClass("invisible");
-        }
-
-        cancelPassword() {
-            this.$passwordSetting.removeClass("invisible");
-            this.$passwordEdit.addClass("invisible");
-            this.$passwordInput.val("");
-        }
-
-        async updatePassword() {
-            try {
-                await $.post("/user/password", { password: this.$passwordInput.val() }, (data) => {
-                    this.cancelPassword();
-                    this.$info.text("Password Updated!");
-                });
-            } 
-            catch(err) {
-                this.$info.text(err);
-            }
-        }
     }
 
     let accountServices = new AccountServices();