Skip to content

A self-hosted media server and file management system

refactor: form input and nav buttons

aminnausin7d648ef43413
diff --git a/resources/js/components/inputs/FormInput.vue b/resources/js/components-archive/inputs/FormInput.vue
old mode 100755
new mode 100644
similarity index 100%
rename from resources/js/components/inputs/FormInput.vue
rename to resources/js/components-archive/inputs/FormInput.vue
diff --git a/resources/js/components/inputs/NavButton.vue b/resources/js/components/cedar-ui/button-nav/NavButton.vue
old mode 100755
new mode 100644
similarity index 100%
rename from resources/js/components/inputs/NavButton.vue
rename to resources/js/components/cedar-ui/button-nav/NavButton.vue
diff --git a/resources/js/components/inputs/NavLink.vue b/resources/js/components/cedar-ui/button-nav/NavLink.vue
old mode 100755
new mode 100644
similarity index 100%
rename from resources/js/components/inputs/NavLink.vue
rename to resources/js/components/cedar-ui/button-nav/NavLink.vue
diff --git a/resources/js/components/forms/ChangeEmail.vue b/resources/js/components/forms/ChangeEmail.vue
index e512cee2..33d6adde 100644
--- a/resources/js/components/forms/ChangeEmail.vue
+++ b/resources/js/components/forms/ChangeEmail.vue
@@ -2,16 +2,14 @@
import type { ChangeEmailRequest } from '@/types/requests';
import type { FormField } from '@/types/types';
-import { FormErrorList } from '@/components/cedar-ui/form';
+import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { changeEmail } from '@/service/authAPI';
-import { FormLabel } from '@/components/cedar-ui/form';
import { reactive } from 'vue';
import { toast } from '@aminnausin/cedar-ui';
import SettingsHeader from '@/components/settings/SettingsHeader.vue';
import SettingsCard from '@/components/cards/layout/SettingsCard.vue';
import ButtonForm from '@/components/inputs/ButtonForm.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import useForm from '@/composables/useForm';
const fields = reactive<FormField[]>([
diff --git a/resources/js/components/forms/ChangePassword.vue b/resources/js/components/forms/ChangePassword.vue
index f97b55bd..d33ad737 100644
--- a/resources/js/components/forms/ChangePassword.vue
+++ b/resources/js/components/forms/ChangePassword.vue
@@ -2,16 +2,14 @@
import type { ChangePasswordRequest } from '@/types/requests';
import type { FormField } from '@/types/types';
+import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { changePassword } from '@/service/authAPI';
-import { FormErrorList } from '@/components/cedar-ui/form';
-import { FormLabel } from '@/components/cedar-ui/form';
import { reactive } from 'vue';
import { toast } from '@aminnausin/cedar-ui';
import SettingsHeader from '@/components/settings/SettingsHeader.vue';
import SettingsCard from '@/components/cards/layout/SettingsCard.vue';
import ButtonForm from '@/components/inputs/ButtonForm.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import useForm from '@/composables/useForm';
const fields = reactive<FormField[]>([
diff --git a/resources/js/components/forms/EditFolder.vue b/resources/js/components/forms/EditFolder.vue
index 4600e723..a7deba23 100644
--- a/resources/js/components/forms/EditFolder.vue
+++ b/resources/js/components/forms/EditFolder.vue
@@ -4,18 +4,16 @@ import type { FormField, SelectItem } from '@/types/types';
import type { SeriesUpdateRequest } from '@/types/requests';
import { handleStorageURL, toCalendarFormattedDate } from '@/service/util';
+import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { computed, reactive, ref, watch } from 'vue';
-import { FormErrorList } from '@/components/cedar-ui/form';
import { useGetAllTags } from '@/service/queries';
import { FormTextArea } from '@/components/cedar-ui/textarea';
import { UseCreateTag } from '@/service/mutations';
-import { FormLabel } from '@/components/cedar-ui/form';
import { toast } from '@aminnausin/cedar-ui';
import FormInputNumber from '@/components/inputs/FormInputNumber.vue';
import InputMultiChip from '@/components/pinesUI/InputMultiChip.vue';
import DatePicker from '@/components/pinesUI/DatePicker.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import mediaAPI from '@/service/mediaAPI.ts';
import useForm from '@/composables/useForm';
diff --git a/resources/js/components/forms/EditVideo.vue b/resources/js/components/forms/EditVideo.vue
index f5c0428d..7fb977dc 100755
--- a/resources/js/components/forms/EditVideo.vue
+++ b/resources/js/components/forms/EditVideo.vue
@@ -3,22 +3,20 @@ import type { TagResource, VideoResource, VideoTagResource } from '@/types/resou
import type { FormField, SelectItem } from '@/types/types';
import type { MetadataUpdateRequest } from '@/types/requests';
+import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { computed, reactive, ref, watch } from 'vue';
import { toCalendarFormattedDate } from '@/service/util';
import { useContentStore } from '@/stores/ContentStore';
-import { FormErrorList } from '@/components/cedar-ui/form';
import { useGetAllTags } from '@/service/queries';
import { FormTextArea } from '@/components/cedar-ui/textarea';
import { UseCreateTag } from '@/service/mutations';
import { storeToRefs } from 'pinia';
import { MediaType } from '@/types/types';
-import { FormLabel } from '@/components/cedar-ui/form';
import { toast } from '@aminnausin/cedar-ui';
import FormInputNumber from '@/components/inputs/FormInputNumber.vue';
import InputMultiChip from '@/components/pinesUI/InputMultiChip.vue';
import DatePicker from '@/components/pinesUI/DatePicker.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import mediaAPI from '@/service/mediaAPI.ts';
import useForm from '@/composables/useForm';
diff --git a/resources/js/components/forms/LoginForm.vue b/resources/js/components/forms/LoginForm.vue
index 3f569cb4..2b7a7c95 100644
--- a/resources/js/components/forms/LoginForm.vue
+++ b/resources/js/components/forms/LoginForm.vue
@@ -2,16 +2,14 @@
import type { UserResource } from '@/types/resources';
import type { FormField } from '@/types/types';
+import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { useRouter, useRoute, RouterLink } from 'vue-router';
-import { FormErrorList } from '@/components/cedar-ui/form';
import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
-import { FormLabel } from '@/components/cedar-ui/form';
import { login } from '@/service/authAPI';
import { ref } from 'vue';
import ButtonForm from '@/components/inputs/ButtonForm.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
diff --git a/resources/js/components/forms/PasswordConfirm.vue b/resources/js/components/forms/PasswordConfirm.vue
index 8d28a68b..ad13d6f3 100644
--- a/resources/js/components/forms/PasswordConfirm.vue
+++ b/resources/js/components/forms/PasswordConfirm.vue
@@ -3,12 +3,10 @@ import type { PasswordRequest } from '@/types/requests';
import type { AxiosResponse } from 'axios';
import type { FormField } from '@/types/types';
-import { FormErrorList } from '@/components/cedar-ui/form';
-import { FormLabel } from '@/components/cedar-ui/form';
+import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { toast } from '@aminnausin/cedar-ui';
import ButtonForm from '@/components/inputs/ButtonForm.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
diff --git a/resources/js/components/forms/RecoveryForm.vue b/resources/js/components/forms/RecoveryForm.vue
index 140d23aa..5635bdc6 100644
--- a/resources/js/components/forms/RecoveryForm.vue
+++ b/resources/js/components/forms/RecoveryForm.vue
@@ -1,15 +1,13 @@
<script setup lang="ts">
import type { FormField } from '@/types/types';
+import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { recoverAccount } from '@/service/authAPI';
-import { FormErrorList } from '@/components/cedar-ui/form';
import { RouterLink } from 'vue-router';
-import { FormLabel } from '@/components/cedar-ui/form';
import { toast } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
import ButtonForm from '@/components/inputs/ButtonForm.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
diff --git a/resources/js/components/forms/RegisterForm.vue b/resources/js/components/forms/RegisterForm.vue
index 31bb55b3..bfa25a75 100644
--- a/resources/js/components/forms/RegisterForm.vue
+++ b/resources/js/components/forms/RegisterForm.vue
@@ -1,16 +1,14 @@
<script setup lang="ts">
import type { FormField } from '@/types/types';
+import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { useRouter, RouterLink } from 'vue-router';
-import { FormErrorList } from '@/components/cedar-ui/form';
import { useAuthStore } from '@/stores/AuthStore';
import { storeToRefs } from 'pinia';
-import { FormLabel } from '@/components/cedar-ui/form';
import { register } from '@/service/authAPI';
import { ref } from 'vue';
import ButtonForm from '@/components/inputs/ButtonForm.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
diff --git a/resources/js/components/forms/ResetPassword.vue b/resources/js/components/forms/ResetPassword.vue
index 79df654f..737dd534 100644
--- a/resources/js/components/forms/ResetPassword.vue
+++ b/resources/js/components/forms/ResetPassword.vue
@@ -1,15 +1,13 @@
<script setup lang="ts">
import type { FormField } from '@/types/types';
+import { FormInput, FormLabel, FormErrorList } from '@/components/cedar-ui/form';
import { useRoute, useRouter } from 'vue-router';
-import { FormErrorList } from '@/components/cedar-ui/form';
import { resetPassword } from '@/service/authAPI';
-import { FormLabel } from '@/components/cedar-ui/form';
import { toast } from '@aminnausin/cedar-ui';
import { ref } from 'vue';
import ButtonForm from '@/components/inputs/ButtonForm.vue';
-import FormInput from '@/components/inputs/FormInput.vue';
import BaseForm from '@/components/forms/BaseForm.vue';
import FormItem from '@/components/forms/FormItem.vue';
import useForm from '@/composables/useForm';
diff --git a/resources/js/components/panels/NavBar.vue b/resources/js/components/panels/NavBar.vue
index 567588d6..f8dc562f 100755
--- a/resources/js/components/panels/NavBar.vue
+++ b/resources/js/components/panels/NavBar.vue
@@ -9,8 +9,8 @@ import { ref } from 'vue';
import VideoSidebarDrawer from '@/components/drawers/VideoSidebarDrawer.vue';
import ToggleLightMode from '@/components/inputs/ToggleLightMode.vue';
import DropdownMenu from '@/components/pinesUI/DropdownMenu.vue';
-import NavButton from '@/components/inputs/NavButton.vue';
-import NavLink from '@/components/inputs/NavLink.vue';
+import NavButton from '@/components/cedar-ui/button-nav/NavButton.vue';
+import NavLink from '@/components/cedar-ui/button-nav/NavLink.vue';
import MaterialSymbolsLightHistory from '~icons/material-symbols-light/history';
import CircumFolderOn from '~icons/circum/folder-on';