From 5772ab7aa356bb1975b43ead436fec0253eced10 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Sun, 12 May 2024 22:11:28 +0200 Subject: [PATCH 01/32] Base nuxt move after refactoring until no warnings There still exists an issue with one Adobe led library ; @international-dates don't seem to compile their sourcemaps correctly. I don't think this is something I can fix however, and it may require hacks and workarounds to solve from what I've gathered --- .eslintrc.cjs | 35 - .gitignore | 40 +- .vscode/extensions.json | 7 - .vscode/settings.json | 5 + README.md | 78 +- app.vue | 21 + {src/assets => assets}/main.css | 48 +- components.json | 4 +- .../calendar/Calendar.vue | 0 .../calendar/CalendarCurrentDate.vue | 0 .../calendar/CalendarEvent.vue | 11 +- .../calendar/CalendarEventDetails.vue | 40 +- .../calendar/CalendarMenu.vue | 5 +- .../calendar/CalendarMenuNav.vue | 82 +- .../calendar/CalendarMenuSubnav.vue | 42 +- .../calendar/CalendarMenuToday.vue | 22 +- components/calendar/CalendarSwitch.vue | 32 + .../calendar/SearchMode.ts | 0 .../calendar/Sidebar.vue | 6 +- .../calendar/search/CalendarSearch.vue | 191 +- .../search/lists/CharacterCallout.vue | 10 +- .../calendar/search/lists/EventCallout.vue | 2 +- .../calendar/search/lists/SearchList.vue | 5 +- .../calendar/state/centennially/Layout.vue | 0 .../calendar/state/decennially/Layout.vue | 0 .../calendar/state/monthly/DayTile.vue | 13 +- .../calendar/state/monthly/Layout.vue | 0 .../calendar/state/yearly/DayTile.vue | 0 .../calendar/state/yearly/Layout.vue | 0 .../calendar/state/yearly/MonthTile.vue | 0 .../ui/badge/Badge.vue | 0 .../ui/badge/index.ts | 13 +- .../ui/button/Button.vue | 0 .../ui/button/index.ts | 0 .../ui/card/Card.vue | 3 +- .../ui/card/CardContent.vue | 2 +- .../ui/card/CardDescription.vue | 4 +- .../ui/card/CardFooter.vue | 0 .../ui/card/CardHeader.vue | 2 +- .../ui/card/CardTitle.vue | 6 +- .../ui/card/index.ts | 0 .../ui/command/Command.vue | 0 .../ui/command/CommandDialog.vue | 0 .../ui/command/CommandEmpty.vue | 0 .../ui/command/CommandGroup.vue | 0 .../ui/command/CommandInput.vue | 0 .../ui/command/CommandItem.vue | 0 .../ui/command/CommandList.vue | 0 .../ui/command/CommandSeparator.vue | 0 .../ui/command/CommandShortcut.vue | 0 .../ui/command/index.ts | 0 .../ui/dialog/Dialog.vue | 0 .../ui/dialog/DialogClose.vue | 0 .../ui/dialog/DialogContent.vue | 0 .../ui/dialog/DialogDescription.vue | 0 .../ui/dialog/DialogFooter.vue | 0 .../ui/dialog/DialogHeader.vue | 0 .../ui/dialog/DialogScrollContent.vue | 0 .../ui/dialog/DialogTitle.vue | 0 .../ui/dialog/DialogTrigger.vue | 0 .../ui/dialog/index.ts | 0 .../ui/dropdown-menu/DropdownMenu.vue | 0 .../DropdownMenuCheckboxItem.vue | 0 .../ui/dropdown-menu/DropdownMenuContent.vue | 0 .../ui/dropdown-menu/DropdownMenuGroup.vue | 0 .../ui/dropdown-menu/DropdownMenuItem.vue | 0 .../ui/dropdown-menu/DropdownMenuLabel.vue | 0 .../dropdown-menu/DropdownMenuRadioGroup.vue | 0 .../dropdown-menu/DropdownMenuRadioItem.vue | 0 .../dropdown-menu/DropdownMenuSeparator.vue | 0 .../ui/dropdown-menu/DropdownMenuShortcut.vue | 0 .../ui/dropdown-menu/DropdownMenuSub.vue | 0 .../dropdown-menu/DropdownMenuSubContent.vue | 0 .../dropdown-menu/DropdownMenuSubTrigger.vue | 0 .../ui/dropdown-menu/DropdownMenuTrigger.vue | 0 .../ui/dropdown-menu/index.ts | 0 .../ui/input/Input.vue | 0 .../ui/input/index.ts | 0 .../ui/pagination/PaginationEllipsis.vue | 0 .../ui/pagination/PaginationFirst.vue | 0 .../ui/pagination/PaginationLast.vue | 0 .../ui/pagination/PaginationNext.vue | 0 .../ui/pagination/PaginationPrev.vue | 0 .../ui/pagination/index.ts | 0 .../ui/popover/Popover.vue | 0 .../ui/popover/PopoverContent.vue | 0 .../ui/popover/PopoverTrigger.vue | 0 .../ui/popover/index.ts | 0 .../ui/select/Select.vue | 0 .../ui/select/SelectContent.vue | 0 .../ui/select/SelectGroup.vue | 0 .../ui/select/SelectItem.vue | 0 .../ui/select/SelectItemText.vue | 0 .../ui/select/SelectLabel.vue | 0 .../ui/select/SelectScrollDownButton.vue | 0 .../ui/select/SelectScrollUpButton.vue | 0 .../ui/select/SelectSeparator.vue | 0 .../ui/select/SelectTrigger.vue | 0 .../ui/select/SelectValue.vue | 0 .../ui/select/index.ts | 0 .../ui/tabs/Tabs.vue | 0 .../ui/tabs/TabsContent.vue | 0 .../ui/tabs/TabsList.vue | 0 .../ui/tabs/TabsTrigger.vue | 0 .../ui/tabs/index.ts | 0 .../ui/tags-input/TagsInput.vue | 0 .../ui/tags-input/TagsInputInput.vue | 0 .../ui/tags-input/TagsInputItem.vue | 0 .../ui/tags-input/TagsInputItemDelete.vue | 0 .../ui/tags-input/TagsInputItemText.vue | 0 .../ui/tags-input/index.ts | 0 .../ui/toggle-group/ToggleGroup.vue | 0 .../ui/toggle-group/ToggleGroupItem.vue | 0 .../ui/toggle-group/index.ts | 0 .../ui/toggle/Toggle.vue | 0 .../ui/toggle/index.ts | 0 .../ui/tooltip/Tooltip.vue | 0 .../ui/tooltip/TooltipContent.vue | 0 .../ui/tooltip/TooltipProvider.vue | 0 .../ui/tooltip/TooltipTrigger.vue | 0 .../ui/tooltip/index.ts | 0 cypress.config.ts | 15 - {src/data => data}/Characters.ts | 0 {src/data => data}/Events.ts | 0 env.d.ts | 1 - eslint.config.mjs | 15 + index.html | 32 - {src/lib => lib}/utils.ts | 0 {src/models => models}/Characters.ts | 0 {src/models => models}/Date.ts | 0 {src/models => models}/Events.ts | 0 nuxt.config.ts | 30 + package-lock.json | 6432 ---------- package.json | 65 +- .../CalendarPage.vue => pages/calendar.vue | 8 +- pages/index.vue | 17 + pnpm-lock.yaml | 10088 ++++++++++++++++ postcss.config.js | 6 - public/favicon.ico | Bin 15086 -> 0 bytes server/tsconfig.json | 3 + src/App.vue | 12 - src/components/calendar/CalendarSwitch.vue | 42 - src/main.ts | 14 - src/router/index.ts | 21 - src/utils/meta.ts | 1 - src/views/HomePage.vue | 27 - {src/stores => stores}/CalendarStore.ts | 1 + {src/stores => stores}/CharacterStore.ts | 0 {src/stores => stores}/EventStore.ts | 0 tailwind.config.js | 125 +- tsconfig.app.json | 14 - tsconfig.cypress-ct.json | 15 - tsconfig.json | 17 +- tsconfig.node.json | 19 - {src/utils => utils}/Regex.ts | 0 {src/utils => utils}/Strings.ts | 0 vite.config.ts | 14 - 157 files changed, 10627 insertions(+), 7136 deletions(-) delete mode 100644 .eslintrc.cjs delete mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json create mode 100644 app.vue rename {src/assets => assets}/main.css (95%) rename {src/components => components}/calendar/Calendar.vue (100%) rename {src/components => components}/calendar/CalendarCurrentDate.vue (100%) rename {src/components => components}/calendar/CalendarEvent.vue (94%) rename {src/components => components}/calendar/CalendarEventDetails.vue (89%) rename {src/components => components}/calendar/CalendarMenu.vue (90%) rename {src/components => components}/calendar/CalendarMenuNav.vue (69%) rename {src/components => components}/calendar/CalendarMenuSubnav.vue (77%) rename {src/components => components}/calendar/CalendarMenuToday.vue (58%) create mode 100644 components/calendar/CalendarSwitch.vue rename src/components/calendar/Search.ts => components/calendar/SearchMode.ts (100%) rename {src/components => components}/calendar/Sidebar.vue (90%) rename {src/components => components}/calendar/search/CalendarSearch.vue (71%) rename {src/components => components}/calendar/search/lists/CharacterCallout.vue (96%) rename {src/components => components}/calendar/search/lists/EventCallout.vue (98%) rename {src/components => components}/calendar/search/lists/SearchList.vue (93%) rename {src/components => components}/calendar/state/centennially/Layout.vue (100%) rename {src/components => components}/calendar/state/decennially/Layout.vue (100%) rename {src/components => components}/calendar/state/monthly/DayTile.vue (93%) rename {src/components => components}/calendar/state/monthly/Layout.vue (100%) rename {src/components => components}/calendar/state/yearly/DayTile.vue (100%) rename {src/components => components}/calendar/state/yearly/Layout.vue (100%) rename {src/components => components}/calendar/state/yearly/MonthTile.vue (100%) rename {src/components => components}/ui/badge/Badge.vue (100%) rename {src/components => components}/ui/badge/index.ts (78%) rename {src/components => components}/ui/button/Button.vue (100%) rename {src/components => components}/ui/button/index.ts (100%) rename {src/components => components}/ui/card/Card.vue (92%) rename {src/components => components}/ui/card/CardContent.vue (76%) rename {src/components => components}/ui/card/CardDescription.vue (73%) rename {src/components => components}/ui/card/CardFooter.vue (100%) rename {src/components => components}/ui/card/CardHeader.vue (74%) rename {src/components => components}/ui/card/CardTitle.vue (67%) rename {src/components => components}/ui/card/index.ts (100%) rename {src/components => components}/ui/command/Command.vue (100%) rename {src/components => components}/ui/command/CommandDialog.vue (100%) rename {src/components => components}/ui/command/CommandEmpty.vue (100%) rename {src/components => components}/ui/command/CommandGroup.vue (100%) rename {src/components => components}/ui/command/CommandInput.vue (100%) rename {src/components => components}/ui/command/CommandItem.vue (100%) rename {src/components => components}/ui/command/CommandList.vue (100%) rename {src/components => components}/ui/command/CommandSeparator.vue (100%) rename {src/components => components}/ui/command/CommandShortcut.vue (100%) rename {src/components => components}/ui/command/index.ts (100%) rename {src/components => components}/ui/dialog/Dialog.vue (100%) rename {src/components => components}/ui/dialog/DialogClose.vue (100%) rename {src/components => components}/ui/dialog/DialogContent.vue (100%) rename {src/components => components}/ui/dialog/DialogDescription.vue (100%) rename {src/components => components}/ui/dialog/DialogFooter.vue (100%) rename {src/components => components}/ui/dialog/DialogHeader.vue (100%) rename {src/components => components}/ui/dialog/DialogScrollContent.vue (100%) rename {src/components => components}/ui/dialog/DialogTitle.vue (100%) rename {src/components => components}/ui/dialog/DialogTrigger.vue (100%) rename {src/components => components}/ui/dialog/index.ts (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenu.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuCheckboxItem.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuContent.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuGroup.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuItem.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuLabel.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuRadioGroup.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuRadioItem.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuSeparator.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuShortcut.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuSub.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuSubContent.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuSubTrigger.vue (100%) rename {src/components => components}/ui/dropdown-menu/DropdownMenuTrigger.vue (100%) rename {src/components => components}/ui/dropdown-menu/index.ts (100%) rename {src/components => components}/ui/input/Input.vue (100%) rename {src/components => components}/ui/input/index.ts (100%) rename {src/components => components}/ui/pagination/PaginationEllipsis.vue (100%) rename {src/components => components}/ui/pagination/PaginationFirst.vue (100%) rename {src/components => components}/ui/pagination/PaginationLast.vue (100%) rename {src/components => components}/ui/pagination/PaginationNext.vue (100%) rename {src/components => components}/ui/pagination/PaginationPrev.vue (100%) rename {src/components => components}/ui/pagination/index.ts (100%) rename {src/components => components}/ui/popover/Popover.vue (100%) rename {src/components => components}/ui/popover/PopoverContent.vue (100%) rename {src/components => components}/ui/popover/PopoverTrigger.vue (100%) rename {src/components => components}/ui/popover/index.ts (100%) rename {src/components => components}/ui/select/Select.vue (100%) rename {src/components => components}/ui/select/SelectContent.vue (100%) rename {src/components => components}/ui/select/SelectGroup.vue (100%) rename {src/components => components}/ui/select/SelectItem.vue (100%) rename {src/components => components}/ui/select/SelectItemText.vue (100%) rename {src/components => components}/ui/select/SelectLabel.vue (100%) rename {src/components => components}/ui/select/SelectScrollDownButton.vue (100%) rename {src/components => components}/ui/select/SelectScrollUpButton.vue (100%) rename {src/components => components}/ui/select/SelectSeparator.vue (100%) rename {src/components => components}/ui/select/SelectTrigger.vue (100%) rename {src/components => components}/ui/select/SelectValue.vue (100%) rename {src/components => components}/ui/select/index.ts (100%) rename {src/components => components}/ui/tabs/Tabs.vue (100%) rename {src/components => components}/ui/tabs/TabsContent.vue (100%) rename {src/components => components}/ui/tabs/TabsList.vue (100%) rename {src/components => components}/ui/tabs/TabsTrigger.vue (100%) rename {src/components => components}/ui/tabs/index.ts (100%) rename {src/components => components}/ui/tags-input/TagsInput.vue (100%) rename {src/components => components}/ui/tags-input/TagsInputInput.vue (100%) rename {src/components => components}/ui/tags-input/TagsInputItem.vue (100%) rename {src/components => components}/ui/tags-input/TagsInputItemDelete.vue (100%) rename {src/components => components}/ui/tags-input/TagsInputItemText.vue (100%) rename {src/components => components}/ui/tags-input/index.ts (100%) rename {src/components => components}/ui/toggle-group/ToggleGroup.vue (100%) rename {src/components => components}/ui/toggle-group/ToggleGroupItem.vue (100%) rename {src/components => components}/ui/toggle-group/index.ts (100%) rename {src/components => components}/ui/toggle/Toggle.vue (100%) rename {src/components => components}/ui/toggle/index.ts (100%) rename {src/components => components}/ui/tooltip/Tooltip.vue (100%) rename {src/components => components}/ui/tooltip/TooltipContent.vue (100%) rename {src/components => components}/ui/tooltip/TooltipProvider.vue (100%) rename {src/components => components}/ui/tooltip/TooltipTrigger.vue (100%) rename {src/components => components}/ui/tooltip/index.ts (100%) delete mode 100644 cypress.config.ts rename {src/data => data}/Characters.ts (100%) rename {src/data => data}/Events.ts (100%) delete mode 100644 env.d.ts create mode 100644 eslint.config.mjs delete mode 100644 index.html rename {src/lib => lib}/utils.ts (100%) rename {src/models => models}/Characters.ts (100%) rename {src/models => models}/Date.ts (100%) rename {src/models => models}/Events.ts (100%) create mode 100644 nuxt.config.ts delete mode 100644 package-lock.json rename src/views/CalendarPage.vue => pages/calendar.vue (90%) create mode 100644 pages/index.vue create mode 100644 pnpm-lock.yaml delete mode 100644 postcss.config.js delete mode 100644 public/favicon.ico create mode 100644 server/tsconfig.json delete mode 100644 src/App.vue delete mode 100644 src/components/calendar/CalendarSwitch.vue delete mode 100644 src/main.ts delete mode 100644 src/router/index.ts delete mode 100644 src/utils/meta.ts delete mode 100644 src/views/HomePage.vue rename {src/stores => stores}/CalendarStore.ts (99%) rename {src/stores => stores}/CharacterStore.ts (100%) rename {src/stores => stores}/EventStore.ts (100%) delete mode 100644 tsconfig.app.json delete mode 100644 tsconfig.cypress-ct.json delete mode 100644 tsconfig.node.json rename {src/utils => utils}/Regex.ts (100%) rename {src/utils => utils}/Strings.ts (100%) delete mode 100644 vite.config.ts diff --git a/.eslintrc.cjs b/.eslintrc.cjs deleted file mode 100644 index 95aefff..0000000 --- a/.eslintrc.cjs +++ /dev/null @@ -1,35 +0,0 @@ -/* eslint-env node */ -require('@rushstack/eslint-patch/modern-module-resolution') - -module.exports = { - root: true, - extends: [ - 'plugin:vue/vue3-essential', - 'eslint:recommended', - '@vue/eslint-config-typescript', - '@vue/eslint-config-prettier/skip-formatting' - ], - overrides: [ - { - files: [ - '**/__tests__/*.{cy,spec}.{js,ts,jsx,tsx}', - 'cypress/e2e/**/*.{cy,spec}.{js,ts,jsx,tsx}', - 'cypress/support/**/*.{js,ts,jsx,tsx}' - ], - extends: ['plugin:cypress/recommended'] - } - ], - parserOptions: { - ecmaVersion: 'latest' - }, - rules: { - indent: ['error', 2, { SwitchCase: 1 }], - 'prettier/prettier': [ - 'error', - { - endOfLine: 'auto' - } - ], - 'vue/multi-word-component-names': 'off' - } -} diff --git a/.gitignore b/.gitignore index 514d5db..4a7f73a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,24 @@ +# Nuxt dev/build outputs +.output +.data +.nuxt +.nitro +.cache +dist + +# Node dependencies +node_modules + # Logs logs *.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* -lerna-debug.log* -node_modules +# Misc .DS_Store -dist -dist-ssr -coverage -*.local - -/cypress/videos/ -/cypress/screenshots/ - -# Editor directories and files -.vscode/* -!.vscode/extensions.json +.fleet .idea -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? - -*.tsbuildinfo +# Local env files .env +.env.* +!.env.example diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 93ea3e7..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "recommendations": [ - "Vue.volar", - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode" - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d259bb4 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "eslint.experimental.useFlatConfig": true, + "editor.indentSize": "tabSize", + "editor.tabSize": 2, +} \ No newline at end of file diff --git a/README.md b/README.md index 1d3a6b8..f5db2a2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,75 @@ -# Leim Tools -A congregate of tools used to visualize TTRPG elements and help content creators (mostly me for now tbh) build their worlds. +# Nuxt 3 Minimal Starter -## Timeline -Visual helper for time-related data, such as events, eras and characters. Helpful to know how old a character is while something is happening in the world, or how far two events are separated in the timeline. +Look at the [Nuxt 3 documentation](https://nuxt.com/docs/getting-started/introduction) to learn more. + +## Setup + +Make sure to install the dependencies: + +```bash +# npm +npm install + +# pnpm +pnpm install + +# yarn +yarn install + +# bun +bun install +``` + +## Development Server + +Start the development server on `http://localhost:3000`: + +```bash +# npm +npm run dev + +# pnpm +pnpm run dev + +# yarn +yarn dev + +# bun +bun run dev +``` + +## Production + +Build the application for production: + +```bash +# npm +npm run build + +# pnpm +pnpm run build + +# yarn +yarn build + +# bun +bun run build +``` + +Locally preview production build: + +```bash +# npm +npm run preview + +# pnpm +pnpm run preview + +# yarn +yarn preview + +# bun +bun run preview +``` + +Check out the [deployment documentation](https://nuxt.com/docs/getting-started/deployment) for more information. diff --git a/app.vue b/app.vue new file mode 100644 index 0000000..790f6ef --- /dev/null +++ b/app.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/assets/main.css b/assets/main.css similarity index 95% rename from src/assets/main.css rename to assets/main.css index 010919c..71f25ec 100644 --- a/src/assets/main.css +++ b/assets/main.css @@ -2,70 +2,68 @@ @tailwind components; @tailwind utilities; -@layer base { - :root { +:root { --background: 0 0% 100%; --foreground: 222.2 84% 4.9%; - + --muted: 210 40% 96.1%; --muted-foreground: 215.4 16.3% 46.9%; - + --popover: 0 0% 100%; --popover-foreground: 222.2 84% 4.9%; - + --card: 0 0% 100%; --card-foreground: 222.2 84% 4.9%; - + --border: 214.3 31.8% 91.4%; --input: 214.3 31.8% 91.4%; - + --primary: 222.2 47.4% 11.2%; --primary-foreground: 210 40% 98%; - + --secondary: 210 40% 96.1%; --secondary-foreground: 222.2 47.4% 11.2%; - + --accent: 210 40% 96.1%; --accent-foreground: 222.2 47.4% 11.2%; - + --destructive: 0 84.2% 60.2%; --destructive-foreground: 210 40% 98%; - + --ring: 222.2 84% 4.9%; - + --radius: 0.5rem; } - - .dark { + + :root.dark { --background: 222.2 84% 4.9%; --foreground: 210 40% 98%; - + --muted: 217.2 32.6% 17.5%; --muted-foreground: 215 20.2% 65.1%; - + --popover: 222.2 84% 4.9%; --popover-foreground: 210 40% 98%; - + --card: 222.2 84% 4.9%; --card-foreground: 210 40% 98%; - + --border: 217.2 32.6% 17.5%; --input: 217.2 32.6% 17.5%; - + --primary: 210 40% 98%; --primary-foreground: 222.2 47.4% 11.2%; - + --secondary: 217.2 32.6% 17.5%; --secondary-foreground: 210 40% 98%; - + --accent: 217.2 32.6% 17.5%; --accent-foreground: 210 40% 98%; - + --destructive: 0 62.8% 30.6%; --destructive-foreground: 210 40% 98%; - + --ring: 212.7 26.8% 83.9%; - } } @layer base { @@ -75,4 +73,4 @@ body { @apply bg-background text-foreground; } -} +} \ No newline at end of file diff --git a/components.json b/components.json index 9c826ef..be94b1d 100644 --- a/components.json +++ b/components.json @@ -4,11 +4,11 @@ "typescript": true, "tailwind": { "config": "tailwind.config.js", - "css": "src/assets/main.css", + "css": "assets/main.css", "baseColor": "slate", "cssVariables": true }, - "framework": "vite", + "framework": "nuxt", "aliases": { "components": "@/components", "utils": "@/lib/utils" diff --git a/src/components/calendar/Calendar.vue b/components/calendar/Calendar.vue similarity index 100% rename from src/components/calendar/Calendar.vue rename to components/calendar/Calendar.vue diff --git a/src/components/calendar/CalendarCurrentDate.vue b/components/calendar/CalendarCurrentDate.vue similarity index 100% rename from src/components/calendar/CalendarCurrentDate.vue rename to components/calendar/CalendarCurrentDate.vue diff --git a/src/components/calendar/CalendarEvent.vue b/components/calendar/CalendarEvent.vue similarity index 94% rename from src/components/calendar/CalendarEvent.vue rename to components/calendar/CalendarEvent.vue index 7f1c6e5..cfb6b74 100644 --- a/src/components/calendar/CalendarEvent.vue +++ b/components/calendar/CalendarEvent.vue @@ -3,7 +3,6 @@ import { ref } from 'vue' import { cn } from '@/lib/utils' import { areDatesIdentical, type LeimDate } from '@/models/Date' -import { Popover, PopoverTrigger } from '@/components/ui/popover' import type { CalendarEvent } from '@/models/Events' import CalendarEventDetails from './CalendarEventDetails.vue' @@ -26,8 +25,8 @@ function handleClosePopover() { diff --git a/src/components/calendar/CalendarEventDetails.vue b/components/calendar/CalendarEventDetails.vue similarity index 89% rename from src/components/calendar/CalendarEventDetails.vue rename to components/calendar/CalendarEventDetails.vue index c7e3f73..1da2745 100644 --- a/src/components/calendar/CalendarEventDetails.vue +++ b/components/calendar/CalendarEventDetails.vue @@ -12,8 +12,6 @@ import { PhArrowBendDoubleUpLeft, PhArrowBendDoubleUpRight } from '@phosphor-icons/vue' -import { Badge } from '@/components/ui/badge' -import { PopoverContent } from '@/components/ui/popover' const { defaultDate, getFormattedDateTitle, jumpToDate } = useCalendar() const { getRelativeEventFromEvent } = useCalendarEvents() @@ -51,7 +49,7 @@ function handleGotoRelativeEvent(position: 'next' | 'prev' = 'next') { From c4b5ad724c418de51c510792534fc5709dd3ebf4 Mon Sep 17 00:00:00 2001 From: Alexis <35.alexis.pele@gmail.com> Date: Tue, 4 Jun 2024 18:47:54 +0200 Subject: [PATCH 32/32] Added delete functions for events --- components/calendar/CalendarEventDetails.vue | 3 +- models/CalendarEvent.ts | 2 +- server/api/calendars/events/[id].delete.ts | 41 ++++++++++++++++++++ stores/EventStore.ts | 16 +++++++- 4 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 server/api/calendars/events/[id].delete.ts diff --git a/components/calendar/CalendarEventDetails.vue b/components/calendar/CalendarEventDetails.vue index 793dcfe..9816ace 100644 --- a/components/calendar/CalendarEventDetails.vue +++ b/components/calendar/CalendarEventDetails.vue @@ -12,6 +12,7 @@ import { } from '@phosphor-icons/vue' const { defaultDate, getFormattedDateTitle, jumpToDate, revealEditEventModal, getRelativeString } = useCalendar() +const { deleteEvent } = useCalendarEvents() const { lastActiveEvent } = storeToRefs(useCalendarEvents()) const props = defineProps<{ @@ -145,7 +146,7 @@ function deployEditModal() { Modifier - Supprimer + Supprimer diff --git a/models/CalendarEvent.ts b/models/CalendarEvent.ts index 618ce65..e5f751a 100644 --- a/models/CalendarEvent.ts +++ b/models/CalendarEvent.ts @@ -24,7 +24,7 @@ export const postEventBodySchema = z.object({ startDate: dateSchema.required(), endDate: dateSchema.optional().nullable() }), - calendarId: z.number().int().positive() + calendarId: z.number({ coerce: true }).int().positive() }) // eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/server/api/calendars/events/[id].delete.ts b/server/api/calendars/events/[id].delete.ts new file mode 100644 index 0000000..7a15913 --- /dev/null +++ b/server/api/calendars/events/[id].delete.ts @@ -0,0 +1,41 @@ +import { z } from 'zod' +import { serverSupabaseClient } from "#supabase/server" +import type { CalendarEvent } from "~/models/CalendarEvent" + +const paramsSchema = z.object({ + id: z.number({ coerce: true }).positive().int() +}) + +export default defineEventHandler(async (event) => { + const client = await serverSupabaseClient(event) + + const { data: params, error: paramsError} = await getValidatedRouterParams(event, paramsSchema.safeParse) + + if (paramsError) { + throw createError({ + cause: 'Utilisateur', + fatal: false, + message: "L'identifiant de l'évènement est manquant ou mal renseigné.", + status: 401, + }) + } + + try { + const { data, error } = await client + .from('calendar_events') + .delete() + .eq('id', params.id) + .single() + + if (error) throw error + + return data + } catch (err) { + throw createError({ + cause: 'Serveur', + status: 500, + fatal: false, + message: 'Une erreur inconnue est survenue.' + }) + } +}) diff --git a/stores/EventStore.ts b/stores/EventStore.ts index 4d48e47..d703b5a 100644 --- a/stores/EventStore.ts +++ b/stores/EventStore.ts @@ -205,5 +205,19 @@ export const useCalendarEvents = defineStore('calendar-events', () => { } } - return { allEvents, setEvents, currentEvents, getRelativeEventFromDate, getRelativeEventFromEvent, eventSkeleton, resetSkeleton, submitSkeleton, lastActiveEvent, updateEventFromSkeleton } + async function deleteEvent(eventId: number) { + if (!eventId) { + throw new Error('ID of the event is required') + } + + try { + await $fetch(`/api/calendars/events/${eventId}`, { method: 'DELETE' }) + const eventIndex = baseEvents.value.findIndex(e => e.id === eventId) + baseEvents.value.splice(eventIndex, 1) + } catch (err) { + console.log(err) + } + } + + return { allEvents, setEvents, currentEvents, getRelativeEventFromDate, getRelativeEventFromEvent, eventSkeleton, resetSkeleton, submitSkeleton, lastActiveEvent, updateEventFromSkeleton, deleteEvent } })