diff --git a/admin/admin.js b/admin/admin.js index c5d5318..bb3a8b8 100644 --- a/admin/admin.js +++ b/admin/admin.js @@ -55,9 +55,9 @@ document.addEventListener('DOMContentLoaded', () => { const responseDiv = document.getElementById('response'); const backendUrl = (() => { - const { hostname } = window.location; - // Always use http because the backend is not serving https - return `http://${hostname}:5000`; + const { protocol } = window.location; + const backendHostname = 'photobackend.beachpartyballoons.com'; + return `${protocol}//${backendHostname}`; // No explicit port needed as it's on 443 })(); const LAST_TAGS_KEY = 'bpb-last-tags'; let adminPassword = ''; diff --git a/docker-compose.yml b/docker-compose.yml index 8baa9dd..aa78968 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: photo-gallery-backend: build: ./photo-gallery-app/backend ports: - - "5000:5000" + - "5001:5000" environment: MONGO_URI: mongodb://mongodb:27017/photogallery WATERMARK_URL: http://watermarker:8000/watermark diff --git a/photo-gallery-app/backend/Dockerfile b/photo-gallery-app/backend/Dockerfile index d7b9028..d361c55 100644 --- a/photo-gallery-app/backend/Dockerfile +++ b/photo-gallery-app/backend/Dockerfile @@ -8,6 +8,7 @@ WORKDIR /usr/src/app RUN apt-get update && apt-get install -y \ imagemagick \ ghostscript \ + libheif-dev \ && rm -rf /var/lib/apt/lists/* # Copy package.json and package-lock.json to the working directory diff --git a/photo-gallery-app/backend/server.js b/photo-gallery-app/backend/server.js index 5c30128..4e04ff6 100644 --- a/photo-gallery-app/backend/server.js +++ b/photo-gallery-app/backend/server.js @@ -7,6 +7,7 @@ const port = process.env.PORT || 5000; const whitelist = [ 'https://preview.beachpartyballoons.com', + 'https://photobackend.beachpartyballoons.com', // Added new backend hostname as a potential origin 'http://localhost:3050', 'http://127.0.0.1:3050', 'http://localhost:8080' // Common local dev port