From d01322b1ad5ebdfa7fbb79227a60e6ffb31b4808 Mon Sep 17 00:00:00 2001 From: Philipp Lang Date: Thu, 18 May 2023 23:22:45 +0200 Subject: [PATCH] Move component subfolders --- resources/js/app.js | 16 +++++++++------- .../{Form => form}/CheckboxesLabel.vue | 0 .../components/{FSwitch.vue => form/Switch.vue} | 0 .../js/components/{Full => full}/PageHeading.vue | 0 .../js/components/{Page => page}/Layout.vue | 0 resources/js/components/{Ui => ui}/Button.vue | 0 .../js/components/{Ui => ui}/IconButton.vue | 0 resources/js/components/{Ui => ui}/Note.vue | 0 resources/js/components/{Ui => ui}/Popup.vue | 0 resources/js/components/{Ui => ui}/Spinner.vue | 0 .../js/components/{Ui => ui}/ToolbarButton.vue | 0 resources/js/views/activity/VForm.vue | 4 ++-- resources/js/views/activity/VIndex.vue | 2 +- resources/js/views/member/VForm.vue | 2 +- resources/js/views/member/VIndex.vue | 4 ++-- 15 files changed, 15 insertions(+), 13 deletions(-) rename resources/js/components/{Form => form}/CheckboxesLabel.vue (100%) rename resources/js/components/{FSwitch.vue => form/Switch.vue} (100%) rename resources/js/components/{Full => full}/PageHeading.vue (100%) rename resources/js/components/{Page => page}/Layout.vue (100%) rename resources/js/components/{Ui => ui}/Button.vue (100%) rename resources/js/components/{Ui => ui}/IconButton.vue (100%) rename resources/js/components/{Ui => ui}/Note.vue (100%) rename resources/js/components/{Ui => ui}/Popup.vue (100%) rename resources/js/components/{Ui => ui}/Spinner.vue (100%) rename resources/js/components/{Ui => ui}/ToolbarButton.vue (100%) diff --git a/resources/js/app.js b/resources/js/app.js index 220f1a30..38162d09 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -8,9 +8,9 @@ import VLabel from './components/VLabel.vue'; import VBool from './components/VBool.vue'; import Box from './components/Box.vue'; import Heading from './components/Heading.vue'; -import IconButton from './components/Ui/IconButton.vue'; -import ToolbarButton from './components/Ui/ToolbarButton.vue'; -import PageLayout from './components/Page/Layout.vue'; +import IconButton from './components/ui/IconButton.vue'; +import ToolbarButton from './components/ui/ToolbarButton.vue'; +import PageLayout from './components/page/Layout.vue'; import AppLayout from './layouts/AppLayout.vue'; import VTooltip from 'v-tooltip'; import hasModule from './mixins/hasModule.js'; @@ -28,7 +28,6 @@ Vue.use(Toasted); Vue.use(VueAxios, axios); Vue.use(PiniaVuePlugin); Vue.component('f-text', () => import(/* webpackChunkName: "form" */ './components/FText')); -Vue.component('f-switch', () => import(/* webpackChunkName: "form" */ './components/FSwitch')); Vue.component('f-select', () => import(/* webpackChunkName: "form" */ './components/FSelect')); Vue.component('f-textarea', () => import(/* webpackChunkName: "form" */ './components/FTextarea')); Vue.component('SvgSprite', SvgSprite); @@ -43,11 +42,14 @@ Vue.component('page-layout', PageLayout); Vue.component('save-button', () => import(/* webpackChunkName: "form" */ './components/SaveButton')); // ------------------------------ Full components ------------------------------ -Vue.component('full-page-heading', () => import(/* webpackChunkName: "full" */ './components/Full/PageHeading.vue')); +Vue.component('full-page-heading', () => import(/* webpackChunkName: "full" */ './components/full/PageHeading.vue')); // ------------------------------- UI Components ------------------------------- -Vue.component('ui-button', () => import(/* webpackChunkName: "ui" */ './components/Ui/Button.vue')); -Vue.component('ui-spinner', () => import(/* webpackChunkName: "ui" */ './components/Ui/Spinner.vue')); +Vue.component('ui-button', () => import(/* webpackChunkName: "ui" */ './components/ui/Button.vue')); +Vue.component('ui-spinner', () => import(/* webpackChunkName: "ui" */ './components/ui/Spinner.vue')); + +// ------------------------------ Form components ------------------------------ +Vue.component('f-switch', () => import(/* webpackChunkName: "form" */ './components/form/Switch.vue')); // ----------------------------------- init ------------------------------------ const el = document.getElementById('app'); diff --git a/resources/js/components/Form/CheckboxesLabel.vue b/resources/js/components/form/CheckboxesLabel.vue similarity index 100% rename from resources/js/components/Form/CheckboxesLabel.vue rename to resources/js/components/form/CheckboxesLabel.vue diff --git a/resources/js/components/FSwitch.vue b/resources/js/components/form/Switch.vue similarity index 100% rename from resources/js/components/FSwitch.vue rename to resources/js/components/form/Switch.vue diff --git a/resources/js/components/Full/PageHeading.vue b/resources/js/components/full/PageHeading.vue similarity index 100% rename from resources/js/components/Full/PageHeading.vue rename to resources/js/components/full/PageHeading.vue diff --git a/resources/js/components/Page/Layout.vue b/resources/js/components/page/Layout.vue similarity index 100% rename from resources/js/components/Page/Layout.vue rename to resources/js/components/page/Layout.vue diff --git a/resources/js/components/Ui/Button.vue b/resources/js/components/ui/Button.vue similarity index 100% rename from resources/js/components/Ui/Button.vue rename to resources/js/components/ui/Button.vue diff --git a/resources/js/components/Ui/IconButton.vue b/resources/js/components/ui/IconButton.vue similarity index 100% rename from resources/js/components/Ui/IconButton.vue rename to resources/js/components/ui/IconButton.vue diff --git a/resources/js/components/Ui/Note.vue b/resources/js/components/ui/Note.vue similarity index 100% rename from resources/js/components/Ui/Note.vue rename to resources/js/components/ui/Note.vue diff --git a/resources/js/components/Ui/Popup.vue b/resources/js/components/ui/Popup.vue similarity index 100% rename from resources/js/components/Ui/Popup.vue rename to resources/js/components/ui/Popup.vue diff --git a/resources/js/components/Ui/Spinner.vue b/resources/js/components/ui/Spinner.vue similarity index 100% rename from resources/js/components/Ui/Spinner.vue rename to resources/js/components/ui/Spinner.vue diff --git a/resources/js/components/Ui/ToolbarButton.vue b/resources/js/components/ui/ToolbarButton.vue similarity index 100% rename from resources/js/components/Ui/ToolbarButton.vue rename to resources/js/components/ui/ToolbarButton.vue diff --git a/resources/js/views/activity/VForm.vue b/resources/js/views/activity/VForm.vue index 6cf12084..d38171f3 100644 --- a/resources/js/views/activity/VForm.vue +++ b/resources/js/views/activity/VForm.vue @@ -54,9 +54,9 @@ export default { }, components: { - 'checkboxes-label': () => import('../../components/Form/CheckboxesLabel'), + 'checkboxes-label': () => import('../../components/form/CheckboxesLabel'), 'subactivity-form': () => import('./SubactivityForm.vue'), - 'popup': () => import(/* webpackChunkName: "ui" */ '../../components/Ui/Popup.vue'), + 'popup': () => import(/* webpackChunkName: "ui" */ '../../components/ui/Popup.vue'), }, methods: { diff --git a/resources/js/views/activity/VIndex.vue b/resources/js/views/activity/VIndex.vue index 53f15a50..64f6ccb7 100644 --- a/resources/js/views/activity/VIndex.vue +++ b/resources/js/views/activity/VIndex.vue @@ -59,7 +59,7 @@ export default { }, components: { - popup: () => import(/* webpackChunkName: "ui" */ '../../components/Ui/Popup.vue'), + popup: () => import(/* webpackChunkName: "ui" */ '../../components/ui/Popup.vue'), }, mixins: [indexHelpers], diff --git a/resources/js/views/member/VForm.vue b/resources/js/views/member/VForm.vue index 27d8b47a..7a507b83 100644 --- a/resources/js/views/member/VForm.vue +++ b/resources/js/views/member/VForm.vue @@ -156,7 +156,7 @@ export default { }, components: { - popup: () => import(/* webpackChunkName: "ui" */ '../../components/Ui/Popup.vue'), + popup: () => import(/* webpackChunkName: "ui" */ '../../components/ui/Popup.vue'), }, computed: { diff --git a/resources/js/views/member/VIndex.vue b/resources/js/views/member/VIndex.vue index 0fa6b239..00d64978 100644 --- a/resources/js/views/member/VIndex.vue +++ b/resources/js/views/member/VIndex.vue @@ -156,8 +156,8 @@ export default { 'age-groups': () => import(/* webpackChunkName: "member" */ './AgeGroups'), 'tags': () => import(/* webpackChunkName: "member" */ './Tags'), 'actions': () => import(/* webpackChunkName: "member" */ './index/Actions'), - 'popup': () => import(/* webpackChunkName: "ui" */ '../../components/Ui/Popup.vue'), - 'note': () => import(/* webpackChunkName: "ui" */ '../../components/Ui/Note.vue'), + 'popup': () => import(/* webpackChunkName: "ui" */ '../../components/ui/Popup.vue'), + 'note': () => import(/* webpackChunkName: "ui" */ '../../components/ui/Note.vue'), }, methods: {