Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-08-05 05:05:17 +02:00
Code Issues Releases Activity

Merge pull request #120 from seanmorley15/development

Browse source 
docker fix
This commit is contained in:
Sean Morley 2024-07-12 09:21:24 -04:00 • committed by GitHub
commit 4d73b9b06a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docker-compose.yml
View file

@ -6,7 +6,7 @@ services:
#image: ghcr.io/seanmorley15/adventurelog-frontend:latest
environment:
- PUBLIC_SERVER_URL=http://server:8000
- ORIGIN=http://10.0.0.92:8080
- ORIGIN=http://localhost:8080
- BODY_SIZE_LIMIT=Infinity
ports:
- "8080:3000"
@ -34,7 +34,7 @@ services:
- DJANGO_ADMIN_USERNAME=admin
- DJANGO_ADMIN_PASSWORD=admin
- DJANGO_ADMIN_EMAIL=admin@example.com
- PUBLIC_URL='http://10.0.92:81'
- PUBLIC_URL='http://localhost:81'
- CSRF_TRUSTED_ORIGINS=https://api.adventurelog.app,https://adventurelog.app
- DEBUG=False
ports:

6
frontend/src/routes/adventures/+page.server.ts
View file

@ -442,12 +442,6 @@ export const actions: Actions = {
// Start with the current URL if next and previous are not provided
let url: string = next || previous || event.url.toString();
let index = url.indexOf('/api');
let newUrl = url.substring(index);
console.log('NEW URL' + newUrl);
url = serverEndpoint + newUrl;
console.log('URL' + url);
// Replace or add the page number in the URL
if (url.includes('page=')) {
url = url.replace(/page=\d+/, `page=${page}`);