notherbase-fs 1.2.6 → 1.2.9

package/controllers/chat.js

@@ -6,9 +6,9 @@ const getRouterWithIO = function getRouterWithIO(io) {
         try {
             //const foundAccount = await User.findOne({ _id: req.session.currentUser });
             
-            if (req.session.currentUserFull) {
+            if (req.session.currentUser) {
                 io.to(req.body.room).emit('chat message', {
-                    name: req.session.currentUserFull.username,
+                    name: req.session.currentUser,
                     time: Date.now(),
                     text: req.body.text
                 });

package/controllers/explorer.js

@@ -1,4 +1,5 @@
 const { inventory, game, item, user } = require("../models");
+const path = require('path');
 
 let router = require("express").Router();;
 let dir = "";
@@ -94,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) {
@@ -134,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/inventory.js

@@ -29,7 +29,7 @@ router.get("/", async function(req, res) {
 router.post("/", async function(req, res) {
     if (connectionSuccess) {
         try {
-            if (req.session.currentUserFull) {
+            if (req.session.currentUser) {
                 let foundInventory = await inventory.findOne({user: req.session.currentUser}).populate("items.item");
     
                 let holding = false;

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.6",
+  "version": "1.2.9",
   "description": "Functions to help make developing for NotherBase easier.",
   "main": "index.js",
   "scripts": {

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>

package/public/styles/account.css

@@ -1,41 +0,0 @@
-.content#account {
-    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/chat.css

@@ -1,60 +0,0 @@
-.chat-box {
-    position: relative;
-    box-shadow: 5px 5px 10px 5px var(--shadowColor);
-    margin-top: 20px;
-    width: 100%;
-    min-height: 200px;
-}
-
-.chat-name {
-    color: var(--textColor);
-    padding: 10px;
-}
-
-.chat-log {
-    width: 100%;
-    height: calc(100% - 65px);
-    background-color: rgba(0, 0, 0, 0.534);
-    overflow: auto;
-    padding: 5px;
-}
-
-.chat-send {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    height: 25px;
-    width: 5em;
-    outline: none;
-    background-color: var(--bgColor);
-    border: 1px solid var(--textColor);
-    color: var(--textColor);
-    text-align: center;
-    padding: 2px;
-}
-
-.chat-send:hover {
-    border: 1px solid var(--textColorBright);
-    color: var(--textColorBright);
-    cursor: pointer;
-}
-
-.chat-entry {
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    height: 25px;
-    width: calc(100% - 5em);
-    outline: none;
-    background-color: var(--bgColor);
-    border: 1px solid var(--textColor);
-    color: var(--textColor);
-}
-
-.chat-log > p {
-    color: var(--textColor);
-    margin: 0;
-    padding: 0;
-    line-height: 1em;
-    text-align: left;
-}

package/public/styles/inventory.css

@@ -1,63 +0,0 @@
-.inventory {
-    border: 1px solid var(--textColor);
-    color: var(--textColor);
-    width: 100%;
-    height: 100%;
-    padding: 5px;
-    z-index: 500;
-    overflow: auto;
-}
-
-.inventory .item-list {
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-    overflow: auto;
-    border: 1px solid var(--textColor);
-    align-content: flex-start;
-}
-
-.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 {
-    width: 150px;
-    height: 45px;
-    border-radius: 3px;
-    border: 1px solid var(--textColor);
-    padding: 5px;
-    margin: 2.5px;
-    position: relative;
-    background-color: var(--bgColor);
-}
-
-.item-card button {
-    position: absolute;
-    right: 0;
-    top: 0;
-    margin: 0;
-    padding: 0;
-    border-radius: 0;
-}
-
-.item-card hr {
-    width: 100%;
-    margin: 0;
-}

package/public/styles/main.css

@@ -1,235 +0,0 @@
-:root {
-    --bgColor: rgb(37, 37, 37);
-    --bgColorTransparent: rgba(37, 37, 37, 0.404);
-    --darkBgColor: rgb(27, 27, 27);
-    --veryDarkBgColorTransparent: rgba(15, 15, 15, 0.404);
-    --veryDarkBgColor: rgb(15, 15, 15);
-    --lightBgColor: rgb(57, 57, 57);
-    --shadowColor: rgb(26, 26, 26);
-    --textColor: rgb(185, 135, 69);
-    --textColorBright: rgb(221, 181, 130);
-    --woodColor: rgb(95, 68, 43);
-    --darkWoodColor: rgb(70, 50, 32);
-    --standardBorder: 1px solid var(--textColor);
-}
-
-* {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-    color: var(--textColor);
-}
-
-.invisible {
-    display: none !important;
-}
-
-.camo {
-    transition: all .15s;
-    opacity: 0;
-}
-
-body {
-    background-color: var(--darkBgColor);
-    min-height: 100vh;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    align-content: center;
-    flex-direction: column;
-    position: relative;
-}
-
-main {
-    width: 1000px;
-    min-height: 500px;
-    box-shadow: 5px 5px 5px 5px var(--shadowColor);
-    padding: 20px;
-    border-radius: 5px 5px 0px 0px;
-    margin-top: 15px;
-    margin-bottom: 0;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    align-content: center;
-    align-items: flex-start;
-    background-color: var(--bgColor);
-}
-
-footer {
-    display: flex;
-    justify-content: center;
-    align-content: center;
-    align-items: flex-start;
-    min-height: 25px;
-    width: 1000px;
-    background-color: var(--veryDarkBgColor);
-    border-radius: 0px 0px 5px 5px;
-    box-shadow: 5px 5px 5px 5px var(--shadowColor);
-    padding: 5px;
-    border: none;
-    margin-bottom: 100px;
-}
-
-footer a {
-    text-decoration: none;
-    height: 100%;
-    margin: 0;
-    padding: 5px;
-    width: 50%;
-    height: 100%;
-}
-
-hr {
-    border: none;
-    border-bottom: 1px solid var(--textColor);
-    margin: 20px;
-    width: 100%;
-}
-
-p {
-    color: var(--textColor);
-    margin-bottom: 10px;
-    width: 80%;
-}
-
-input, textarea {
-    padding: 10px;
-    width: calc(100% - 10px);
-    background-color: var(--bgColor);
-    border-radius: 5px;
-    border: 1px solid var(--textColor);
-    margin: 5px;
-    font-size: 15px;
-}
-
-input[type=submit], button, a {
-    background-color: var(--bgColor);
-    padding: 10px;
-    border-radius: 5px;
-    border: 1px solid var(--textColor);
-    color: var(--textColor);
-    margin: 5px;
-    margin-top: 20px;
-    text-decoration: none;
-    text-align: center;
-}
-
-input[type=submit]:hover, button:hover, a:hover {
-    border: 1px solid var(--textColorBright);
-    color: var(--textColorBright);
-    cursor: pointer;
-}
-
-.locked {
-    background-color: var(--bgColor);
-    padding: 10px;
-    border-radius: 5px;
-    border: 1px solid var(--textColor);
-    color: var(--textColor);
-    margin: 5px;
-    margin-top: 20px;
-    text-decoration: none;
-    text-align: center;
-    filter: brightness(.5);
-    user-select: none;
-}
-
-.to {
-    width: 100%;
-    height: 200px;
-    display: flex;
-    justify-content: flex-end;
-    align-items: flex-end;
-    padding: 20px;
-}
-
-.return {
-    width: 100%;
-    height: 75px;
-    display: flex;
-    justify-content: flex-end;
-    align-items: flex-end;
-    padding: 20px;
-}
-
-.do {
-    width: 100%;
-    height: 200px;
-    display: flex;
-    justify-content: flex-end;
-    align-items: flex-end;
-    padding: 20px;
-}
-
-h2, h3 {
-    color: var(--textColor);
-    width: 100%;
-}
-
-ul {
-    margin: 10px;
-}
-
-.door {
-    border: 1px solid var(--darkWoodColor);
-    width: 100px;
-    height: 150px;
-    background-color: var(--woodColor);
-    position: relative;
-}
-
-.knob {
-    position: absolute;
-    width: 20px;
-    height: 20px;
-    border-radius: 50%;
-    right: 5px;
-    top: 50%;
-    background-color: var(--darkWoodColor);
-}
-
-iframe {
-    border: none;
-}
-
-.auth-form {
-    height: 100%;
-    width: 100%;
-    padding: 40px 5px;
-    overflow: hidden;
-    display: flex;
-    justify-content: center;
-    flex-wrap: wrap;
-}
-
-.auth-form h3 {
-    width: calc(100% - 20px);
-    text-align: center;
-    margin: 10px;
-    font-size: 15px;
-}
-
-.auth-form h1 {
-    width: calc(100% - 20px);
-    text-align: center;
-    margin: 10px;
-    font-size: 20px;
-}
-
-.auth-form p {
-    width: calc(100% - 20px);
-    text-align: center;
-    margin: 10px;
-    font-size: 12px;
-}
-
-@media only screen and (max-width: 1000px) {
-    main {
-        width: 100%;
-    }
-
-    footer {
-        width: 100%;
-    }
-}

package/public/styles/menu.css

@@ -1,113 +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(--bgColorTransparent);
-    backdrop-filter: blur(3px);
-    border-radius: 5px;
-    z-index: 500;
-}
-
-.menu hr {
-    margin: 0;
-}
-
-.ui .fade {
-    background-color: var(--veryDarkBgColorTransparent);
-    backdrop-filter: blur(3px);
-    width: 100%;
-    height: 100%;
-    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;
-}
-
-.menu button#close {
-    top: 0;
-    right: 0;
-    width: 32px;
-    height: 32px;
-    position: absolute;
-    border-radius: 0;
-}
-
-.menu .tabs {
-    width: 100%;
-    height: 30px;
-    border: 1px solid var(--textColor);
-}
-
-.menu .tabs button {
-    height: 30px;
-    border-radius: 0;
-    padding: 0 10px;
-}
-
-.menu .tabs .selected {
-    border: 2px solid var(--textColorBright);
-}
-
-.menu #content-window {
-    width: 100%;
-    height: calc(100% - 30px);
-    border: 1px solid var(--textColor);
-}
-
-.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;
-}
-
-@media only screen and (max-width: 1000px) {
-    .menu {
-        width: 100%;
-        height: 90vh;
-        top: 0;
-        left: 0;
-    }
-
-    .ui button#menu {
-        bottom: 5px;
-        right: 5px;
-    }
-}

package/public/styles/more.css

@@ -1,3 +0,0 @@
-.content#more {
-    padding: 10px;
-}

package/public/styles/player.css

@@ -1,12 +0,0 @@
-.content#player {
-    padding: 10px;
-}
-
-.content#player h3 {
-    width: 100%;
-    text-transform: capitalize;
-}
-
-.content#player h3 button {
-    width: 40px;
-}