notherbase-fs 3.0.1 → 3.0.3

package/controllers/creation.js

@@ -11,7 +11,7 @@ export default class Creation {
         this.router.get(`/the-front`, this.explore);
         this.router.get(`/the-front/:frontDetail`, this.explore);
         //pages
-        this.router.get(`/:page`, this.explore);
+        this.router.get(`/:page`, this.page);
         //explorer
         this.router.get(`/:region/:area/:poi`, this.lock, this.explore);
         this.router.get(`/:region/:area/:poi/:detail`, this.lock, this.explore);
@@ -85,4 +85,40 @@ export default class Creation {
             res.status(500).end();
         }
     }
+
+    page = async (req, res, next) => {
+        let main = `${req.contentPath}`;
+
+        main += `/${req.params.page}/index.ejs`;
+
+        try {
+            if (fs.existsSync(main)) {
+                let user = await req.db.User.recallOne(req.session.currentUser);
+
+                let userStuff = {
+                    userID: null,
+                    user: null
+                };
+
+                if (user) userStuff = {
+                    userID: user.id,
+                    user: user.memory.data
+                };
+
+                let context = {
+                    ...userStuff,
+                    query: req.query,
+                    dir: req.frontDir,
+                    route: req.path
+                }
+
+                res.render(main, context);
+            }
+            else next();
+        }
+        catch(err) {
+            console.log(err);
+            res.status(500).end();
+        }
+    }
 }

package/models/index.js

@@ -63,11 +63,30 @@ catch (err) {
     
 //     user.find({}, async (err, users) => {
 //         for (let i = 0; i < users.length; i++) {
-//             let userSpirit = await User.create(
-//                 users[i].username,
-//                 users[i].password,
-//                 users[i].email
-//             );
+//             let userSpirit = await Spirit.create({
+//                 route: "/",
+//                 service: "user",
+//                 scope: "global",
+//                 parent: null,
+//                 _lastUpdate: Date.now()
+//             }, {
+//                 username: users[i].username,
+//                 password: users[i].password,
+//                 email: users[i].email,
+//                 resetToken: null,
+//                 resetExp: null,
+//                 coin: 0,
+//                 home: "/",
+//                 authLevels: [ "Basic" ],
+//                 location: "/the-front",
+//                 attributes: {
+//                     translation: 0,
+//                     strength: 0,
+//                     agility: 0,
+//                     defense: 0
+//                 },
+//                 inventory: []
+//             });
             
 //             let foundPages = await page.find({ user: users[i]._id });
     

package/models/spirit.js

@@ -92,6 +92,7 @@ export default class Spirit {
             return spirit;
         }
         else {
+            options._lastUpdate = Date.now();
             let newSpirit = await Spirit.create(options, initdata);
             return newSpirit;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Functions to help make developing for NotherBase easier.",
   "exports": "./notherbase-fs.js",
   "scripts": {

package/views/scripts/base.js

@@ -6,7 +6,7 @@ class Base {
 
         await $.post(route, JSON.stringify(body), (res) => {
             response = res;
-            if (res.status != "success") console.log(`${route} - ${res}`);
+            if (res.status != "success") console.log(`${route} - ${res.message}`);
         });
     
         return response;