Merge branch 'main' of github.com:briancaffey/django-step-by-step

Author: briancaffey

backend/backend/settings/base.py

@@ -164,6 +164,9 @@
 
 CELERY_TASK_ALWAYS_EAGER = bool(int(os.environ.get("CELERY_TASK_ALWAYS_EAGER", 0)))
 
+# broker_connection_retry_on_startup
+CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP = True
+
 # Internationalization
 # https://docs.djangoproject.com/en/3.1/topics/i18n/
 

backend/backend/settings/development.py

@@ -18,6 +18,7 @@
 INTERNAL_IPS = ["127.0.0.1"]
 
 ADMIN_EMAIL = "[email protected]"
+EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 
 NOTEBOOK_ARGUMENTS = [
     "--ip",

docker-compose.yml

@@ -115,6 +115,7 @@ services:
 
       # celery beat
       - PIDFILE=
+      - TZ=America/New_York
     depends_on:
       - postgres
       - redis
@@ -127,6 +128,11 @@ services:
       - "manage.py"
       - "start_celery_worker"
     ports: []
+    healthcheck:
+      test: ["CMD", "celery", "--app=backend.celery_app:app", "inspect", "ping"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   celery_beat:
     <<: *backend
@@ -193,9 +199,11 @@ services:
     networks:
       - main
     depends_on:
-      - celery_worker
+      celery_worker:
+        condition: service_healthy
     environment:
       - CELERY_BROKER_URL=redis://redis:6379/1
+      - TZ=America/New_York
 
 volumes:
   pg-data:

nuxt-app/app.vue

@@ -1,12 +1,10 @@
 <template>
   <NuxtLayout>
     <NuxtPage class="dark-mode dark" />
-    <Toaster />
   </NuxtLayout>
 </template>
 
 <script setup lang="ts">
-import Toaster from '@/components/ui/toast/Toaster.vue'
 import { useAuth } from '@/composables/useAuth'
 import { useProfile } from '@/composables/useProfile';
 await useAuth();

nuxt-app/composables/useChat.ts

@@ -1,32 +1,5 @@
 import { ref } from 'vue';
 
-export interface Message {
-  id: number;
-  content: string;
-  timestamp: string;
-  role: string;
-}
-
-export interface Messages {
-  messages: Message[];
-  session_id: number;
-}
-
-export interface ChatResponse {
-  messages: Message[];
-}
-
-export interface SendMessageResponse {
-  id: number;
-  content: string;
-  timestamp: string;
-  role: string;
-}
-
-export interface Session {
-  session_id: number;
-  created_at: string;
-}
 
 export const useChatComposable = async () => {
 

nuxt-app/layouts/default.vue

@@ -86,20 +86,9 @@
             </DropdownMenuContent>
         </DropdownMenu>
       </div>
-        <!-- <NavigationMenu class="flex space-x-4">
-
-          <Popover v-if="authStore.getIsAuthenticated">
-            <PopoverTrigger class="text-sm font-medium transition">Logout</PopoverTrigger>
-            <PopoverContent class="p-2 w-auto">
-            <NuxtLink>
-              <Button @click="logout">Logout</Button>
-            </NuxtLink>
-          </PopoverContent>
-        </Popover>
-        </NavigationMenu> -->
       </div>
     </nav>
-    <!-- Page Content -->
+
     <main class="container mx-auto px-6 py-8 pb-0">
       <NuxtPage />
     </main>
@@ -109,20 +98,6 @@
 <script setup lang="ts">
 import { storeToRefs } from 'pinia';
 import { CircleUser, Menu, Package2, Search } from 'lucide-vue-next'
-import {
-  NavigationMenu,
-  NavigationMenuContent,
-  NavigationMenuItem,
-  NavigationMenuLink,
-  NavigationMenuList,
-  NavigationMenuTrigger,
-  NavigationMenuViewport,
-} from '@/components/ui/navigation-menu'
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover"
 import {
   DropdownMenu,
   DropdownMenuContent,

nuxt-app/lib/utils.ts

@@ -28,6 +28,6 @@ export default defineNuxtConfig({
      * Directory that the component lives in.
      * @default "./components/ui"
      */
-    componentDir: '@/components/ui'
+    componentDir: './components/ui',
   }
 })