Merge pull request #107 from seanmorley15/development

Development
seanmorley15 · Jul 10, 2024 · ed14263 · ed14263
2 parents d44e5e7 + 17b274d
commit ed14263
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 4 deletions.
diff --git 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
@@ -208,8 +208,9 @@
 
 
 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
@@ -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'
+				}
+			}
+		]
 	}
 };