notherbase-fs 1.1.31 → 1.1.34

package/controllers/authCheck.js

@@ -1,26 +1,33 @@
-const User = require("../models/user.js");
+const { user, connectionSuccess } = require("../models");
 
 const authCheck = async function authCheck(req, res, next){
-    try {
-        if (req.session.currentUser) {
-            const foundAccount = await User.findById(req.session.currentUser);
-    
-            if (foundAccount) {
-                req.session.currentUserFull = foundAccount;
-                next();
+    if (connectionSuccess) {
+        try {
+            if (req.session.currentUser) {
+                const foundAccount = await user.findById(req.session.currentUser);
+        
+                if (foundAccount) {
+                    req.session.currentUserFull = foundAccount;
+                    next();
+                }
+                else {
+                    req.session.currentUserFull = null;
+                    res.redirect("/the-front");
+                }
             }
-            else {
-                req.session.currentUserFull = null;
+            else{
                 res.redirect("/the-front");
             }
         }
-        else{
-            res.redirect("/the-front");
+        catch(err) {
+            console.log("database error");
+            console.log(err);
         }
     }
-    catch(err) {
-        console.log("database error");
-        console.log(err);
+    else {
+        console.log("AuthCheck failed: not connected to db");
+        req.session.currentUserFull = null;
+        res.redirect("/the-front");
     }
 }
 

package/controllers/explorer.js

@@ -100,6 +100,10 @@ let complete = function complete(explorerBuild) {
         }
     }
 
+    // start location
+    router.get("/", function(req, res) {
+        res.redirect("/the-front");
+    });
 
     //the void
     router.use(function(req, res, next){
@@ -114,11 +118,6 @@ let complete = function complete(explorerBuild) {
             main: `${dir}/${explorerBuild.void}/index`
         });
     });
-
-    // start location
-    router.get("/", function(req, res) {
-        res.redirect("/the-front");
-    });
 }
 
 module.exports = {

package/controllers/inventory.js

@@ -2,101 +2,111 @@ const express = require("express");
 const router = express.Router();
 
 // Import my Data
-const inventory = require("../models/inventory");
-const item = require("../models/item");
+const { inventory, item, connectionSuccess } = require("../models");
 
 router.get("/", async function(req, res) {
-    try {
-        if (req.session.currentUserFull) {
-            let foundInventory = await inventory.findOne({user: req.session.currentUser}).populate("items.item");
-
-            res.status(200).send({ foundInventory: foundInventory });
+    if (connectionSuccess) {
+        try {
+            if (req.session.currentUserFull) {
+                let foundInventory = await inventory.findOne({user: req.session.currentUser}).populate("items.item");
+    
+                res.status(200).send({ foundInventory: foundInventory });
+            }
+            else {
+                res.status(401).end();
+            }
         }
-        else {
-            res.status(401).end();
+        catch(err) {
+            console.log(err);
+            res.status(500).end();
         }
     }
-    catch(err) {
-        console.log(err);
+    else {
+        res.status(500).end();
     }
 });
 
 router.post("/", async function(req, res) {
-    try {
-        if (req.session.currentUserFull) {
-            let foundInventory = await inventory.findOne({user: req.session.currentUser}).populate("items.item");
-
-            let holding = false;
-
-            for (let j = 0; j < foundInventory.items.length; j++) {
-                if (foundInventory.items[j].item._id.equals(req.body.change.item)) {
-                    holding = true;
-
-                    if (foundInventory.items[j].amount >= -Math.floor(req.body.change.amount)) {
-                        foundInventory.items[j].amount += Math.floor(req.body.change.amount);
-
-                        if (foundInventory.items[j].amount === 0) {
-                            let itemToEmpty = foundInventory.items[j].item._id;
-
-                            foundInventory.items.splice(j, 1);
-                            await foundInventory.save();
+    if (connectionSuccess) {
+        try {
+            if (req.session.currentUserFull) {
+                let foundInventory = await inventory.findOne({user: req.session.currentUser}).populate("items.item");
+    
+                let holding = false;
+    
+                for (let j = 0; j < foundInventory.items.length; j++) {
+                    if (foundInventory.items[j].item._id.equals(req.body.change.item)) {
+                        holding = true;
     
-                            res.status(200).send({
-                                item: {
-                                    _id: itemToEmpty
-                                },
-                                amount: 0
-                            });
+                        if (foundInventory.items[j].amount >= -Math.floor(req.body.change.amount)) {
+                            foundInventory.items[j].amount += Math.floor(req.body.change.amount);
+    
+                            if (foundInventory.items[j].amount === 0) {
+                                let itemToEmpty = foundInventory.items[j].item._id;
+    
+                                foundInventory.items.splice(j, 1);
+                                await foundInventory.save();
+        
+                                res.status(200).send({
+                                    item: {
+                                        _id: itemToEmpty
+                                    },
+                                    amount: 0
+                                });
+                            }
+                            else {
+                                await foundInventory.save();
+        
+                                res.status(200).send(foundInventory.items[j]);
+                            }
                         }
                         else {
-                            await foundInventory.save();
-    
-                            res.status(200).send(foundInventory.items[j]);
+                            console.log("subtract from too few", req.body.change);
+                            res.status(304).send(
+                                `Unable to remove ${req.body.change.amount} ${req.body.change.item} 
+                                from inventory because the inventory has only ${foundInventory.items[j].amount}.`
+                            );
                         }
+    
+                        break;
+                    }
+                }
+                
+                if (!holding) {
+                    if (req.body.change.amount > 0) {
+                        let foundItem = await item.findById(req.body.change.item);
+        
+                        foundInventory.items.push({
+                            item: foundItem._id,
+                            amount: req.body.change.amount
+                        });
+    
+                        await foundInventory.save();
+    
+                        await inventory.populate(foundInventory, "items.item");
+    
+                        res.status(200).send(foundInventory.items[foundInventory.items.length - 1]);
                     }
                     else {
-                        console.log("subtract from too few", req.body.change);
+                        console.log("subtract from none", req.body.change);
                         res.status(304).send(
                             `Unable to remove ${req.body.change.amount} ${req.body.change.item} 
-                            from inventory because the inventory has only ${foundInventory.items[j].amount}.`
+                            from inventory because the inventory has none.`
                         );
                     }
-
-                    break;
-                }
+                };
+            }
+            else {
+                res.status(401).send("User not logged in!");
             }
-            
-            if (!holding) {
-                if (req.body.change.amount > 0) {
-                    let foundItem = await item.findById(req.body.change.item);
-    
-                    foundInventory.items.push({
-                        item: foundItem._id,
-                        amount: req.body.change.amount
-                    });
-
-                    await foundInventory.save();
-
-                    await inventory.populate(foundInventory, "items.item");
-
-                    res.status(200).send(foundInventory.items[foundInventory.items.length - 1]);
-                }
-                else {
-                    console.log("subtract from none", req.body.change);
-                    res.status(304).send(
-                        `Unable to remove ${req.body.change.amount} ${req.body.change.item} 
-                        from inventory because the inventory has none.`
-                    );
-                }
-            };
         }
-        else {
-            res.status(401).send("User not logged in!");
+        catch(err) {
+            res.status(500).end();
+            console.log(err);
         }
     }
-    catch(err) {
+    else {
         res.status(500).end();
-        console.log(err);
     }
 });
 

package/controllers/the-front.js

@@ -1,4 +1,4 @@
-const inventory = require("../models/inventory");
+const { inventory, connectionSuccess } = require("../models");
 
 let router = require("express").Router();
 let dir = "";
@@ -33,17 +33,30 @@ let front = function front(detail) {
     detail.options.main = `${dir}/views/${detail.options.main}`;
 
     router.get(`/${detail.name}`, async function(req, res) {
-        try {
-            const foundInventory = await inventory.findOne({ user: req.session.currentUser }).populate("items.item");
-        
-            if (detail.options.needsKey !== "" && foundInventory) {
-                let hasKey = false;
-
-                for (let i = 0; i < foundInventory.items.length; i++) {
-                    if (foundInventory.items[i].item.name === detail.options.needsKey) hasKey = true;
+        if (connectionSuccess) {
+            try {
+                const foundInventory = await inventory.findOne({ user: req.session.currentUser }).populate("items.item");
+            
+                if (detail.options.needsKey !== "" && foundInventory) {
+                    let hasKey = false;
+    
+                    for (let i = 0; i < foundInventory.items.length; i++) {
+                        if (foundInventory.items[i].item.name === detail.options.needsKey) hasKey = true;
+                    }
+    
+                    if (!hasKey) res.redirect(detail.options.dropOff);
+                    else res.render(`explorer`, 
+                    {
+                        siteTitle: "NotherBase | The Front",
+                        user: req.session.currentUserFull,
+                        styles: detail.options.styles,
+                        externalStyles: detail.options.externalStyles,
+                        main: detail.options.main,
+                        scripts: detail.options.scripts,
+                        inventory: foundInventory,
+                        query: req.query
+                    });
                 }
-
-                if (!hasKey) res.redirect(detail.options.dropOff);
                 else res.render(`explorer`, 
                 {
                     siteTitle: "NotherBase | The Front",
@@ -56,21 +69,25 @@ let front = function front(detail) {
                     query: req.query
                 });
             }
-            else res.render(`explorer`, 
+            catch(err) {
+                console.log(err);
+            }
+        }
+        else {
+            console.log("no db connection");
+
+            res.render(`explorer`, 
             {
                 siteTitle: "NotherBase | The Front",
-                user: req.session.currentUserFull,
+                user: null,
                 styles: detail.options.styles,
                 externalStyles: detail.options.externalStyles,
                 main: detail.options.main,
                 scripts: detail.options.scripts,
-                inventory: foundInventory,
+                inventory: null,
                 query: req.query
             });
         }
-        catch(err) {
-            console.log(err);
-        }
     });
 }
 

package/index.js

@@ -1,10 +1,12 @@
 require("dotenv").config();
 
+let db = require("./models");
+
 module.exports = {
     explore: function explore(path) {
         return `./${path}/${path}.js`;
     },
-    data: require("./models"),
+    data: db,
     chat: null,
     start: function start(world) {
         let theFront = require("./controllers/the-front");
@@ -13,6 +15,6 @@ module.exports = {
         explorer.complete(world.explorer);
         theFront.complete(world.theFront);
 
-        require("./server")(theFront.router, explorer.router);
+        require("./server")(theFront.router, explorer.router, db.connectionSuccess);
     }
 }

package/models/index.js

@@ -1,9 +1,8 @@
 module.exports = {
+    connectionSuccess: require("./start-mongoose"),
     chat: require("./chat"),
     item: require("./item"),
     user: require("./user"),
     contact: require("./contact"),
     inventory: require("./inventory"),
 }
-
-require("./start-mongoose");

package/models/start-mongoose.js

@@ -1,21 +1,40 @@
 require("dotenv").config();
 const mongoose = require("mongoose");
 
+let success = false;
+
 //connect mongoose and mongo
-mongoose.connect(process.env.MONGODB_URI, { 
-	useNewUrlParser: true,
-	useUnifiedTopology: true
-});
+let init = async function init() {
+	try {
+		await mongoose.connect(process.env.MONGODB_URI, { 
+			useNewUrlParser: true,
+			useUnifiedTopology: true
+		});
+	
+		success = true;
+
+		//handlers
+		mongoose.connection.on('connected', (err) => {
+			console.log(`Mongoose connected to db`);
+			success = true;
+		});
+
+		mongoose.connection.on('error', (err) => {
+			console.log(`Mongoose ${err}`);
+			success = false;
+		});
 
-//handlers
-mongoose.connection.on('connected', () => {
-console.log(`Mongoose connected to db`);
-});
+		mongoose.connection.on('disconnected', () => {
+			console.log('Mongoose disconnected');
+			success = false;
+		});
+	}
+	catch (err) {
+		console.log(`Mongoose on connect: ${err}`);
+		success = false;
+	}
+}
 
-mongoose.connection.on('error', (err) => {
-console.log(`Mongoose connected error ${err}`);
-});
+init();
 
-mongoose.connection.on('disconnected', () => {
-console.log('Mongoose disconnected');
-});
+module.exports = success;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "notherbase-fs",
-  "version": "1.1.31",
+  "version": "1.1.34",
   "description": "Functions to help make developing for NotherBase easier.",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "nodemon test.js"
   },
   "repository": {
     "type": "git",

package/public/styles/inventory.css

@@ -0,0 +1,75 @@
+.inventory {
+    border: 1px solid var(--textColor);
+    color: var(--textColor);
+    position: fixed;
+    width: 90%;
+    height: 30%;
+    left: 5%;
+    bottom: 105px;
+    background-color: var(--bgColor);
+    padding: 5px;
+    border-radius: 5px;
+    z-index: 500;
+    display: flex;
+    flex-wrap: wrap;
+    overflow: auto;
+}
+
+.inventory .item-list {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    overflow: auto;
+    border: 1px solid var(--textColor);
+}
+
+.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);
+}
+
+button#inventory {
+    position: fixed;
+    bottom: 30px;
+    right: 75px;
+    width: 64px;
+    height: 64px;
+}
+
+.item-card {
+    width: 100px;
+    height: 100px;
+    border-radius: 5px;
+    border: 1px solid var(--textColor);
+    padding: 10px;
+    margin: 5px;
+    position: relative;
+}
+
+.item-card button {
+    position: absolute;
+    right: 0;
+    top: 0;
+    margin: 0;
+    padding: 0;
+}
+
+.item-card hr {
+    margin:  5px -10px;
+    width: calc(100% + 20px);
+}

package/public/styles/main.css

@@ -163,7 +163,6 @@ ul {
     margin: 10px;
 }
 
-
 #contact {
     position: fixed;
     bottom: 30px;
@@ -190,83 +189,6 @@ ul {
     overflow: auto;
 }
 
-.inventory {
-    width: 100%;
-    border: 1px solid var(--textColor);
-    color: var(--textColor);
-    position: fixed;
-    width: 90%;
-    height: 30%;
-    left: 5%;
-    bottom: 105px;
-    background-color: var(--bgColor);
-    padding: 5px;
-    border-radius: 5px;
-    z-index: 500;
-    display: flex;
-    flex-wrap: wrap;
-    overflow: auto;
-}
-
-.inventory .item-list {
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-    overflow: auto;
-    border: 1px solid var(--textColor);
-}
-
-.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);
-}
-
-#inventory-button {
-    position: fixed;
-    bottom: 30px;
-    right: 5px;
-    width: 64px;
-    height: 64px;
-}
-
-.item-card {
-    width: 100px;
-    height: 100px;
-    border-radius: 5px;
-    border: 1px solid var(--textColor);
-    padding: 10px;
-    margin: 5px;
-    position: relative;
-}
-
-.item-card button {
-    position: absolute;
-    right: 0;
-    top: 0;
-    margin: 0;
-    padding: 0;
-}
-
-.item-card hr {
-    margin:  5px -10px;
-    width: calc(100% + 20px);
-}
-
 .door {
     border: 1px solid var(--darkWoodColor);
     width: 100px;
@@ -299,7 +221,6 @@ iframe {
     flex-wrap: wrap;
 }
 
-
 .auth-form h3 {
     width: calc(100% - 20px);
     text-align: center;
@@ -321,6 +242,10 @@ iframe {
     font-size: 12px;
 }
 
+.ui {
+    position: relative;
+}
+
 @media only screen and (max-width: 500px) {
     main {
         width: 100%;

package/public/styles/menu.css

@@ -0,0 +1,47 @@
+.menu {
+    width: 75%;
+    height: 50%;
+    margin: 5% 12.5%;
+    border: 1px solid var(--textColor);
+    color: var(--textColor);
+    position: fixed;
+    left: 0;
+    top: 0;
+    background-color: var(--bgColor);
+    border-radius: 5px;
+    z-index: 500;
+}
+
+.ui button#menu {
+    position: fixed;
+    bottom: 30px;
+    right: 5px;
+    width: 64px;
+    height: 64px;
+}
+
+.menu button#close {
+    top: 5px;
+    right: 5px;
+    width: 32px;
+    height: 32px;
+    position: absolute;
+}
+
+.menu .tabs {
+    width: 100%;
+    height: 10%;
+    border: 1px solid var(--textColor);
+}
+
+.menu .content {
+    width: 100%;
+    height: 90%;
+    border: 1px solid var(--textColor);
+}
+
+.menu a {
+    margin: 0;
+    padding: 5px;
+    margin: 5px;
+}

package/server.js

@@ -1,6 +1,6 @@
 let started = false;
 
-module.exports = function start(frontRouter, exploreRouter) {
+module.exports = function start(frontRouter, exploreRouter, dbConnected) {
     if (!started) {
         // Setup for Express
         const express = require("express");
@@ -37,12 +37,14 @@ module.exports = function start(frontRouter, exploreRouter) {
         const controllers = require("./controllers");
     
         //enable cookies
-        app.use(session({
-            store: MongoStore.create({ mongoUrl: process.env.MONGODB_URI }),
-            secret: process.env.SECRET || "won",
-            resave: false,
-            saveUninitialized: false
-        }));
+        if (dbConnected) {
+            app.use(session({
+                store: MongoStore.create({ mongoUrl: process.env.MONGODB_URI }),
+                secret: process.env.SECRET || "won",
+                resave: false,
+                saveUninitialized: false
+            }));
+        }
     
         io.on('connection', (socket) => {
             socket.join(socket.handshake.query.room);
@@ -66,12 +68,11 @@ module.exports = function start(frontRouter, exploreRouter) {
     
         app.use("/", controllers.authCheck, exploreRouter);
     
-        // Go Off (On)
         server.listen(process.env.PORT, function () {
             console.log(`Server started at ${process.env.PORT}`);
+            started = true;
         });
 
-        started = true;
     }
     else console.log("Server already started!");
 }

package/test/views/index.ejs

@@ -4,6 +4,35 @@
 
 <hr>
 
-<a class="return" href="/forest/pond/tower">
-    Back to the Wizard's Tower
-</a>
+<div class="auth-form" id="login-form">
+    <h1>NotherBase</h1>
+    <h3>Login to Your Account</h3>
+    <input type="text" name="username" placeholder="username" id="login-user">
+    <input type="password" name="password" placeholder="password" id="login-pass">
+    <button id="login-button">Login</button>
+    <p id="login-info"></p>
+</div>
+
+<script>
+    let $loginButton = $("#login-button");
+    let $loginInfo = $("#login-info");
+
+    $loginButton.on("click", async function () {
+        try {
+            await $.post("/user/login", {
+                username: $("#login-user").val(),
+                password: $("#login-pass").val()
+            }, (data) => {
+                $loginInfo.text("To your right you hear the sound of a bang against a chain-link fence. You've logged in.");
+            });
+        } catch (error) {
+            //console.log(error);
+            if (error.status === 401) {
+                $loginInfo.text("Login Error: Username or password incorrect!");
+            }
+            else if (error.status === 500) {
+                $loginInfo.text("Server Error: Try again later!");
+            }
+        }
+    });
+</script>

package/test.js

@@ -0,0 +1 @@
+require("./test/test-index");

package/views/contact.ejs

@@ -4,8 +4,6 @@
     <button id="send">Send Message</button>
 </div>
 
-<button id="contact">Msg Nother</button>
-
 <script>
     $("#contact").on("click", (e) => {
         $("#contact-form").toggleClass("invisible");

package/views/explorer.ejs

@@ -11,12 +11,13 @@
 
 <main class="override">
     <%- include(`${main}.ejs`); %>
-    
-    <%- include("./inventory.ejs", {inventory: inventory}); %>
-
-    <%- include("./contact.ejs"); %>
 </main>
 
+<div class="ui">
+    <%- include("./inventory.ejs", {inventory: inventory}); %>
+    <%- include("./menu.ejs", {user: user}); %>
+</div>
+
 <script>
     <% for (let i = 0; i < scripts.length; i++) { %>
         <%- include(`${scripts[i]}.js`); %>

package/views/footer.ejs

@@ -1,8 +1,6 @@
 
 <footer>
-    <% if (user) { %> 
-        <a href="/user/logout">Logout</a>
-    <% } %> 
+    
 </footer>
 
 </body>

package/views/head.ejs

@@ -14,6 +14,8 @@
     <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/inventory.css">
+    <link rel="stylesheet" href="/styles/menu.css">
 </head>
 
 <body>

package/views/inventory.ejs

@@ -21,11 +21,11 @@
             </div>
         </div>
 
-        <button id="inventory-button">
+        <button id="inventory">
             <i class="fas fa-database"></i>
         </button>
     <% } else { %>
-        <button id="inventory-button">
+        <button id="inventory">
             ERR
         </button>
     <% } %>
@@ -39,7 +39,7 @@
             this.$search = $(".search");
             this.$searchResults = $(".search-results");
             this.searchResults = [];
-            this.$button = $("#inventory-button");
+            this.$button = $("button#inventory");
             this.items = [];
 
             this.$button.on("click", () => {

package/views/menu.ejs

@@ -0,0 +1,42 @@
+<div class="menu invisible">
+    
+
+    <div class="tabs">
+        <button id="inventory">
+            Inventory
+        </button>
+        <button id="player">
+            Player
+        </button>
+        <button id="contact">
+            Contact
+        </button>
+
+        <button id="close">
+            X
+        </button>
+    </div>
+
+    <div class="content">
+        <%- include("./contact.ejs"); %>
+
+    </div>
+
+    <% if (user) { %> 
+        <a href="/user/logout">Logout</a>
+    <% } %> 
+</div>
+
+<button id="menu"><i class="fas fa-cog"></i></button>
+
+<script>
+    let $menu = $(".menu");
+
+    $("button#menu").on("click", function () {
+        $menu.toggleClass("invisible");
+    });
+
+    $("button#close").on("click", function () {
+        $menu.toggleClass("invisible");
+    });
+</script>