Skip to content

Commit 4dbc380

Browse files
fixed changelog and sidebar
1 parent 798ed20 commit 4dbc380

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
id: git-cliff
1919
uses: orhun/git-cliff-action@v3
2020
with:
21-
args: "-o CHANGELOG.md"
21+
args: --latest --strip all
2222
env:
2323
GIT_CLIFF_CONFIG: |
2424
[changelog]

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Large diffs are not rendered by default.

components/sidebar.tsx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Link from 'next/link';
33
import { X, MessageCircle, Search, Gift, Settings, HelpCircle, CreditCard, User, LogOut, MoreHorizontal, Menu, Plus } from 'lucide-react';
44
import type { User as SupabaseUser } from '@supabase/supabase-js';
55
import { HelpModal } from '@/components/help-center';
6+
import { PricingModal } from '@/components/pricing';
67
import { Button } from '@/components/ui/button';
78
import { Input } from '@/components/ui/input';
89
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
@@ -40,6 +41,7 @@ const Sidebar: React.FC<SidebarProps> = ({
4041
}) => {
4142
const [searchQuery, setSearchQuery] = React.useState("");
4243
const [isOpen, setIsOpen] = React.useState(initialIsOpen);
44+
const [isPricingModalOpen, setIsPricingModalOpen] = React.useState(false);
4345
const [user, setUser] = React.useState<SupabaseUser | null>(null);
4446
const hoverTimeoutRef = React.useRef<NodeJS.Timeout | null>(null);
4547
const leaveTimeoutRef = React.useRef<NodeJS.Timeout | null>(null);
@@ -202,13 +204,11 @@ const Sidebar: React.FC<SidebarProps> = ({
202204
<Button
203205
variant="ghost"
204206
size="icon"
205-
asChild
207+
onClick={() => setIsPricingModalOpen(true)}
206208
className="h-8 w-8 text-muted-foreground hover:text-foreground transition-colors"
207209
aria-label="My Subscription"
208210
>
209-
<Link href="/settings/billing">
210-
<CreditCard className="h-5 w-5" />
211-
</Link>
211+
<CreditCard className="h-5 w-5" />
212212
</Button>
213213
<Button
214214
variant="ghost"
@@ -343,13 +343,11 @@ const Sidebar: React.FC<SidebarProps> = ({
343343

344344
<Button
345345
variant="ghost"
346-
asChild
346+
onClick={() => setIsPricingModalOpen(true)}
347347
className="w-full justify-start gap-3 text-muted-foreground hover:text-foreground transition-colors"
348348
>
349-
<Link href="/settings/billing">
350-
<CreditCard className="h-4 w-4" />
351-
My Subscription
352-
</Link>
349+
<CreditCard className="h-4 w-4" />
350+
My Subscription
353351
</Button>
354352

355353
<Button
@@ -391,6 +389,7 @@ const Sidebar: React.FC<SidebarProps> = ({
391389
</div>
392390
</div>
393391
</div>
392+
<PricingModal isOpen={isPricingModalOpen} onClose={() => setIsPricingModalOpen(false)} />
394393
</div>
395394
);
396395
};

0 commit comments

Comments
 (0)