diff --git a/docker-compose.yml b/docker-compose.yml index f4fe517..7e4b345 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -35,22 +35,22 @@ services: - ./shared:/shared restart: unless-stopped - login-auth: - container_name: login-auth - build: ./login-auth_backend - ports: - - "4002:4002" - environment: - DB_HOST: mysql - DB_USER: root - DB_PASSWORD: D7Ze0lwV9hMrNQHdz1Q8yi0MIQuOO8 - DB_NAME: login_page - depends_on: - - mysql - volumes: - - ./login-auth_backend:/login-auth_app - - ./shared:/shared - restart: unless-stopped +# login-auth: +# container_name: login-auth +# build: ./login-auth_backend +# ports: +# - "4002:4002" +# environment: +# DB_HOST: mysql +# DB_USER: root +# DB_PASSWORD: D7Ze0lwV9hMrNQHdz1Q8yi0MIQuOO8 +# DB_NAME: login_page +# depends_on: +# - mysql +# volumes: +# - ./login-auth_backend:/login-auth_app +# - ./shared:/shared +# restart: unless-stopped mysql: container_name: mysql-db diff --git a/panel-mgmt_backend/server.js b/panel-mgmt_backend/server.js index 478c01d..e58a0b7 100644 --- a/panel-mgmt_backend/server.js +++ b/panel-mgmt_backend/server.js @@ -33,27 +33,15 @@ app.get("/", (req, res) => { res.render("index.ejs", { error: null }); }); -app.post("/login", (req, res) => { +app.post("/login", async (req, res) => { const { username, password } = req.body; - const apiUrl = "http://localhost:4002/login"; - - axios - .post(apiUrl, { username, password }) - .then(function (response) { - if (response.data.loginQuery) { - // If login is successful, redirect to the dashboard - res.render("userView.ejs"); - } else { - // If login fails, render the login page with an error message - res.status(404).render("index.ejs", { error: response.data.message }); - } - }) - .catch(function (error) { - console.error("Error during login:", error); - res - .status(500) - .render("index.ejs", { error: "An error occurred during login." }); - }); + loginUser(username, password).then((result) => { + if (result.success === true) { + res.render("userView.ejs"); + } else { + res.render("index.ejs", { error: result.message }); + } + }); }); // error handling code