Skip to content

Commit

Permalink
Merge pull request #120 from seanmorley15/development
Browse files Browse the repository at this point in the history
docker fix
  • Loading branch information
seanmorley15 authored Jul 12, 2024
2 parents ddc492b + 4ac61bc commit 4d73b9b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -34,7 +34,7 @@ services:
- DJANGO_ADMIN_USERNAME=admin
- DJANGO_ADMIN_PASSWORD=admin
- [email protected]
- 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:
Expand Down
6 changes: 0 additions & 6 deletions frontend/src/routes/adventures/+page.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
Expand Down

0 comments on commit 4d73b9b

Please sign in to comment.