Skip to content

Nick/tms 249 add feedback support #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adrenallen merged 2 commits into from
Jun 23, 2025
Merged

Nick/tms 249 add feedback support #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f914eaf
Adding feedback button and modal
sorrell Jun 23, 2025
b2a6916
Fixing crazy diff for sidebar
sorrell Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 75 additions & 58 deletions resources/js/Components/AppSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
ChevronRight,
GalleryVerticalEnd,
Home,
MessageCircle,
Package,
Truck,
Users,
Expand All @@ -11,6 +12,7 @@ import {
import * as React from 'react';
import { useEffect, useState } from 'react';

import GeneralFeedbackModal from '@/Components/GeneralFeedbackModal';
import { NavUser } from '@/Components/NavUser';
import { TeamSwitcher } from '@/Components/TeamSwitcher';
import {
Expand Down Expand Up @@ -38,6 +40,7 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
const permissions = usePage().props.auth.permissions;
const config = usePage().props.config;
const [isOrgMenuOpen, setIsOrgMenuOpen] = useState(false);
const [isFeedbackModalOpen, setIsFeedbackModalOpen] = useState(false);

useEffect(() => {
const savedState = localStorage.getItem('orgMenuOpen');
Expand Down Expand Up @@ -76,57 +79,58 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
};

return (
<Sidebar collapsible="icon" {...props}>
<SidebarHeader>
<TeamSwitcher teams={data.teams} />
</SidebarHeader>
<SidebarContent>
<SidebarGroup>
<SidebarMenuButton
asChild
isActive={route().current('dashboard')}
>
<a href={route('dashboard')}>
<Home />
<span>Dashboard</span>
</a>
</SidebarMenuButton>
<SidebarMenuButton
asChild
isActive={route().current('shipments.index')}
>
<a href={route('shipments.index')}>
<Package />
<span>Shipments</span>
</a>
</SidebarMenuButton>
<SidebarMenuButton
asChild
isActive={route().current('carriers.index')}
>
<a href={route('carriers.index')}>
<Truck />
<span>Carriers</span>
</a>
</SidebarMenuButton>
<SidebarMenuButton
asChild
isActive={route().current('customers.index')}
>
<a href={route('customers.index')}>
<Users />
<span>Customers</span>
</a>
</SidebarMenuButton>
<SidebarMenuButton
asChild
isActive={route().current('facilities.index')}
>
<a href={route('facilities.index')}>
<Warehouse />
<span>Facilities</span>
</a>
</SidebarMenuButton>
<>
<Sidebar collapsible="icon" {...props}>
<SidebarHeader>
<TeamSwitcher teams={data.teams} />
</SidebarHeader>
<SidebarContent>
<SidebarGroup>
<SidebarMenuButton
asChild
isActive={route().current('dashboard')}
>
<a href={route('dashboard')}>
<Home />
<span>Dashboard</span>
</a>
</SidebarMenuButton>
<SidebarMenuButton
asChild
isActive={route().current('shipments.index')}
>
<a href={route('shipments.index')}>
<Package />
<span>Shipments</span>
</a>
</SidebarMenuButton>
<SidebarMenuButton
asChild
isActive={route().current('carriers.index')}
>
<a href={route('carriers.index')}>
<Truck />
<span>Carriers</span>
</a>
</SidebarMenuButton>
<SidebarMenuButton
asChild
isActive={route().current('customers.index')}
>
<a href={route('customers.index')}>
<Users />
<span>Customers</span>
</a>
</SidebarMenuButton>
<SidebarMenuButton
asChild
isActive={route().current('facilities.index')}
>
<a href={route('facilities.index')}>
<Warehouse />
<span>Facilities</span>
</a>
</SidebarMenuButton>

{(permissions?.ORGANIZATION_MANAGER ||
permissions?.ORGANIZATION_MANAGE_USERS) && (
Expand Down Expand Up @@ -268,12 +272,25 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
</SidebarMenuItem>
</Collapsible>
)}
</SidebarGroup>
</SidebarContent>
<SidebarFooter>
<NavUser user={userData} />
</SidebarFooter>
<SidebarRail />
</Sidebar>
<SidebarMenuButton
onClick={() => setIsFeedbackModalOpen(true)}
>
<MessageCircle />
<span>Send Feedback</span>
</SidebarMenuButton>
</SidebarGroup>
</SidebarContent>
<SidebarFooter>
<NavUser user={userData} />
</SidebarFooter>
<SidebarRail />
</Sidebar>

<GeneralFeedbackModal
isOpen={isFeedbackModalOpen}
onClose={() => setIsFeedbackModalOpen(false)}
userEmail={user.email}
/>
</>
);
}
167 changes: 167 additions & 0 deletions resources/js/Components/GeneralFeedbackModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
import { Button } from '@/Components/ui/button';
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
} from '@/Components/ui/dialog';
import { Label } from '@/Components/ui/label';
import { Textarea } from '@/Components/ui/textarea';
import { useToast } from '@/hooks/UseToast';
import { router } from '@inertiajs/react';
import { CheckCircle, Send } from 'lucide-react';
import { useState } from 'react';

interface GeneralFeedbackModalProps {
isOpen: boolean;
onClose: () => void;
userEmail: string;
}

export default function GeneralFeedbackModal({
isOpen,
onClose,
userEmail,
}: GeneralFeedbackModalProps) {
const [message, setMessage] = useState('');
const [isSubmitting, setIsSubmitting] = useState(false);
const [errors, setErrors] = useState<{ feedback?: string }>({});
const { toast } = useToast();

const handleSubmit = (e: React.FormEvent) => {
e.preventDefault();

if (isSubmitting) return;

// Reset errors
setErrors({});

// Basic validation
const newErrors: { feedback?: string } = {};
if (!message) {
newErrors.feedback = 'Message is required';
} else if (message.length < 10) {
newErrors.feedback = 'Message must be at least 10 characters';
}

if (Object.keys(newErrors).length > 0) {
setErrors(newErrors);
return;
}

setIsSubmitting(true);

router.post(
route('feedback.submit'),
{
email: userEmail,
feedback: message,
},
{
onSuccess: () => {
setMessage('');
setErrors({});
onClose();

// Show success toast
toast({
title: 'Thank you for your feedback!',
description: (
<>
<CheckCircle
className="mr-2 inline h-4 w-4"
color="green"
/>
We've received your feedback and will review it
promptly.
</>
),
});
},
onError: (errors) => {
setErrors(errors);
toast({
title: 'Submission failed',
description:
'There was an error submitting your feedback. Please try again.',
variant: 'destructive',
});
},
onFinish: () => {
setIsSubmitting(false);
},
},
);
};

const handleClose = () => {
if (isSubmitting) return;
setMessage('');
setErrors({});
onClose();
};

return (
<Dialog open={isOpen} onOpenChange={handleClose}>
<DialogContent className="sm:max-w-md">
<DialogHeader>
<DialogTitle>Send Feedback</DialogTitle>
<DialogDescription>
Share your thoughts, report issues, or ask questions.
We'd love to hear from you!
</DialogDescription>
</DialogHeader>

<form onSubmit={handleSubmit}>
<div className="grid gap-4 py-4">
<div className="grid gap-2">
<Label htmlFor="message">Message</Label>
<Textarea
id="message"
placeholder="Tell us what's on your mind - feature requests, bug reports, questions, or general feedback..."
value={message}
onChange={(e) => setMessage(e.target.value)}
disabled={isSubmitting}
rows={4}
className={
errors.feedback ? 'border-red-500' : ''
}
/>
{errors.feedback && (
<p className="text-sm text-red-500">
{errors.feedback}
</p>
)}
</div>
</div>

<DialogFooter>
<Button
type="button"
variant="outline"
onClick={handleClose}
disabled={isSubmitting}
>
Cancel
</Button>
<Button type="submit" disabled={isSubmitting}>
{isSubmitting ? (
<>
<div className="mr-2 h-4 w-4 animate-spin rounded-full border-2 border-background border-t-transparent" />
Sending...
</>
) : (
<>
<Send className="mr-2 h-4 w-4" />
Send Feedback
</>
)}
</Button>
</DialogFooter>
</form>
</DialogContent>
</Dialog>
);
}