notherbase-fs 1.2.9 → 1.2.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,7 @@
1
1
  module.exports = {
2
2
  chat: require("./chat"),
3
3
  item: require("./item"),
4
- portfolio: require("./portfolio/portfolio-controller.js"),
4
+ pages: require("./pages.js"),
5
5
  user: require("./user"),
6
6
  authCheck: require("./authCheck"),
7
7
  contact: require("./contact"),
@@ -0,0 +1,19 @@
1
+ const express = require("express");
2
+ const router = express.Router();
3
+ const fs = require('fs');
4
+
5
+ module.exports = function name(path)
6
+ {
7
+ let files = fs.readdirSync(path);
8
+
9
+ files.forEach(file => {
10
+ file = file.slice(0, -4);
11
+ console.log(file);
12
+
13
+ router.get(`/${file}`, function(req, res) {
14
+ res.render(`${path}/${file}.ejs`);
15
+ });
16
+ });
17
+
18
+ return router;
19
+ }
package/index.js CHANGED
@@ -8,13 +8,15 @@ module.exports = {
8
8
  },
9
9
  data: db,
10
10
  chat: null,
11
- start: function start(world) {
11
+ start: function start(world, pagesPath) {
12
12
  let theFront = require("./controllers/the-front");
13
13
  let explorer = require("./controllers/explorer");
14
14
 
15
15
  explorer.complete(world.explorer);
16
16
  theFront.complete(world.theFront);
17
17
 
18
- require("./server")(theFront.router, explorer.router, db.connectionSuccess);
18
+ let pagesRouter = require("./controllers/pages")(pagesPath);
19
+
20
+ require("./server")(theFront.router, explorer.router, pagesRouter, db.connectionSuccess);
19
21
  }
20
22
  }
package/package.json CHANGED
@@ -1,10 +1,10 @@
1
1
  {
2
2
  "name": "notherbase-fs",
3
- "version": "1.2.9",
3
+ "version": "1.2.12",
4
4
  "description": "Functions to help make developing for NotherBase easier.",
5
5
  "main": "index.js",
6
6
  "scripts": {
7
- "test": "nodemon test.js",
7
+ "test": "nodemon test/test-index.js",
8
8
  "gmail-auth": "node gmail-auth.js",
9
9
  "gmail-token": "node gmail-token.js"
10
10
  },
@@ -0,0 +1,41 @@
1
+ .content#account {
2
+ padding: 10px;
3
+ }
4
+
5
+ .content#account hr {
6
+ margin: 10px 0;
7
+ }
8
+
9
+ .content#account #info {
10
+ text-align: center;
11
+ width: 100%;
12
+ margin-top: 40px;
13
+ }
14
+
15
+ .content#account .setting {
16
+ background: var(--darkBgColor);
17
+ padding: 25px;
18
+ border-radius: 5px;
19
+ display: flex;
20
+ justify-content: center;
21
+ text-align: center;
22
+ flex-wrap: wrap;
23
+ }
24
+
25
+ .content#account p {
26
+ width: 100%;
27
+ }
28
+
29
+ .content#account button {
30
+ width: 40%;
31
+ }
32
+
33
+ .content#account .edit {
34
+ background: var(--darkWoodColor);
35
+ padding: 25px;
36
+ border-radius: 5px;
37
+ display: flex;
38
+ justify-content: center;
39
+ text-align: center;
40
+ flex-wrap: wrap;
41
+ }
@@ -0,0 +1,60 @@
1
+ .chat-box {
2
+ position: relative;
3
+ box-shadow: 5px 5px 10px 5px var(--shadowColor);
4
+ margin-top: 20px;
5
+ width: 100%;
6
+ min-height: 200px;
7
+ }
8
+
9
+ .chat-name {
10
+ color: var(--textColor);
11
+ padding: 10px;
12
+ }
13
+
14
+ .chat-log {
15
+ width: 100%;
16
+ height: calc(100% - 65px);
17
+ background-color: rgba(0, 0, 0, 0.534);
18
+ overflow: auto;
19
+ padding: 5px;
20
+ }
21
+
22
+ .chat-send {
23
+ position: absolute;
24
+ right: 0;
25
+ bottom: 0;
26
+ height: 25px;
27
+ width: 5em;
28
+ outline: none;
29
+ background-color: var(--bgColor);
30
+ border: 1px solid var(--textColor);
31
+ color: var(--textColor);
32
+ text-align: center;
33
+ padding: 2px;
34
+ }
35
+
36
+ .chat-send:hover {
37
+ border: 1px solid var(--textColorBright);
38
+ color: var(--textColorBright);
39
+ cursor: pointer;
40
+ }
41
+
42
+ .chat-entry {
43
+ position: absolute;
44
+ left: 0;
45
+ bottom: 0;
46
+ height: 25px;
47
+ width: calc(100% - 5em);
48
+ outline: none;
49
+ background-color: var(--bgColor);
50
+ border: 1px solid var(--textColor);
51
+ color: var(--textColor);
52
+ }
53
+
54
+ .chat-log > p {
55
+ color: var(--textColor);
56
+ margin: 0;
57
+ padding: 0;
58
+ line-height: 1em;
59
+ text-align: left;
60
+ }
@@ -0,0 +1,63 @@
1
+ .inventory {
2
+ border: 1px solid var(--textColor);
3
+ color: var(--textColor);
4
+ width: 100%;
5
+ height: 100%;
6
+ padding: 5px;
7
+ z-index: 500;
8
+ overflow: auto;
9
+ }
10
+
11
+ .inventory .item-list {
12
+ width: 100%;
13
+ display: flex;
14
+ flex-wrap: wrap;
15
+ overflow: auto;
16
+ border: 1px solid var(--textColor);
17
+ align-content: flex-start;
18
+ }
19
+
20
+ .inventory .item-spawner {
21
+ width: 100%;
22
+ border: 1px solid var(--textColor);
23
+ }
24
+
25
+ .item-spawner .search-results {
26
+ width: 100%;
27
+ border: 1px solid var(--textColor);
28
+ overflow: auto;
29
+ }
30
+
31
+ .search-results p {
32
+ width: 100%;
33
+ cursor: pointer;
34
+ }
35
+
36
+ .search-results p:hover {
37
+ background-color: var(--woodColor);
38
+ }
39
+
40
+ .item-card {
41
+ width: 150px;
42
+ height: 45px;
43
+ border-radius: 3px;
44
+ border: 1px solid var(--textColor);
45
+ padding: 5px;
46
+ margin: 2.5px;
47
+ position: relative;
48
+ background-color: var(--bgColor);
49
+ }
50
+
51
+ .item-card button {
52
+ position: absolute;
53
+ right: 0;
54
+ top: 0;
55
+ margin: 0;
56
+ padding: 0;
57
+ border-radius: 0;
58
+ }
59
+
60
+ .item-card hr {
61
+ width: 100%;
62
+ margin: 0;
63
+ }
@@ -0,0 +1,235 @@
1
+ :root {
2
+ --bgColor: rgb(216, 216, 216);
3
+ --bgColorTransparent: rgba(211, 211, 211, 0.404);
4
+ --darkBgColor: rgb(136, 136, 136);
5
+ --veryDarkBgColorTransparent: rgba(78, 78, 78, 0.404);
6
+ --veryDarkBgColor: rgb(59, 59, 59);
7
+ --lightBgColor: rgb(57, 57, 57);
8
+ --shadowColor: rgb(26, 26, 26);
9
+ --textColor: rgb(15, 15, 15);
10
+ --textColorBright: rgb(110, 63, 0);
11
+ --woodColor: rgb(95, 68, 43);
12
+ --darkWoodColor: rgb(70, 50, 32);
13
+ --standardBorder: 1px solid var(--textColor);
14
+ }
15
+
16
+ * {
17
+ box-sizing: border-box;
18
+ margin: 0;
19
+ padding: 0;
20
+ color: var(--textColor);
21
+ }
22
+
23
+ .invisible {
24
+ display: none !important;
25
+ }
26
+
27
+ .camo {
28
+ transition: all .15s;
29
+ opacity: 0;
30
+ }
31
+
32
+ body {
33
+ background-color: var(--darkBgColor);
34
+ min-height: 100vh;
35
+ display: flex;
36
+ justify-content: center;
37
+ align-items: center;
38
+ align-content: center;
39
+ flex-direction: column;
40
+ position: relative;
41
+ }
42
+
43
+ main {
44
+ width: 1000px;
45
+ min-height: 500px;
46
+ box-shadow: 5px 5px 5px 5px var(--shadowColor);
47
+ padding: 20px;
48
+ border-radius: 5px 5px 0px 0px;
49
+ margin-top: 15px;
50
+ margin-bottom: 0;
51
+ display: flex;
52
+ flex-wrap: wrap;
53
+ justify-content: center;
54
+ align-content: center;
55
+ align-items: flex-start;
56
+ background-color: var(--bgColor);
57
+ }
58
+
59
+ footer {
60
+ display: flex;
61
+ justify-content: center;
62
+ align-content: center;
63
+ align-items: flex-start;
64
+ min-height: 25px;
65
+ width: 1000px;
66
+ background-color: var(--veryDarkBgColor);
67
+ border-radius: 0px 0px 5px 5px;
68
+ box-shadow: 5px 5px 5px 5px var(--shadowColor);
69
+ padding: 5px;
70
+ border: none;
71
+ margin-bottom: 100px;
72
+ }
73
+
74
+ footer a {
75
+ text-decoration: none;
76
+ height: 100%;
77
+ margin: 0;
78
+ padding: 5px;
79
+ width: 50%;
80
+ height: 100%;
81
+ }
82
+
83
+ hr {
84
+ border: none;
85
+ border-bottom: 1px solid var(--textColor);
86
+ margin: 20px;
87
+ width: 100%;
88
+ }
89
+
90
+ p {
91
+ color: var(--textColor);
92
+ margin-bottom: 10px;
93
+ width: 80%;
94
+ }
95
+
96
+ input, textarea {
97
+ padding: 10px;
98
+ width: calc(100% - 10px);
99
+ background-color: var(--bgColor);
100
+ border-radius: 5px;
101
+ border: 1px solid var(--textColor);
102
+ margin: 5px;
103
+ font-size: 15px;
104
+ }
105
+
106
+ input[type=submit], button, a {
107
+ background-color: var(--bgColor);
108
+ padding: 10px;
109
+ border-radius: 5px;
110
+ border: 1px solid var(--textColor);
111
+ color: var(--textColor);
112
+ margin: 5px;
113
+ margin-top: 20px;
114
+ text-decoration: none;
115
+ text-align: center;
116
+ }
117
+
118
+ input[type=submit]:hover, button:hover, a:hover {
119
+ border: 1px solid var(--textColorBright);
120
+ color: var(--textColorBright);
121
+ cursor: pointer;
122
+ }
123
+
124
+ .locked {
125
+ background-color: var(--bgColor);
126
+ padding: 10px;
127
+ border-radius: 5px;
128
+ border: 1px solid var(--textColor);
129
+ color: var(--textColor);
130
+ margin: 5px;
131
+ margin-top: 20px;
132
+ text-decoration: none;
133
+ text-align: center;
134
+ filter: brightness(.5);
135
+ user-select: none;
136
+ }
137
+
138
+ .to {
139
+ width: 100%;
140
+ height: 200px;
141
+ display: flex;
142
+ justify-content: flex-end;
143
+ align-items: flex-end;
144
+ padding: 20px;
145
+ }
146
+
147
+ .return {
148
+ width: 100%;
149
+ height: 75px;
150
+ display: flex;
151
+ justify-content: flex-end;
152
+ align-items: flex-end;
153
+ padding: 20px;
154
+ }
155
+
156
+ .do {
157
+ width: 100%;
158
+ height: 200px;
159
+ display: flex;
160
+ justify-content: flex-end;
161
+ align-items: flex-end;
162
+ padding: 20px;
163
+ }
164
+
165
+ h2, h3 {
166
+ color: var(--textColor);
167
+ width: 100%;
168
+ }
169
+
170
+ ul {
171
+ margin: 10px;
172
+ }
173
+
174
+ .door {
175
+ border: 1px solid var(--darkWoodColor);
176
+ width: 100px;
177
+ height: 150px;
178
+ background-color: var(--woodColor);
179
+ position: relative;
180
+ }
181
+
182
+ .knob {
183
+ position: absolute;
184
+ width: 20px;
185
+ height: 20px;
186
+ border-radius: 50%;
187
+ right: 5px;
188
+ top: 50%;
189
+ background-color: var(--darkWoodColor);
190
+ }
191
+
192
+ iframe {
193
+ border: none;
194
+ }
195
+
196
+ .auth-form {
197
+ height: 100%;
198
+ width: 100%;
199
+ padding: 40px 5px;
200
+ overflow: hidden;
201
+ display: flex;
202
+ justify-content: center;
203
+ flex-wrap: wrap;
204
+ }
205
+
206
+ .auth-form h3 {
207
+ width: calc(100% - 20px);
208
+ text-align: center;
209
+ margin: 10px;
210
+ font-size: 15px;
211
+ }
212
+
213
+ .auth-form h1 {
214
+ width: calc(100% - 20px);
215
+ text-align: center;
216
+ margin: 10px;
217
+ font-size: 20px;
218
+ }
219
+
220
+ .auth-form p {
221
+ width: calc(100% - 20px);
222
+ text-align: center;
223
+ margin: 10px;
224
+ font-size: 12px;
225
+ }
226
+
227
+ @media only screen and (max-width: 1000px) {
228
+ main {
229
+ width: 100%;
230
+ }
231
+
232
+ footer {
233
+ width: 100%;
234
+ }
235
+ }
@@ -0,0 +1,113 @@
1
+ .menu {
2
+ width: 75%;
3
+ height: 50%;
4
+ border: 1px solid var(--textColor);
5
+ color: var(--textColor);
6
+ position: fixed;
7
+ left: 12.5%;
8
+ top: 5%;
9
+ background-color: var(--bgColorTransparent);
10
+ backdrop-filter: blur(3px);
11
+ border-radius: 5px;
12
+ z-index: 500;
13
+ }
14
+
15
+ .menu hr {
16
+ margin: 0;
17
+ }
18
+
19
+ .ui .fade {
20
+ background-color: var(--veryDarkBgColorTransparent);
21
+ backdrop-filter: blur(3px);
22
+ width: 100%;
23
+ height: 100%;
24
+ position: fixed;
25
+ left: 0;
26
+ top: 0;
27
+ z-index: 400;
28
+ }
29
+
30
+ .ui button {
31
+ background-color: var(--bgColor);
32
+ border: 1px solid var(--textColor);
33
+ margin: 0;
34
+
35
+ }
36
+
37
+ .ui button:hover {
38
+ border: 1px solid var(--textColorBright);
39
+ color: var(--textColorBright);
40
+ cursor: pointer;
41
+ }
42
+
43
+ .ui button#menu {
44
+ position: fixed;
45
+ bottom: 15px;
46
+ right: 15px;
47
+ width: 64px;
48
+ height: 64px;
49
+ border-radius: 5px;
50
+ }
51
+
52
+ .menu button#close {
53
+ top: 0;
54
+ right: 0;
55
+ width: 32px;
56
+ height: 32px;
57
+ position: absolute;
58
+ border-radius: 0;
59
+ }
60
+
61
+ .menu .tabs {
62
+ width: 100%;
63
+ height: 30px;
64
+ border: 1px solid var(--textColor);
65
+ }
66
+
67
+ .menu .tabs button {
68
+ height: 30px;
69
+ border-radius: 0;
70
+ padding: 0 10px;
71
+ }
72
+
73
+ .menu .tabs .selected {
74
+ border: 2px solid var(--textColorBright);
75
+ }
76
+
77
+ .menu #content-window {
78
+ width: 100%;
79
+ height: calc(100% - 30px);
80
+ border: 1px solid var(--textColor);
81
+ }
82
+
83
+ .menu a {
84
+ margin: 0;
85
+ padding: 5px;
86
+ }
87
+
88
+ .menu #logout {
89
+ position: absolute;
90
+ width: 50%;
91
+ height: 40px;
92
+ bottom: -40px;
93
+ left: calc(25%);
94
+ background-color: var(--bgColor);
95
+ border: var(--standardBorder);
96
+ border-top: none;
97
+ border-radius: 0 0 5px 5px;
98
+ text-align: center;
99
+ }
100
+
101
+ @media only screen and (max-width: 1000px) {
102
+ .menu {
103
+ width: 100%;
104
+ height: 90vh;
105
+ top: 0;
106
+ left: 0;
107
+ }
108
+
109
+ .ui button#menu {
110
+ bottom: 5px;
111
+ right: 5px;
112
+ }
113
+ }
@@ -0,0 +1,3 @@
1
+ .content#more {
2
+ padding: 10px;
3
+ }
@@ -0,0 +1,12 @@
1
+ .content#player {
2
+ padding: 10px;
3
+ }
4
+
5
+ .content#player h3 {
6
+ width: 100%;
7
+ text-transform: capitalize;
8
+ }
9
+
10
+ .content#player h3 button {
11
+ width: 40px;
12
+ }
package/server.js CHANGED
@@ -1,6 +1,6 @@
1
1
  let started = false;
2
2
 
3
- module.exports = function start(frontRouter, exploreRouter, dbConnected) {
3
+ module.exports = function start(frontRouter, exploreRouter, pagesRouter, dbConnected) {
4
4
  if (!started) {
5
5
  // Setup for Express
6
6
  const express = require("express");
@@ -57,8 +57,6 @@ module.exports = function start(frontRouter, exploreRouter, dbConnected) {
57
57
 
58
58
  app.use("/user", controllers.user);
59
59
 
60
- app.use("/portfolio", controllers.portfolio);
61
-
62
60
  app.use("/chat", controllers.chat(io));
63
61
 
64
62
  app.use("/contact", controllers.contact);
@@ -70,6 +68,8 @@ module.exports = function start(frontRouter, exploreRouter, dbConnected) {
70
68
  app.use("/item", controllers.item);
71
69
 
72
70
  app.use("/the-front", frontRouter);
71
+
72
+ app.use("/", pagesRouter);
73
73
 
74
74
  app.use("/", controllers.authCheck, exploreRouter);
75
75
 
@@ -64,7 +64,7 @@ class NonoGame {
64
64
  this.$board.css("width", this.dimensions[0] * (tileSize) + this.nonoSize + 5);
65
65
  this.$board.css("height", this.dimensions[1] * (tileSize) + this.nonoSize + 5);
66
66
 
67
- let $nono = this.$board.append(`<img class="nono" src="/img/logo.png">`).children().last();
67
+ let $nono = this.$board.append(`<img class="nono" src="/img/nono-${Math.floor(Math.random() * (this.maxNonoId + 1))}.png">`).children().last();
68
68
  $nono.css("width", this.nonoSize);
69
69
  $nono.css("height", this.nonoSize);
70
70
 
@@ -0,0 +1,12 @@
1
+ <!DOCTYPE html>
2
+ <html lang="en">
3
+ <head>
4
+ <meta charset="UTF-8">
5
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
6
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
7
+ <title>Document</title>
8
+ </head>
9
+ <body>
10
+ Test hahahahahah
11
+ </body>
12
+ </html>
@@ -1,3 +1,4 @@
1
+ const path = require('path');
1
2
  const notherbase = require("../index");
2
3
 
3
4
  const world = {
@@ -60,4 +61,4 @@ const world = {
60
61
  }
61
62
  };
62
63
 
63
- notherbase.start(world);
64
+ notherbase.start(world, path.resolve(__dirname, "pages"));
@@ -1,12 +1,12 @@
1
1
  <%- include("./head.ejs"); %>
2
2
 
3
3
  <style>
4
- <%- include(path.resolve(dir, "../../", "public/styles/main.css")); %>
5
- <%- include(path.resolve(dir, "../../", "public/styles/menu.css")); %>
6
- <%- include(path.resolve(dir, "../../", "public/styles/inventory.css")); %>
7
- <%- include(path.resolve(dir, "../../", "public/styles/player.css")); %>
8
- <%- include(path.resolve(dir, "../../", "public/styles/account.css")); %>
9
- <%- include(path.resolve(dir, "../../", "public/styles/more.css")); %>
4
+ <%- //include(path.resolve(dir, "../../", "public/styles/main.css")); %>
5
+ <%- //include(path.resolve(dir, "../../", "public/styles/menu.css")); %>
6
+ <%- //include(path.resolve(dir, "../../", "public/styles/inventory.css")); %>
7
+ <%- //include(path.resolve(dir, "../../", "public/styles/player.css")); %>
8
+ <%- //include(path.resolve(dir, "../../", "public/styles/account.css")); %>
9
+ <%- //include(path.resolve(dir, "../../", "public/styles/more.css")); %>
10
10
 
11
11
  <% for (let i = 0; i < styles.length; i++) { %>
12
12
  <%- include(`${styles[i]}.css`); %>
package/views/head.ejs CHANGED
@@ -13,12 +13,12 @@
13
13
  <!-- 'Redacted Script', cursive; -->
14
14
  <link href="https://fonts.googleapis.com/css2?family=Redacted+Script:wght@300&display=swap" rel="stylesheet">
15
15
  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
16
- <!-- <link rel="stylesheet" href="/styles/main.css">
16
+ <link rel="stylesheet" href="/styles/main.css">
17
17
  <link rel="stylesheet" href="/styles/menu.css">
18
18
  <link rel="stylesheet" href="/styles/inventory.css">
19
19
  <link rel="stylesheet" href="/styles/player.css">
20
20
  <link rel="stylesheet" href="/styles/account.css">
21
- <link rel="stylesheet" href="/styles/more.css"> -->
21
+ <link rel="stylesheet" href="/styles/more.css">
22
22
  </head>
23
23
 
24
24
  <body>
@@ -52,7 +52,7 @@
52
52
  }
53
53
  }
54
54
 
55
- if (!holding) {
55
+ if (!holding && data.amount > 0) {
56
56
  this.items.push(data);
57
57
  }
58
58
 
@@ -1,10 +0,0 @@
1
- const express = require("express");
2
- const router = express.Router();
3
-
4
- router.get("/", function(req, res) {
5
- res.render(`${__dirname}/views/index`, {
6
- siteTitle: "Wyatt's Portfolio"
7
- });
8
- });
9
-
10
- module.exports = router;
package/test.js DELETED
@@ -1 +0,0 @@
1
- require("./test/test-index");