From a949085e62832ce9fac00338964b88cc510b2141 Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 12 Apr 2020 02:53:04 +0200 Subject: [PATCH] ZG loots and hide admin roles when registering --- log.txt | 141 +++++++++++++++--- src/backend/Types/Items.ts | 8 +- src/backend/Types/Types.ts | 1 - .../auth/register/register.component.html | 2 +- .../auth/register/register.component.ts | 2 +- 5 files changed, 132 insertions(+), 22 deletions(-) diff --git a/log.txt b/log.txt index 9dafd4e..ae1338b 100644 --- a/log.txt +++ b/log.txt @@ -1,22 +1,23 @@ -[2020-03-29T12:12:03.477] [DEBUG] Admin#makeKnex - Making new knex: { +[2020-04-12T02:46:02.286] [DEBUG] Admin#makeKnex - Making new knex: { client: 'sqlite3', - 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. -Terminated -npm ERR! code ELIFECYCLE -npm ERR! errno 143 -npm ERR! frontcraft@1.0.0 launch: `node lib/src/backend/Launcher.js > log.txt "-"` -npm ERR! Exit status 143 -npm ERR! -npm ERR! Failed at the frontcraft@1.0.0 launch script. -npm ERR! This is probably not a problem with npm. There is likely additional logging output above. - -npm ERR! A complete log of this run can be found in: -npm ERR! /home/cake/.npm/_logs/2020-03-29T10_12_28_351Z-debug.log -s loaded -[2020-03-29T12:12:04.535] [INFO] Admin#startWebserver - Admin panel listening for HTTP on *8080 -[2020-03-29T12:12:17.689] [DEBUG] UserManager#checkConnection - { + connection: { + filename: '/home/cake/nitowa.xyz/frontcraft/admin/data/frontworkAdmin.sqlite' + }, + migrations: { + directory: '/home/cake/nitowa.xyz/frontcraft/admin/migrations', + extension: 'ts' + }, + useNullAsDefault: true +} +[2020-04-12T02:46:02.426] [DEBUG] Admin#startWebsocket - Websocket up on 20000 +[2020-04-12T02:46:02.427] [DEBUG] UserManager#initialize - setting up permissions +skipping spec insertion +[2020-04-12T02:46:02.613] [DEBUG] Admin#start - 6 components initialized +[2020-04-12T02:46:03.296] [INFO] Admin#startWebserver - Frontend from /home/cake/nitowa.xyz/frontcraft/admin/dist/server.js loaded +[2020-04-12T02:46:03.297] [INFO] Admin#startWebserver - Admin panel listening for HTTP on *8080 +[2020-04-12T02:46:42.194] [DEBUG] UserManager#checkConnection - { celinda: { - connections: { '59288': [Socket] }, + connections: { '45536': [Socket] }, auth: { token: [Object], user: [Object], port: 20001 }, user: { id: 3, @@ -30,4 +31,108 @@ s loaded Naxx: 1 } } -} [ '1563eebe-9da2-4b31-b4ef-ef3aaa7e23b1' ] +} [ 'cfa202ff-5f2c-4e4e-9fa5-9a45233ab0e0' ] +[2020-04-12T02:49:29.208] [DEBUG] UserManager#closeHandler - { + celinda: { + connections: {}, + auth: { token: [Object], user: [Object], port: 20001 }, + user: { + id: 3, + username: 'celinda', + rank: 'Officer', + MC: 1, + BWL: 0, + ZG: 1, + AQ20: 1, + AQ40: 1, + Naxx: 1 + } + } +} [ 'cfa202ff-5f2c-4e4e-9fa5-9a45233ab0e0' ] +[2020-04-12T02:49:31.572] [DEBUG] UserManager#checkConnection - { + celinda: { + connections: { '46948': [Socket] }, + auth: { token: [Object], user: [Object], port: 20001 }, + user: { + id: 3, + username: 'celinda', + rank: 'Officer', + MC: 1, + BWL: 0, + ZG: 1, + AQ20: 1, + AQ40: 1, + Naxx: 1 + } + } +} [ 'cfa202ff-5f2c-4e4e-9fa5-9a45233ab0e0' ] +[2020-04-12T02:49:37.031] [DEBUG] UserManager#closeHandler - { + celinda: { + connections: {}, + auth: { token: [Object], user: [Object], port: 20001 }, + user: { + id: 3, + username: 'celinda', + rank: 'Officer', + MC: 1, + BWL: 0, + ZG: 1, + AQ20: 1, + AQ40: 1, + Naxx: 1 + } + } +} [ 'cfa202ff-5f2c-4e4e-9fa5-9a45233ab0e0' ] +[2020-04-12T02:49:38.886] [DEBUG] UserManager#checkConnection - { + celinda: { + connections: { '47044': [Socket] }, + auth: { token: [Object], user: [Object], port: 20001 }, + user: { + id: 3, + username: 'celinda', + rank: 'Officer', + MC: 1, + BWL: 0, + ZG: 1, + AQ20: 1, + AQ40: 1, + Naxx: 1 + } + } +} [ 'cfa202ff-5f2c-4e4e-9fa5-9a45233ab0e0' ] +[2020-04-12T02:49:44.132] [DEBUG] UserManager#closeHandler - {} [] +[2020-04-12T02:52:10.916] [DEBUG] UserManager#checkConnection - { + celinda: { + connections: { '48390': [Socket] }, + auth: { token: [Object], user: [Object], port: 20001 }, + user: { + id: 3, + username: 'celinda', + rank: 'Officer', + MC: 1, + BWL: 0, + ZG: 0, + AQ20: 1, + AQ40: 1, + Naxx: 1 + } + } +} [ '7a8bbb51-412a-4bee-9e0e-9b7cbaef82d8' ] +[2020-04-12T02:52:47.682] [INFO] process#SIGINT - Shutting down from SIGINT (Ctrl-C) +[2020-04-12T02:52:47.684] [DEBUG] UserManager#closeHandler - { + celinda: { + connections: {}, + auth: { token: [Object], user: [Object], port: 20001 }, + user: { + id: 3, + username: 'celinda', + rank: 'Officer', + MC: 1, + BWL: 0, + ZG: 0, + AQ20: 1, + AQ40: 1, + Naxx: 1 + } + } +} [ '7a8bbb51-412a-4bee-9e0e-9b7cbaef82d8' ] diff --git a/src/backend/Types/Items.ts b/src/backend/Types/Items.ts index d16cde7..d5e4b85 100644 --- a/src/backend/Types/Items.ts +++ b/src/backend/Types/Items.ts @@ -281,6 +281,12 @@ export const T2:string[] = [ "Sabatons of Wrath" ] +export const ZGMounts = [ + "Swift Zulian Tiger", + "Swift Razzashi Raptor", + "Primal Hakkari Idol" +] + export type AllItems = { [tier in Tiers] : string[] } @@ -288,7 +294,7 @@ export type AllItems = { export const allItems : AllItems = { MC: T1, BWL: T2, - ZG:[], + ZG: ZGMounts, AQ20: [], AQ40: [], Naxx: [] diff --git a/src/backend/Types/Types.ts b/src/backend/Types/Types.ts index a1a6e3e..8c0b2f6 100644 --- a/src/backend/Types/Types.ts +++ b/src/backend/Types/Types.ts @@ -142,7 +142,6 @@ export type User = { username: string pwhash: string rank: Rank - currency?: number } & { [currency in Tiers]? : number } diff --git a/src/frontend/src/app/frontcraft/auth/register/register.component.html b/src/frontend/src/app/frontcraft/auth/register/register.component.html index da18425..5ae9a5e 100644 --- a/src/frontend/src/app/frontcraft/auth/register/register.component.html +++ b/src/frontend/src/app/frontcraft/auth/register/register.component.html @@ -37,7 +37,7 @@ - I understand this is super beta and things might not work or are not very pretty + By creating an account I am okay with cookies on my machine
diff --git a/src/frontend/src/app/frontcraft/auth/register/register.component.ts b/src/frontend/src/app/frontcraft/auth/register/register.component.ts index 82b3454..24de763 100644 --- a/src/frontend/src/app/frontcraft/auth/register/register.component.ts +++ b/src/frontend/src/app/frontcraft/auth/register/register.component.ts @@ -21,7 +21,7 @@ export class RegisterComponent implements OnInit{ race: "Night Elf" } - ranks = _Rank + ranks = _Rank.splice(5) //remove admin, gm, officer classes = _Class races = _Race selectedClass : Class = "Warrior"