Skip to content

Commit

Permalink
Merge pull request #67 from zsh-eng/cleanup
Browse files Browse the repository at this point in the history
Cleanup flashcard components
  • Loading branch information
zsh-eng authored Apr 24, 2024
2 parents 052ff60 + 5652350 commit 5b44838
Show file tree
Hide file tree
Showing 12 changed files with 775 additions and 562 deletions.
2 changes: 1 addition & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import FlashcardBox from "@/components/flashcard/flashcard-box";
import FlashcardBox from "@/components/flashcard/main/flashcard-box";
import { gridChildContentGrid } from "@/components/ui/grid";
import { cn } from "@/utils/ui";

Expand Down
23 changes: 13 additions & 10 deletions src/components/client-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,26 @@
import { NavigationBar } from "@/components/nav-bar";
import { ThemeProvider } from "@/components/theme-provider";
import { Toaster } from "@/components/ui/sonner";
import { FlashcardSessionProvider } from "@/providers/flashcard-session";
import { HistoryProvider } from "@/providers/history";
import { trpc } from "@/utils/trpc";
import { PropsWithChildren } from "react";

function ClientLayout({ children }: PropsWithChildren<{}>) {
return (
<HistoryProvider>
<ThemeProvider
attribute="class"
defaultTheme="system"
enableSystem
disableTransitionOnChange
>
<NavigationBar />
{children}
<Toaster position="top-center" />
</ThemeProvider>
<FlashcardSessionProvider>
<ThemeProvider
attribute="class"
defaultTheme="system"
enableSystem
disableTransitionOnChange
>
<NavigationBar />
{children}
<Toaster position="top-center" />
</ThemeProvider>
</FlashcardSessionProvider>
</HistoryProvider>
);
}
Expand Down
116 changes: 0 additions & 116 deletions src/components/flashcard/flashcard-box.tsx

This file was deleted.

Loading

0 comments on commit 5b44838

Please sign in to comment.