notherbase-fs 1.3.8 → 1.3.10

package/controllers/chat.js

@@ -4,8 +4,6 @@ const router = express.Router();
 const getRouterWithIO = function getRouterWithIO(io) {
     router.post("/", async function(req, res) {
         try {
-            //const foundAccount = await User.findOne({ _id: req.session.currentUser });
-            
             if (req.session.currentUser) {
                 io.to(req.body.room).emit('chat message', {
                     name: req.session.currentUser,

package/controllers/explorer.js

@@ -42,7 +42,8 @@ const explorer = async function explorer(worldPath, voidPath) {
         try {
             let currentRoute = `${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`;
 
-            if (await db.poi.exists({ route: currentRoute, user: req.session.currentUser }) === false) {
+            let exists = await db.poi.exists({ route: currentRoute, user: req.session.currentUser });
+            if (!exists) {
                 await db.poi.create({
                     route: currentRoute,
                     name: req.params.detail,
@@ -54,8 +55,7 @@ const explorer = async function explorer(worldPath, voidPath) {
 
             let found = await db.poi.findOne({ route: currentRoute, user: req.session.currentUser });
     
-            if (found) res.send(found.data);
-            else res.send("Found nothing.");
+            res.send(found.data);
         }
         catch(err) {
             console.log(err);
@@ -67,15 +67,14 @@ const explorer = async function explorer(worldPath, voidPath) {
         try {
             let currentRoute = `${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`;
 
-            if (await db.poi.exists({ route: currentRoute, user: req.session.currentUser }) === false) {
-                await db.poi.create({
-                    route: currentRoute,
-                    name: req.params.detail,
-                    type: "user",
-                    user: req.session.currentUser,
-                    data: {}
-                });
-            }
+            let exists = await db.poi.exists({ route: currentRoute, user: req.session.currentUser });
+            if (!exists) await db.poi.create({
+                route: currentRoute,
+                name: req.params.detail,
+                type: "user",
+                user: req.session.currentUser,
+                data: {}
+            });
 
             await db.poi.updateOne({ route: currentRoute, user: req.session.currentUser }, { data: req.body });
     

package/controllers/pages.js

@@ -2,10 +2,69 @@ const express = require("express");
 const router = express.Router();
 const fs = require('fs');
 
+const page = require("../models").page;
+
 module.exports = function name(path)
 {
     let files = fs.readdirSync(path);
 
+    router.get('/pages/db', async function (req, res) {
+        try {
+            if (req.query.type === "global") {
+                let foundPage = await page.findOne({name: req.query.name, type: "global"});
+        
+                if (!foundPage) res.status(404).end();
+                else res.status(200).send(foundPage);
+            }
+            else {
+                let foundPage = await page.findOne({name: req.query.name, user: req.session.currentUser});
+        
+                if (!foundPage) res.status(404).end();
+                else res.status(200).send(foundPage);
+            }
+        }
+        catch(err) {
+            res.status(500).end();
+            console.log(err);
+        }
+    });
+
+    router.post('/pages/db', async function (req, res) {
+        try {
+            let foundPage;
+
+            if (req.query.type === "global") {
+                foundPage = await page.findOne({name: req.query.name, type: "global"});
+            }
+            else {
+                foundPage = await page.findOne({name: req.query.name, user: req.session.currentUser});
+            }
+            
+            if (!foundGame) {
+                await game.create({
+                    name: req.body.name,
+                    type: req.query.type,
+                    user: req.session.currentUser,
+                    data: req.query.data
+                });
+    
+                res.status(200).end();
+            } 
+            else {
+                foundGame.data = req.query.data;
+                foundGame.markModified("data");
+                await foundGame.save();
+    
+                res.status(200).end();
+            }
+        }
+        catch(err) {
+            res.status(500).end();
+            console.log(req.query);
+            console.log(err);
+        }
+    });
+
     files.forEach(file => {
         file = file.slice(0, -4);
 

package/models/index.js

@@ -7,5 +7,6 @@ module.exports = {
     inventory: require("./inventory"),
     game: require("./game"),
     sendMail: require("./send-mail"),
-    poi: require("./poi")
+    poi: require("./poi"),
+    page: require("./page")
 }

package/models/page.js

@@ -0,0 +1,14 @@
+const mongoose = require("mongoose");
+
+const page = new mongoose.Schema({
+	name: String,
+	type: String,
+    user: { 
+        type: mongoose.Schema.Types.ObjectId, 
+        ref: "users",
+        required: false
+    },
+    data: {}
+});
+
+module.exports = mongoose.model('pages', page);

package/notherbase-fs.js

@@ -52,6 +52,10 @@ class NotherBaseFS {
         
             this.io.on('connection', (socket) => {
                 socket.join(socket.handshake.query.room);
+
+                console.log(socket.rooms);
+
+                socket.to(socket.handshake.query.room).emit(`${socket.handshake.query.name} has joined the room`);
         
                 socket.on('disconnect', () => {});
             });

package/package.json

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

package/public/js/chat-box.js

@@ -0,0 +1,50 @@
+class ChatBox {
+    constructor(name, box, room) {
+        this.socket = null;
+        import("/socket.io/socket.io.js").then(() => {
+            this.socket = io({
+                query: {
+                    room: room,
+                    name: name
+                }
+            });
+
+            this.socket.on('chat message', this.newMessage);
+            $(".chat-send").on("click", this.sendMessage);
+            this.$entry.on("keyup", function(e) {
+                if (e.keyCode == 13) sendMessage();
+            });
+        });
+
+        this.room = room;
+        this.$div = $(`.chat-box #${box}`)
+        this.$chatLog = this.$div.find(".chat-log");
+        this.$entry = this.$div.find(".chat-entry");
+    }
+
+    newMessage = (msg) => {
+        let time = new Date(msg.time);
+        this.$chatLog.append(`<p>[${time.toLocaleTimeString('en-US')}] ${msg.name}: ${msg.text}</p>`);
+    }
+
+    sendMessage = () => {
+        if (this.$entry.val() !== ""){
+            let val = this.$entry.val();
+            this.$entry.val("");
+
+            // $.post("/chat", {
+            //     room: "<%= room %>",
+            //     text: val
+            // }, function () {
+            //     $chatLog.scrollTop($chatLog[0].scrollHeight);
+            // });
+
+            this.socket.emit('chat message', {
+                name: name,
+                time: Date.now(),
+                text: val
+            });
+        }
+    }
+}
+

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

@@ -4,6 +4,19 @@
 
 <hr>
 
+<div class="chat-box" id="test-box">
+    <div class="chat-name">Chatting using the name <%= user.username %>:</div>
+
+    <div class="chat-log">
+        
+    </div>
+
+    <input autocomplete="off" type="text" name="text" class="chat-entry">
+    <div value="Send" class="chat-send">Send</div>
+</div>
+
+<hr>
+
 <h3>Game Test</h3>
 
 <button onclick="addToTime()">Add</button>
@@ -67,7 +80,11 @@
     Go to Nono Cove
 </a>
 
+
+<script src="/js/chat-box.js"></script>
 <script>
+    let chatTest = new ChatBox("<%= user.username %>", "test-box", "testRoom");
+
     let bought = false;
 
     let tradeForDoll = async function tradeForDoll() {

package/views/head.ejs

@@ -18,6 +18,7 @@
     <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/chat.css">
 </head>
 
 <body>

package/views/chat-box.ejs

@@ -1,47 +0,0 @@
-<link rel="stylesheet" href="/styles/chat.css">
-
-<div class="chat-box">
-    <div class="chat-name">Chatting using the name <%= user.username %>:</div>
-
-    <div class="chat-log">
-        
-    </div>
-    <input autocomplete="off" type="text" name="text" class="chat-entry">
-    <div value="Send" class="chat-send">Send</div>
-</div>
-
-<script>
-    <%- include("../node_modules/socket.io/client-dist/socket.io.js"); %>
-
-    let socket = io({
-        query: {
-            room: "<%= room %>"
-        }
-    });
-    let $chatLog = $(".chat-log");
-    let $entry = $(".chat-entry");
-
-    socket.on('chat message', function(msg) {
-        let time = new Date(msg.time);
-        $chatLog.append(`<p>[${time.toLocaleTimeString('en-US')}] ${msg.name}: ${msg.text}</p>`);
-    });
-
-    const sendMessage = function() {
-        if ($entry.val() !== ""){
-            let val = $entry.val();
-            $entry.val("");
-
-            $.post("/chat", {
-                room: "<%= room %>",
-                text: val
-            }, function () {
-                $chatLog.scrollTop($chatLog[0].scrollHeight);
-            });
-        }
-    }
-
-    $(".chat-send").on("click", sendMessage);
-    $entry.on("keyup", function(e) {
-        if (e.keyCode == 13) sendMessage();
-    });
-</script>