Merge branch 'add-product-upload-page'

inventory-server/package-lock.json

@@ -1537,20 +1537,6 @@
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "license": "ISC"
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",

inventory-server/src/utils/db.js

@@ -1,47 +1,10 @@
-const { Pool, Client } = require('pg');
-const { Client: SSHClient } = require('ssh2');
+const mysql = require('mysql2/promise');
 
 let pool;
 
 function initPool(config) {
-  // Log config without sensitive data
-  const safeConfig = {
-    host: config.host || process.env.DB_HOST,
-    user: config.user || process.env.DB_USER,
-    database: config.database || process.env.DB_NAME,
-    port: config.port || process.env.DB_PORT || 5432,
-    max: config.max || 10,
-    idleTimeoutMillis: config.idleTimeoutMillis || 30000,
-    connectionTimeoutMillis: config.connectionTimeoutMillis || 2000,
-    ssl: config.ssl || false,
-    password: (config.password || process.env.DB_PASSWORD) ? '[password set]' : '[no password]'
-  };
-  console.log('[Database] Initializing pool with config:', safeConfig);
-  
-  // Create the pool with the configuration
-  pool = new Pool({
-    host: config.host || process.env.DB_HOST,
-    user: config.user || process.env.DB_USER,
-    password: config.password || process.env.DB_PASSWORD,
-    database: config.database || process.env.DB_NAME,
-    port: config.port || process.env.DB_PORT || 5432,
-    max: config.max || 10,
-    idleTimeoutMillis: config.idleTimeoutMillis || 30000,
-    connectionTimeoutMillis: config.connectionTimeoutMillis || 2000,
-    ssl: config.ssl || false
-  });
-
-  // Test the pool connection
-  return pool.connect()
-    .then(client => {
-      console.log('[Database] Pool connection successful');
-      client.release();
-      return pool;
-    })
-    .catch(err => {
-      console.error('[Database] Connection failed:', err);
-      throw err;
-    });
+  pool = mysql.createPool(config);
+  return pool;
 }
 
 async function getConnection() {