From a8c21ef42dbc21190d7fb6b4d328b7686ffee99c Mon Sep 17 00:00:00 2001
From: Tassana Pralao <65160024@go.buu.ac.th>
Date: Mon, 24 Mar 2025 15:13:50 +0700
Subject: [PATCH] update server.js

---
 server.js                | 29 +++++++++++++++++++++--------
 server/package-lock.json | 13 +++++++++++++
 server/package.json      |  1 +
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/server.js b/server.js
index 2999df97..90df7322 100644
--- a/server.js
+++ b/server.js
@@ -1,10 +1,12 @@
-const mysql = require("mysql2");
 const express = require("express");
-const app = express();
+const mysql = require("mysql2");
 const morgan = require("morgan");
 const { readdirSync } = require("fs");
 const cors = require("cors");
 const path = require("path");
+require("dotenv").config(); // โหลดตัวแปรจาก .env
+
+const app = express();
 
 // เชื่อมต่อฐานข้อมูล MySQL
 const db = mysql.createConnection({
@@ -19,7 +21,11 @@ const db = mysql.createConnection({
 db.connect((err) => {
   if (err) {
     console.error("❌ ไม่สามารถเชื่อมต่อฐานข้อมูล:", err);
+<<<<<<< HEAD:server.js
     return;
+=======
+    process.exit(1); // ปิดโปรแกรมถ้าเชื่อมต่อไม่ได้
+>>>>>>> 8a73597 (update server.js):server/server.js
   }
   console.log("✅ เชื่อมต่อฐานข้อมูลสำเร็จ!");
 });
@@ -27,11 +33,7 @@ db.connect((err) => {
 // Middleware
 app.use(morgan("dev"));
 app.use(express.json({ limit: "20mb" }));
-app.use(
-  cors({
-    origin: "*", // อนุญาตทุกโดเมน
-  })
-);
+app.use(cors({ origin: "*" }));
 
 // โหลด router จากโฟลเดอร์ routes
 const routesPath = path.join(__dirname, "routes");
@@ -40,8 +42,19 @@ readdirSync(routesPath).map((file) => {
   app.use("/api", require(routePath));
 });
 
+<<<<<<< HEAD:server.js
 // app.get('/', (req, res) => {
 //   res.send('Hello World!')
 // })
 
-app.listen(3000, () => console.log("Server is running on port 3000"));
\ No newline at end of file
+app.listen(3000, () => console.log("Server is running on port 3000"));
+=======
+// Route หลัก
+app.get("/", (req, res) => {
+  res.send("Hello, world!");
+});
+
+// เริ่มเซิร์ฟเวอร์
+const PORT = process.env.PORT || 3000;
+app.listen(PORT, () => console.log(`🚀 Server is running on port ${PORT}`));
+>>>>>>> 8a73597 (update server.js):server/server.js
diff --git a/server/package-lock.json b/server/package-lock.json
index e4ba31fe..bae426a9 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -13,6 +13,7 @@
         "bcryptjs": "^3.0.2",
         "cloudinary": "^2.6.0",
         "cors": "^2.8.5",
+        "dotenv": "^16.4.7",
         "express": "^4.21.2",
         "jsonwebtoken": "^9.0.2",
         "morgan": "^1.10.0",
@@ -770,6 +771,18 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/dotenv": {
+      "version": "16.4.7",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
+      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
diff --git a/server/package.json b/server/package.json
index efadb970..5aabaa82 100644
--- a/server/package.json
+++ b/server/package.json
@@ -16,6 +16,7 @@
     "bcryptjs": "^3.0.2",
     "cloudinary": "^2.6.0",
     "cors": "^2.8.5",
+    "dotenv": "^16.4.7",
     "express": "^4.21.2",
     "jsonwebtoken": "^9.0.2",
     "morgan": "^1.10.0",
-- 
GitLab