From 70e779c8a43e191a173269cf54dca9f38fd46cd1 Mon Sep 17 00:00:00 2001 From: Geriano Date: Sun, 31 Jul 2022 10:31:21 +0700 Subject: [PATCH] move input and input error into component --- resources/js/Components/Input.vue | 28 ++++++++++++++++ resources/js/Components/InputError.vue | 15 +++++++++ resources/js/Pages/Superuser/Menu/Index.vue | 12 ++++--- .../js/Pages/Superuser/Permission/Index.vue | 8 ++--- resources/js/Pages/Superuser/Role/Index.vue | 13 ++++---- resources/js/Pages/Superuser/User/Index.vue | 32 +++++++++---------- 6 files changed, 76 insertions(+), 32 deletions(-) create mode 100644 resources/js/Components/Input.vue create mode 100644 resources/js/Components/InputError.vue diff --git a/resources/js/Components/Input.vue b/resources/js/Components/Input.vue new file mode 100644 index 0000000..2770ee7 --- /dev/null +++ b/resources/js/Components/Input.vue @@ -0,0 +1,28 @@ + + + diff --git a/resources/js/Components/InputError.vue b/resources/js/Components/InputError.vue new file mode 100644 index 0000000..8e18d33 --- /dev/null +++ b/resources/js/Components/InputError.vue @@ -0,0 +1,15 @@ + + + \ No newline at end of file diff --git a/resources/js/Pages/Superuser/Menu/Index.vue b/resources/js/Pages/Superuser/Menu/Index.vue index 87351ae..d563e6f 100644 --- a/resources/js/Pages/Superuser/Menu/Index.vue +++ b/resources/js/Pages/Superuser/Menu/Index.vue @@ -13,6 +13,8 @@ import Modal from '@/Components/Modal.vue' import Close from '@/Components/Button/Close.vue' import ButtonGreen from '@/Components/Button/Green.vue' import ButtonBlue from '@/Components/Button/Blue.vue' +import Input from '@/Components/Input.vue' +import InputError from '@/Components/InputError.vue' const self = getCurrentInstance() const props = defineProps({ @@ -173,10 +175,10 @@ onUnmounted(() => window.removeEventListener('keydown', esc))
- +
-
{{ form.errors.name }}
+
@@ -193,7 +195,7 @@ onUnmounted(() => window.removeEventListener('keydown', esc)) placeholder="route name or url" />
-
{{ form.errors.route_or_url }}
+
@@ -212,7 +214,7 @@ onUnmounted(() => window.removeEventListener('keydown', esc)) placeholder="actives" />
-
{{ form.errors.actives }}
+
@@ -233,7 +235,7 @@ onUnmounted(() => window.removeEventListener('keydown', esc)) placeholder="permissions" />
-
{{ form.errors.permissions }}
+
diff --git a/resources/js/Pages/Superuser/Permission/Index.vue b/resources/js/Pages/Superuser/Permission/Index.vue index 4df6415..3d3f062 100644 --- a/resources/js/Pages/Superuser/Permission/Index.vue +++ b/resources/js/Pages/Superuser/Permission/Index.vue @@ -12,6 +12,8 @@ import Close from '@/Components/Button/Close.vue' import ButtonGreen from '@/Components/Button/Green.vue' import ButtonBlue from '@/Components/Button/Blue.vue' import ButtonRed from '@/Components/Button/Red.vue' +import Input from '@/Components/Input.vue' +import InputError from '@/Components/InputError.vue' const self = getCurrentInstance() const permissions = ref([]) @@ -153,12 +155,10 @@ onUnmounted(() => window.removeEventListener('keydown', esc))
- +
- -
{{ form.errors.name }}
-
+
diff --git a/resources/js/Pages/Superuser/Role/Index.vue b/resources/js/Pages/Superuser/Role/Index.vue index 2e3ae40..ae41c9e 100644 --- a/resources/js/Pages/Superuser/Role/Index.vue +++ b/resources/js/Pages/Superuser/Role/Index.vue @@ -14,6 +14,8 @@ import Close from '@/Components/Button/Close.vue' import ButtonGreen from '@/Components/Button/Green.vue' import ButtonBlue from '@/Components/Button/Blue.vue' import ButtonRed from '@/Components/Button/Red.vue' +import Input from '@/Components/Input.vue' +import InputError from '@/Components/InputError.vue' const self = getCurrentInstance() const { permissions } = defineProps({ @@ -29,10 +31,7 @@ const form = useForm({ const table = ref(null) const open = ref(false) -const show = () => { - open.value = true - nextTick(() => self.refs.name?.focus()) -} +const show = () => open.value = true const close = () => { open.value = false @@ -204,10 +203,10 @@ onUnmounted(() => window.removeEventListener('keydown', esc))
- +
-

{{ form.errors.name }}

+
@@ -226,7 +225,7 @@ onUnmounted(() => window.removeEventListener('keydown', esc)) mode="tags" />
-

{{ form.errors.permissions }}

+ diff --git a/resources/js/Pages/Superuser/User/Index.vue b/resources/js/Pages/Superuser/User/Index.vue index 1dd9da2..b51e053 100644 --- a/resources/js/Pages/Superuser/User/Index.vue +++ b/resources/js/Pages/Superuser/User/Index.vue @@ -14,12 +14,15 @@ import ButtonGreen from '@/Components/Button/Green.vue' import ButtonBlue from '@/Components/Button/Blue.vue' import ButtonRed from '@/Components/Button/Red.vue' import Close from '@/Components/Button/Close.vue' +import Input from '@/Components/Input.vue' +import InputError from '@/Components/InputError.vue' const self = getCurrentInstance() const { permissions, roles } = defineProps({ permissions: Array, roles: Array, }) + const form = useForm({ id: null, name: '', @@ -34,10 +37,7 @@ const form = useForm({ const table = ref(null) const open = ref(false) -const show = () => { - open.value = true - nextTick(() => self.refs.name?.focus()) -} +const show = () => open.value = true const close = () => { open.value = false @@ -261,46 +261,46 @@ onUnmounted(() => window.removeEventListener('keydown', esc))
- +
-

{{ form.errors.name }}

+
- +
-

{{ form.errors.username }}

+
- +
-

{{ form.errors.email }}

+
- +
-

{{ form.errors.password }}

+
- +
-

{{ form.errors.password_confirmation }}

+
@@ -319,7 +319,7 @@ onUnmounted(() => window.removeEventListener('keydown', esc)) mode="tags" />
-

{{ form.errors.permissions }}

+
@@ -338,7 +338,7 @@ onUnmounted(() => window.removeEventListener('keydown', esc)) mode="tags" />
-

{{ form.errors.roles }}

+