notherbase-fs 1.2.4 → 1.2.7

package/controllers/explorer.js

@@ -1,4 +1,5 @@
-const { inventory, game, item } = require("../models");
+const { inventory, game, item, user } = require("../models");
+const path = require('path');
 
 let router = require("express").Router();;
 let dir = "";
@@ -63,6 +64,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 +86,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,
@@ -93,7 +95,9 @@ let complete = function complete(explorerBuild) {
                                 itemIDs: foundItemIDs,
                                 pov: req.query.pov,
                                 inventory: foundInventory,
-                                query: req.query
+                                query: req.query,
+                                dir: dir,
+                                path: path
                             }
 
                             if (detail.options.needsKey !== "" && foundInventory) {
@@ -133,7 +137,9 @@ let complete = function complete(explorerBuild) {
             localScripts: [],
             inventory: null,
             itemIDs: [],
-            main: `${dir}/${explorerBuild.void}/index`
+            main: `${dir}/${explorerBuild.void}/index`,
+            dir: dir,
+            path: path
         });
     });
 }

package/controllers/the-front.js

@@ -1,4 +1,5 @@
 const { user, inventory, connectionSuccess } = require("../models");
+const path = require('path');
 
 let router = require("express").Router();
 let dir = "";
@@ -51,7 +52,9 @@ let front = function front(detail) {
             localScripts: detail.options.localScripts,
             itemIDs: foundItemIDs,
             inventory: null,
-            query: req.query
+            query: req.query,
+            dir: dir,
+            path: path
         }
 
         if (connectionSuccess) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "1.2.4",
+  "version": "1.2.7",
   "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/explorer.ejs

@@ -1,6 +1,13 @@
 <%- include("./head.ejs"); %>
 
 <style>
+    <%- include(path.resolve(dir, "../", "public/styles/main.css")); %>
+    <%- include(path.resolve(dir, "../", "public/styles/menu.css")); %>
+    <%- include(path.resolve(dir, "../", "public/styles/inventory.css")); %>
+    <%- include(path.resolve(dir, "../", "public/styles/player.css")); %>
+    <%- include(path.resolve(dir, "../", "public/styles/account.css")); %>
+    <%- include(path.resolve(dir, "../", "public/styles/more.css")); %>
+
     <% for (let i = 0; i < styles.length; i++) { %>
         <%- include(`${styles[i]}.css`); %>
     <% } %>

package/views/head.ejs

@@ -13,12 +13,12 @@
     <!-- 'Redacted Script', cursive; -->
     <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/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/more.css"> -->
 </head>
 
 <body>