notherbase-fs 1.5.3 → 2.0.0

package/views/account.ejs

@@ -56,27 +56,23 @@
             this.$passwordInput = this.$passwordEdit.find("input");
 
             this.$info = $(".content#account #info");
-
+            
             <% if (user) { %>
+                this.username = "<%= user.username %>";
+                this.email = "<%= user.email %>";
+
                 this.refresh();
             <% } %>
         }
 
         async refresh() {
-            try {
-                $.get("/user/basic", (data) => {
-                    this.$email.text(data.email);
-                    this.$emailInput.val(data.email);
-                    this.$username.text(data.username);
-                    this.$usernameInput.val(data.username);
-
-                    $(".content#account .settings").removeClass("invisible");
-                    $(".content#account #please-login").addClass("invisible");
-                });
-            } 
-            catch(err) {
-                this.$info.text(err);
-            }
+            this.$email.text(this.email);
+            this.$emailInput.val(this.email);
+            this.$username.text(this.username);
+            this.$usernameInput.val(this.username);
+
+            $(".content#account .settings").removeClass("invisible");
+            $(".content#account #please-login").addClass("invisible");
         }
 
         editEmail() {
@@ -91,16 +87,13 @@
         }
 
         async updateEmail() {
-            try {
-                await $.post("/user/email", { email: this.$emailInput.val() }, (data) => {
-                    this.$email.text(this.$emailInput.val());
-                    this.cancelEmail();
-                    this.$info.text("Email Updated!");
-                });
-            } 
-            catch(err) {
-                this.$info.text(err);
-            }
+            let response = await commune("changeUserEmail", { email: this.$emailInput.val() });
+
+            this.$email.text(this.$emailInput.val());
+            this.cancelEmail();
+            this.$info.text("Email Updated!");
+
+            location.reload();
         }
 
         editUsername() {
@@ -115,17 +108,13 @@
         }
 
         async updateUsername() {
-            try {
-                await $.post("/user/username", { username: this.$usernameInput.val() }, (data) => {
-                    this.$username.text(this.$usernameInput.val());
-                    this.cancelUsername();
-                    this.$info.text("Username Updated!");
-                });
-            } 
-            catch(err) {
-                if (err.status === 401) this.$info.text("Username already taken!");
-                else this.$info.text("Server Error");
-            }
+            let response = await commune("changeUsername", { username: this.$usernameInput.val() });
+
+            this.$username.text(this.$usernameInput.val());
+            this.cancelUsername();
+            this.$info.text("Username Updated!");
+
+            location.reload();
         }
     }
 

package/views/explorer.ejs

@@ -3,11 +3,58 @@
 <script>
     const currentRoute = "<%- route %>";
 </script>
+<script src="/js/commune.js"></script>
 <script src="/socket.io/socket.io.js"></script>
 <script src="/js/memories.js"></script>
+<script src="/js/establishment.js"></script>
 
 <main class="override">
-    <%- include(`${main}.ejs`); %>
+    <% if (requireUser && !user) { %>
+        <div class="login-cover">
+            <a href="/">
+                <h1>NotherBase</h1>
+            </a>
+            <h3>Login to Your Account</h3>
+            <input type="email" placeholder="user@email.com" id="email">
+            <input type="password" placeholder="password" id="pass">
+            <button id="login" onclick="attemptLogin()">Login</button>
+            <button id="reset" onclick="resetPassword()">Reset Password</button>
+            <p class="info"></p>
+        </div>
+        <script>
+            const $loginEmail = $(".login-cover #email");
+            const $loginPassword = $(".login-cover #pass");
+            const $loginInfo = $(".login-cover .info");
+
+            const attemptLogin = async () => {
+                return $.post("/s", JSON.stringify({
+                    action: "login",
+                    data: {
+                        email: $loginEmail.val(),
+                        password: $loginPassword.val()
+                    }
+                }), (data) => {
+                    if (data.status === "success") {
+                        $loginInfo.text("You've logged in.");
+                        location.reload();
+                    }
+                    else $loginInfo.text(data.message);
+                });
+            };
+
+            const resetPassword = async () => {
+                return $.post("/s", JSON.stringify({
+                    action: "sendPasswordReset",
+                    data: { email: $loginEmail.val() }
+                }), (data) => {
+                    if (data.status === "success") $loginInfo.text("A reset code has been sent to your email.");
+                    else $loginInfo.text(data.message);
+                });
+            }
+        </script>
+    <% } else { %>
+        <%- include(`${main}.ejs`); %>
+    <% } %>
 </main>
 
 <div class="ui">

package/views/inventory.ejs

@@ -3,13 +3,6 @@
         Please login to view your inventory.
     </div>
 
-    <div class="item-spawner invisible">
-        <input type="text" class="search">
-        <div class="search-results">
-            
-        </div>
-    </div>
-
     <div class="item-list">
     </div>
 </div>
@@ -25,74 +18,49 @@
             this.$error = $("#inventory #error");
             this.items = [];
 
-            this.$search.on("keyup", () => {
-                let searchString = this.$search.val();
-
-                $.get(`/item`, { name: searchString }, (data) => {
-                    this.renderSearchResults(data.foundItems);
-                });
-            });
-
             this.refresh();
-
-            setInterval(this.update, this.updateCooldown);
         }
 
         async change(itemName, amount) {
             let change = {
-                item: itemName,
+                name: itemName,
                 amount: amount
             }
 
-            try {
-                let data = null;
-                let status = null;
-
-                await $.post("/inventory", change, (d, s) => {
-                    data = d;
-                    status = s;
-                });
-
-                if (status === "notmodified") {
-                    return false;
-                }
-                else {
-                    let holding = false;
-
-                    for (let i = 0; i < this.items.length; i++) {
-                        if (this.items[i].item._id === data.item._id) {
-                            this.items[i].amount = data.amount;
-                            holding = true;
+            let response = await commune("updateItemInInventory", change);
 
-                            if (data.amount <= 0) this.items.splice(i, 1);
-                        }
-                    }
-                    
-                    if (!holding && data.amount > 0 && data.item) {
-                        this.items.push(data);
+            if (response.status === "success") {
+                let holding = false;
+    
+                for (let i = 0; i < this.items.length; i++) {
+                    if (this.items[i].name === response.data.name) {
+                        this.items[i].amount = response.data.amount;
+                        holding = true;
+    
+                        if (response.data.amount <= 0) this.items.splice(i, 1);
                     }
-
-                    this.render();
-                    return true;
                 }
+                
+                if (!holding && response.data.amount > 0 && response.data.name) {
+                    this.items.push(response.data);
+                }
+    
+                this.render();
+
+                return true;
             }
-            catch(err) {
-                console.log(err);
-                return false;
-            }
+            else return false;
         }
 
         async getData() {
-            try {
-                await $.get("/inventory", (data) => {
-                    if (data.foundInventory) this.items = data.foundInventory.items;
+            await $.post("/s", JSON.stringify({ action: "getUserInventory" }), (res) => {
+                if (res.status === "success") {
+                    this.items = res.data;
     
                     this.clearError();
-                });
-            } 
-            catch(err) {
-                
-            }
+                }
+                else console.log(res);
+            });
         }
         
         render() {
@@ -101,34 +69,28 @@
             for (let i = 0; i < this.items.length; i++) {
                 let $new = this.$list.append(
                     `<div class="item-card">
-                        <h5>${this.items[i].item.name}</h5>
+                        <h5>${this.items[i].name}</h5>
                         <button id="${i}">X</button>
                         <hr>
                         <p>${this.items[i].amount}</p>
-                        </div>`
-                        ).children().last();
-
-                    $new.find("button").on("click", (e) => {
-                        let which = parseInt(e.currentTarget.id);
-                        
-                        this.change({
-                            item: this.items[which].item._id,
-                            amount: -1
-                        });
+                    </div>`
+                ).children().last();
 
-                        this.clearError();
-                    });
-                }
+                $new.find("button").on("click", this.reduceItem);
             }
+        }
+
+        reduceItem = (e) => {
+            let which = parseInt(e.currentTarget.id);
+                    
+            this.change(this.items[which].name, -1);
+
+            this.clearError();
+        }
         
         async refresh() {
-            try {
-                await this.getData();
-                this.render();
-            } 
-            catch(err) {
-                
-            }
+            await this.getData();
+            this.render();
         }
         
         clearError() {
@@ -140,26 +102,6 @@
             this.$error.removeClass("invisible");
         }
 
-        renderSearchResults(results) {
-            this.$searchResults.empty();
-            this.searchResults = results;
-
-            for (let i = 0; i < this.searchResults.length; i++) {
-                let $new = this.$searchResults.append(
-                                                        `<p id="${i}">${this.searchResults[i].name}</p>`
-                                                    ).children().last();
-
-                $new.on("click", (e) => {
-                    let which = parseInt(e.currentTarget.id);
-
-                    this.change({
-                        item: this.searchResults[which]._id,
-                        amount: 1
-                    });
-                });
-            }
-        }
-
         hasItem(itemName, minAmount = 1) {
             for (let i = 0; i < this.items.length; i++) {
                 if (this.items[i].item.name === itemName) {

package/views/menu.ejs

@@ -25,11 +25,11 @@
     <div id="content-window">
         <%- include("./inventory.ejs"); %>
         <%- include("./player.ejs"); %>
-        <%- include("./account.ejs"); %>
+        <%- include("./account.ejs", { user: user }); %>
         <%- include("./more.ejs"); %>
     </div>
 
-    <a href="/user/logout" id="logout">Logout</a>
+    <button onclick="logout()">Logout</button>
 </div>
 
 <button id="menu"><i class="fas fa-cog"></i></button>
@@ -75,5 +75,11 @@
         $(`.menu .tabs #${id}`).addClass("selected");
     }
 
+    let logout = () => {
+        $.post("/s", JSON.stringify({
+            action: "logout"
+        }), () => {location.reload();});
+    }
+
     switchTab("inventory");
 </script>

package/views/more.ejs

@@ -1,22 +1,16 @@
 <div class="content invisible" id="more">
     <h4>Message Nother</h4>
     <textarea id="content"></textarea>
-    <button id="send">Send Message</button>
+    <button id="send" onclick="sendMessageToNother()">Send Message</button>
 </div>
 
 <script>
-    $("#contact").on("click", (e) => {
-        $("#contact-form").toggleClass("invisible");
-    });
-
-    $("#send").on("click", (e) => {
-        $.post("/contact", 
-        {
-            location: currentRoute,
-            content: $("#content").val(),
-        }, 
-        function () {
-            $("#content").val("");
+    let sendMessageToNother = async () => {
+        await commune("contactNother", {
+            content: $(".menu .content#more #content").val(),
+            route: currentRoute
         });
-    });
+
+        $(".menu .content#more #content").val("");
+    }
 </script>

package/views/player.ejs

@@ -6,39 +6,52 @@
     class PlayerAttributes {
         constructor() {
             this.$content = $(".content#player");
+            this.attributes = [];
 
             <% if (user) { %>
                 this.refresh();
             <% } %>
         }
 
-        async setAtt(change, to) {
-            await $.post("/user/attributes", { change: change, to: to }, async (data) => {
-                await this.refresh();
-            });
+        async set(change, to) {
+            let response = await commune("setAttribute", { change: change, to: to });
+            this.attributes = response.data;
+            await this.render();
+        }
+
+        async increment(which) {
+            let response = await commune("incrementAttribute", { change: which, max: 20 });
+            this.attributes[which] = response.data;
+            await this.render();
+        }
+
+        async check(which, against) {
+            let response = await commune("checkAttribute", { check: which, against: against });
+            await this.render();
         }
 
         async refresh() {
-            try {
-                await $.get("/user/attributes", (data) => {
-                    this.$content.empty();
-                    for (const [key, value] of Object.entries(data)) {
-                        <% if (user) { 
-                             if (user.authLevels.includes("Creator")) { %>
-                                this.$content.append(`<h3 id="${key}">
-                                    ${key}: ${value}
-                                    <input type="number"></input>
-                                    <button onclick="playerAttributes.setAtt('${key}', $('.content#player h3#${key} input').val())">Set</button>
-                                </h3>`);
-                            <% } 
-                        } else { %>
-                            this.$content.append(`<h3 id="${key}">${key}: ${value}</h3>`);
-                        <% } %>
-                    }
-                });
-            } 
-            catch(err) {
-                console.log(err);
+            let response = await commune("attributes");
+            this.attributes = response.data;
+
+            this.render();
+        }
+
+        render() {
+            this.$content.empty();
+
+            for (const [key, value] of Object.entries(this.attributes)) {
+                <% if (user && user.authLevels.includes("Creator")) { %>
+                    this.$content.append(`<h3 id="${key}">
+                        ${key}: ${value}
+                        <input type="number"></input>
+                        <button onclick="playerAttributes.set('${key}', $('.content#player h3#${key} input').val())">Set</button>
+                        <button onclick="playerAttributes.increment('${key}')">+</button>
+                        <button onclick="playerAttributes.check('${key}', $('.content#player h3#${key} input').val())">Check</button>
+                    </h3>`);
+                <% } else { %>
+                    this.$content.append(`<h3 id="${key}">${key}: ${value}</h3>`);
+                <% } %>
             }
         }
     }

package/controllers/authCheck.js

@@ -1,18 +0,0 @@
-import { connectionSuccess } from "../models/index.js";
-
-const authCheck = async function authCheck(req, res, next){
-    if (connectionSuccess) {
-        if (req.session.currentUser) {
-            next();
-        }
-        else {
-            res.redirect("/the-front");
-        }
-    }
-    else {
-        console.log("AuthCheck failed: not connected to db");
-        res.redirect("/the-front");
-    }
-}
-
-export default authCheck;

package/controllers/contact.js

@@ -1,22 +0,0 @@
-import express from "express";
-const router = express.Router();
-
-import contact from "../models/contact.js";
-
-router.post("/", async function(req, res) {
-    try {
-        await contact.create({
-            user: req.session.currentUser,
-            location: req.body.location,
-            content: req.body.content
-        });
-
-        res.status(200).end();
-    }
-    catch(err) {
-        res.status(500).end();
-        console.log(err);
-    }
-});
-
-export default router;

package/controllers/explorer.js

@@ -1,150 +0,0 @@
-import express from "express";
-import fs from 'fs';
-
-let router = express.Router();
-
-router.post(`/:region/:area/:poi/:detail/serve/:script`, async function(req, res) {
-    try {
-        let currentAreaRoute = `${req.params.region}/${req.params.area}/${req.params.poi}`;
-        let currentRoute = `${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`;
-        const foundUser = await req.db.user.findById(req.session.currentUser);
-
-        let script = await import(`${req.worldDir}/${currentAreaRoute}/server-scripts/${req.params.script}.js`);
-        let scriptResult = await script.default(req.db, currentRoute, foundUser, req.body);
-        res.send({ scriptResult: scriptResult });
-    }
-    catch(err) {
-        console.log(err);
-        res.status(500).end();
-    }
-});
-
-router.get(`/recall`, async function(req, res) {
-    try {
-        let exists = await req.db.detail.exists({ 
-            route: req.query.route,
-            service: req.query.service,
-            scope: "local",
-            user: req.session.currentUser
-        });
-
-        if (!exists) {
-            await req.db.detail.create({
-                _lastUpdate: Date.now(),
-                route: req.query.route,
-                service: req.query.service,
-                scope: "local",
-                user: req.session.currentUser,
-                data: {}
-            });
-        }
-
-        let found = await req.db.detail.findOne({ 
-            route: req.query.route,
-            service: req.query.service,
-            scope: "local",
-            user: req.session.currentUser
-        });
-
-        if (new Date(found._lastUpdate) > new Date(req.query._lastUpdate)) {
-            res.send({
-                isUpToDate: false,
-                data: found.data
-            });
-        }
-        else res.send({
-            isUpToDate: true,
-            data: null
-        });
-    }
-    catch(err) {
-        console.log(err);
-        res.status(500).end();
-    }
-});
-
-router.post(`/commit`, async function(req, res) {
-    try {
-        await req.db.detail.updateOne({ 
-            route: req.body.route,
-            service: req.body.service,
-            scope: "local",
-            user: req.session.currentUser
-        }, { 
-            route: req.body.route,
-            service: req.body.service,
-            scope: "local",
-            user: req.session.currentUser,
-            _lastUpdate: req.body.time,
-            data: req.body.data
-        }, {
-            upsert: true
-        });
-
-        res.send("Update successful!");
-    }
-    catch(err) {
-        console.log(err);
-        res.status(500).end();
-    }
-});
-
-router.get(`/:region/:area/:poi/:detail`, async function(req, res, next) {
-    try {
-        let main = `${req.worldDir}/${req.params.region}/${req.params.area}/${req.params.poi}/views/${req.params.detail}`;
-
-        if (fs.existsSync(main + ".ejs")) {
-            const foundUser = await req.db.user.findById(req.session.currentUser);
-            const foundInventory = await req.db.inventory.findOne({ user: req.session.currentUser }).populate("items.item");
-
-            let context = {
-                siteTitle: `NotherBase - ${req.params.detail}`,
-                user: foundUser,
-                main: main,
-                pov: req.query.pov,
-                inventory: foundInventory,
-                query: req.query,
-                dir: req.worldDir,
-                route: `/${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`
-            }
-    
-            await res.render(`explorer`, context);
-        } 
-        else next();
-    }
-    catch(err) {
-        console.log(err);
-        res.status(500).end();
-    }
-});
-
-router.get(`/:region/:area/:poi`, async function(req, res, next) {
-    try {
-        let main = `${req.worldDir}/${req.params.region}/${req.params.area}/${req.params.poi}/views/index`;
-
-        if (fs.existsSync(main + ".ejs")) {
-            const foundUser = await req.db.user.findById(req.session.currentUser);
-            const foundInventory = await req.db.inventory.findOne({ user: req.session.currentUser }).populate("items.item");
-
-            let context = {
-                siteTitle: `NotherBase - ${req.params.poi}`,
-                user: foundUser,
-                main: main,
-                pov: req.query.pov,
-                inventory: foundInventory,
-                query: req.query,
-                dir: req.worldDir,
-                route: `/${req.params.region}/${req.params.area}/${req.params.poi}`
-            }
-    
-            await res.render(`explorer`, context);
-        } 
-        else next();
-    }
-    catch(err) {
-        console.log(err);
-        res.status(500).end();
-    }
-});
-
-export default router;