diff --git a/backend/server/main/settings.py b/backend/server/main/settings.py index 76a661c..986343e 100644 --- a/backend/server/main/settings.py +++ b/backend/server/main/settings.py @@ -263,4 +263,4 @@ LOGGING = { } # https://github.com/dr5hn/countries-states-cities-database/tags -COUNTRY_REGION_JSON_VERSION = 'v2.4' \ No newline at end of file +COUNTRY_REGION_JSON_VERSION = 'v2.5' \ No newline at end of file diff --git a/documentation/docs/Usage/nginx_migration.md b/documentation/docs/Usage/nginx_migration.md new file mode 100644 index 0000000..4f071aa --- /dev/null +++ b/documentation/docs/Usage/nginx_migration.md @@ -0,0 +1,35 @@ +--- +sidebar_position: 2 +--- + +# AdventureLog v0.7.1 Migration Guide + +In order to make installation easier, the AdventureLog v0.7.1 release has **removed the need for a seperate nginx container** and cofig to serve the media files. Instead, the media files are now served by an instance of nginx running in the same container as the Django application. + +## Docker Compose Changes + +:::note + +You can also just use the new `docker-compose.yml` file in the repository and change the environment variables to match your setup. + +::: + +1. Remove the `nginx` service from your `docker-compose.yml` file. +2. Update the `PUBLIC_URL` environment variable in the `server` service (backend) to match the address of your **server**, instead of the previous nginx instance. For example, if your server is exposed to `https://localhost:8000`, set `PUBLIC_URL` to `http://localhost:8000`. If you are using a domain name, set `PUBLIC_URL` to `https://api.yourdomain.com` as an example. +3. Change port mapping for the `server` service. Right now it probally looks like this: + ```yaml + ports: + - "your-exposed-port:8000" + ``` + Change it to: + ```yaml + ports: + - "your-exposed-port:80" + ``` + This is because the nginx instance in the container is now serving the Django application on port 80. The port on the left side of the colon is the port on your host machine and this can be changed to whatever you want. The port on the right side of the colon is the port the Django application is running on in the container and should not be changed. + +That's it! You should now be able to run the application with the new configuration! This update also includes some performance enhancements so there should be a slight speed increase as well, especially with multiple users. + +Enjoy the new version of AdventureLog! 🎉 + +Report any bugs [GitHub repository](https://github.com/seanmorley15/adventurelog) or ask for help in the [Discord server](https://discord.gg/wRbQ9Egr8C). diff --git a/frontend/package.json b/frontend/package.json index 7842a94..b9aa1f4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "adventurelog-frontend", - "version": "0.7.0", + "version": "0.7.1", "scripts": { "dev": "vite dev", "django": "cd .. && cd backend/server && python3 manage.py runserver", diff --git a/frontend/src/lib/config.ts b/frontend/src/lib/config.ts index 1319ff3..15ee7ef 100644 --- a/frontend/src/lib/config.ts +++ b/frontend/src/lib/config.ts @@ -1,4 +1,4 @@ -export let appVersion = 'Web v0.7.0'; -export let versionChangelog = 'https://github.com/seanmorley15/AdventureLog/releases/tag/v0.7.0'; +export let appVersion = 'Web v0.7.1'; +export let versionChangelog = 'https://github.com/seanmorley15/AdventureLog/releases/tag/v0.7.1'; export let appTitle = 'AdventureLog'; export let copyrightYear = '2024'; diff --git a/frontend/src/routes/map/+page.svelte b/frontend/src/routes/map/+page.svelte index d3ec589..a8580c1 100644 --- a/frontend/src/routes/map/+page.svelte +++ b/frontend/src/routes/map/+page.svelte @@ -130,7 +130,9 @@ {#if isPopupOpen} (isPopupOpen = false)}> - + {#if adventure.images && adventure.images.length > 0} + + {/if}
{adventure.name}

{adventure.is_visited ? $t('adventures.visited') : $t('adventures.planned')}