updateweb
This commit is contained in:
@@ -8,10 +8,17 @@ require("dotenv").config();
|
||||
const app = express();
|
||||
const PORT = process.env.PORT || 5000;
|
||||
|
||||
// Serve static files from /var/www/skyartshop
|
||||
app.use(express.static("/var/www/skyartshop/public"));
|
||||
app.use("/assets", express.static("/var/www/skyartshop/assets"));
|
||||
app.use("/uploads", express.static("/var/www/skyartshop/uploads"));
|
||||
// Development mode - Serve static files from development directory
|
||||
const isDevelopment = process.env.NODE_ENV !== "production";
|
||||
const baseDir = isDevelopment
|
||||
? path.join(__dirname, "..", "website")
|
||||
: "/var/www/skyartshop";
|
||||
|
||||
console.log(`📁 Serving from: ${baseDir}`);
|
||||
|
||||
app.use(express.static(path.join(baseDir, "public")));
|
||||
app.use("/assets", express.static(path.join(baseDir, "assets")));
|
||||
app.use("/uploads", express.static(path.join(baseDir, "uploads")));
|
||||
|
||||
app.use(express.json());
|
||||
app.use(express.urlencoded({ extended: true }));
|
||||
@@ -27,13 +34,12 @@ app.use(
|
||||
resave: false,
|
||||
saveUninitialized: false,
|
||||
cookie: {
|
||||
secure: process.env.NODE_ENV === "production" ? true : false,
|
||||
secure: false, // Always false for localhost development
|
||||
httpOnly: true,
|
||||
maxAge: 24 * 60 * 60 * 1000,
|
||||
sameSite: "lax",
|
||||
domain: process.env.NODE_ENV === "production" ? ".ddns.net" : "localhost",
|
||||
},
|
||||
proxy: true,
|
||||
proxy: false, // No proxy in development
|
||||
name: "skyartshop.sid",
|
||||
})
|
||||
);
|
||||
@@ -49,6 +55,7 @@ const authRoutes = require("./routes/auth");
|
||||
const adminRoutes = require("./routes/admin");
|
||||
const publicRoutes = require("./routes/public");
|
||||
const usersRoutes = require("./routes/users");
|
||||
const uploadRoutes = require("./routes/upload");
|
||||
|
||||
// Admin redirect - handle /admin to redirect to login (must be before static files)
|
||||
app.get("/admin", (req, res) => {
|
||||
@@ -63,14 +70,15 @@ app.get("/admin/", (req, res) => {
|
||||
app.use("/api/admin", authRoutes);
|
||||
app.use("/api/admin", adminRoutes);
|
||||
app.use("/api/admin/users", usersRoutes);
|
||||
app.use("/api/admin", uploadRoutes);
|
||||
app.use("/api", publicRoutes);
|
||||
|
||||
// Admin static files (must be after redirect routes)
|
||||
app.use("/admin", express.static("/var/www/skyartshop/admin"));
|
||||
app.use("/admin", express.static(path.join(baseDir, "admin")));
|
||||
|
||||
// Root redirect to admin login
|
||||
// Root redirect to home page
|
||||
app.get("/", (req, res) => {
|
||||
res.redirect("/admin/login.html");
|
||||
res.sendFile(path.join(baseDir, "public", "index.html"));
|
||||
});
|
||||
|
||||
app.get("/health", (req, res) => {
|
||||
|
||||
Reference in New Issue
Block a user