Skip to content

Last pull to main#45

Merged
afluffybunny7 merged 146 commits into
mainfrom
dev
Nov 6, 2025
Merged

Last pull to main#45
afluffybunny7 merged 146 commits into
mainfrom
dev

Conversation

@jcgoins2

@jcgoins2 jcgoins2 commented Nov 6, 2025

Copy link
Copy Markdown
Collaborator

Getting everything for the project in before deadline

jcgoins2 and others added 30 commits November 2, 2025 23:29
Remade the chatbot so that there are no merge conflicts
Added more backend test to get security classes up
- Implemented backend ChatController and ChatService for Ollama API communication
- Created interactive chatbot UI with 3-question conversation flow
- Integrated user preferences (budget and dietary restrictions) into AI recommendations
- Added personalized food recommendations based on mood, hunger, and preferences
- Direct order creation from chatbot recommendations
- Added AI Assistant navigation link for customer users
- Includes comprehensive setup guide in CHATBOT_SETUP.md

Backend changes:
- ChatController.java: REST endpoint at /api/chat
- ChatService & ChatServiceImpl: Ollama API integration
- ChatRequestDto & ChatResponseDto: DTOs for chat communication

Frontend changes:
- Chatbot.js: Interactive chat component with typing indicators
- Navigation.js: Added AI Assistant link
- App.js: Added /chatbot route
- api.js: Added sendChatMessage function
- index.css: Added chatbot styling
- Save chatbot conversation state to localStorage
- Persist messages, conversation step, and recommendation across navigation
- Order This Now button now adds food to cart instead of direct order
- Automatically add recommended food to cart when navigating to Create Order
- Show success/out-of-stock notification banner
- Clear localStorage state when starting over
- Improved UX: users can browse other pages without losing conversation
@jcgoins2 jcgoins2 self-assigned this Nov 6, 2025
@codecov-commenter

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@afluffybunny7

Copy link
Copy Markdown
Collaborator

Tests all pass. Good work guys. Merging.

@afluffybunny7 afluffybunny7 merged commit 004301f into main Nov 6, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants