Fixing login
This commit is contained in:
+15
-4
@@ -94,9 +94,12 @@ declare global {
|
||||
|
||||
const app = express();
|
||||
const port = Number(process.env.PORT ?? 5000);
|
||||
const databaseUrl =
|
||||
process.env.DATABASE_URL ||
|
||||
`postgresql://${process.env.POSTGRES_USER}:${process.env.POSTGRES_PASSWORD}@localhost:5432/${process.env.POSTGRES_DB}`;
|
||||
const databaseUrl = process.env.DATABASE_URL || '';
|
||||
const postgresHost = process.env.POSTGRES_HOST ?? 'localhost';
|
||||
const postgresPort = Number(process.env.POSTGRES_PORT ?? 5432);
|
||||
const postgresDatabase = process.env.POSTGRES_DB ?? 'arsenal_iq';
|
||||
const postgresUser = process.env.POSTGRES_USER ?? 'arsenal';
|
||||
const postgresPassword = process.env.POSTGRES_PASSWORD ?? 'arsenal_dev_password';
|
||||
const frontendUrl = process.env.FRONTEND_URL || 'http://localhost:3000';
|
||||
const apiBaseUrl = process.env.API_BASE_URL || 'http://localhost:5000/api';
|
||||
const allowRegistration = (process.env.ALLOW_REGISTRATION ?? 'true').toLowerCase() !== 'false';
|
||||
@@ -104,7 +107,15 @@ const allowDemoAccount = (process.env.ALLOW_DEMO_ACCOUNT ?? 'false').toLowerCase
|
||||
const demoAccountPassword = process.env.DEMO_ACCOUNT_PASSWORD ?? 'demo1234';
|
||||
const demoAccountName = process.env.DEMO_ACCOUNT_NAME ?? 'Demo User';
|
||||
const { Pool } = pg;
|
||||
const pool = new Pool({ connectionString: databaseUrl });
|
||||
const pool = databaseUrl
|
||||
? new Pool({ connectionString: databaseUrl })
|
||||
: new Pool({
|
||||
host: postgresHost,
|
||||
port: postgresPort,
|
||||
database: postgresDatabase,
|
||||
user: postgresUser,
|
||||
password: postgresPassword,
|
||||
});
|
||||
|
||||
const defaultCalibers = ['9mm', '.22 LR', '5.56 NATO', '.308 Win', '12 Gauge', '.45 ACP'];
|
||||
const firearmCategories = ['Handgun', 'Rifle', 'Shotgun', 'PCC', 'Other'];
|
||||
|
||||
Reference in New Issue
Block a user