notherbase-fs 1.0.38 → 1.0.39

package/controllers/user.js

@@ -0,0 +1,111 @@
+const express = require("express");
+const router = express.Router();
+const bcrypt = require("bcrypt");
+
+// Import my Data
+const User = require("./models.js").user;
+const inventory = require("../../models/inventory");
+
+const authCheck = require("../authCheck");
+
+router.post("/register", async function(req, res) {
+    try {
+        const foundAccount = await User.findOne({ username: req.body.username });
+
+        if (!foundAccount) {
+            const salt = await bcrypt.genSalt(10);
+            const hash = await bcrypt.hash(req.body.password, salt);
+
+            let qAuth = await User.create({
+                username: req.body.username,
+                password: hash,
+                email: "temp@example.com",
+                coin: 0,
+                home: "/",
+                authLevels: [ "Basic" ]
+            });
+
+            await inventory.create({
+                user: qAuth._id,
+                items: []
+            });
+    
+            res.status(200).send("Registration Successful!");
+        }
+        else {
+            res.status(400).send("Registration Failed: Username taken!");
+        }
+    }
+    catch(err) {
+        console.log(err);
+
+        res.status(500).send("Registration Failed: Database error!");
+    }
+});
+
+router.post("/login", async function(req, res) {
+    try {
+        const foundAccount = await User.findOne({ username: req.body.username });
+
+        if (foundAccount) {
+            if (await bcrypt.compare(req.body.password, foundAccount.password)) {
+                req.session.currentUser = { _id: foundAccount._id };
+                req.session.currentUserFull = foundAccount;
+
+                res.status(200).send("Login successful!");
+            }
+            else {
+                res.status(401).send("Login Failed: Password incorrect!");
+            }
+        }
+        else {
+            res.status(401).send("Login Failed: Username not found!");
+        }
+    }
+    catch(err) {
+        console.log(err);
+
+        res.status(500).send("Login Failed: Database error!");
+    }
+});
+
+router.get("/logout", authCheck, async function(req, res) {
+    try {
+        await req.session.destroy();
+
+        res.redirect(`/`);
+    }
+    catch {
+        console.log(err);
+    }
+});
+
+router.get("/all", authCheck, async function(req, res) {
+    try {
+        let foundUsers = await User.find({}, 'username coin home authLevels location');
+
+        res.status(200).send({ foundUsers: foundUsers });
+    }
+    catch(err) {
+        res.status(500).end();
+        console.log(err);
+    }
+});
+
+router.delete("/", authCheck, async function(req, res) {
+    try {
+        const found = await User.findByIdAndDelete(req.session.currentUser);
+
+        if (!found) console.log("Could not find account. No deletion!");
+
+        await req.session.destroy();
+
+        res.redirect("/");
+    }
+    catch {
+        console.log(err);
+    }
+});
+
+module.exports = router;
+

package/index.js

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

package/models/chat.js

@@ -0,0 +1,13 @@
+const mongoose = require("mongoose");
+
+//get schema template
+const Schema = mongoose.Schema;
+const chatSchema = new Schema({
+    name: String,
+	text: String,
+    date: Number
+});
+
+module.exports = {
+    chat: mongoose.model('chat', chatSchema)
+};

package/models/contact.js

@@ -0,0 +1,17 @@
+// This allows us to use Mongoose to connect to MongoDB
+const mongoose = require("mongoose");
+
+// This shows the kind of documents we're interacting with in the db
+const contact = new mongoose.Schema({
+	user: { 
+		type: mongoose.Schema.Types.ObjectId, 
+		ref: "users",
+		required: true
+	},
+	location: String,
+	content: String
+});
+
+// This tells Mongoose to use the exampleSchema to access the examples collection
+// in our db and then exports the model so we can use it.
+module.exports = mongoose.model('contacts', contact);

package/models/index.js

@@ -0,0 +1,11 @@
+module.exports = {
+    chat: require("chat"),
+    item: require("item"),
+    user: require("user"),
+    contact: require("contact"),
+    explorer: require("explorer"),
+    front: require("the-front"),
+    inventory: require("inventory"),
+}
+
+require("start-mongoose");

package/models/inventory.js

@@ -0,0 +1,22 @@
+// This allows us to use Mongoose to connect to MongoDB
+const mongoose = require("mongoose");
+
+// This shows the kind of documents we're interacting with in the db
+const inventory = new mongoose.Schema({
+	user: { 
+		type: mongoose.Schema.Types.ObjectId, 
+		ref: "users",
+		required: true
+	},
+	items: [{
+		item: { 
+			type: mongoose.Schema.Types.ObjectId, 
+			ref: "items"
+		},
+		amount: Number
+	}]
+});
+
+// This tells Mongoose to use the exampleSchema to access the examples collection
+// in our db and then exports the model so we can use it.
+module.exports = mongoose.model('inventories', inventory);

package/models/item.js

@@ -0,0 +1,12 @@
+// This allows us to use Mongoose to connect to MongoDB
+const mongoose = require("mongoose");
+
+const item = new mongoose.Schema({
+	name: String,
+	shortDescription: String,
+	fullDescription: String
+});
+
+// This tells Mongoose to use the exampleSchema to access the examples collection
+// in our db and then exports the model so we can use it.
+module.exports = mongoose.model('items', item);

package/models/start-mongoose.js

@@ -0,0 +1,22 @@
+const mongoose = require("mongoose");
+
+//connect mongoose and mongo
+mongoose.connect(process.env.MONGODB_URI, { 
+	useNewUrlParser: true,
+	useUnifiedTopology: true,
+	useCreateIndex: true,
+	useFindAndModify: false,
+});
+
+//handlers
+mongoose.connection.on('connected', () => {
+console.log(`Mongoose connected to db`);
+});
+
+mongoose.connection.on('error', (err) => {
+console.log(`Mongoose connected error ${err}`);
+});
+
+mongoose.connection.on('disconnected', () => {
+console.log('Mongoose disconnected');
+});

package/models/user.js

@@ -0,0 +1,16 @@
+const mongoose = require("mongoose");
+
+//convert schema to model
+const user = mongoose.model('users',
+    new mongoose.Schema({
+        username: String,
+        password: String,
+        email: String,
+        coin: Number,
+        home: String,
+        authLevels: [ String ],
+        location: String
+    })
+);
+
+module.exports = { user: user };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "notherbase-fs",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "Functions to help make developing for NotherBase easier.",
-  "main": "main.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -17,6 +17,15 @@
   },
   "homepage": "https://github.com/Mosshide/notherbase-fs#readme",
   "dependencies": {
-    "express": "^4.17.1"
+    "bcrypt": "^5.0.1",
+    "connect-mongo": "^4.6.0",
+    "dotenv": "^14.2.0",
+    "ejs": "^3.1.6",
+    "express": "^4.17.1",
+    "express-session": "^1.17.2",
+    "method-override": "^3.0.0",
+    "mongoose": "^6.1.7",
+    "serve-favicon": "^2.5.0",
+    "socket.io": "^4.4.1"
   }
 }

package/public/styles/chat.css

@@ -0,0 +1,60 @@
+.chat-box {
+    position: relative;
+    box-shadow: 5px 5px 10px 5px var(--shadowColor);
+    margin-top: 20px;
+    width: 100%;
+    min-height: 200px;
+}
+
+.chat-name {
+    color: var(--textColor);
+    padding: 10px;
+}
+
+.chat-log {
+    width: 100%;
+    height: calc(100% - 65px);
+    background-color: rgba(0, 0, 0, 0.534);
+    overflow: auto;
+    padding: 5px;
+}
+
+.chat-send {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    height: 25px;
+    width: 5em;
+    outline: none;
+    background-color: var(--bgColor);
+    border: 1px solid var(--textColor);
+    color: var(--textColor);
+    text-align: center;
+    padding: 2px;
+}
+
+.chat-send:hover {
+    border: 1px solid var(--textColorBright);
+    color: var(--textColorBright);
+    cursor: pointer;
+}
+
+.chat-entry {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    height: 25px;
+    width: calc(100% - 5em);
+    outline: none;
+    background-color: var(--bgColor);
+    border: 1px solid var(--textColor);
+    color: var(--textColor);
+}
+
+.chat-log > p {
+    color: var(--textColor);
+    margin: 0;
+    padding: 0;
+    line-height: 1em;
+    text-align: left;
+}

package/public/styles/main.css

@@ -0,0 +1,328 @@
+:root {
+    --bgColor: rgb(37, 37, 37);
+    --darkBgColor: rgb(27, 27, 27);
+    --veryDarkBgColor: rgb(15, 15, 15);
+    --lightBgColor: rgb(57, 57, 57);
+    --shadowColor: rgb(26, 26, 26);
+    --textColor: rgb(185, 135, 69);
+    --textColorBright: rgb(221, 181, 130);
+    --woodColor: rgb(95, 68, 43);
+    --darkWoodColor: rgb(70, 50, 32);
+}
+
+* {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    color: var(--textColor);
+}
+
+.invisible {
+    display: none !important;
+}
+
+body {
+    background-color: var(--darkBgColor);
+    min-height: 100vh;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    align-content: center;
+    flex-direction: column;
+    position: relative;
+}
+
+main {
+    width: 500px;
+    min-height: 500px;
+    box-shadow: 5px 5px 5px 5px var(--shadowColor);
+    padding: 20px;
+    border-radius: 5px 5px 0px 0px;
+    margin-top: 15px;
+    margin-bottom: 0;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    align-content: center;
+    align-items: flex-start;
+    background-color: var(--bgColor);
+}
+
+footer {
+    display: flex;
+    justify-content: center;
+    align-content: center;
+    align-items: flex-start;
+    min-height: 25px;
+    width: 500px;
+    background-color: var(--veryDarkBgColor);
+    border-radius: 0px 0px 5px 5px;
+    box-shadow: 5px 5px 5px 5px var(--shadowColor);
+    padding: 5px;
+    border: none;
+    margin-bottom: 100px;
+}
+
+footer a {
+    text-decoration: none;
+    height: 100%;
+    margin: 0;
+    padding: 5px;
+    width: 50%;
+    height: 100%;
+}
+
+hr {
+    border: none;
+    border-bottom: 1px solid var(--textColor);
+    margin: 20px;
+    width: 100%;
+}
+
+p {
+    color: var(--textColor);
+    margin-bottom: 10px;
+    width: 80%;
+}
+
+input, textarea {
+    padding: 10px;
+    width: calc(100% - 10px);
+    background-color: var(--bgColor);
+    border-radius: 5px;
+    border: 1px solid var(--textColor);
+    margin: 5px;
+    font-size: 15px;
+}
+
+input[type=submit], button, a {
+    background-color: var(--bgColor);
+    padding: 10px;
+    border-radius: 5px;
+    border: 1px solid var(--textColor);
+    color: var(--textColor);
+    margin: 5px;
+    margin-top: 20px;
+    text-decoration: none;
+    text-align: center;
+}
+
+input[type=submit]:hover, button:hover, a:hover {
+    border: 1px solid var(--textColorBright);
+    color: var(--textColorBright);
+    cursor: pointer;
+}
+
+.locked {
+    background-color: var(--bgColor);
+    padding: 10px;
+    border-radius: 5px;
+    border: 1px solid var(--textColor);
+    color: var(--textColor);
+    margin: 5px;
+    margin-top: 20px;
+    text-decoration: none;
+    text-align: center;
+    filter: brightness(.5);
+    user-select: none;
+}
+
+.to {
+    width: 100%;
+    height: 200px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+    padding: 20px;
+}
+
+.return {
+    width: 100%;
+    height: 75px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+    padding: 20px;
+}
+
+.do {
+    width: 100%;
+    height: 200px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: flex-end;
+    padding: 20px;
+}
+
+h2, h3 {
+    color: var(--textColor);
+    width: 100%;
+}
+
+ul {
+    margin: 10px;
+}
+
+
+#contact {
+    position: fixed;
+    bottom: 30px;
+    left: 5px;
+    width: 64px;
+    height: 64px;
+}
+
+#contact-form {
+    width: 100%;
+    border: 1px solid var(--textColor);
+    color: var(--textColor);
+    position: fixed;
+    width: 90%;
+    height: 30%;
+    left: 5%;
+    bottom: 105px;
+    background-color: var(--bgColor);
+    padding: 5px;
+    border-radius: 5px;
+    z-index: 500;
+    display: flex;
+    flex-wrap: wrap;
+    overflow: auto;
+}
+
+.inventory {
+    width: 100%;
+    border: 1px solid var(--textColor);
+    color: var(--textColor);
+    position: fixed;
+    width: 90%;
+    height: 30%;
+    left: 5%;
+    bottom: 105px;
+    background-color: var(--bgColor);
+    padding: 5px;
+    border-radius: 5px;
+    z-index: 500;
+    display: flex;
+    flex-wrap: wrap;
+    overflow: auto;
+}
+
+.inventory .item-list {
+    width: 100%;
+    display: flex;
+    flex-wrap: wrap;
+    overflow: auto;
+    border: 1px solid var(--textColor);
+}
+
+.inventory .item-spawner {
+    width: 100%;
+    border: 1px solid var(--textColor);
+}
+
+.item-spawner .search-results {
+    width: 100%;
+    border: 1px solid var(--textColor);
+    overflow: auto;
+}
+
+.search-results p {
+    width: 100%;
+    cursor: pointer;
+}
+
+.search-results p:hover {
+    background-color: var(--woodColor);
+}
+
+#inventory-button {
+    position: fixed;
+    bottom: 30px;
+    right: 5px;
+    width: 64px;
+    height: 64px;
+}
+
+.item-card {
+    width: 100px;
+    height: 100px;
+    border-radius: 5px;
+    border: 1px solid var(--textColor);
+    padding: 10px;
+    margin: 5px;
+    position: relative;
+}
+
+.item-card button {
+    position: absolute;
+    right: 0;
+    top: 0;
+    margin: 0;
+    padding: 0;
+}
+
+.item-card hr {
+    margin:  5px -10px;
+    width: calc(100% + 20px);
+}
+
+.door {
+    border: 1px solid var(--darkWoodColor);
+    width: 100px;
+    height: 150px;
+    background-color: var(--woodColor);
+    position: relative;
+}
+
+.knob {
+    position: absolute;
+    width: 20px;
+    height: 20px;
+    border-radius: 50%;
+    right: 5px;
+    top: 50%;
+    background-color: var(--darkWoodColor);
+}
+
+iframe {
+    border: none;
+}
+
+.auth-form {
+    height: 100%;
+    width: 100%;
+    padding: 40px 5px;
+    overflow: hidden;
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+}
+
+
+.auth-form h3 {
+    width: calc(100% - 20px);
+    text-align: center;
+    margin: 10px;
+    font-size: 15px;
+}
+
+.auth-form h1 {
+    width: calc(100% - 20px);
+    text-align: center;
+    margin: 10px;
+    font-size: 20px;
+}
+
+.auth-form p {
+    width: calc(100% - 20px);
+    text-align: center;
+    margin: 10px;
+    font-size: 12px;
+}
+
+@media only screen and (max-width: 500px) {
+    main {
+        width: 100%;
+    }
+}