Merge remote-tracking branch 'origin/blond-maggots/francois' into blond-maggots/main

# Conflicts:
#	src/pages/index.tsx

Author: François Pelletier

.eslintrc.js

@@ -3,11 +3,12 @@ module.exports = {
   extends: [
     "plugin:react/recommended",
     "plugin:@typescript-eslint/recommended",
+    "next/core-web-vitals",
   ],
   rules: { "react/react-in-jsx-scope": "off" },
   settings: {
     react: {
       version: "detect",
     },
   },
-};
+};

.gitignore

@@ -165,4 +165,5 @@ cython_debug/
 next-env.d.ts
 dist
 
-coverage/
+coverage/
+/.env

Dockerfile

@@ -1,32 +1,39 @@
-# Stage 1: Build the application
+# Build stage
 FROM node:20-alpine AS build
 
-# Set the working directory
 WORKDIR /app
 
-# Copy package.json and package-lock.json
+# Copy package.json and package-lock.json (if available)
 COPY package*.json ./
 
 # Install dependencies
-RUN npm install
+RUN npm ci --only=production
 
-# Copy the rest of the application code
-COPY . .
+# Copy only necessary files for the build
+COPY *.json ./
+COPY *.js ./
+COPY *.ts ./
+COPY cypress ./cypress
+COPY public ./public
+COPY src ./src
 
 # Build the application
 RUN npm run build
 
-# Stage 2: Serve the application
-FROM fholzer/nginx-brotli:v1.23.4
+# Production stage
+FROM nginx:alpine
 
-# Copy nginx configuration file
-COPY nginx.conf /etc/nginx/nginx.conf
+# Remove default nginx static assets
+RUN rm -rf /usr/share/nginx/html/*
 
 # Copy built files from the previous stage
-COPY --from=build /app/build /usr/share/nginx/html
+COPY --from=build /app/dist /usr/share/nginx/html
+
+# Copy nginx configuration
+COPY nginx.conf /etc/nginx/nginx.conf
 
 # Expose port 8080
 EXPOSE 8080
 
 # Start nginx
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["nginx", "-g", "daemon off;"]

cypress/support/commands.ts

@@ -1,37 +1,4 @@
-/// <reference types="cypress" />
-// ***********************************************
-// This example commands.ts shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-//
-// declare global {
-//   namespace Cypress {
-//     interface Chainable {
-//       login(email: string, password: string): Chainable<void>
-//       drag(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
-//       dismiss(subject: string, options?: Partial<TypeOptions>): Chainable<Element>
-//       visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element>
-//     }
-//   }
-// }
+// Add your Cypress commands here
+
+// Add this line at the end of the file
+export {};

docker-run-local.sh

@@ -1,4 +1,4 @@
 docker network create medical-codex-net
 docker stop codex-website-app
 docker rm codex-website-app
-docker run -p 8080:8080 --env-file=.env --network medical-codex-net --name codex-website-app codex-website-app
+docker run -p 8080:8080 --env-file=".env" --network medical-codex-net --name codex-website-app codex-website-app

next.config.js

@@ -1,6 +1,14 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
+  reactStrictMode: true,
+  output: 'export',
   distDir: "./dist", // Changes the build output directory to `./dist/`.
+  images: {
+    unoptimized: true,
+  },
+  env: {
+    NEXT_PUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL,
+  },
 };
 
-module.exports = nextConfig;
+module.exports = nextConfig;

nginx.conf

@@ -1,67 +1,32 @@
-user  nginx;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
-
 events {
-    worker_connections  1024;
+    worker_connections 1024;
 }
 
 http {
-    include       /etc/nginx/mime.types;
-    default_type  application/octet-stream;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    gzip on;
-    gzip_disable "msie6";
-
-    gzip_vary on;
-    gzip_proxied any;
-    gzip_comp_level 6;
-    gzip_buffers 16 8k;
-    gzip_http_version 1.1;
-    gzip_types text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
-
-    brotli on;
-    brotli_types text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
-    brotli_static on;
-
+    types {
+        text/html                             html htm shtml;
+        text/css                              css;
+        application/javascript                js;
+        # ... other types ...
+    }
     server {
         listen 8080;
-
+        server_name localhost;
         root /usr/share/nginx/html;
         index index.html;
 
-        server_name localhost;
-
-        location ~* \.(?:manifest|appcache|html?|xml|json)$ {
-            expires -1;
+        location / {
+            try_files $uri $uri.html $uri/ =404;
         }
 
-        location ~* \.(?:css|js)$ {
-            try_files $uri =404;
-            expires 1y;
-            access_log off;
-            add_header Cache-Control "public";
+        location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
+            expires max;
+            log_not_found off;
         }
 
-        location ~ ^.+\..+$ {
-            try_files $uri =404;
-        }
-
-        location / {
-            try_files $uri $uri/ /index.html;
+        error_page 404 /404.html;
+        location = /404.html {
+            internal;
         }
     }
-}
+}

src/pages/index.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, FC } from "react";
+import React, { useState, FC, useEffect } from "react";
 import SearchSection from "@/components/HomePage/SearchSection";
 import ResultsSection from "@/components/HomePage/ResultsSection";
 import TranslateSection from "@/components/HomePage/TranslateSection";
@@ -7,11 +7,14 @@ import handleTranslate from "@/utils/handleTranslate";
 import HelpModal from "@/components/ui/modals/HelpModal";
 import Head from "next/head";
 
-const NEXT_PUBLIC_API_URL: string | undefined = process.env.NEXT_PUBLIC_API_URL;
+const NEXT_PUBLIC_API_URL: string | undefined = process.env.NEXT_PUBLIC_API_URL || 'http://localhost:8000' ;
 
 const languages = ["English", "Ukrainian", "Russian", "French"];
 
 const HomePage: FC = () => {
+  useEffect(() => {
+    console.log("API URL:", process.env.NEXT_PUBLIC_API_URL);
+  }, []);
   const [inputSearch, setInputSearch] = useState<string>("");
   const [outputTranslation, setOutputTranslation] = useState<string>("");
   const [medicines, setMedicines] = useState<Array<{ matching_name: string }>>(