Artworks fetch

Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile backend
-FROM node:16.14
+FROM node:lts-alpine
 
 WORKDIR /usr/src/app
 

backend/src/app.js

@@ -83,6 +83,7 @@ app.use(express.json());
 app.use(express.static("public"));
 
 // Import the API routes from the router module
+const path = require("path");
 const router = require("./router");
 
 // Mount the API routes under the "/api" endpoint
@@ -113,22 +114,20 @@ app.use(express.static(reactBuildPath));
 
 // Redirect unhandled requests to the react index file
 
-app.get("*", (req, res) => {
-  res.sendFile(`${reactBuildPath}/index.html`);
-});
-
-// const path = require("path");
-
-// app.use("*", (req, res) => {
-//   if (req.originalUrl.includes("assets")) {
-//     res.sendFile(
-//       path.resolve(__dirname, `../../frontend/dist/${req.originalUrl}`)
-//     );
-//   } else {
-//     res.sendFile(path.resolve(__dirname, `../../frontend/dist/index.html`));
-//   }
+// app.get("*", (req, res) => {
+//   res.sendFile(`${reactBuildPath}/index.html`);
 // });
 
+app.use("*", (req, res) => {
+  if (req.originalUrl.includes("assets")) {
+    res.sendFile(
+      path.resolve(__dirname, `../../frontend/dist/${req.originalUrl}`)
+    );
+  } else {
+    res.sendFile(path.resolve(__dirname, `../../frontend/dist/index.html`));
+  }
+});
+
 /* ************************************************************************* */
 
 // Middleware for Error Logging (Uncomment to enable)

backend/src/models/CaptureManager.js

@@ -24,7 +24,11 @@ class CaptureManager extends AbstractManager {
   }
 
   async readAll() {
-    const [rows] = await this.database.query(`SELECT * FROM ${this.table}`);
+    const [rows] = await this.database.query(`
+    SELECT c.id, c.user_id, c.artwork_id, c.capture, a.picture AS artwork_url
+    FROM ${this.table} c
+    LEFT JOIN artworks a ON c.artwork_id = a.id
+  `);
     return rows;
   }
 

docker-compose.prod.yml

@@ -19,6 +19,7 @@ services:
       DB_USER: ${USER_NAME}
       DB_PASSWORD: ${USER_PASSWORD}
       DB_NAME: ${DB_NAME}
+      VITE_BACKEND_URL: ""
     networks:
       - proxy
     labels:
@@ -30,4 +31,4 @@ services:
 
 networks:
   proxy:
-    external: true
+    external: true

frontend/src/components/CaptureAdmin.jsx

@@ -50,7 +50,7 @@ function CaptureAdmin() {
           <img
             alt="Street Art"
             className="original-img-grid"
-            src={artwork.picture}
+            src={artwork.artwork_url}
           />
           <p className="original-work-grid">Oeuvre Originale</p>
         </div>