package.json

@@ -11,7 +11,6 @@
     "migrate": "node-pg-migrate -m ./src/migrations",
     "test": "jest --forceExit"
   },
-  "type": "module",
   "keywords": [
     "express",
     "node.js",

src/app.js

@@ -1,15 +1,15 @@
 import express from 'express'
 import path from 'path'
 import cors from 'cors'
-import healthCheckRoutes from './routes/healthcheck'
-import authRoutes from './routes/auth'
-import userRoutes from './routes/users'
-import roleRoutes from './routes/roles'
-import locationRoutes from './routes/locations'
-import imageRoutes from './routes/images'
-import collectionRoutes from './routes/collections'
-import setRoutes from './routes/sets'
-import itemRoutes from './routes/items'
+import healthCheckRoutes from './routes/healthcheck/index.js'
+import authRoutes from './routes/auth/index.js'
+import userRoutes from './routes/users/index.js'
+import roleRoutes from './routes/roles/index.js'
+import locationRoutes from './routes/locations/index.js'
+import imageRoutes from './routes/images/index.js'
+import collectionRoutes from './routes/collections/index.js'
+import setRoutes from './routes/sets/index.js'
+import itemRoutes from './routes/items/index.js'
 
 const app = express()
 const port = process.env.PORT || 3000

src/config/index.js

@@ -1,13 +1,12 @@
 // config/index.js
-export default {
-	database: {
-		host: process.env.DB_HOST || 'localhost',
-		user: process.env.DB_USER || 'your_db_user',
-		password: process.env.DB_PASSWORD || 'your_db_password',
-		database: process.env.DB_NAME || 'your_db_name',
-		port: process.env.DB_PORT || 5432,
-	},
-	jwtEnv: {
-		secret: process.env.JWT_SECRET || '',
-	},
+export const database = {
+	host: process.env.DB_HOST || 'localhost',
+	user: process.env.DB_USER || 'your_db_user',
+	password: process.env.DB_PASSWORD || 'your_db_password',
+	database: process.env.DB_NAME || 'your_db_name',
+	port: process.env.DB_PORT || 5432,
+}
+
+export const jwtEnv = {
+	secret: process.env.JWT_SECRET || '',
 }

src/routes/auth/index.js

@@ -1,9 +1,8 @@
 import express from 'express'
 import jwt from 'jsonwebtoken'
 import bcrypt from 'bcryptjs'
-import { database, jwtEnv } from '../../config'
-
-const { Pool } = require('pg')
+import { database, jwtEnv } from '../../config/index.js'
+import { Pool } from 'pg'
 
 const router = express.Router()
 

src/routes/collections/index.js

@@ -1,8 +1,7 @@
 import express from 'express'
 import { Pool } from 'pg'
-import { database } from '../../config'
-
-const { check, validationResult } = require('express-validator')
+import { database } from '../../config/index.js'
+import { check, validationResult } from 'express-validator'
 
 const router = express.Router()
 

src/routes/images/index.js

@@ -1,8 +1,7 @@
 import express from 'express'
 import { Pool } from 'pg'
-import { database } from '../../config'
-
-const { check, validationResult } = require('express-validator')
+import { database } from '../../config/index.js'
+import { check, validationResult } from 'express-validator'
 
 const router = express.Router()
 

src/routes/items/index.js

@@ -1,8 +1,7 @@
 import express from 'express'
 import { Pool } from 'pg'
-import { database } from '../../config'
-
-const { check, validationResult } = require('express-validator')
+import { database } from '../../config/index.js'
+import { check, validationResult } from 'express-validator'
 
 const router = express.Router()
 

src/routes/locations/index.js

@@ -1,8 +1,7 @@
 import express from 'express'
 import { Pool } from 'pg'
-import { database } from '../../config'
-
-const { check, validationResult } = require('express-validator')
+import { database } from '../../config/index.js'
+import { check, validationResult } from 'express-validator'
 
 const router = express.Router()
 

src/routes/roles/index.js

@@ -1,7 +1,6 @@
 import express from 'express'
-import { database } from '../../config'
-
-const { Pool } = require('pg')
+import { database } from '../../config/index.js'
+import { Pool } from 'pg'
 
 const router = express.Router()
 

src/routes/sets/index.js

@@ -1,8 +1,7 @@
 import express from 'express'
 import { Pool } from 'pg'
-import { database } from '../../config'
-
-const { check, validationResult } = require('express-validator')
+import { database } from '../../config/index.js'
+import { check, validationResult } from 'express-validator'
 
 const router = express.Router()
 

src/routes/users/index.js

@@ -1,7 +1,6 @@
 import express from 'express'
-import { database } from '../../config'
-
-const { Pool } = require('pg')
+import { database } from '../../config/index.js'
+import { Pool } from 'pg'
 
 const router = express.Router()