Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ss220-space/queue-manager
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 497ece5e571c5bef4efbfa998cb87eaf3697f7b0
Choose a base ref
..
head repository: ss220-space/queue-manager
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 46bb312c4fafc2ff03664babe59b0204ea0c8888
Choose a head ref
Showing with 116 additions and 115 deletions.
  1. +2 −2 queue-backend/package.json
  2. +9 −8 queue-backend/prisma/schema.prisma
  3. +105 −105 queue-backend/yarn.lock
4 changes: 2 additions & 2 deletions queue-backend/package.json
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
"@nestjs/platform-ws": "^8.2.4",
"@nestjs/schedule": "^1.0.2",
"@nestjs/websockets": "^8.2.4",
"@prisma/client": "^3.10.0",
"@prisma/client": "^4.3.1",
"@types/ioredis": "^4.28.5",
"async-mutex": "^0.3.2",
"byond-fetch": "^1.0.2",
@@ -70,7 +70,7 @@
"eslint-plugin-import": "2.25.3",
"jest": "27.4.5",
"prettier": "2.5.1",
"prisma": "^3.7.0",
"prisma": "^4.3.1",
"supertest": "6.1.6",
"ts-jest": "27.1.2",
"ts-loader": "9.2.6",
17 changes: 9 additions & 8 deletions queue-backend/prisma/schema.prisma
Original file line number Diff line number Diff line change
@@ -127,14 +127,15 @@ model characters {
}

model ckey_whitelist {
id Int @id @default(autoincrement())
date DateTime @default(now()) @db.DateTime(0)
ckey String @db.VarChar(32)
adminwho String @db.VarChar(32)
port Int @db.UnsignedInt
date_start DateTime @default(now()) @db.DateTime(0)
date_end DateTime? @db.DateTime(0)
is_valid Boolean @default(true)
id Int @id @default(autoincrement())
date DateTime @default(now()) @db.DateTime(0)
ckey String @db.VarChar(32)
adminwho String @db.VarChar(32)
port Int @db.UnsignedInt
date_start DateTime @default(now()) @db.DateTime(0)
date_end DateTime? @db.DateTime(0)
is_valid Boolean @default(true)
is_blocktime Int? @default(0) @db.TinyInt
}

model connection_log {
Loading