chore: cleanup partials imports and move icons list to own file

Signed-off-by: Alexander Trost <[email protected]>
fivenet-app · Feb 4, 2025 · b786c2d · b786c2d
1 parent 222c4fe
commit b786c2d
Show file tree

Hide file tree

Showing 47 changed files with 146 additions and 159 deletions.
diff --git a/app/assets/css/tailwind.css b/app/assets/css/tailwind.css
@@ -3,7 +3,6 @@
 @tailwind utilities;
 
 @layer base {
-
     input[type='number']::-webkit-inner-spin-button,
     input[type='number']::-webkit-outer-spin-button {
         -webkit-appearance: none;
@@ -52,13 +51,13 @@ html {
             align-items: flex-start;
             display: flex;
 
-            >label {
+            > label {
                 flex: 0 0 auto;
                 margin-right: 0.5rem;
                 user-select: none;
             }
 
-            >div {
+            > div {
                 flex: 1 1 auto;
 
                 p {
@@ -102,7 +101,7 @@ html {
             position: relative;
             vertical-align: top;
 
-            >* {
+            > * {
                 margin-bottom: 0;
             }
         }

diff --git a/app/components/auth/ForgotPasswordForm.vue b/app/components/auth/ForgotPasswordForm.vue
@@ -2,9 +2,9 @@
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
 import PasswordStrengthMeter from '~/components/auth/PasswordStrengthMeter.vue';
+import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import { useNotificatorStore } from '~/store/notificator';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
-import DataErrorBlock from '../partials/data/DataErrorBlock.vue';
 
 const props = defineProps<{
     modelValue: boolean;

diff --git a/app/components/auth/LoginForm.vue b/app/components/auth/LoginForm.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
+import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import { useAuthStore } from '~/store/auth';
 import { useCookiesStore } from '~/store/cookies';
 import { useSettingsStore } from '~/store/settings';
-import DataErrorBlock from '../partials/data/DataErrorBlock.vue';
 
 const props = defineProps<{
     modelValue: boolean;

diff --git a/app/components/auth/RegistrationForm.vue b/app/components/auth/RegistrationForm.vue
@@ -2,10 +2,10 @@
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
 import PasswordStrengthMeter from '~/components/auth/PasswordStrengthMeter.vue';
+import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import { openTokenMgmt } from '~/composables/nui';
 import { useNotificatorStore } from '~/store/notificator';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
-import DataErrorBlock from '../partials/data/DataErrorBlock.vue';
 
 const notifications = useNotificatorStore();
 

diff --git a/app/components/calendar/CalendarCreateOrUpdateModal.vue b/app/components/calendar/CalendarCreateOrUpdateModal.vue
@@ -1,6 +1,9 @@
 <script lang="ts" setup>
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
+import ColorPickerTW from '~/components/partials/ColorPickerTW.vue';
+import AccessManager from '~/components/partials/access/AccessManager.vue';
+import { enumToAccessLevelEnums } from '~/components/partials/access/helpers';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
@@ -9,9 +12,6 @@ import { useNotificatorStore } from '~/store/notificator';
 import { AccessLevel, type CalendarJobAccess, type CalendarUserAccess } from '~~/gen/ts/resources/calendar/access';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { CreateOrUpdateCalendarResponse } from '~~/gen/ts/services/calendar/calendar';
-import ColorPickerTW from '../partials/ColorPickerTW.vue';
-import AccessManager from '../partials/access/AccessManager.vue';
-import { enumToAccessLevelEnums } from '../partials/access/helpers';
 
 const props = defineProps<{
     calendarId?: number;

diff --git a/app/components/calendar/CalendarViewSlideover.vue b/app/components/calendar/CalendarViewSlideover.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import AccessBadges from '~/components/partials/access/AccessBadges.vue';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
 import ConfirmModal from '~/components/partials/ConfirmModal.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
@@ -7,7 +8,6 @@ import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
 import OpenClosedBadge from '~/components/partials/OpenClosedBadge.vue';
 import { useCalendarStore } from '~/store/calendar';
 import { AccessLevel } from '~~/gen/ts/resources/calendar/access';
-import AccessBadges from '../partials/access/AccessBadges.vue';
 import CalendarCreateOrUpdateModal from './CalendarCreateOrUpdateModal.vue';
 import { checkCalendarAccess } from './helpers';
 

diff --git a/app/components/citizens/CitizensList.vue b/app/components/citizens/CitizensList.vue
@@ -2,6 +2,7 @@
 import type { TableColumn } from '#ui/types';
 import { vMaska } from 'maska/vue';
 import { z } from 'zod';
+import { sexToTextColor } from '~/components/partials/citizens/helpers';
 import PhoneNumberBlock from '~/components/partials/citizens/PhoneNumberBlock.vue';
 import ProfilePictureImg from '~/components/partials/citizens/ProfilePictureImg.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
@@ -11,7 +12,6 @@ import { useNotificatorStore } from '~/store/notificator';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { User } from '~~/gen/ts/resources/users/users';
 import type { ListCitizensRequest, ListCitizensResponse } from '~~/gen/ts/services/citizenstore/citizenstore';
-import { sexToTextColor } from '../partials/citizens/helpers';
 
 const { t } = useI18n();
 

diff --git a/app/components/documents/DocumentEditor.vue b/app/components/documents/DocumentEditor.vue
@@ -4,6 +4,10 @@ import { z } from 'zod';
 import DocumentReferenceManager from '~/components/documents/DocumentReferenceManager.vue';
 import DocumentRelationManager from '~/components/documents/DocumentRelationManager.vue';
 import { checkDocAccess, logger } from '~/components/documents/helpers';
+import AccessManager from '~/components/partials/access/AccessManager.vue';
+import { enumToAccessLevelEnums } from '~/components/partials/access/helpers';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
+import { availableIcons, fallbackIcon } from '~/components/partials/icons';
 import { getDocument, getUser, useClipboardStore } from '~/store/clipboard';
 import { useCompletorStore } from '~/store/completor';
 import { useDocumentEditorStore } from '~/store/documenteditor';
@@ -17,10 +21,6 @@ import { DocReference, DocRelation } from '~~/gen/ts/resources/documents/documen
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { UserShort } from '~~/gen/ts/resources/users/users';
 import type { CreateDocumentRequest, UpdateDocumentRequest } from '~~/gen/ts/services/docstore/docstore';
-import { markerFallbackIcon, markerIcons } from '../livemap/helpers';
-import AccessManager from '../partials/access/AccessManager.vue';
-import { enumToAccessLevelEnums } from '../partials/access/helpers';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
 
 const props = defineProps<{
     documentId?: number;
@@ -551,9 +551,9 @@ logger.info(
                                                     >
                                                         <component
                                                             :is="
-                                                                markerIcons.find(
+                                                                availableIcons.find(
                                                                     (item) => item.name === state.category?.icon,
-                                                                ) ?? markerFallbackIcon
+                                                                ) ?? fallbackIcon
                                                             "
                                                             v-if="state.category.icon"
                                                             class="size-5"
@@ -567,8 +567,8 @@ logger.info(
                                                     <span class="inline-flex gap-1" :class="`bg-${option.color}-500`">
                                                         <component
                                                             :is="
-                                                                markerIcons.find((item) => item.name === option.icon) ??
-                                                                markerFallbackIcon
+                                                                availableIcons.find((item) => item.name === option.icon) ??
+                                                                fallbackIcon
                                                             "
                                                             v-if="option.icon"
                                                             class="size-5"

diff --git a/app/components/documents/DocumentList.vue b/app/components/documents/DocumentList.vue
@@ -5,17 +5,17 @@ import { z } from 'zod';
 import DocumentListEntry from '~/components/documents/DocumentListEntry.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
+import DateRangePickerPopoverClient from '~/components/partials/DateRangePickerPopover.client.vue';
+import { availableIcons, fallbackIcon } from '~/components/partials/icons';
 import Pagination from '~/components/partials/Pagination.vue';
+import SortButton from '~/components/partials/SortButton.vue';
 import { useCompletorStore } from '~/store/completor';
 import { useSettingsStore } from '~/store/settings';
 import type { OpenClose } from '~/typings';
 import * as googleProtobufTimestamp from '~~/gen/ts/google/protobuf/timestamp';
 import type { Category } from '~~/gen/ts/resources/documents/category';
 import type { UserShort } from '~~/gen/ts/resources/users/users';
 import type { ListDocumentsRequest, ListDocumentsResponse } from '~~/gen/ts/services/docstore/docstore';
-import { markerFallbackIcon, markerIcons } from '../livemap/helpers';
-import DateRangePickerPopoverClient from '../partials/DateRangePickerPopover.client.vue';
-import SortButton from '../partials/SortButton.vue';
 
 const { t } = useI18n();
 
@@ -191,8 +191,8 @@ defineShortcuts({
                                                 <span class="inline-flex gap-1" :class="`bg-${category.color}-500`">
                                                     <component
                                                         :is="
-                                                            markerIcons.find((item) => item.name === category?.icon) ??
-                                                            markerFallbackIcon
+                                                            availableIcons.find((item) => item.name === category?.icon) ??
+                                                            fallbackIcon
                                                         "
                                                         v-if="category.icon"
                                                         class="size-5"
@@ -207,9 +207,7 @@ defineShortcuts({
                                     <template #option="{ option }">
                                         <span class="inline-flex gap-1" :class="`bg-${option.color}-500`">
                                             <component
-                                                :is="
-                                                    markerIcons.find((item) => item.name === option.icon) ?? markerFallbackIcon
-                                                "
+                                                :is="availableIcons.find((item) => item.name === option.icon) ?? fallbackIcon"
                                                 v-if="option.icon"
                                                 class="size-5"
                                             />

diff --git a/app/components/documents/DocumentListEntry.vue b/app/components/documents/DocumentListEntry.vue
@@ -2,9 +2,9 @@
 import IDCopyBadge from '~/components/partials/IDCopyBadge.vue';
 import OpenClosedBadge from '~/components/partials/OpenClosedBadge.vue';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
+import DocumentCategoryBadge from '~/components/partials/documents/DocumentCategoryBadge.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import type { DocumentShort } from '~~/gen/ts/resources/documents/documents';
-import DocumentCategoryBadge from '../partials/documents/DocumentCategoryBadge.vue';
 
 defineProps<{
     document: DocumentShort;

diff --git a/app/components/documents/DocumentReferenceManager.vue b/app/components/documents/DocumentReferenceManager.vue
@@ -2,12 +2,12 @@
 import type { TabItem } from '#ui/types';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
+import DocumentInfoPopover from '~/components/partials/documents/DocumentInfoPopover.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import type { ClipboardDocument } from '~/store/clipboard';
 import { getDocument, useClipboardStore } from '~/store/clipboard';
 import type { DocumentReference, DocumentShort } from '~~/gen/ts/resources/documents/documents';
 import { DocReference } from '~~/gen/ts/resources/documents/documents';
-import DocumentInfoPopover from '../partials/documents/DocumentInfoPopover.vue';
 
 const props = defineProps<{
     open: boolean;

diff --git a/app/components/documents/DocumentReferences.vue b/app/components/documents/DocumentReferences.vue
@@ -3,10 +3,10 @@ import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopove
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
+import DocumentCategoryBadge from '~/components/partials/documents/DocumentCategoryBadge.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import type { DocumentReference } from '~~/gen/ts/resources/documents/documents';
 import { DocReference } from '~~/gen/ts/resources/documents/documents';
-import DocumentCategoryBadge from '../partials/documents/DocumentCategoryBadge.vue';
 import { refToBadge } from './helpers';
 
 const props = withDefaults(

diff --git a/app/components/documents/DocumentRelations.vue b/app/components/documents/DocumentRelations.vue
@@ -3,10 +3,10 @@ import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopove
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
+import DocumentCategoryBadge from '~/components/partials/documents/DocumentCategoryBadge.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import type { DocumentRelation } from '~~/gen/ts/resources/documents/documents';
 import { DocRelation } from '~~/gen/ts/resources/documents/documents';
-import DocumentCategoryBadge from '../partials/documents/DocumentCategoryBadge.vue';
 import { relationToBadge } from './helpers';
 
 const props = withDefaults(

diff --git a/app/components/documents/DocumentReminderModal.vue b/app/components/documents/DocumentReminderModal.vue
@@ -2,11 +2,11 @@
 import type { FormSubmitEvent } from '#ui/types';
 import { subDays } from 'date-fns';
 import { z } from 'zod';
+import DatePickerPopoverClient from '~/components/partials/DatePickerPopover.client.vue';
 import { useNotificatorStore } from '~/store/notificator';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { Timestamp } from '~~/gen/ts/resources/timestamp/timestamp';
 import type { SetDocumentReminderResponse } from '~~/gen/ts/services/docstore/docstore';
-import DatePickerPopoverClient from '../partials/DatePickerPopover.client.vue';
 
 const props = defineProps<{
     documentId: number;

diff --git a/app/components/documents/DocumentView.vue b/app/components/documents/DocumentView.vue
@@ -1,20 +1,23 @@
 <script lang="ts" setup>
 import AddToButton from '~/components/clipboard/AddToButton.vue';
-import DocumentActivityList from '~/components/documents/DocumentActivityList.vue';
-import DocumentComments from '~/components/documents/DocumentComments.vue';
+import DocumentActivityList from '~/components/documents/activity/DocumentActivityList.vue';
+import DocumentComments from '~/components/documents/comments/DocumentComments.vue';
 import DocumentReferences from '~/components/documents/DocumentReferences.vue';
 import DocumentRelations from '~/components/documents/DocumentRelations.vue';
 import { checkDocAccess } from '~/components/documents/helpers';
 import DocumentRequestAccess from '~/components/documents/requests/DocumentRequestAccess.vue';
 import DocumentRequestsModal from '~/components/documents/requests/DocumentRequestsModal.vue';
-import ConfirmModal from '~/components/partials/ConfirmModal.vue';
-import IDCopyBadge from '~/components/partials/IDCopyBadge.vue';
-import OpenClosedBadge from '~/components/partials/OpenClosedBadge.vue';
+import AccessBadges from '~/components/partials/access/AccessBadges.vue';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
+import ConfirmModal from '~/components/partials/ConfirmModal.vue';
+import HTMLContent from '~/components/partials/content/HTMLContent.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
+import DocumentCategoryBadge from '~/components/partials/documents/DocumentCategoryBadge.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
+import IDCopyBadge from '~/components/partials/IDCopyBadge.vue';
+import OpenClosedBadge from '~/components/partials/OpenClosedBadge.vue';
 import { useClipboardStore } from '~/store/clipboard';
 import { useNotificatorStore } from '~/store/notificator';
 import type { DocumentAccess } from '~~/gen/ts/resources/documents/access';
@@ -23,9 +26,6 @@ import type { Document } from '~~/gen/ts/resources/documents/documents';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { Timestamp } from '~~/gen/ts/resources/timestamp/timestamp';
 import type { ToggleDocumentPinResponse } from '~~/gen/ts/services/docstore/docstore';
-import AccessBadges from '../partials/access/AccessBadges.vue';
-import HTMLContent from '../partials/content/HTMLContent.vue';
-import DocumentCategoryBadge from '../partials/documents/DocumentCategoryBadge.vue';
 import DocumentReminderModal from './DocumentReminderModal.vue';
 
 const props = defineProps<{

diff --git a/...onents/documents/DocumentActivityList.vue → ...cuments/activity/DocumentActivityList.vue b/...onents/documents/DocumentActivityList.vue → ...cuments/activity/DocumentActivityList.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import DocumentActivityListEntry from '~/components/documents/DocumentActivityListEntry.vue';
+import DocumentActivityListEntry from '~/components/documents/activity/DocumentActivityListEntry.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';

diff --git a/...s/documents/DocumentActivityListEntry.vue → ...ts/activity/DocumentActivityListEntry.vue b/...s/documents/DocumentActivityListEntry.vue → ...ts/activity/DocumentActivityListEntry.vue
@@ -5,7 +5,7 @@ import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import { AccessLevel } from '~~/gen/ts/resources/documents/access';
 import type { DocActivity } from '~~/gen/ts/resources/documents/activity';
 import { DocActivityType } from '~~/gen/ts/resources/documents/activity';
-import { getDocAtivityIcon } from './helpers';
+import { getDocAtivityIcon } from '../helpers';
 
 defineProps<{
     entry: DocActivity;

diff --git a/app/components/documents/categories/CategoriesList.vue b/app/components/documents/categories/CategoriesList.vue
@@ -81,6 +81,7 @@ const modal = useModal();
                     <template #title>
                         <USkeleton class="h-6 w-[275px]" />
                     </template>
+
                     <template #description>
                         <USkeleton class="h-11 w-[350px]" />
                     </template>
@@ -93,7 +94,7 @@ const modal = useModal();
             :error="error"
             :retry="refresh"
         />
-        <DataNoDataBlock v-else-if="categories && categories.length === 0" icon="i-mdi-tag" :type="$t('common.category', 2)" />
+        <DataNoDataBlock v-else-if="!categories || categories.length === 0" icon="i-mdi-tag" :type="$t('common.category', 2)" />
 
         <div v-else class="flex justify-center">
             <CardsList :items="items" @selected="categorySelected($event)" />