notherbase-fs 1.3.5 → 1.3.8

package/controllers/explorer.js

@@ -23,7 +23,7 @@ const explorer = async function explorer(worldPath, voidPath) {
                 await db.poi.create({
                     route: currentRoute,
                     name: req.params.detail,
-                    type: "local",
+                    type: "user",
                     user: req.session.currentUser,
                     data: {}
                 });
@@ -37,6 +37,55 @@ const explorer = async function explorer(worldPath, voidPath) {
             res.status(500).end();
         }
     });
+
+    router.get(`/:region/:area/:poi/:detail/load`, async function(req, res) {
+        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 found = await db.poi.findOne({ route: currentRoute, user: req.session.currentUser });
+    
+            if (found) res.send(found.data);
+            else res.send("Found nothing.");
+        }
+        catch(err) {
+            console.log(err);
+            res.status(500).end();
+        }
+    });
+
+    router.post(`/:region/:area/:poi/:detail/save`, async function(req, res) {
+        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: {}
+                });
+            }
+
+            await db.poi.updateOne({ route: currentRoute, user: req.session.currentUser }, { data: req.body });
+    
+            res.send("Update successful!");
+        }
+        catch(err) {
+            console.log(err);
+            res.status(500).end();
+        }
+    });
     
     router.get(`/:region/:area/:poi/:detail`, async function(req, res) {
         try {

package/package.json

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

package/public/styles/main.css

@@ -18,6 +18,7 @@
     margin: 0;
     padding: 0;
     color: var(--textColor);
+    font-family: 'Roboto', sans-serif;
 }
 
 .invisible {

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

@@ -90,9 +90,10 @@
 
     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);
+            time += 10;
+
+            await $.post(`/coast/tall-beach/nono-cove/index/save`, { timer: time, lastTime: Date.now() }, function () {
+                $("#timer").text(Math.floor(time));
             });
         } catch (error) {
             console.log(error);
@@ -101,9 +102,15 @@
 
     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);
+            await $.get(`/coast/tall-beach/nono-cove/index/load`, function (data) {
+                console.log(data);
+                data.timer = parseFloat(data.timer);
+                data.lastTime = parseFloat(data.lastTime);
+                console.log(data);
+                console.log(Date.now());
+                time = data.timer - ((Date.now() - data.lastTime) / 1000);
+                if (time < 0) time = 0;
+                $("#timer").text(Math.floor(time));
             });
         } catch (error) {
             console.log(error);
@@ -113,8 +120,10 @@
     let updateTime = function updateTime() {
         if (time > 0) {
             time--;
-            $("#timer").text(time);
+            if (time < 0) time = 0;
+            $("#timer").text(Math.floor(time));
         }
+        
     }
 
     setInterval(updateTime, 1000);

package/views/head.ejs

@@ -7,8 +7,8 @@
     <script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <!-- 'Roboto Condensed', sans-serif; -->
-    <link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@700&display=swap" rel="stylesheet">
+    <!-- font-family: 'Roboto' or 'Roboto Condensed', sans-serif; -->
+    <link href="https://fonts.googleapis.com/css2?family=Roboto&family=Roboto+Condensed:wght@700&display=swap" rel="stylesheet">
     <!-- 'Redacted Script', cursive; -->
     <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">