notherbase-fs 3.1.4 → 3.1.6

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.
Files changed (23) hide show
  1. package/README.md +4 -2
  2. package/controllers/creation.js +97 -94
  3. package/controllers/spirit-world.js +68 -11
  4. package/controllers/{spirits/user.js → user.js} +76 -14
  5. package/controllers/util.js +56 -0
  6. package/models/item.js +24 -3
  7. package/models/send-mail.js +12 -3
  8. package/models/spirit.js +52 -16
  9. package/models/user.js +61 -16
  10. package/notherbase-fs.js +7 -0
  11. package/package.json +1 -1
  12. package/public/js/base.js +105 -0
  13. package/public/js/chat-box.js +31 -8
  14. package/public/styles/account.css +4 -0
  15. package/public/styles/chat copy.css +57 -0
  16. package/public/styles/chat.css +9 -1
  17. package/public/styles/inventory.css +39 -26
  18. package/public/styles/main.css +530 -41
  19. package/public/styles/menu.css +29 -8
  20. package/public/styles/more.css +14 -0
  21. package/public/styles/player.css +25 -1
  22. package/test/pages/test-page/index.ejs +0 -2
  23. package/controllers/spirits/util.js +0 -31
package/public/styles/menu.css CHANGED
@@ -6,10 +6,11 @@
6
6
  position: fixed;
7
7
  left: 12.5%;
8
8
  top: 5%;
9
- background-color: var(--bgColorTransparent);
9
+ background-color: var(--bgColor);
10
10
  backdrop-filter: blur(3px);
11
11
  border-radius: 5px;
12
12
  z-index: 500;
13
+ padding: 0;
13
14
  }
14
15
 
15
16
  .menu hr {
@@ -20,7 +21,7 @@
20
21
  background-color: var(--veryDarkBgColorTransparent);
21
22
  backdrop-filter: blur(3px);
22
23
  width: 100%;
23
- height: 100%;
24
+ height: 130%;
24
25
  position: fixed;
25
26
  left: 0;
26
27
  top: 0;
@@ -48,21 +49,27 @@
48
49
  height: 64px;
49
50
  border-radius: 5px;
50
51
  z-index: 100;
52
+ padding: var(--padding);
51
53
  }
52
54
 
53
55
  .menu button#close {
54
56
  top: 0;
55
57
  right: 0;
56
58
  width: 32px;
57
- height: 32px;
58
- position: absolute;
59
+ height: 30px;
60
+ position: fixed;
59
61
  border-radius: 0;
62
+ padding: 0 3px;
60
63
  }
61
64
 
62
65
  .menu .tabs {
63
66
  width: 100%;
64
67
  height: 30px;
65
68
  border: 1px solid var(--textColor);
69
+ border-top: none;
70
+ padding: 0;
71
+ margin: 0;
72
+ display: flex;
66
73
  }
67
74
 
68
75
  .menu .tabs button {
@@ -76,9 +83,22 @@
76
83
  }
77
84
 
78
85
  .menu #content-window {
79
- width: 100%;
80
- height: calc(100% - 30px);
86
+ width: var(--fillFromMargin);
87
+ margin: var(--margin);
88
+ height: calc(100% - 30px - 2 * var(--margin));
81
89
  border: 1px solid var(--textColor);
90
+ overflow: auto;
91
+ padding: 0;
92
+ }
93
+
94
+ .menu .content {
95
+ border: none;
96
+ color: var(--textColor);
97
+ width: 100%;
98
+ height: 100%;
99
+ padding: 0;
100
+ z-index: 500;
101
+ overflow: auto;
82
102
  }
83
103
 
84
104
  .menu a {
@@ -97,12 +117,13 @@
97
117
  border-top: none;
98
118
  border-radius: 0 0 5px 5px;
99
119
  text-align: center;
120
+ padding: 5px;
100
121
  }
101
122
 
102
- @media only screen and (max-width: 1000px) {
123
+ @media only screen and (max-width: 1300px) {
103
124
  .menu {
104
125
  width: 100%;
105
- height: 90vh;
126
+ height: 80vh;
106
127
  top: 0;
107
128
  left: 0;
108
129
  }
package/public/styles/more.css CHANGED
@@ -1,3 +1,17 @@
1
1
  .content#more {
2
2
  padding: 10px;
3
+ position: relative;
4
+ height: 100%;
5
+ overflow: auto;
6
+ }
7
+
8
+ .content#more h4 {
9
+ padding: 10px;
10
+ font-size: xx-large;
11
+ }
12
+
13
+ .content#more button {
14
+ position: absolute;
15
+ bottom: 5px;
16
+ right: 5px;
3
17
  }
package/public/styles/player.css CHANGED
@@ -1,12 +1,36 @@
1
1
  .content#player {
2
2
  padding: 10px;
3
+ display: flex;
4
+ align-items: center;
5
+ flex-wrap: wrap;
6
+ justify-content: space-around;
3
7
  }
4
8
 
5
9
  .content#player h3 {
6
10
  width: 100%;
7
11
  text-transform: capitalize;
12
+ border: 1px solid var(--textColor);
13
+ padding: 5px 30px;
14
+ height: 100px;
15
+ position: relative;
16
+ font-size: 25px;
17
+ display: flex;
18
+ align-items: center;
19
+ }
20
+
21
+ .content#player input {
22
+ width: 100px;
23
+ text-transform: capitalize;
24
+ position: absolute;
25
+ right: 0;
26
+ top: 0;
27
+ margin: 2px;
8
28
  }
9
29
 
10
30
  .content#player h3 button {
11
- width: 40px;
31
+ width: 100px;
32
+ position: absolute;
33
+ right: 0;
34
+ bottom: 0;
35
+ margin: 2px;
12
36
  }
package/test/pages/test-page/index.ejs CHANGED
@@ -24,8 +24,6 @@
24
24
 
25
25
  <script>
26
26
  const currentRoute = "<%- route %>";
27
-
28
- <%- include("../../../views/scripts/base.js", {user: user}); %>
29
27
  </script>
30
28
 
31
29
 
package/controllers/spirits/util.js DELETED
@@ -1,31 +0,0 @@
1
- export const check = (res, checkee, failMsg = "Failed!") => {
2
- if (!checkee) {
3
- fail(res, failMsg);
4
- return false;
5
- }
6
- else {
7
- return true;
8
- }
9
- };
10
-
11
- export const success = (res, msg = "Success!", data = null, lastUpdate = 0) => {
12
- res.send({
13
- status: "success",
14
- message: msg,
15
- lastUpdate: lastUpdate,
16
- data: data
17
- });
18
- };
19
-
20
- export const fail = (res, msg = "Failed!") => {
21
- res.send({
22
- status: "failed",
23
- message: msg,
24
- lastUpdate: 0,
25
- data: null
26
- });
27
- };
28
-
29
- export const loginCheck = (req, res) => {
30
- return check(res, req.session.currentUser, "Please login first.");
31
- }