From c581ad8854b226d587971400adcfe1ba19184e2f Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Tue, 3 Mar 2026 18:15:29 +0100
Subject: [PATCH] move calendar, dropdown-menu, select, dialog, number-field
 components to the ui package

---
 .../Common/Member/MemberBillableSelect.vue    |  8 +-
 .../Common/Member/MemberEditModal.vue         |  8 +-
 .../Common/Member/MemberRoleSelect.vue        |  8 +-
 .../Common/Project/BaseFilterBadge.vue        |  6 +-
 .../Common/Reporting/ReportingFilterBar.vue   |  8 +-
 .../Reporting/ReportingGroupBySelect.vue      |  8 +-
 .../Reporting/ReportingRoundingControls.vue   | 10 +--
 .../ui/calendar/CalendarDateInput.vue         | 71 ----------------
 .../js/Pages/Profile/Partials/ThemeForm.vue   |  8 +-
 .../Partials/OrganizationFormatSettings.vue   |  8 +-
 .../FullCalendar/CalendarSettingsPopover.vue  |  8 +-
 .../ui/src/Input/BillableRateInput.vue        |  2 +-
 .../js/packages/ui/src/Input/DatePicker.vue   |  2 +-
 resources/js/packages/ui/src/Modal.vue        |  2 +-
 .../ui/src/Project/ProjectBillableSelect.vue  |  8 +-
 .../Project/ProjectEditBillableSection.vue    |  8 +-
 .../ui/src/TimeEntry/TimeEntryCreateModal.vue |  8 +-
 .../ui/src/TimeEntry/TimeEntryEditModal.vue   |  8 +-
 .../TimeEntry/TimeEntryMassUpdateModal.vue    |  8 +-
 .../TimeEntryMoreOptionsDropdown.vue          |  7 +-
 .../TimeTrackerMoreOptionsDropdown.vue        |  7 +-
 .../ui/src}/calendar/Calendar.vue             |  0
 .../ui/src}/calendar/CalendarCell.vue         |  0
 .../ui/src}/calendar/CalendarCellTrigger.vue  |  0
 .../ui/src}/calendar/CalendarGrid.vue         |  0
 .../ui/src}/calendar/CalendarGridBody.vue     |  0
 .../ui/src}/calendar/CalendarGridHead.vue     |  0
 .../ui/src}/calendar/CalendarGridRow.vue      |  0
 .../ui/src}/calendar/CalendarHeadCell.vue     |  0
 .../ui/src}/calendar/CalendarHeader.vue       |  0
 .../ui/src}/calendar/CalendarHeading.vue      |  0
 .../ui/src}/calendar/CalendarNextButton.vue   |  0
 .../ui/src}/calendar/CalendarPrevButton.vue   |  0
 .../ui => packages/ui/src}/calendar/index.ts  |  0
 .../ui => packages/ui/src}/dialog/Dialog.vue  |  0
 .../ui/src}/dialog/DialogClose.vue            |  0
 .../ui/src}/dialog/DialogContent.vue          |  0
 .../ui/src}/dialog/DialogDescription.vue      |  0
 .../ui/src}/dialog/DialogFooter.vue           |  0
 .../ui/src}/dialog/DialogHeader.vue           |  0
 .../ui/src}/dialog/DialogScrollContent.vue    |  0
 .../ui/src}/dialog/DialogTitle.vue            |  0
 .../ui/src}/dialog/DialogTrigger.vue          |  0
 .../ui => packages/ui/src}/dialog/index.ts    |  0
 .../js/packages/ui/src/field/FieldLabel.vue   |  2 +-
 resources/js/packages/ui/src/index.ts         | 84 +++++++++++++++++++
 .../ui => packages/ui/src}/label/Label.vue    |  0
 .../ui => packages/ui/src}/label/index.ts     |  0
 .../ui/src}/number-field/NumberField.vue      |  0
 .../src}/number-field/NumberFieldContent.vue  |  0
 .../number-field/NumberFieldDecrement.vue     |  0
 .../number-field/NumberFieldIncrement.vue     |  0
 .../ui/src}/number-field/NumberFieldInput.vue |  0
 .../ui/src}/number-field/index.ts             |  0
 .../ui => packages/ui/src}/select/Select.vue  |  0
 .../ui/src}/select/SelectContent.vue          |  0
 .../ui/src}/select/SelectGroup.vue            |  0
 .../ui/src}/select/SelectItem.vue             |  0
 .../ui/src}/select/SelectItemText.vue         |  0
 .../ui/src}/select/SelectLabel.vue            |  0
 .../ui/src}/select/SelectScrollDownButton.vue |  0
 .../ui/src}/select/SelectScrollUpButton.vue   |  0
 .../ui/src}/select/SelectSeparator.vue        |  0
 .../ui/src}/select/SelectTrigger.vue          |  0
 .../ui/src}/select/SelectValue.vue            |  0
 .../ui => packages/ui/src}/select/index.ts    |  0
 66 files changed, 106 insertions(+), 191 deletions(-)
 delete mode 100644 resources/js/Components/ui/calendar/CalendarDateInput.vue
 rename resources/js/{Components/ui => packages/ui/src}/calendar/Calendar.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarCell.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarCellTrigger.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarGrid.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarGridBody.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarGridHead.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarGridRow.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarHeadCell.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarHeader.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarHeading.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarNextButton.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/CalendarPrevButton.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/calendar/index.ts (100%)
 rename resources/js/{Components/ui => packages/ui/src}/dialog/Dialog.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/dialog/DialogClose.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/dialog/DialogContent.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/dialog/DialogDescription.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/dialog/DialogFooter.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/dialog/DialogHeader.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/dialog/DialogScrollContent.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/dialog/DialogTitle.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/dialog/DialogTrigger.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/dialog/index.ts (100%)
 rename resources/js/{Components/ui => packages/ui/src}/label/Label.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/label/index.ts (100%)
 rename resources/js/{Components/ui => packages/ui/src}/number-field/NumberField.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/number-field/NumberFieldContent.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/number-field/NumberFieldDecrement.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/number-field/NumberFieldIncrement.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/number-field/NumberFieldInput.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/number-field/index.ts (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/Select.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/SelectContent.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/SelectGroup.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/SelectItem.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/SelectItemText.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/SelectLabel.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/SelectScrollDownButton.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/SelectScrollUpButton.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/SelectSeparator.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/SelectTrigger.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/SelectValue.vue (100%)
 rename resources/js/{Components/ui => packages/ui/src}/select/index.ts (100%)

diff --git a/resources/js/Components/Common/Member/MemberBillableSelect.vue b/resources/js/Components/Common/Member/MemberBillableSelect.vue
index 436e083d..b61bc84b 100644
--- a/resources/js/Components/Common/Member/MemberBillableSelect.vue
+++ b/resources/js/Components/Common/Member/MemberBillableSelect.vue
@@ -1,11 +1,5 @@
 <script setup lang="ts">
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
 import type { BillableKey } from '@/types/projects';
 
 const model = defineModel<BillableKey>({
diff --git a/resources/js/Components/Common/Member/MemberEditModal.vue b/resources/js/Components/Common/Member/MemberEditModal.vue
index 638ce3ff..6dd99555 100644
--- a/resources/js/Components/Common/Member/MemberEditModal.vue
+++ b/resources/js/Components/Common/Member/MemberEditModal.vue
@@ -7,13 +7,7 @@ import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import { type MemberBillableKey, useMembersStore } from '@/utils/useMembers';
 import BillableRateInput from '@/packages/ui/src/Input/BillableRateInput.vue';
 import { Field, FieldLabel, FieldDescription } from '@/packages/ui/src/field';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
 import {
     Tooltip,
     TooltipContent,
diff --git a/resources/js/Components/Common/Member/MemberRoleSelect.vue b/resources/js/Components/Common/Member/MemberRoleSelect.vue
index 4c7d7d74..f469ca1c 100644
--- a/resources/js/Components/Common/Member/MemberRoleSelect.vue
+++ b/resources/js/Components/Common/Member/MemberRoleSelect.vue
@@ -1,11 +1,5 @@
 <script setup lang="ts">
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
 import type { Role } from '@/types/jetstream';
 import { usePage } from '@inertiajs/vue3';
 
diff --git a/resources/js/Components/Common/Project/BaseFilterBadge.vue b/resources/js/Components/Common/Project/BaseFilterBadge.vue
index 66af0194..c80e6be2 100644
--- a/resources/js/Components/Common/Project/BaseFilterBadge.vue
+++ b/resources/js/Components/Common/Project/BaseFilterBadge.vue
@@ -1,11 +1,7 @@
 <script setup lang="ts">
 import { XMarkIcon, ChevronDownIcon } from '@heroicons/vue/16/solid';
 import type { Component } from 'vue';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuTrigger,
-} from '@/packages/ui/src';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from '@/packages/ui/src';
 
 defineProps<{
     icon: Component;
diff --git a/resources/js/Components/Common/Reporting/ReportingFilterBar.vue b/resources/js/Components/Common/Reporting/ReportingFilterBar.vue
index 851f1fd0..d80cd213 100644
--- a/resources/js/Components/Common/Reporting/ReportingFilterBar.vue
+++ b/resources/js/Components/Common/Reporting/ReportingFilterBar.vue
@@ -8,13 +8,7 @@ import ClientMultiselectDropdown from '@/Components/Common/Client/ClientMultisel
 import MemberMultiselectDropdown from '@/Components/Common/Member/MemberMultiselectDropdown.vue';
 import ReportingFilterBadge from '@/Components/Common/Reporting/ReportingFilterBadge.vue';
 import ProjectMultiselectDropdown from '@/Components/Common/Project/ProjectMultiselectDropdown.vue';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
 import MainContainer from '@/packages/ui/src/MainContainer.vue';
 import DateRangePicker from '@/packages/ui/src/Input/DateRangePicker.vue';
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
diff --git a/resources/js/Components/Common/Reporting/ReportingGroupBySelect.vue b/resources/js/Components/Common/Reporting/ReportingGroupBySelect.vue
index 22c106d6..c32bfb1d 100644
--- a/resources/js/Components/Common/Reporting/ReportingGroupBySelect.vue
+++ b/resources/js/Components/Common/Reporting/ReportingGroupBySelect.vue
@@ -1,11 +1,5 @@
 <script setup lang="ts">
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
 import { type Component, computed } from 'vue';
 
 const model = defineModel<string | null>({ default: null });
diff --git a/resources/js/Components/Common/Reporting/ReportingRoundingControls.vue b/resources/js/Components/Common/Reporting/ReportingRoundingControls.vue
index 85463e26..650d845a 100644
--- a/resources/js/Components/Common/Reporting/ReportingRoundingControls.vue
+++ b/resources/js/Components/Common/Reporting/ReportingRoundingControls.vue
@@ -2,13 +2,7 @@
 import { Switch } from '@/Components/ui/switch';
 import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src';
 import { Button } from '@/packages/ui/src';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
 import { Field, FieldLabel } from '@/packages/ui/src/field';
 import {
     NumberField,
@@ -16,7 +10,7 @@ import {
     NumberFieldContent,
     NumberFieldIncrement,
     NumberFieldDecrement,
-} from '@/Components/ui/number-field';
+} from '@/packages/ui/src';
 import { ArrowsUpDownIcon } from '@heroicons/vue/20/solid';
 import { computed, ref, watch } from 'vue';
 import { twMerge } from 'tailwind-merge';
diff --git a/resources/js/Components/ui/calendar/CalendarDateInput.vue b/resources/js/Components/ui/calendar/CalendarDateInput.vue
deleted file mode 100644
index 5c630069..00000000
--- a/resources/js/Components/ui/calendar/CalendarDateInput.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<script setup lang="ts">
-import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src';
-import { Button } from '@/packages/ui/src';
-import { Calendar } from '@/Components/ui/calendar';
-import { CalendarIcon, XIcon } from 'lucide-vue-next';
-import { formatDate } from '@/packages/ui/src/utils/time';
-import { parseDate } from '@internationalized/date';
-import { computed, inject, type ComputedRef } from 'vue';
-import { type Organization } from '@/packages/api/src';
-
-const model = defineModel<string | null>();
-const emit = defineEmits<{
-    blur: [];
-}>();
-
-defineProps<{
-    clearable?: boolean;
-}>();
-
-const handleChange = (date: string) => {
-    model.value = date;
-};
-
-const handleBlur = () => {
-    emit('blur');
-};
-
-const handleClear = (event: Event) => {
-    event.stopPropagation();
-    model.value = null;
-};
-
-const date = computed(() => {
-    return model.value ? parseDate(model.value) : undefined;
-});
-
-const organization = inject<ComputedRef<Organization>>('organization');
-</script>
-
-<template>
-    <Popover>
-        <PopoverTrigger as-child>
-            <Button
-                variant="input"
-                :class="[
-                    'w-full justify-start text-left font-normal',
-                    !model && 'text-muted-foreground',
-                ]">
-                <CalendarIcon class="mr-2 h-4 w-4" />
-                <span class="flex-1">
-                    {{ model ? formatDate(model, organization?.date_format) : 'Pick a date' }}
-                </span>
-                <button
-                    v-if="clearable && model"
-                    class="ml-2 hover:bg-muted rounded p-1 transition-colors"
-                    type="button"
-                    @click="handleClear">
-                    <XIcon class="h-4 w-4" />
-                </button>
-            </Button>
-        </PopoverTrigger>
-        <PopoverContent class="w-auto p-0">
-            <Calendar
-                mode="single"
-                :model-value="date"
-                :initial-focus="true"
-                @update:model-value="(date) => handleChange(date ? date.toString() : '')"
-                @blur="handleBlur" />
-        </PopoverContent>
-    </Popover>
-</template>
diff --git a/resources/js/Pages/Profile/Partials/ThemeForm.vue b/resources/js/Pages/Profile/Partials/ThemeForm.vue
index 5f30ac39..69de1786 100644
--- a/resources/js/Pages/Profile/Partials/ThemeForm.vue
+++ b/resources/js/Pages/Profile/Partials/ThemeForm.vue
@@ -1,13 +1,7 @@
 <script setup lang="ts">
 import FormSection from '@/Components/FormSection.vue';
 import { Field, FieldLabel, FieldDescription } from '@/packages/ui/src/field';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
 import { usePreferredColorScheme } from '@vueuse/core';
 import { themeSetting } from '@/utils/theme';
 
diff --git a/resources/js/Pages/Teams/Partials/OrganizationFormatSettings.vue b/resources/js/Pages/Teams/Partials/OrganizationFormatSettings.vue
index 389d343c..3f04e7bd 100644
--- a/resources/js/Pages/Teams/Partials/OrganizationFormatSettings.vue
+++ b/resources/js/Pages/Teams/Partials/OrganizationFormatSettings.vue
@@ -6,13 +6,7 @@ import { Field, FieldLabel } from '@/packages/ui/src/field';
 import type { UpdateOrganizationBody } from '@/packages/api/src';
 import { useOrganizationStore } from '@/utils/useOrganization';
 import { storeToRefs } from 'pinia';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/packages/ui/src';
 import { useMutation, useQueryClient } from '@tanstack/vue-query';
 import type { DateFormat, TimeFormat, IntervalFormat } from '@/packages/ui/src/utils/time';
 import type { CurrencyFormat } from '@/packages/ui/src/utils/money';
diff --git a/resources/js/packages/ui/src/FullCalendar/CalendarSettingsPopover.vue b/resources/js/packages/ui/src/FullCalendar/CalendarSettingsPopover.vue
index 7557a14b..452f646c 100644
--- a/resources/js/packages/ui/src/FullCalendar/CalendarSettingsPopover.vue
+++ b/resources/js/packages/ui/src/FullCalendar/CalendarSettingsPopover.vue
@@ -1,12 +1,6 @@
 <script setup lang="ts">
 import { Popover, PopoverContent, PopoverTrigger, Button } from '..';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '..';
 import { Field, FieldLabel } from '../field';
 import { Settings } from 'lucide-vue-next';
 import { ref, watch } from 'vue';
diff --git a/resources/js/packages/ui/src/Input/BillableRateInput.vue b/resources/js/packages/ui/src/Input/BillableRateInput.vue
index bb07f587..a87a9f50 100644
--- a/resources/js/packages/ui/src/Input/BillableRateInput.vue
+++ b/resources/js/packages/ui/src/Input/BillableRateInput.vue
@@ -7,7 +7,7 @@ import {
     NumberFieldDecrement,
     NumberFieldIncrement,
     NumberFieldInput,
-} from '@/Components/ui/number-field';
+} from '..';
 
 const props = defineProps<{
     name: string;
diff --git a/resources/js/packages/ui/src/Input/DatePicker.vue b/resources/js/packages/ui/src/Input/DatePicker.vue
index 31d148b8..0b823e13 100644
--- a/resources/js/packages/ui/src/Input/DatePicker.vue
+++ b/resources/js/packages/ui/src/Input/DatePicker.vue
@@ -7,7 +7,7 @@ import {
     type WeekStartDay,
 } from '@/packages/ui/src/utils/time';
 import { Popover, PopoverContent, PopoverTrigger } from '@/packages/ui/src/popover';
-import { Calendar } from '@/Components/ui/calendar';
+import { Calendar } from '..';
 import { Button } from '@/packages/ui/src/Buttons';
 import { CalendarIcon } from 'lucide-vue-next';
 import { parseDate, type DateValue } from '@internationalized/date';
diff --git a/resources/js/packages/ui/src/Modal.vue b/resources/js/packages/ui/src/Modal.vue
index e1cead48..fbb536a4 100644
--- a/resources/js/packages/ui/src/Modal.vue
+++ b/resources/js/packages/ui/src/Modal.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { Dialog, DialogContent, DialogFooter } from '@/Components/ui/dialog';
+import { Dialog, DialogContent, DialogFooter } from './dialog/index';
 import { computed } from 'vue';
 
 const props = defineProps({
diff --git a/resources/js/packages/ui/src/Project/ProjectBillableSelect.vue b/resources/js/packages/ui/src/Project/ProjectBillableSelect.vue
index 40c58ceb..b570849e 100644
--- a/resources/js/packages/ui/src/Project/ProjectBillableSelect.vue
+++ b/resources/js/packages/ui/src/Project/ProjectBillableSelect.vue
@@ -1,11 +1,5 @@
 <script setup lang="ts">
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '..';
 import type { BillableKey } from '@/types/projects';
 
 const model = defineModel<BillableKey>({
diff --git a/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue b/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue
index c49e58d9..634bd6ab 100644
--- a/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue
+++ b/resources/js/packages/ui/src/Project/ProjectEditBillableSection.vue
@@ -1,13 +1,7 @@
 <script setup lang="ts">
 import { Field, FieldDescription, FieldLabel } from '../field';
 import BillableRateInput from '@/packages/ui/src/Input/BillableRateInput.vue';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '..';
 import {
     Tooltip,
     TooltipContent,
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
index 727f6700..6d5d92f4 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryCreateModal.vue
@@ -17,13 +17,7 @@ import type {
 } from '@/packages/api/src';
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '..';
 import { Button } from '@/packages/ui/src/Buttons';
 import DatePicker from '@/packages/ui/src/Input/DatePicker.vue';
 import DurationHumanInput from '@/packages/ui/src/Input/DurationHumanInput.vue';
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
index 5c71f0c5..954e5171 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryEditModal.vue
@@ -17,13 +17,7 @@ import type {
 } from '@/packages/api/src';
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '..';
 import { Button } from '@/packages/ui/src/Buttons';
 import DatePicker from '@/packages/ui/src/Input/DatePicker.vue';
 import DurationHumanInput from '@/packages/ui/src/Input/DurationHumanInput.vue';
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue
index f9ec1860..a31e780e 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryMassUpdateModal.vue
@@ -16,13 +16,7 @@ import {
 } from '@/packages/api/src';
 import { Checkbox } from '@/packages/ui/src';
 import { TagIcon } from '@heroicons/vue/20/solid';
-import {
-    Select,
-    SelectContent,
-    SelectItem,
-    SelectTrigger,
-    SelectValue,
-} from '@/Components/ui/select';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '..';
 import { Button } from '@/packages/ui/src/Buttons';
 import TagDropdown from '@/packages/ui/src/Tag/TagDropdown.vue';
 import type { Tag, Task } from '@/packages/api/src';
diff --git a/resources/js/packages/ui/src/TimeEntry/TimeEntryMoreOptionsDropdown.vue b/resources/js/packages/ui/src/TimeEntry/TimeEntryMoreOptionsDropdown.vue
index 3063bac0..b422e007 100644
--- a/resources/js/packages/ui/src/TimeEntry/TimeEntryMoreOptionsDropdown.vue
+++ b/resources/js/packages/ui/src/TimeEntry/TimeEntryMoreOptionsDropdown.vue
@@ -1,11 +1,6 @@
 <script setup lang="ts">
 import { TrashIcon, PencilIcon, DocumentDuplicateIcon } from '@heroicons/vue/20/solid';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger,
-} from '..';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '..';
 
 const props = withDefaults(
     defineProps<{
diff --git a/resources/js/packages/ui/src/TimeTracker/TimeTrackerMoreOptionsDropdown.vue b/resources/js/packages/ui/src/TimeTracker/TimeTrackerMoreOptionsDropdown.vue
index 54a7fa51..bac57973 100644
--- a/resources/js/packages/ui/src/TimeTracker/TimeTrackerMoreOptionsDropdown.vue
+++ b/resources/js/packages/ui/src/TimeTracker/TimeTrackerMoreOptionsDropdown.vue
@@ -1,11 +1,6 @@
 <script setup lang="ts">
 import { PlusIcon, XMarkIcon } from '@heroicons/vue/20/solid';
-import {
-    DropdownMenu,
-    DropdownMenuContent,
-    DropdownMenuItem,
-    DropdownMenuTrigger,
-} from '..';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '..';
 
 const props = defineProps<{
     hasActiveTimer: boolean;
diff --git a/resources/js/Components/ui/calendar/Calendar.vue b/resources/js/packages/ui/src/calendar/Calendar.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/Calendar.vue
rename to resources/js/packages/ui/src/calendar/Calendar.vue
diff --git a/resources/js/Components/ui/calendar/CalendarCell.vue b/resources/js/packages/ui/src/calendar/CalendarCell.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarCell.vue
rename to resources/js/packages/ui/src/calendar/CalendarCell.vue
diff --git a/resources/js/Components/ui/calendar/CalendarCellTrigger.vue b/resources/js/packages/ui/src/calendar/CalendarCellTrigger.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarCellTrigger.vue
rename to resources/js/packages/ui/src/calendar/CalendarCellTrigger.vue
diff --git a/resources/js/Components/ui/calendar/CalendarGrid.vue b/resources/js/packages/ui/src/calendar/CalendarGrid.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarGrid.vue
rename to resources/js/packages/ui/src/calendar/CalendarGrid.vue
diff --git a/resources/js/Components/ui/calendar/CalendarGridBody.vue b/resources/js/packages/ui/src/calendar/CalendarGridBody.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarGridBody.vue
rename to resources/js/packages/ui/src/calendar/CalendarGridBody.vue
diff --git a/resources/js/Components/ui/calendar/CalendarGridHead.vue b/resources/js/packages/ui/src/calendar/CalendarGridHead.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarGridHead.vue
rename to resources/js/packages/ui/src/calendar/CalendarGridHead.vue
diff --git a/resources/js/Components/ui/calendar/CalendarGridRow.vue b/resources/js/packages/ui/src/calendar/CalendarGridRow.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarGridRow.vue
rename to resources/js/packages/ui/src/calendar/CalendarGridRow.vue
diff --git a/resources/js/Components/ui/calendar/CalendarHeadCell.vue b/resources/js/packages/ui/src/calendar/CalendarHeadCell.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarHeadCell.vue
rename to resources/js/packages/ui/src/calendar/CalendarHeadCell.vue
diff --git a/resources/js/Components/ui/calendar/CalendarHeader.vue b/resources/js/packages/ui/src/calendar/CalendarHeader.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarHeader.vue
rename to resources/js/packages/ui/src/calendar/CalendarHeader.vue
diff --git a/resources/js/Components/ui/calendar/CalendarHeading.vue b/resources/js/packages/ui/src/calendar/CalendarHeading.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarHeading.vue
rename to resources/js/packages/ui/src/calendar/CalendarHeading.vue
diff --git a/resources/js/Components/ui/calendar/CalendarNextButton.vue b/resources/js/packages/ui/src/calendar/CalendarNextButton.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarNextButton.vue
rename to resources/js/packages/ui/src/calendar/CalendarNextButton.vue
diff --git a/resources/js/Components/ui/calendar/CalendarPrevButton.vue b/resources/js/packages/ui/src/calendar/CalendarPrevButton.vue
similarity index 100%
rename from resources/js/Components/ui/calendar/CalendarPrevButton.vue
rename to resources/js/packages/ui/src/calendar/CalendarPrevButton.vue
diff --git a/resources/js/Components/ui/calendar/index.ts b/resources/js/packages/ui/src/calendar/index.ts
similarity index 100%
rename from resources/js/Components/ui/calendar/index.ts
rename to resources/js/packages/ui/src/calendar/index.ts
diff --git a/resources/js/Components/ui/dialog/Dialog.vue b/resources/js/packages/ui/src/dialog/Dialog.vue
similarity index 100%
rename from resources/js/Components/ui/dialog/Dialog.vue
rename to resources/js/packages/ui/src/dialog/Dialog.vue
diff --git a/resources/js/Components/ui/dialog/DialogClose.vue b/resources/js/packages/ui/src/dialog/DialogClose.vue
similarity index 100%
rename from resources/js/Components/ui/dialog/DialogClose.vue
rename to resources/js/packages/ui/src/dialog/DialogClose.vue
diff --git a/resources/js/Components/ui/dialog/DialogContent.vue b/resources/js/packages/ui/src/dialog/DialogContent.vue
similarity index 100%
rename from resources/js/Components/ui/dialog/DialogContent.vue
rename to resources/js/packages/ui/src/dialog/DialogContent.vue
diff --git a/resources/js/Components/ui/dialog/DialogDescription.vue b/resources/js/packages/ui/src/dialog/DialogDescription.vue
similarity index 100%
rename from resources/js/Components/ui/dialog/DialogDescription.vue
rename to resources/js/packages/ui/src/dialog/DialogDescription.vue
diff --git a/resources/js/Components/ui/dialog/DialogFooter.vue b/resources/js/packages/ui/src/dialog/DialogFooter.vue
similarity index 100%
rename from resources/js/Components/ui/dialog/DialogFooter.vue
rename to resources/js/packages/ui/src/dialog/DialogFooter.vue
diff --git a/resources/js/Components/ui/dialog/DialogHeader.vue b/resources/js/packages/ui/src/dialog/DialogHeader.vue
similarity index 100%
rename from resources/js/Components/ui/dialog/DialogHeader.vue
rename to resources/js/packages/ui/src/dialog/DialogHeader.vue
diff --git a/resources/js/Components/ui/dialog/DialogScrollContent.vue b/resources/js/packages/ui/src/dialog/DialogScrollContent.vue
similarity index 100%
rename from resources/js/Components/ui/dialog/DialogScrollContent.vue
rename to resources/js/packages/ui/src/dialog/DialogScrollContent.vue
diff --git a/resources/js/Components/ui/dialog/DialogTitle.vue b/resources/js/packages/ui/src/dialog/DialogTitle.vue
similarity index 100%
rename from resources/js/Components/ui/dialog/DialogTitle.vue
rename to resources/js/packages/ui/src/dialog/DialogTitle.vue
diff --git a/resources/js/Components/ui/dialog/DialogTrigger.vue b/resources/js/packages/ui/src/dialog/DialogTrigger.vue
similarity index 100%
rename from resources/js/Components/ui/dialog/DialogTrigger.vue
rename to resources/js/packages/ui/src/dialog/DialogTrigger.vue
diff --git a/resources/js/Components/ui/dialog/index.ts b/resources/js/packages/ui/src/dialog/index.ts
similarity index 100%
rename from resources/js/Components/ui/dialog/index.ts
rename to resources/js/packages/ui/src/dialog/index.ts
diff --git a/resources/js/packages/ui/src/field/FieldLabel.vue b/resources/js/packages/ui/src/field/FieldLabel.vue
index f7001817..603d2e04 100644
--- a/resources/js/packages/ui/src/field/FieldLabel.vue
+++ b/resources/js/packages/ui/src/field/FieldLabel.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { Component, HTMLAttributes } from 'vue';
 import { cn } from '@/lib/utils';
-import { Label } from '@/Components/ui/label';
+import { Label } from '../label/index';
 
 const props = defineProps<{
     class?: HTMLAttributes['class'];
diff --git a/resources/js/packages/ui/src/index.ts b/resources/js/packages/ui/src/index.ts
index fae7fcbe..94455145 100644
--- a/resources/js/packages/ui/src/index.ts
+++ b/resources/js/packages/ui/src/index.ts
@@ -78,6 +78,52 @@ import {
     DropdownMenuSubTrigger,
     DropdownMenuTrigger,
 } from './dropdown-menu/index';
+import {
+    Select,
+    SelectContent,
+    SelectGroup,
+    SelectItem,
+    SelectItemText,
+    SelectLabel,
+    SelectScrollDownButton,
+    SelectScrollUpButton,
+    SelectSeparator,
+    SelectTrigger,
+    SelectValue,
+} from './select/index';
+import {
+    NumberField,
+    NumberFieldContent,
+    NumberFieldDecrement,
+    NumberFieldIncrement,
+    NumberFieldInput,
+} from './number-field/index';
+import {
+    Dialog,
+    DialogClose,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogScrollContent,
+    DialogTitle,
+    DialogTrigger,
+} from './dialog/index';
+import {
+    Calendar,
+    CalendarCell,
+    CalendarCellTrigger,
+    CalendarGrid,
+    CalendarGridBody,
+    CalendarGridHead,
+    CalendarGridRow,
+    CalendarHeadCell,
+    CalendarHeader,
+    CalendarHeading,
+    CalendarNextButton,
+    CalendarPrevButton,
+} from './calendar/index';
+import { Label } from './label/index';
 import {
     Field,
     FieldContent,
@@ -185,4 +231,42 @@ export {
     DropdownMenuSubContent,
     DropdownMenuSubTrigger,
     DropdownMenuTrigger,
+    Select,
+    SelectContent,
+    SelectGroup,
+    SelectItem,
+    SelectItemText,
+    SelectLabel,
+    SelectScrollDownButton,
+    SelectScrollUpButton,
+    SelectSeparator,
+    SelectTrigger,
+    SelectValue,
+    NumberField,
+    NumberFieldContent,
+    NumberFieldDecrement,
+    NumberFieldIncrement,
+    NumberFieldInput,
+    Dialog,
+    DialogClose,
+    DialogContent,
+    DialogDescription,
+    DialogFooter,
+    DialogHeader,
+    DialogScrollContent,
+    DialogTitle,
+    DialogTrigger,
+    Calendar,
+    CalendarCell,
+    CalendarCellTrigger,
+    CalendarGrid,
+    CalendarGridBody,
+    CalendarGridHead,
+    CalendarGridRow,
+    CalendarHeadCell,
+    CalendarHeader,
+    CalendarHeading,
+    CalendarNextButton,
+    CalendarPrevButton,
+    Label,
 };
diff --git a/resources/js/Components/ui/label/Label.vue b/resources/js/packages/ui/src/label/Label.vue
similarity index 100%
rename from resources/js/Components/ui/label/Label.vue
rename to resources/js/packages/ui/src/label/Label.vue
diff --git a/resources/js/Components/ui/label/index.ts b/resources/js/packages/ui/src/label/index.ts
similarity index 100%
rename from resources/js/Components/ui/label/index.ts
rename to resources/js/packages/ui/src/label/index.ts
diff --git a/resources/js/Components/ui/number-field/NumberField.vue b/resources/js/packages/ui/src/number-field/NumberField.vue
similarity index 100%
rename from resources/js/Components/ui/number-field/NumberField.vue
rename to resources/js/packages/ui/src/number-field/NumberField.vue
diff --git a/resources/js/Components/ui/number-field/NumberFieldContent.vue b/resources/js/packages/ui/src/number-field/NumberFieldContent.vue
similarity index 100%
rename from resources/js/Components/ui/number-field/NumberFieldContent.vue
rename to resources/js/packages/ui/src/number-field/NumberFieldContent.vue
diff --git a/resources/js/Components/ui/number-field/NumberFieldDecrement.vue b/resources/js/packages/ui/src/number-field/NumberFieldDecrement.vue
similarity index 100%
rename from resources/js/Components/ui/number-field/NumberFieldDecrement.vue
rename to resources/js/packages/ui/src/number-field/NumberFieldDecrement.vue
diff --git a/resources/js/Components/ui/number-field/NumberFieldIncrement.vue b/resources/js/packages/ui/src/number-field/NumberFieldIncrement.vue
similarity index 100%
rename from resources/js/Components/ui/number-field/NumberFieldIncrement.vue
rename to resources/js/packages/ui/src/number-field/NumberFieldIncrement.vue
diff --git a/resources/js/Components/ui/number-field/NumberFieldInput.vue b/resources/js/packages/ui/src/number-field/NumberFieldInput.vue
similarity index 100%
rename from resources/js/Components/ui/number-field/NumberFieldInput.vue
rename to resources/js/packages/ui/src/number-field/NumberFieldInput.vue
diff --git a/resources/js/Components/ui/number-field/index.ts b/resources/js/packages/ui/src/number-field/index.ts
similarity index 100%
rename from resources/js/Components/ui/number-field/index.ts
rename to resources/js/packages/ui/src/number-field/index.ts
diff --git a/resources/js/Components/ui/select/Select.vue b/resources/js/packages/ui/src/select/Select.vue
similarity index 100%
rename from resources/js/Components/ui/select/Select.vue
rename to resources/js/packages/ui/src/select/Select.vue
diff --git a/resources/js/Components/ui/select/SelectContent.vue b/resources/js/packages/ui/src/select/SelectContent.vue
similarity index 100%
rename from resources/js/Components/ui/select/SelectContent.vue
rename to resources/js/packages/ui/src/select/SelectContent.vue
diff --git a/resources/js/Components/ui/select/SelectGroup.vue b/resources/js/packages/ui/src/select/SelectGroup.vue
similarity index 100%
rename from resources/js/Components/ui/select/SelectGroup.vue
rename to resources/js/packages/ui/src/select/SelectGroup.vue
diff --git a/resources/js/Components/ui/select/SelectItem.vue b/resources/js/packages/ui/src/select/SelectItem.vue
similarity index 100%
rename from resources/js/Components/ui/select/SelectItem.vue
rename to resources/js/packages/ui/src/select/SelectItem.vue
diff --git a/resources/js/Components/ui/select/SelectItemText.vue b/resources/js/packages/ui/src/select/SelectItemText.vue
similarity index 100%
rename from resources/js/Components/ui/select/SelectItemText.vue
rename to resources/js/packages/ui/src/select/SelectItemText.vue
diff --git a/resources/js/Components/ui/select/SelectLabel.vue b/resources/js/packages/ui/src/select/SelectLabel.vue
similarity index 100%
rename from resources/js/Components/ui/select/SelectLabel.vue
rename to resources/js/packages/ui/src/select/SelectLabel.vue
diff --git a/resources/js/Components/ui/select/SelectScrollDownButton.vue b/resources/js/packages/ui/src/select/SelectScrollDownButton.vue
similarity index 100%
rename from resources/js/Components/ui/select/SelectScrollDownButton.vue
rename to resources/js/packages/ui/src/select/SelectScrollDownButton.vue
diff --git a/resources/js/Components/ui/select/SelectScrollUpButton.vue b/resources/js/packages/ui/src/select/SelectScrollUpButton.vue
similarity index 100%
rename from resources/js/Components/ui/select/SelectScrollUpButton.vue
rename to resources/js/packages/ui/src/select/SelectScrollUpButton.vue
diff --git a/resources/js/Components/ui/select/SelectSeparator.vue b/resources/js/packages/ui/src/select/SelectSeparator.vue
similarity index 100%
rename from resources/js/Components/ui/select/SelectSeparator.vue
rename to resources/js/packages/ui/src/select/SelectSeparator.vue
diff --git a/resources/js/Components/ui/select/SelectTrigger.vue b/resources/js/packages/ui/src/select/SelectTrigger.vue
similarity index 100%
rename from resources/js/Components/ui/select/SelectTrigger.vue
rename to resources/js/packages/ui/src/select/SelectTrigger.vue
diff --git a/resources/js/Components/ui/select/SelectValue.vue b/resources/js/packages/ui/src/select/SelectValue.vue
similarity index 100%
rename from resources/js/Components/ui/select/SelectValue.vue
rename to resources/js/packages/ui/src/select/SelectValue.vue
diff --git a/resources/js/Components/ui/select/index.ts b/resources/js/packages/ui/src/select/index.ts
similarity index 100%
rename from resources/js/Components/ui/select/index.ts
rename to resources/js/packages/ui/src/select/index.ts