diff --git a/database/factories/CardFactory.php b/database/factories/CardFactory.php index a6bd416..7dacfdc 100644 --- a/database/factories/CardFactory.php +++ b/database/factories/CardFactory.php @@ -9,6 +9,14 @@ */ class CardFactory extends Factory { + protected function createTextBlock(string $text): array + { + return [ + 'type' => 'text', + 'content' => $text, + ]; + } + /** * Define the model's default state. * @@ -17,7 +25,13 @@ class CardFactory extends Factory public function definition(): array { return [ - // + 'front' => [ + $this->createTextBlock($this->faker->sentence), + ], + 'back' => [ + $this->createTextBlock($this->faker->sentence), + ], + ]; } } diff --git a/package-lock.json b/package-lock.json index 6c459e2..1157e5e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,7 +27,7 @@ "pinia": "^2.1.7", "quill": "^2.0.2", "quill-paste-smart": "^2.0.0", - "radix-vue": "^1.8.4", + "radix-vue": "^1.9.12", "ramda": "^0.30.1", "uuid": "^10.0.0", "vue": "^3.4.21", @@ -7418,9 +7418,9 @@ } }, "node_modules/radix-vue": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/radix-vue/-/radix-vue-1.9.3.tgz", - "integrity": "sha512-9pewcgzghM+B+FO1h9mMsZa/csVH6hElpN1sqmG4/qoeieiDG0i4nhMjS7p2UOz11EEdVm7eLandHSPyx7hYhg==", + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/radix-vue/-/radix-vue-1.9.12.tgz", + "integrity": "sha512-zkr66Jqxbej4+oR6O/pZRzyM/VZi66ndbyIBZQjJKAXa1lIoYReZJse6W1EEDZKXknD7rXhpS+jM9Sr23lIqfg==", "license": "MIT", "dependencies": { "@floating-ui/dom": "^1.6.7", diff --git a/package.json b/package.json index d237007..154e6b1 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "pinia": "^2.1.7", "quill": "^2.0.2", "quill-paste-smart": "^2.0.0", - "radix-vue": "^1.8.4", + "radix-vue": "^1.9.12", "ramda": "^0.30.1", "uuid": "^10.0.0", "vue": "^3.4.21", diff --git a/resources/client/components/DeckMembership.vue b/resources/client/components/DeckMembership.vue index 5ff9626..8f9e04d 100644 --- a/resources/client/components/DeckMembership.vue +++ b/resources/client/components/DeckMembership.vue @@ -12,7 +12,8 @@

@@ -24,8 +25,8 @@ - Viewer - Editor + Viewer + Editor diff --git a/resources/client/components/icons/IconSearch.vue b/resources/client/components/icons/IconSearch.vue new file mode 100644 index 0000000..0ad090f --- /dev/null +++ b/resources/client/components/icons/IconSearch.vue @@ -0,0 +1,19 @@ + + + diff --git a/resources/client/components/icons/index.ts b/resources/client/components/icons/index.ts index 2fc33a6..61e9bf7 100644 --- a/resources/client/components/icons/index.ts +++ b/resources/client/components/icons/index.ts @@ -27,6 +27,7 @@ export { default as IconPencil } from "./IconPencil.vue"; export { default as IconPlusFilled } from "./IconPlusFilled.vue"; export { default as IconUser } from "./IconUser.vue"; export { default as IconRefresh } from "./IconRefresh.vue"; +export { default as IconSearch } from "./IconSearch.vue"; export { default as IconSettings } from "./IconSettings.vue"; export { default as IconSpinner } from "./IconSpinner.vue"; export { default as IconSound } from "./IconSound.vue"; diff --git a/resources/client/components/ui/button/index.ts b/resources/client/components/ui/button/index.ts index f02ad70..430fce9 100644 --- a/resources/client/components/ui/button/index.ts +++ b/resources/client/components/ui/button/index.ts @@ -8,13 +8,13 @@ export const buttonVariants = cva( variants: { variant: { default: - "bg-brand-maroon-800 text-neutral-50 shadow hover:bg-brand-maroon-800/90 dark:bg-neutral-50 dark:text-brand-maroon-800 dark:hover:bg-neutral-50/90", + "bg-brand-maroon-800 text-neutral-50 hover:bg-brand-maroon-800/90 dark:bg-neutral-50 dark:text-brand-maroon-800 dark:hover:bg-neutral-50/90", destructive: - "bg-red-500 text-neutral-50 shadow-sm hover:bg-red-500/90 dark:bg-red-900 dark:text-neutral-50 dark:hover:bg-red-900/90", + "bg-red-500 text-neutral-50 hover:bg-red-500/90 dark:bg-red-900 dark:text-neutral-50 dark:hover:bg-red-900/90", outline: "border border-brand-maroon-800/20 hover:bg-white brand-maroon-800/20 hover:text-brand-maroon-800 dark:border-neutral-800 dark:bg-neutral-950 dark:hover:bg-neutral-800 dark:hover:text-neutral-50", secondary: - "bg-brand-maroon-800/5 text-brand-maroon-800 shadow-sm hover:bg-brand-maroon-800/80 hover:text-white dark:bg-neutral-800 dark:text-neutral-50 dark:hover:bg-neutral-800/80", + "bg-brand-maroon-800/5 text-brand-maroon-800 hover:bg-brand-maroon-800/80 hover:text-white dark:bg-neutral-800 dark:text-neutral-50 dark:hover:bg-neutral-800/80", ghost: "hover:bg-neutral-100 hover:text-brand-maroon-800 dark:hover:bg-neutral-800 dark:hover:text-neutral-50", link: "text-brand-maroon-800 underline-offset-4 hover:underline dark:text-neutral-50", diff --git a/resources/client/components/ui/dialog/DialogContent.vue b/resources/client/components/ui/dialog/DialogContent.vue index fb6406f..94a7ede 100644 --- a/resources/client/components/ui/dialog/DialogContent.vue +++ b/resources/client/components/ui/dialog/DialogContent.vue @@ -33,6 +33,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits); /> Close diff --git a/resources/client/components/ui/dropdown-menu/DropdownMenu.vue b/resources/client/components/ui/dropdown-menu/DropdownMenu.vue index b83d90b..6fc03a6 100644 --- a/resources/client/components/ui/dropdown-menu/DropdownMenu.vue +++ b/resources/client/components/ui/dropdown-menu/DropdownMenu.vue @@ -1,10 +1,15 @@