浏览代码

ZG loots and hide admin roles when registering

master
peter 5 年前
父节点
当前提交
a949085e62

+ 123
- 18
log.txt 查看文件

@@ -1,22 +1,23 @@
1
-[2020-03-29T12:12:03.477] [DEBUG] Admin#makeKnex - Making new knex: {
1
+[2020-04-12T02:46:02.286] [DEBUG] Admin#makeKnex - Making new knex: {
2 2
   client: 'sqlite3',
3
-  connection: {(node:1085628) [DEP0005] DeprecationWarning: Buffer() is deprecated due to security and usability issues. Please use the Buffer.alloc(), Buffer.allocUnsafe(), or Buffer.from() methods instead.
4
-Terminated
5
-npm ERR! code ELIFECYCLE
6
-npm ERR! errno 143
7
-npm ERR! frontcraft@1.0.0 launch: `node lib/src/backend/Launcher.js > log.txt "-"`
8
-npm ERR! Exit status 143
9
-npm ERR! 
10
-npm ERR! Failed at the frontcraft@1.0.0 launch script.
11
-npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
12
-
13
-npm ERR! A complete log of this run can be found in:
14
-npm ERR!     /home/cake/.npm/_logs/2020-03-29T10_12_28_351Z-debug.log
15
-s loaded
16
-[2020-03-29T12:12:04.535] [INFO] Admin#startWebserver - Admin panel listening for HTTP on *8080
17
-[2020-03-29T12:12:17.689] [DEBUG] UserManager#checkConnection - {
3
+  connection: {
4
+    filename: '/home/cake/nitowa.xyz/frontcraft/admin/data/frontworkAdmin.sqlite'
5
+  },
6
+  migrations: {
7
+    directory: '/home/cake/nitowa.xyz/frontcraft/admin/migrations',
8
+    extension: 'ts'
9
+  },
10
+  useNullAsDefault: true
11
+}
12
+[2020-04-12T02:46:02.426] [DEBUG] Admin#startWebsocket - Websocket up on 20000
13
+[2020-04-12T02:46:02.427] [DEBUG] UserManager#initialize - setting up permissions
14
+skipping spec insertion
15
+[2020-04-12T02:46:02.613] [DEBUG] Admin#start - 6 components initialized
16
+[2020-04-12T02:46:03.296] [INFO] Admin#startWebserver - Frontend from /home/cake/nitowa.xyz/frontcraft/admin/dist/server.js loaded
17
+[2020-04-12T02:46:03.297] [INFO] Admin#startWebserver - Admin panel listening for HTTP on *8080
18
+[2020-04-12T02:46:42.194] [DEBUG] UserManager#checkConnection - {
18 19
   celinda: {
19
-    connections: { '59288': [Socket] },
20
+    connections: { '45536': [Socket] },
20 21
     auth: { token: [Object], user: [Object], port: 20001 },
21 22
     user: {
22 23
       id: 3,
@@ -30,4 +31,108 @@ s loaded
30 31
       Naxx: 1
31 32
     }
32 33
   }
33
-} [ '1563eebe-9da2-4b31-b4ef-ef3aaa7e23b1' ]
34
+} [ 'cfa202ff-5f2c-4e4e-9fa5-9a45233ab0e0' ]
35
+[2020-04-12T02:49:29.208] [DEBUG] UserManager#closeHandler - {
36
+  celinda: {
37
+    connections: {},
38
+    auth: { token: [Object], user: [Object], port: 20001 },
39
+    user: {
40
+      id: 3,
41
+      username: 'celinda',
42
+      rank: 'Officer',
43
+      MC: 1,
44
+      BWL: 0,
45
+      ZG: 1,
46
+      AQ20: 1,
47
+      AQ40: 1,
48
+      Naxx: 1
49
+    }
50
+  }
51
+} [ 'cfa202ff-5f2c-4e4e-9fa5-9a45233ab0e0' ]
52
+[2020-04-12T02:49:31.572] [DEBUG] UserManager#checkConnection - {
53
+  celinda: {
54
+    connections: { '46948': [Socket] },
55
+    auth: { token: [Object], user: [Object], port: 20001 },
56
+    user: {
57
+      id: 3,
58
+      username: 'celinda',
59
+      rank: 'Officer',
60
+      MC: 1,
61
+      BWL: 0,
62
+      ZG: 1,
63
+      AQ20: 1,
64
+      AQ40: 1,
65
+      Naxx: 1
66
+    }
67
+  }
68
+} [ 'cfa202ff-5f2c-4e4e-9fa5-9a45233ab0e0' ]
69
+[2020-04-12T02:49:37.031] [DEBUG] UserManager#closeHandler - {
70
+  celinda: {
71
+    connections: {},
72
+    auth: { token: [Object], user: [Object], port: 20001 },
73
+    user: {
74
+      id: 3,
75
+      username: 'celinda',
76
+      rank: 'Officer',
77
+      MC: 1,
78
+      BWL: 0,
79
+      ZG: 1,
80
+      AQ20: 1,
81
+      AQ40: 1,
82
+      Naxx: 1
83
+    }
84
+  }
85
+} [ 'cfa202ff-5f2c-4e4e-9fa5-9a45233ab0e0' ]
86
+[2020-04-12T02:49:38.886] [DEBUG] UserManager#checkConnection - {
87
+  celinda: {
88
+    connections: { '47044': [Socket] },
89
+    auth: { token: [Object], user: [Object], port: 20001 },
90
+    user: {
91
+      id: 3,
92
+      username: 'celinda',
93
+      rank: 'Officer',
94
+      MC: 1,
95
+      BWL: 0,
96
+      ZG: 1,
97
+      AQ20: 1,
98
+      AQ40: 1,
99
+      Naxx: 1
100
+    }
101
+  }
102
+} [ 'cfa202ff-5f2c-4e4e-9fa5-9a45233ab0e0' ]
103
+[2020-04-12T02:49:44.132] [DEBUG] UserManager#closeHandler - {} []
104
+[2020-04-12T02:52:10.916] [DEBUG] UserManager#checkConnection - {
105
+  celinda: {
106
+    connections: { '48390': [Socket] },
107
+    auth: { token: [Object], user: [Object], port: 20001 },
108
+    user: {
109
+      id: 3,
110
+      username: 'celinda',
111
+      rank: 'Officer',
112
+      MC: 1,
113
+      BWL: 0,
114
+      ZG: 0,
115
+      AQ20: 1,
116
+      AQ40: 1,
117
+      Naxx: 1
118
+    }
119
+  }
120
+} [ '7a8bbb51-412a-4bee-9e0e-9b7cbaef82d8' ]
121
+[2020-04-12T02:52:47.682] [INFO] process#SIGINT - Shutting down from SIGINT (Ctrl-C)
122
+[2020-04-12T02:52:47.684] [DEBUG] UserManager#closeHandler - {
123
+  celinda: {
124
+    connections: {},
125
+    auth: { token: [Object], user: [Object], port: 20001 },
126
+    user: {
127
+      id: 3,
128
+      username: 'celinda',
129
+      rank: 'Officer',
130
+      MC: 1,
131
+      BWL: 0,
132
+      ZG: 0,
133
+      AQ20: 1,
134
+      AQ40: 1,
135
+      Naxx: 1
136
+    }
137
+  }
138
+} [ '7a8bbb51-412a-4bee-9e0e-9b7cbaef82d8' ]

+ 7
- 1
src/backend/Types/Items.ts 查看文件

@@ -281,6 +281,12 @@ export const T2:string[] = [
281 281
 "Sabatons of Wrath"
282 282
 ]
283 283
 
284
+export const ZGMounts = [
285
+    "Swift Zulian Tiger",
286
+    "Swift Razzashi Raptor",
287
+    "Primal Hakkari Idol"
288
+] 
289
+
284 290
 export type AllItems = {
285 291
     [tier in Tiers] : string[]
286 292
 }
@@ -288,7 +294,7 @@ export type AllItems = {
288 294
 export const allItems : AllItems = {
289 295
     MC: T1,
290 296
     BWL: T2,
291
-    ZG:[],
297
+    ZG: ZGMounts,
292 298
     AQ20: [],
293 299
     AQ40: [],
294 300
     Naxx: []

+ 0
- 1
src/backend/Types/Types.ts 查看文件

@@ -142,7 +142,6 @@ export type User = {
142 142
     username: string
143 143
     pwhash: string
144 144
     rank: Rank
145
-    currency?: number
146 145
 } & {
147 146
     [currency in Tiers]? : number
148 147
 }

+ 1
- 1
src/frontend/src/app/frontcraft/auth/register/register.component.html 查看文件

@@ -37,7 +37,7 @@
37 37
 
38 38
   <nb-card>
39 39
     <nb-card-body>
40
-      <nb-checkbox [(ngModel)]="showApplication" name="amMember" #checkbox><!--I am already a member-->I understand this is super beta and things might not work or are not very pretty</nb-checkbox>
40
+      <nb-checkbox [(ngModel)]="showApplication" name="amMember" #checkbox><!--I am already a member-->By creating an account I am okay with cookies on my machine</nb-checkbox>
41 41
       <br />
42 42
       
43 43
       <span > <!--*ngIf="showApplication"-->

+ 1
- 1
src/frontend/src/app/frontcraft/auth/register/register.component.ts 查看文件

@@ -21,7 +21,7 @@ export class RegisterComponent implements OnInit{
21 21
     race: "Night Elf"
22 22
   }
23 23
 
24
-  ranks = _Rank
24
+  ranks = _Rank.splice(5) //remove admin, gm, officer
25 25
   classes = _Class
26 26
   races  = _Race
27 27
   selectedClass : Class = "Warrior"

正在加载...
取消
保存