Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-19 12:59:36 +02:00
Code Issues Releases Activity

Security improvments

Browse source
This commit is contained in:
Sean Morley 2024-08-06 09:35:18 -04:00
parent 8453be8003
commit 3b002c0c50
4 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backend/server/adventures/serializers.py
View file

@ -7,6 +7,7 @@ class AdventureSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Adventure model = Adventure
fields = '__all__' fields = '__all__'
read_only_fields = ['id', 'created_at', 'updated_at', 'user_id']
def to_representation(self, instance): def to_representation(self, instance):
representation = super().to_representation(instance) representation = super().to_representation(instance)
@ -205,4 +206,4 @@ class CollectionSerializer(serializers.ModelSerializer):
model = Collection model = Collection
# fields are all plus the adventures field # fields are all plus the adventures field
fields = ['id', 'description', 'user_id', 'name', 'is_public', 'adventures', 'created_at', 'start_date', 'end_date', 'transportations', 'notes', 'updated_at', 'checklists'] fields = ['id', 'description', 'user_id', 'name', 'is_public', 'adventures', 'created_at', 'start_date', 'end_date', 'transportations', 'notes', 'updated_at', 'checklists']
read_only_fields = ['id', 'created_at', 'updated_at'] read_only_fields = ['id', 'created_at', 'updated_at', 'user_id']

24
backend/server/users/serializers.py
View file

@ -105,19 +105,19 @@ from rest_framework import serializers
from django.conf import settings from django.conf import settings
import os import os
class AdventureSerializer(serializers.ModelSerializer): # class AdventureSerializer(serializers.ModelSerializer):
image = serializers.SerializerMethodField() # image = serializers.SerializerMethodField()
class Meta: # class Meta:
model = Adventure # model = Adventure
fields = ['id', 'user_id', 'type', 'name', 'location', 'activity_types', 'description', # fields = ['id', 'user_id', 'type', 'name', 'location', 'activity_types', 'description',
'rating', 'link', 'image', 'date', 'trip_id', 'is_public', 'longitude', 'latitude'] # 'rating', 'link', 'image', 'date', 'trip_id', 'is_public', 'longitude', 'latitude']
def get_image(self, obj): # def get_image(self, obj):
if obj.image: # if obj.image:
public_url = os.environ.get('PUBLIC_URL', '') # public_url = os.environ.get('PUBLIC_URL', '')
return f'{public_url}/media/{obj.image.name}' # return f'{public_url}/media/{obj.image.name}'
return None # return None
class UserDetailsSerializer(serializers.ModelSerializer): class UserDetailsSerializer(serializers.ModelSerializer):
""" """
@ -161,7 +161,7 @@ class UserDetailsSerializer(serializers.ModelSerializer):
model = UserModel model = UserModel
fields = ('pk', *extra_fields) fields = ('pk', *extra_fields)
read_only_fields = ('email', 'date_joined', 'is_staff') read_only_fields = ('email', 'date_joined', 'is_staff', 'is_superuser', 'is_active', 'pk')
class CustomUserDetailsSerializer(UserDetailsSerializer): class CustomUserDetailsSerializer(UserDetailsSerializer):

5
backend/server/worldtravel/serializers.py
View file

@ -16,14 +16,17 @@ class CountrySerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Country model = Country
fields = '__all__' # Serialize all fields of the Adventure model fields = '__all__' # Serialize all fields of the Adventure model
read_only_fields = '__all__'
class RegionSerializer(serializers.ModelSerializer): class RegionSerializer(serializers.ModelSerializer):
flag_url = '' flag_url = ''
class Meta: class Meta:
model = Region model = Region
fields = '__all__' # Serialize all fields of the Adventure model fields = '__all__' # Serialize all fields of the Adventure model
read_only_fields = '__all__'
class VisitedRegionSerializer(serializers.ModelSerializer): class VisitedRegionSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = VisitedRegion model = VisitedRegion
fields = '__all__' # Serialize all fields of the Adventure model fields = '__all__' # Serialize all fields of the Adventure model
read_only_fields = ['user_id']

4
frontend/src/lib/components/ChecklistModal.svelte
View file

@ -130,9 +130,9 @@
<!-- svelte-ignore a11y-no-noninteractive-element-interactions --> <!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
<!-- svelte-ignore a11y-no-noninteractive-tabindex --> <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
<div class="modal-box" role="dialog" on:keydown={handleKeydown} tabindex="0"> <div class="modal-box" role="dialog" on:keydown={handleKeydown} tabindex="0">
<h3 class="font-bold text-lg">Checklist Editor</h3> <h3 class="font-bold text-lg mb-2">Checklist Editor</h3>
{#if initialName} {#if initialName}
<p class="font-semibold text-md mb-2">Editing note {initialName}</p> <p class="font-semibold text-md mb-2">Editing checklist {initialName}</p>
{/if} {/if}
{#if (checklist && user?.pk == checklist?.user_id) || !checklist} {#if (checklist && user?.pk == checklist?.user_id) || !checklist}