Skip to content

Commit 02fee35

Browse files
ingoauingoau
authored
Merge pull request #587 from EducationalTools/main
redesign and some fixes
2 parents e1eb116 + e244e02 commit 02fee35

45 files changed

Lines changed: 752 additions & 668 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/root.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { cn } from "@/lib/utils";
4040
import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
4141
import { Button } from "@/components/ui/button";
4242
import { ButtonGroup } from "@/components/ui/button-group";
43-
import { Copy } from "lucide-react";
43+
import { PiCopy } from "react-icons/pi";
4444
import { toast } from "sonner";
4545
import { useCloak } from "@/hooks/use-cloak";
4646
import { MotionConfig } from "motion/react";
@@ -311,7 +311,7 @@ export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
311311
});
312312
}}
313313
>
314-
<Copy />
314+
<PiCopy />
315315
</Button>
316316
</ButtonGroup>
317317
<DialogContent>

‎app/routes/admin/columns.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use client";
22

33
import { type ColumnDef } from "@tanstack/react-table";
4-
import { ArrowUpDown } from "lucide-react";
4+
import { PiArrowsDownUp } from "react-icons/pi";
55
import { Button } from "@/components/ui/button";
66

77
export type User = {
@@ -27,7 +27,7 @@ export const createColumns = (): ColumnDef<User>[] => [
2727
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
2828
>
2929
Email
30-
<ArrowUpDown className="ml-2 h-4 w-4" />
30+
<PiArrowsDownUp className="ml-2 h-4 w-4" />
3131
</Button>
3232
);
3333
},
@@ -42,7 +42,7 @@ export const createColumns = (): ColumnDef<User>[] => [
4242
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
4343
>
4444
Name
45-
<ArrowUpDown className="ml-2 h-4 w-4" />
45+
<PiArrowsDownUp className="ml-2 h-4 w-4" />
4646
</Button>
4747
);
4848
},
@@ -90,7 +90,7 @@ export const createColumns = (): ColumnDef<User>[] => [
9090
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
9191
>
9292
Created
93-
<ArrowUpDown className="ml-2 h-4 w-4" />
93+
<PiArrowsDownUp className="ml-2 h-4 w-4" />
9494
</Button>
9595
);
9696
},

‎app/routes/admin/data-table.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
getSortedRowModel,
1414
useReactTable,
1515
} from "@tanstack/react-table";
16-
import { ChevronDown } from "lucide-react";
16+
import { PiCaretDown } from "react-icons/pi";
1717

1818
import { Button } from "@/components/ui/button";
1919
import {
@@ -104,7 +104,7 @@ export function DataTable<TData, TValue>({
104104
<DropdownMenu>
105105
<DropdownMenuTrigger asChild>
106106
<Button variant="outline" size="sm">
107-
Columns <ChevronDown className="ml-2 h-4 w-4" />
107+
Columns <PiCaretDown className="ml-2 h-4 w-4" />
108108
</Button>
109109
</DropdownMenuTrigger>
110110
<DropdownMenuContent align="end">

‎app/routes/backups/page.tsx‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ import {
2222
useQuery,
2323
} from "convex/react";
2424
import {
25-
Archive,
26-
ArchiveRestore,
27-
ArrowRight,
28-
Clipboard,
29-
Copy,
30-
Delete,
31-
Trash,
32-
} from "lucide-react";
25+
PiArchive,
26+
PiArrowRight,
27+
PiClipboard,
28+
PiCopy,
29+
PiTrash,
30+
PiTrashSimple,
31+
} from "react-icons/pi";
3332
import { useEffect, useState } from "react";
3433
import { toast } from "sonner";
3534
import { AnimatePresence, motion } from "motion/react";
@@ -170,7 +169,7 @@ export default function BackupsPage() {
170169
});
171170
}}
172171
>
173-
<Clipboard />
172+
<PiClipboard />
174173
</Button>
175174
</div>
176175
</div>
@@ -247,7 +246,7 @@ export default function BackupsPage() {
247246
onClick={handleCreateBackup}
248247
disabled={!inputtedBackupName.trim()}
249248
>
250-
<ArrowRight />
249+
<PiArrowRight />
251250
</Button>
252251
</div>
253252
</CardContent>
@@ -277,7 +276,7 @@ export default function BackupsPage() {
277276
<AlertDialog>
278277
<AlertDialogTrigger asChild>
279278
<Button variant="destructive" size="icon">
280-
<Trash />
279+
<PiTrash />
281280
</Button>
282281
</AlertDialogTrigger>
283282
<AlertDialogContent>
@@ -333,12 +332,12 @@ export default function BackupsPage() {
333332
});
334333
}}
335334
>
336-
<Copy />
335+
<PiCopy />
337336
</Button>
338337
<AlertDialog>
339338
<AlertDialogTrigger asChild>
340339
<Button>
341-
<ArchiveRestore />
340+
<PiArchive />
342341
Restore
343342
</Button>
344343
</AlertDialogTrigger>
@@ -386,7 +385,7 @@ export default function BackupsPage() {
386385
<Empty>
387386
<EmptyHeader>
388387
<EmptyMedia variant="icon">
389-
<Archive className="size-6" />
388+
<PiArchive className="size-6" />
390389
</EmptyMedia>
391390
<EmptyTitle>No backups yet</EmptyTitle>
392391
<EmptyDescription>

‎app/routes/g/columns.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"use client";
22

33
import type { ColumnDef } from "@tanstack/react-table";
4-
import { ArrowUpDown } from "lucide-react";
4+
import { PiArrowsDownUp } from "react-icons/pi";
55
import { Button } from "@/components/ui/button";
66
import type { ParsedGmae } from "@/lib/gmaes";
77

@@ -16,7 +16,7 @@ export const columns: ColumnDef<ParsedGmae>[] = [
1616
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
1717
>
1818
Name
19-
<ArrowUpDown className="ml-2 h-4 w-4" />
19+
<PiArrowsDownUp className="ml-2 h-4 w-4" />
2020
</Button>
2121
);
2222
},
@@ -40,7 +40,7 @@ export const columns: ColumnDef<ParsedGmae>[] = [
4040
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
4141
>
4242
Category
43-
<ArrowUpDown className="ml-2 h-4 w-4" />
43+
<PiArrowsDownUp className="ml-2 h-4 w-4" />
4444
</Button>
4545
);
4646
},

‎app/routes/g/play.tsx‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ import type { Route } from "./+types/play";
33
import { data } from "react-router";
44
import { Button } from "@/components/ui/button";
55
import {
6-
AppWindow,
7-
Bookmark,
8-
BookmarkCheck,
9-
ChevronDown,
10-
ChevronUp,
11-
ExternalLink,
12-
Fullscreen,
13-
Keyboard,
14-
Maximize,
15-
RefreshCw,
16-
Scan,
17-
Share,
18-
Square,
19-
} from "lucide-react";
6+
PiAppWindow,
7+
PiBookmark,
8+
PiBookmarkFill,
9+
PiCaretDown,
10+
PiCaretUp,
11+
PiArrowSquareOut,
12+
PiArrowsOut,
13+
PiKeyboard,
14+
PiArrowsOutSimple,
15+
PiArrowClockwise,
16+
PiScan,
17+
PiShare,
18+
PiSquare,
19+
} from "react-icons/pi";
2020
import { ButtonGroup } from "@/components/ui/button-group";
2121
import {
2222
Tooltip,
@@ -100,7 +100,7 @@ export function Play({ params }: Route.ComponentProps) {
100100
toast.success("Focused gmae");
101101
}}
102102
>
103-
<Keyboard />
103+
<PiKeyboard />
104104
<span className="sr-only">Fix keyboard input</span>
105105
</Button>
106106
</TooltipTrigger>
@@ -115,7 +115,7 @@ export function Play({ params }: Route.ComponentProps) {
115115
iframeRef.current?.contentWindow?.location.reload();
116116
}}
117117
>
118-
<RefreshCw />
118+
<PiArrowClockwise />
119119
<span className="sr-only">Reload</span>
120120
</Button>
121121
</TooltipTrigger>
@@ -145,7 +145,7 @@ export function Play({ params }: Route.ComponentProps) {
145145
}
146146
}}
147147
>
148-
<AppWindow />
148+
<PiAppWindow />
149149
<span className="sr-only">Open in new window</span>
150150
</Button>
151151
</TooltipTrigger>
@@ -171,7 +171,7 @@ export function Play({ params }: Route.ComponentProps) {
171171
}
172172
}}
173173
>
174-
<ExternalLink />
174+
<PiArrowSquareOut />
175175
<span className="sr-only">Open in new tab</span>
176176
</Button>
177177
</TooltipTrigger>
@@ -187,7 +187,7 @@ export function Play({ params }: Route.ComponentProps) {
187187
}}
188188
variant="outline"
189189
>
190-
<ChevronDown />
190+
<PiCaretDown />
191191
<span className="sr-only">Maximize</span>
192192
</Button>
193193
</TooltipTrigger>
@@ -202,7 +202,7 @@ export function Play({ params }: Route.ComponentProps) {
202202
iframeRef.current?.focus();
203203
}}
204204
>
205-
<Maximize />
205+
<PiArrowsOutSimple />
206206
<span className="sr-only">Fullscreen</span>
207207
</Button>
208208
</TooltipTrigger>
@@ -218,7 +218,7 @@ export function Play({ params }: Route.ComponentProps) {
218218
}
219219
}}
220220
>
221-
{isSaved ? <BookmarkCheck /> : <Bookmark />}
221+
{isSaved ? <PiBookmarkFill /> : <PiBookmark />}
222222
{isSaved ? "Saved" : "Save"}
223223
</Button>
224224
<Button
@@ -248,7 +248,7 @@ export function Play({ params }: Route.ComponentProps) {
248248
}
249249
}}
250250
>
251-
<Share />
251+
<PiShare />
252252
Share
253253
</Button>
254254
</ButtonGroup>
@@ -266,7 +266,7 @@ export function Play({ params }: Route.ComponentProps) {
266266
setMaximized(false);
267267
}}
268268
>
269-
<ChevronUp />
269+
<PiCaretUp />
270270
</Button>
271271
</div>
272272
)}

0 commit comments

Comments
 (0)