diff --git a/backend/server/adventures/views.py b/backend/server/adventures/views.py index b03d687..41f77b7 100644 --- a/backend/server/adventures/views.py +++ b/backend/server/adventures/views.py @@ -47,7 +47,7 @@ class TripViewSet(viewsets.ModelViewSet): def get_queryset(self): return Trip.objects.filter( Q(is_public=True) | Q(user_id=self.request.user.id) - ).prefetch_related( + ).select_related( Prefetch('adventure_set', queryset=Adventure.objects.filter( Q(is_public=True) | Q(user_id=self.request.user.id) )) diff --git a/backend/server/demo/settings.py b/backend/server/demo/settings.py index 5d47082..7c09d06 100644 --- a/backend/server/demo/settings.py +++ b/backend/server/demo/settings.py @@ -208,8 +208,9 @@ CORS_ORIGIN_ALLOW_ALL = True CSRF_TRUSTED_ORIGINS = [ - 'https://api.adventurelog.app', - 'https://adventurelog.app', + # 'https://api.adventurelog.app', + # 'https://adventurelog.app', + ] DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index db23f36..eeb76df 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -6,6 +6,57 @@ export default { }, plugins: [require('@tailwindcss/typography'), require('daisyui')], daisyui: { - themes: ['light', 'dark', 'night', 'retro', 'forest', 'aqua', 'garden', 'emerald'] + themes: [ + 'light', + 'dark', + 'night', + 'retro', + 'forest', + 'aqua', + 'emerald', + { + garden: { + primary: '#5a7c65', + 'primary-focus': '#48604f', + 'primary-content': '#dcd5d5', + + secondary: '#a8cfd7', + 'secondary-focus': '#5585aa', + 'secondary-content': '#177a9b', + + accent: '#c78e8e', + 'accent-focus': '#b25757', + 'accent-content': '#322020', + + neutral: '#5c5757', + 'neutral-focus': '#272525', + 'neutral-content': '#e9e7e7', + + 'base-100': '#e9e7e7', + 'base-200': '#d1cccc', + 'base-300': '#b9b1b1', + 'base-content': '#100f0f', + + info: '#1c92f2', + success: '#009485', + warning: '#c8c21e', + error: '#ff5724', + + '--rounded-box': '1rem', + '--rounded-btn': '.5rem', + '--rounded-badge': '1.9rem', + + '--animation-btn': '.25s', + '--animation-input': '.2s', + + '--btn-text-case': 'uppercase', + '--navbar-padding': '.5rem', + '--border-btn': '1px', + + fontFamily: + 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace' + } + } + ] } };