notherbase-fs 1.2.14 → 1.3.0

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

@@ -0,0 +1,162 @@
+class ItemFloor {
+    constructor() {
+        this.items = [];
+        this.$itemList = $(".floor#items ul.items");
+        this.$items = $(".floor#items ul.items li");
+
+        this.$read = $(".floor#items .editor .read");
+        this.$readName = $(".floor#items .editor .read #name");
+        this.$readShort = $(".floor#items .editor .read #short");
+        this.$readFull = $(".floor#items .editor .read #full");
+
+        this.$edit = $(".floor#items .editor .edit");
+        this.$editName = $(".floor#items .editor .edit #name");
+        this.$editShort = $(".floor#items .editor .edit #short");
+        this.$editFull = $(".floor#items .editor .edit #full");
+
+        this.selected = -1;
+        this.state = "reading";
+
+        this.updateItems();
+    }
+
+    hasValidSelection() {
+        return (this.selected > -1 && this.selected < this.items.length);
+    }
+
+    async updateItems() {
+        try {
+            await $.get(`/item/all`, (data) => {
+                this.items = data.foundItems;
+                this.renderItemList();
+            });
+        } 
+        catch(err) {
+            console.log(err);
+        }
+    };
+
+    renderItemList() {
+        this.$itemList.empty();
+
+        for (let i = 0; i < this.items.length; i++) {
+            $(".floor#items ul.items").append(`<li onClick="itemFloor.selectItem(${i})">${this.items[i].name}</li>`);
+        };
+
+        this.$items = $(".floor#items ul.items li");
+        this.selectItem(this.selected);
+    }
+    
+    createNewItem() {
+        if (this.state === "reading") {
+            this.items.push({
+                _id: null,
+                name: "New Item",
+                shortDescription: "Short Description",
+                fullDescription: "Full Description"
+            });
+
+            this.renderItemList();
+            this.selectItem(this.items.length - 1);
+            this.editSelectedItem();
+        }
+    };
+
+    selectItem(index) {
+        this.$items.removeClass("selected");
+        this.selected = index;
+
+        if (index > -1) {
+            $(this.$items[index]).addClass("selected");
+        }
+
+        this.readSelectedItem();
+    }
+
+    readSelectedItem() {
+        this.cancelEdit();
+
+        if (this.hasValidSelection()) {
+            this.$readName.text(this.items[this.selected].name);
+            this.$readShort.text(this.items[this.selected].shortDescription);
+            this.$readFull.text(this.items[this.selected].fullDescription);
+        }
+        else {
+            this.$readName.text("Please select an item from the list.");
+            this.$readShort.text("");
+            this.$readFull.text("");
+        }
+    }
+
+    editSelectedItem() {
+        if (this.hasValidSelection()) {
+            if (this.state != "editing") {
+                this.$read.addClass("invisible");
+            }
+    
+            this.state = "editing";
+            this.$edit.removeClass("invisible");
+    
+            this.$editName.val(this.items[this.selected].name);
+            this.$editShort.val(this.items[this.selected].shortDescription);
+            this.$editFull.val(this.items[this.selected].fullDescription);
+        }
+    }
+
+    async saveSelectedItem() {
+        if (this.state === "editing") {
+            try {
+                await $.post("/item", {
+                    id: this.items[this.selected]._id,
+                    name: this.$editName.val(),
+                    shortDescription: this.$editShort.val(),
+                    fullDescription: this.$editFull.val(),
+                }, () => {
+                    this.items[this.selected].name = this.$editName.val();
+                    this.items[this.selected].shortDescription = this.$editShort.val();
+                    this.items[this.selected].fullDescription = this.$editFull.val();
+                    this.cancelEdit();
+                    this.updateItems();
+                });
+            } 
+            catch(err) {
+                console.log(err);
+            }
+        }
+    }
+
+    cancelEdit() {
+        if (this.state === "editing") {
+            this.$edit.addClass("invisible");
+            this.$read.removeClass("invisible");
+            this.state = "reading";
+        }
+    }
+
+    async deleteSelectedItem() {
+        if (this.state === "reading" && this.hasValidSelection()) {
+            try {
+                await $.post("/item/delete", {
+                    id: this.items[this.selected]._id
+                }, () => {
+                    this.selectItem(-1);
+                    this.updateItems();
+                });
+            } 
+            catch(err) {
+                console.log(err);
+            }
+        }
+    }
+}
+
+let itemFloor = new ItemFloor();
+
+
+
+
+
+
+$(".floor button#toggle").on("click", function (e) {
+    $(e.target.parentElement).find(".content").toggleClass("invisible");
+});

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

@@ -52,7 +52,7 @@ class NonoGame {
         this.tiles = [];
         this.nonoSize = 100;
         this.maxNonoId = 4;
-        this.goldItem = itemIDs[0];
+        this.goldItem = "Gold Coin";
 
         this.startNew();
     }
@@ -185,10 +185,7 @@ class NonoGame {
 
     tryFinishGame() {
         if (this.checkForSolve()) {
-            playerInventory.change({ 
-                item: this.goldItem, 
-                amount: this.level + this.difficulty
-            });
+            playerInventory.change(this.goldItem, this.level + this.difficulty);
 
             let $tiles = $(".nono-tile");
             $tiles.off("click");

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

@@ -0,0 +1,34 @@
+module.exports = async function addToTimer(db, route, user, params) {
+    try {
+        let poi = await db.poi.findOne({ route: route, user: user });
+
+        let now = Date.now();
+
+        console.log(poi.data);
+        if (!poi.data) poi.data = {
+            timer: 0,
+            lastTime: now
+        }
+        else {
+            if (!poi.data.lastTime) poi.data.lastTime = now;
+            if (!poi.data.timer) poi.data.timer = 0;
+        }
+        console.log(poi.data);
+
+        let difference = (now - poi.data.lastTime) / 1000;
+        poi.data.timer -= difference;
+        if (poi.data.timer < 0) poi.data.timer = 0;
+
+        console.log(poi.data);
+        poi.data.timer = poi.data.timer + 10;
+        poi.data.lastTime = Date.now();
+
+        poi.markModified("data");
+        await poi.save();
+        return poi.data.timer;
+    } 
+    catch(err) {
+        console.log(err);
+        return false;
+    }
+}

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

@@ -0,0 +1,31 @@
+module.exports = async function getTimer(db, route, user, params) {
+    try {
+        let poi = await db.poi.findOne({ route: route, user: user });
+
+        let now = Date.now();
+
+        if (!poi.data) poi.data = {
+            timer: 0,
+            lastTime: now
+        }
+        else {
+            if (!poi.data.lastTime) poi.data.lastTime = now;
+            if (!poi.data.timer) poi.data.timer = 0;
+        }
+
+        let difference = (now - poi.data.lastTime) / 1000;
+
+        poi.data.timer -= difference;
+        if (poi.data.timer < 0) poi.data.timer = 0;
+        poi.data.lastTime = now;
+
+        poi.markModified("data");
+        await poi.save();
+
+        return poi.data.timer;
+    } 
+    catch(err) {
+        console.log(err);
+        return false;
+    }
+}

package/test/coast/tall-beach/nono-cove/styles/items-floor.css

@@ -0,0 +1,92 @@
+:root {
+    --bgColor: rgb(37, 37, 37);
+    --bgColorBright: rgb(66, 66, 66);
+    --shadowColor: rgb(26, 26, 26);
+    --textColor: rgb(185, 135, 69);
+    --textColorBright: rgb(221, 181, 130);
+    --standardBorder: 1px solid var(--textColor);
+    --standardRadius: 5px;
+}
+
+.floor#items ul.items {
+    width: 40%;
+    height: 800px;
+    border: var(--standardBorder);
+    padding: 5px;
+    margin: 0;
+}
+
+.floor#items ul.items li {
+    list-style: none;
+    cursor: pointer;
+}
+
+.floor#items ul.items li:hover {
+    background-color: var(--bgColorBright);
+}
+
+.floor#items ul.items li.selected {
+    background-color: var(--shadowColor);
+}
+
+.floor#items .editor {
+    width: 55%;
+    height: 800px;
+    border: var(--standardBorder);
+    padding: 10px;
+}
+
+.floor#items .read h5 {
+    margin: 10px;
+}
+
+.floor#items .read #name {
+    margin: 20px;
+}
+
+.floor#items .read #short {
+    width: 100%;
+    height: 100px;
+    border: var(--standardBorder);
+    padding: 2px;
+}
+
+.floor#items .read #full {
+    width: 100%;
+    height: 250px;
+    border: var(--standardBorder);
+    padding: 2px;
+}
+
+.floor#items .edit h5 {
+    margin: 10px;
+}
+
+
+.floor {
+    width: 100%;
+    min-height: 50px;
+    border: 1px solid var(--shadowColor);
+    background-color: var(--bgColor);
+    padding: 10px;
+    display: flex;
+    align-items: flex-start;
+    justify-content: center;
+    flex-wrap: wrap;
+}
+
+.floor h2 {
+    width: 90%;
+}
+
+.floor button {
+    margin: 0;
+}
+
+.floor .content {
+    width: 100%;
+    display: flex;
+    align-items: flex-start;
+    justify-content: center;
+    flex-wrap: wrap;
+}

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

@@ -4,10 +4,58 @@
 
 <hr>
 
-<div class="game">
-    <h3><%= serverScriptReturns[0] %>Text</h3>
-    <button>Click</button>
-</div>
+<h3>Game Test</h3>
+
+<button onclick="addToTime()">Add</button>
+<p id="timer">0:00</p>
+
+<hr>
+
+<button onclick="tradeForDoll()">Trade 5g for a doll</button>
+
+<hr>
+
+<section class="floor" id="items">
+    <h2>Items</h2>
+    <button id="toggle">Toggle</button>
+
+    <div class="content invisible">
+        <ul class="items">
+
+        </ul>
+    
+        <div class="editor">
+            <div class="edit invisible">
+                <h5>Item Name:</h5>
+                <input type="text" id="name">
+            
+                <h5>Short Item Description:</h5>
+                <textarea id="short" name="short" cols="30" rows="3"></textarea>
+            
+                <h5>Full Item Description:</h5>
+                <textarea id="full" name="full" cols="30" rows="10"></textarea>
+
+                <button id="cancel" onclick="itemFloor.cancelEdit()">Cancel</button>
+                <button id="save" onclick="itemFloor.saveSelectedItem()">Save</button>
+            </div>
+
+            <div class="read">
+                <h5 id="name">Item Name</h5>
+            
+                <h5>Short Item Description:</h5>
+                <p id="short"></p>
+            
+                <h5>Full Item Description:</h5>
+                <p id="full"></p>
+
+                <button id="new" onclick="itemFloor.createNewItem()">Create New</button>
+                <button id="edit" onclick="itemFloor.editSelectedItem()">Edit</button>
+                <button id="delete" onclick="itemFloor.deleteSelectedItem()">Delete</button>
+                <button id="refresh" onclick="itemFloor.updateItems()">Refresh List</button>
+            </div>
+        </div>
+    </div>
+</section>
 
 <hr>
 
@@ -17,4 +65,44 @@
 
 <a href="/coast/tall-beach/nono-cove/nono-og" class="to">
     Go to Nono Cove
-</a>
+</a>
+
+<script>
+    let tradeForDoll = async function tradeForDoll() {
+        if (await playerInventory.change(itemIDs[0], -5)) await playerInventory.change(itemIDs[1], 1);
+    }
+
+    let time = 0;
+
+    let addToTime = async function addToTime() {
+        try {
+            await $.post(`/coast/tall-beach/nono-cove/index/serve/addToTimer`, function (data) {
+                time = Math.floor(data.scriptResult);
+                $("#timer").text(time);
+            });
+        } catch (error) {
+            console.log(error);
+        }
+    }
+
+    let getTime = async function getTime() {
+        try {
+            await $.post(`/coast/tall-beach/nono-cove/index/serve/getTimer`, function (data) {
+                time = Math.floor(data.scriptResult);
+                $("#timer").text(time);
+            });
+        } catch (error) {
+            console.log(error);
+        }
+    }
+    
+    let updateTime = function updateTime() {
+        if (time > 0) {
+            time--;
+            $("#timer").text(time);
+        }
+    }
+
+    setInterval(updateTime, 1000);
+    getTime();
+</script>

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

@@ -1,3 +1,7 @@
+<style>
+    <%- include("../styles/nono.css"); %>
+</style>
+
 <p>
     A random nono washes up on shore. Will you solve it?
 </p>
@@ -34,4 +38,6 @@
     moveNono();
 
     setInterval(moveNono, 2000);
+
+    <%- include("../local-scripts/nono.js"); %>
 </script>

package/test/test-index.js

@@ -1,66 +1,4 @@
 const path = require('path');
-const notherbase = require("../index");
+const notherBaseFS = require("../notherbase-fs");
 
-const world = {
-    explorer: {
-        name: "explorer",
-        dirname: __dirname,
-        options: {},
-        void: "void",
-        regions: [
-            {
-                name: "coast",
-                dirname: __dirname,
-                options: {},
-                areas: [
-                    {
-                        name: "tall-beach",
-                        dirname: __dirname,
-                        options: {},
-                        pois: [
-                            {
-                                name: "nono-cove",
-                                dirname: __dirname,
-                                options: {},
-                                details: [
-                                    {
-                                        name: "",
-                                        options: {
-                                            localScripts: ["game"],
-                                            serverScripts: ["game"]
-                                        }
-                                    },
-                                    {
-                                        name: "nono-og",
-                                        options: {
-                                            localScripts: ["nono"],
-                                            styles: ["nono"],
-                                            requiredItems: [
-                                                "Gold Coin"
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    theFront: {
-        name: "the-front",
-        dirname: __dirname,
-        options: {},
-        details: [
-            {
-                name: "",
-                options: {
-                    requiredItems: ["Gold Coin"]
-                }
-            }
-        ]
-    }
-};
-
-notherbase.start(world, path.resolve(__dirname, "pages"));
+notherBaseFS.start(__dirname, `${__dirname}/void`, __dirname, `${__dirname}/pages`);

package/test/views/check.ejs

@@ -0,0 +1,7 @@
+<p>Hello</p>
+
+<hr>
+
+<a href="/the-front">
+    Go to The Front
+</a>

package/test/views/index.ejs

@@ -45,6 +45,10 @@
     Go inside
 </a>
 
+<a href="/the-front/check">
+    Go to The Check
+</a>
+
 <script>
     let $resetPassword = $("#reset-password");
     let $loginButton = $("#login-button");

package/views/explorer.ejs

@@ -1,28 +1,5 @@
 <%- 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`); %>
-    <% } %>
-    <% for (let i = 0; i < externalStyles.length; i++) { %>
-        <%- include(`${externalStyles[i]}.css`); %>
-    <% } %>
-</style>
-
-<script>
-    let itemIDs = [];
-    <% for (let i = 0; i < itemIDs.length; i++) { %>
-        itemIDs.push("<%= itemIDs[i] %>");
-    <% } %>
-</script>
-
 <main class="override">
     <%- include(`${main}.ejs`); %>
 </main>
@@ -31,10 +8,4 @@
     <%- include("./menu.ejs", {user: user}); %>
 </div>
 
-<script>
-    <% for (let i = 0; i < localScripts.length; i++) { %>
-        <%- include(`${localScripts[i]}.js`); %>
-    <% } %>
-</script>
-
 <%- include("./footer.ejs"); %>

package/views/inventory.ejs

@@ -38,14 +38,14 @@
             setInterval(this.update, this.updateCooldown);
         }
 
-        async change(itemID, amount) {
+        async change(itemName, amount) {
             let change = {
-                item: itemID,
+                item: itemName,
                 amount: amount
             }
 
-            await $.post("/inventory", change, (data, status) => {
-                if (status === "success") {
+            try {
+                await $.post("/inventory", change, (data, status) => {
                     let holding = false;
 
                     for (let i = 0; i < this.items.length; i++) {
@@ -62,9 +62,14 @@
                     }
 
                     this.render();
-                }
-                else console.log(status);
-            });
+                });
+
+                return true;
+            }
+            catch(err) {
+                console.log(err);
+                return false;
+            }
         }
 
         async getData() {

package/index.js

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