notherbase-fs 1.1.33 → 1.1.36

package/controllers/authCheck.js

@@ -4,7 +4,7 @@ const authCheck = async function authCheck(req, res, next){
     if (connectionSuccess) {
         try {
             if (req.session.currentUser) {
-                const foundAccount = await User.findById(req.session.currentUser);
+                const foundAccount = await user.findById(req.session.currentUser);
         
                 if (foundAccount) {
                     req.session.currentUserFull = foundAccount;
@@ -26,7 +26,6 @@ const authCheck = async function authCheck(req, res, next){
     }
     else {
         console.log("AuthCheck failed: not connected to db");
-        req.session.currentUserFull = null;
         res.redirect("/the-front");
     }
 }

package/controllers/explorer.js

@@ -1,4 +1,4 @@
-const inventory = require("../models/inventory");
+const { inventory, game, item } = require("../models");
 
 let router = require("express").Router();;
 let dir = "";
@@ -24,11 +24,13 @@ let complete = function complete(explorerBuild) {
                     let detail = poi.details[l];
 
                     let currentDir = `${dir}/${currentRegion}/${currentArea}/${currentPoi}`;
+                    let currentRoute = `/${currentRegion}/${currentArea}/${currentPoi}/${detail.name}`;
 
                     detail.options = {
                         styles: [],
                         externalStyles: [],
-                        scripts: [],
+                        localScripts: [],
+                        serverScripts: [],
                         needsKey: "",
                         dropOff: "",
                         ...detail.options
@@ -44,52 +46,58 @@ let complete = function complete(explorerBuild) {
                         return style;
                     });
                 
-                    detail.options.scripts = detail.options.scripts.map(script => {
+                    detail.options.localScripts = detail.options.localScripts.map(script => {
                         script = `${currentDir}/local-scripts/${script}`;
                         return script;
                     });
+
+                    detail.options.serverScripts = detail.options.serverScripts.map(script => {
+                        script = require(`${currentDir}/server-scripts/${script}`);
+                        return script;
+                    });
                 
                     detail.options.main = "index";
                     if (detail.name !== "") detail.options.main = detail.name;
                     detail.options.main = `${currentDir}/views/${detail.options.main}`;
                 
-                    router.get(`/${currentRegion}/${currentArea}/${currentPoi}/${detail.name}`, async function(req, res) {
+                    router.get(currentRoute, 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 (!hasKey) res.redirect(detail.options.dropOff);
-                                else res.render(`explorer`, 
-                                {
-                                    siteTitle: "NotherBase",
-                                    user: req.session.currentUserFull,
-                                    styles: detail.options.styles,
-                                    externalStyles: detail.options.externalStyles,
-                                    main: detail.options.main,
-                                    scripts: detail.options.scripts,
-                                    pov: req.query.pov,
-                                    inventory: foundInventory,
-                                    query: req.query
-                                });
+                            let serverScriptReturns = [];
+
+                            for (let m = 0; m < detail.options.serverScripts.length; m++) {
+                                serverScriptReturns.push(await detail.options.serverScripts[m]({
+                                    game: game,
+                                    inventory: inventory,
+                                    item: item
+                                }));
                             }
-                            else res.render(`explorer`, 
-                            {
+
+                            let context = {
                                 siteTitle: "NotherBase",
                                 user: req.session.currentUserFull,
                                 styles: detail.options.styles,
                                 externalStyles: detail.options.externalStyles,
                                 main: detail.options.main,
-                                scripts: detail.options.scripts,
+                                localScripts: detail.options.localScripts,
+                                serverScriptReturns: serverScriptReturns,
                                 pov: req.query.pov,
                                 inventory: foundInventory,
                                 query: req.query
-                            });
+                            }
+
+                            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`, context);
+                            }
+                            else res.render(`explorer`, context);
                         }
                         catch(err) {
                             console.log(err);

package/controllers/game.js

@@ -0,0 +1,59 @@
+const express = require("express");
+const router = express.Router();
+
+// Import my Data
+const { game } = require("../models");
+
+router.get("/all", async function(req, res) {
+    try {
+        let foundGames = await game.find({game: req.query.game});
+
+        res.status(200).send({ foundGames: foundGames });
+    }
+    catch(err) {
+        res.status(500).end();
+        console.log(err);
+    }
+});
+
+router.get("/one", async function(req, res) {
+    try {
+        let foundGame = await game.findOne({_id: req.query._id});
+
+        if (!foundGame) res.status(404).end();
+        else res.status(200).send({ foundGame: foundGame });
+    }
+    catch(err) {
+        res.status(500).end();
+        console.log(err);
+    }
+});
+
+router.post("/", async function(req, res) {
+    try {
+        let foundGame = await game.findOne({_id: req.query._id});
+
+        if (!foundGame) {
+            await game.create({
+                name: req.body.name,
+                shortDescription: req.body.shortDescription,
+                fullDescription: req.body.fullDescription
+            });
+
+            res.status(200).end();
+        } 
+        else {
+            foundGame.data = req.query.data;
+            foundGame.markModified("data");
+            await foundGame.save();
+
+            res.status(200).send();
+        }
+    }
+    catch(err) {
+        res.status(500).end();
+        console.log(err);
+    }
+});
+
+module.exports = router;

package/controllers/the-front.js

@@ -7,7 +7,7 @@ let front = function front(detail) {
     detail.options = {
         styles: [],
         externalStyles: [],
-        scripts: [],
+        localScripts: [],
         needsKey: "",
         dropOff: "",
         ...detail.options
@@ -23,7 +23,7 @@ let front = function front(detail) {
         return style;
     });
 
-    detail.options.scripts = detail.options.scripts.map(script => {
+    detail.options.localScripts = detail.options.localScripts.map(script => {
         script = `${dir}/local-scripts/${script}`;
         return script;
     });
@@ -52,7 +52,7 @@ let front = function front(detail) {
                         styles: detail.options.styles,
                         externalStyles: detail.options.externalStyles,
                         main: detail.options.main,
-                        scripts: detail.options.scripts,
+                        localScripts: detail.options.localScripts,
                         inventory: foundInventory,
                         query: req.query
                     });
@@ -64,7 +64,7 @@ let front = function front(detail) {
                     styles: detail.options.styles,
                     externalStyles: detail.options.externalStyles,
                     main: detail.options.main,
-                    scripts: detail.options.scripts,
+                    localScripts: detail.options.localScripts,
                     inventory: foundInventory,
                     query: req.query
                 });
@@ -83,7 +83,7 @@ let front = function front(detail) {
                 styles: detail.options.styles,
                 externalStyles: detail.options.externalStyles,
                 main: detail.options.main,
-                scripts: detail.options.scripts,
+                localScripts: detail.options.localScripts,
                 inventory: null,
                 query: req.query
             });

package/controllers/user.js

@@ -3,20 +3,19 @@ const router = express.Router();
 const bcrypt = require("bcrypt");
 
 // Import my Data
-const User = require("../models/user");
-const inventory = require("../models/inventory");
+const { user, inventory } = require("../models");
 
 const authCheck = require("./authCheck");
 
 router.post("/register", async function(req, res) {
     try {
-        const foundAccount = await User.findOne({ username: req.body.username });
+        const foundAccount = await user.findOne({ username: req.body.username });
 
         if (!foundAccount) {
             const salt = await bcrypt.genSalt(10);
             const hash = await bcrypt.hash(req.body.password, salt);
 
-            let qAuth = await User.create({
+            let qAuth = await user.create({
                 username: req.body.username,
                 password: hash,
                 email: "temp@example.com",
@@ -33,7 +32,7 @@ router.post("/register", async function(req, res) {
             res.status(200).send("Registration Successful!");
         }
         else {
-            res.status(400).send("Registration Failed: Username taken!");
+            res.status(400).send("Registration Failed: username taken!");
         }
     }
     catch(err) {
@@ -45,12 +44,12 @@ router.post("/register", async function(req, res) {
 
 router.post("/login", async function(req, res) {
     try {
-        const foundAccount = await User.findOne({ username: req.body.username });
+        const foundAccount = await user.findOne({ username: req.body.username });
 
         if (foundAccount) {
             if (await bcrypt.compare(req.body.password, foundAccount.password)) {
-                req.session.currentUser = { _id: foundAccount._id };
-                req.session.currentUserFull = foundAccount;
+                req.session.currentuser = { _id: foundAccount._id };
+                req.session.currentuserFull = foundAccount;
 
                 res.status(200).send("Login successful!");
             }
@@ -59,7 +58,7 @@ router.post("/login", async function(req, res) {
             }
         }
         else {
-            res.status(401).send("Login Failed: Username not found!");
+            res.status(401).send("Login Failed: username not found!");
         }
     }
     catch(err) {
@@ -82,9 +81,9 @@ router.get("/logout", authCheck, async function(req, res) {
 
 router.get("/all", authCheck, async function(req, res) {
     try {
-        let foundUsers = await User.find({}, 'username coin home authLevels location');
+        let foundusers = await user.find({}, 'username coin home authLevels location');
 
-        res.status(200).send({ foundUsers: foundUsers });
+        res.status(200).send({ foundusers: foundusers });
     }
     catch(err) {
         res.status(500).end();
@@ -94,7 +93,7 @@ router.get("/all", authCheck, async function(req, res) {
 
 router.delete("/", authCheck, async function(req, res) {
     try {
-        const found = await User.findByIdAndDelete(req.session.currentUser);
+        const found = await user.findByIdAndDelete(req.session.currentuser);
 
         if (!found) console.log("Could not find account. No deletion!");
 

package/models/game.js

@@ -0,0 +1,11 @@
+// This allows us to use Mongoose to connect to MongoDB
+const mongoose = require("mongoose");
+
+const game = new mongoose.Schema({
+	name: String,
+	data: {}
+});
+
+// This tells Mongoose to use the exampleSchema to access the examples collection
+// in our db and then exports the model so we can use it.
+module.exports = mongoose.model('games', game);

package/models/index.js

@@ -5,4 +5,5 @@ module.exports = {
     user: require("./user"),
     contact: require("./contact"),
     inventory: require("./inventory"),
+    game: require("./game")
 }

package/models/start-mongoose.js

@@ -1,40 +1,36 @@
 require("dotenv").config();
 const mongoose = require("mongoose");
 
-let success = false;
-
-//connect mongoose and mongo
-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;
-		});
-
-		mongoose.connection.on('disconnected', () => {
-			console.log('Mongoose disconnected');
-			success = false;
-		});
-	}
-	catch (err) {
-		console.log(`Mongoose on connect: ${err}`);
-		success = false;
-	}
+let success = null;
+
+//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;
+});
+
+mongoose.connection.on('disconnected', () => {
+	console.log('Mongoose disconnected');
+	success = false;
+});
+
+try {
+	mongoose.connect(process.env.MONGODB_URI, { 
+		useNewUrlParser: true,
+		useUnifiedTopology: true
+	});
+
+	success = true;
 }
+catch (err) {
+	console.log(`Mongoose on connect: ${err}`);
 
-init();
+	success = false;
+}
 
 module.exports = success;

package/package.json

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

package/test/coast/tall-beach/nono-cove/local-scripts/game.js

@@ -0,0 +1,7 @@
+let $game = $(".game");
+let $text = $(".game h3");
+let $button = $(".game button");
+
+$button.on("click", function () {
+    $text.text(`${$text.text()} clicked`);
+});

package/test/coast/tall-beach/nono-cove/server-scripts/game.js

@@ -0,0 +1,31 @@
+const req = require("express/lib/request");
+
+module.exports = async function gameServerScript(db) {
+    try {
+        let foundGame = await db.game.findOne({ name: "test" });
+
+        if (!foundGame) {
+            await db.game.create({
+                name: "test",
+                data: {
+                    count: 0
+                }
+            });
+
+            return 0;
+        }
+        else {
+            let newCount = foundGame.data.count + 1;
+            foundGame.data = {
+                count: newCount
+            }
+            foundGame.markModified("data");
+            await foundGame.save();
+
+            return newCount;
+        }
+    }
+    catch(err) {
+        console.log(err);
+    }
+}

package/test/coast/tall-beach/nono-cove/views/index.ejs

@@ -1 +1,16 @@
-nono
+<p>
+    nono
+</p>
+
+<hr>
+
+<div class="game">
+    <h3><%= serverScriptReturns[0] %>Text</h3>
+    <button>Click</button>
+</div>
+
+<hr>
+
+<a href="/the-front">
+    Go to The Front
+</a>

package/test/test-index.js

@@ -24,7 +24,10 @@ const world = {
                                 details: [
                                     {
                                         name: "",
-                                        options: {}
+                                        options: {
+                                            localScripts: ["game"],
+                                            serverScripts: ["game"]
+                                        }
                                     }
                                 ]
                             }

package/test/views/index.ejs

@@ -1,5 +1,5 @@
 <p>
-    A random nono washes up on shore. Will you solve it?
+    Welcome to The Front.
 </p>
 
 <hr>
@@ -13,9 +13,26 @@
     <p id="login-info"></p>
 </div>
 
+<hr>
+
+<div class="locked to nother-base">
+    Go to Nono Cove
+</div>
+
+<a href="/coast/tall-beach/nono-cove" class="invisible to nother-base">
+    Go to Nono Cove
+</a>
+
 <script>
     let $loginButton = $("#login-button");
     let $loginInfo = $("#login-info");
+    let $toNonoButton = $(".locked.to.nother-base");
+    let $toNonoLink = $(".invisible.to.nother-base");
+
+    <% if (user) { %>
+        $toNonoButton.addClass("invisible");
+        $toNonoLink.removeClass("invisible");
+    <% } %>
 
     $loginButton.on("click", async function () {
         try {
@@ -24,6 +41,8 @@
                 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.");
+                $toNonoButton.addClass("invisible");
+                $toNonoLink.removeClass("invisible");
             });
         } catch (error) {
             //console.log(error);

package/views/explorer.ejs

@@ -19,8 +19,8 @@
 </div>
 
 <script>
-    <% for (let i = 0; i < scripts.length; i++) { %>
-        <%- include(`${scripts[i]}.js`); %>
+    <% for (let i = 0; i < localScripts.length; i++) { %>
+        <%- include(`${localScripts[i]}.js`); %>
     <% } %>
 </script>