diff --git a/src/components/register.ts b/src/components/register.ts index 69470f5254..f16449ea58 100644 --- a/src/components/register.ts +++ b/src/components/register.ts @@ -50,7 +50,7 @@ Vue.component('v-slider', VSlider); Vue.component('v-switch', VSwitch); Vue.component('v-table', VTable); -import DrawerDetail from '@/views/private-view/drawer-detail/'; +import DrawerDetail from '@/views/private/components/drawer-detail/'; Vue.component('drawer-detail', DrawerDetail); diff --git a/src/modules/collections/routes/browse/browse.test.ts b/src/modules/collections/routes/browse/browse.test.ts index 70236f5474..191a7ea198 100644 --- a/src/modules/collections/routes/browse/browse.test.ts +++ b/src/modules/collections/routes/browse/browse.test.ts @@ -1,7 +1,7 @@ import { createLocalVue, shallowMount } from '@vue/test-utils'; import VueCompositionAPI from '@vue/composition-api'; import CollectionsBrowse from './browse.vue'; -import PrivateView from '@/views/private-view'; +import PrivateView from '@/views/private'; const localVue = createLocalVue(); localVue.use(VueCompositionAPI); diff --git a/src/modules/collections/routes/detail/detail.test.ts b/src/modules/collections/routes/detail/detail.test.ts index 2deaf9102a..d359ba287c 100644 --- a/src/modules/collections/routes/detail/detail.test.ts +++ b/src/modules/collections/routes/detail/detail.test.ts @@ -1,7 +1,7 @@ import { createLocalVue, shallowMount } from '@vue/test-utils'; import VueCompositionAPI from '@vue/composition-api'; import CollectionsDetail from './detail.vue'; -import PrivateView from '@/views/private-view'; +import PrivateView from '@/views/private'; const localVue = createLocalVue(); localVue.use(VueCompositionAPI); diff --git a/src/modules/collections/routes/overview/overview.test.ts b/src/modules/collections/routes/overview/overview.test.ts index 7bd439d7c1..c85d2771cf 100644 --- a/src/modules/collections/routes/overview/overview.test.ts +++ b/src/modules/collections/routes/overview/overview.test.ts @@ -3,7 +3,7 @@ import VueCompositionAPI from '@vue/composition-api'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import useNavigation from '../../compositions/use-navigation'; import VTable from '@/components/v-table'; -import PrivateView from '@/views/private-view/'; +import PrivateView from '@/views/private'; import router from '@/router'; jest.mock('../../compositions/use-navigation'); diff --git a/src/views/private-view/drawer-detail-group/drawer-detail-group.story.ts b/src/views/private/components/drawer-detail-group/drawer-detail-group.story.ts similarity index 79% rename from src/views/private-view/drawer-detail-group/drawer-detail-group.story.ts rename to src/views/private/components/drawer-detail-group/drawer-detail-group.story.ts index 336550f39d..e1ec52ddfd 100644 --- a/src/views/private-view/drawer-detail-group/drawer-detail-group.story.ts +++ b/src/views/private/components/drawer-detail-group/drawer-detail-group.story.ts @@ -1,14 +1,14 @@ import { withKnobs } from '@storybook/addon-knobs'; import markdown from './readme.md'; -import withPadding from '../../../../.storybook/decorators/with-padding'; -import withAltColors from '../../../../.storybook/decorators/with-alt-colors'; +import withPadding from '../../../../../.storybook/decorators/with-padding'; +import withAltColors from '../../../../../.storybook/decorators/with-alt-colors'; import { defineComponent, provide } from '@vue/composition-api'; import DrawerDetailGroup from './drawer-detail-group.vue'; -import DrawerDetail from '../drawer-detail/'; +import DrawerDetail from '../drawer-detail'; export default { - title: 'Views / Private / Drawer Detail Group', + title: 'Views / Private / Components / Drawer Detail Group', decorators: [withKnobs, withAltColors, withPadding], parameters: { notes: markdown diff --git a/src/views/private-view/drawer-detail-group/drawer-detail-group.test.ts b/src/views/private/components/drawer-detail-group/drawer-detail-group.test.ts similarity index 100% rename from src/views/private-view/drawer-detail-group/drawer-detail-group.test.ts rename to src/views/private/components/drawer-detail-group/drawer-detail-group.test.ts diff --git a/src/views/private-view/drawer-detail-group/drawer-detail-group.vue b/src/views/private/components/drawer-detail-group/drawer-detail-group.vue similarity index 100% rename from src/views/private-view/drawer-detail-group/drawer-detail-group.vue rename to src/views/private/components/drawer-detail-group/drawer-detail-group.vue diff --git a/src/views/private-view/drawer-detail-group/index.ts b/src/views/private/components/drawer-detail-group/index.ts similarity index 100% rename from src/views/private-view/drawer-detail-group/index.ts rename to src/views/private/components/drawer-detail-group/index.ts diff --git a/src/views/private-view/drawer-detail-group/readme.md b/src/views/private/components/drawer-detail-group/readme.md similarity index 100% rename from src/views/private-view/drawer-detail-group/readme.md rename to src/views/private/components/drawer-detail-group/readme.md diff --git a/src/views/private-view/drawer-detail/drawer-detail.story.ts b/src/views/private/components/drawer-detail/drawer-detail.story.ts similarity index 80% rename from src/views/private-view/drawer-detail/drawer-detail.story.ts rename to src/views/private/components/drawer-detail/drawer-detail.story.ts index cc81f33b9c..e6a29a89ee 100644 --- a/src/views/private-view/drawer-detail/drawer-detail.story.ts +++ b/src/views/private/components/drawer-detail/drawer-detail.story.ts @@ -1,11 +1,11 @@ import { withKnobs, text, boolean } from '@storybook/addon-knobs'; import markdown from './readme.md'; import { defineComponent, provide, ref, watch } from '@vue/composition-api'; -import withPadding from '../../../../.storybook/decorators/with-padding'; -import withAltColors from '../../../../.storybook/decorators/with-alt-colors'; +import withPadding from '../../../../../.storybook/decorators/with-padding'; +import withAltColors from '../../../../../.storybook/decorators/with-alt-colors'; export default { - title: 'Views / Private / Drawer Detail', + title: 'Views / Private / Components / Drawer Detail', decorators: [withKnobs, withAltColors, withPadding], parameters: { notes: markdown diff --git a/src/views/private-view/drawer-detail/drawer-detail.test.ts b/src/views/private/components/drawer-detail/drawer-detail.test.ts similarity index 100% rename from src/views/private-view/drawer-detail/drawer-detail.test.ts rename to src/views/private/components/drawer-detail/drawer-detail.test.ts diff --git a/src/views/private-view/drawer-detail/drawer-detail.vue b/src/views/private/components/drawer-detail/drawer-detail.vue similarity index 100% rename from src/views/private-view/drawer-detail/drawer-detail.vue rename to src/views/private/components/drawer-detail/drawer-detail.vue diff --git a/src/views/private-view/drawer-detail/index.ts b/src/views/private/components/drawer-detail/index.ts similarity index 100% rename from src/views/private-view/drawer-detail/index.ts rename to src/views/private/components/drawer-detail/index.ts diff --git a/src/views/private-view/drawer-detail/readme.md b/src/views/private/components/drawer-detail/readme.md similarity index 100% rename from src/views/private-view/drawer-detail/readme.md rename to src/views/private/components/drawer-detail/readme.md diff --git a/src/views/private-view/header-bar-actions/header-bar-actions.story.ts b/src/views/private/components/header-bar-actions/header-bar-actions.story.ts similarity index 86% rename from src/views/private-view/header-bar-actions/header-bar-actions.story.ts rename to src/views/private/components/header-bar-actions/header-bar-actions.story.ts index ff5699de7e..92ad8e9fcc 100644 --- a/src/views/private-view/header-bar-actions/header-bar-actions.story.ts +++ b/src/views/private/components/header-bar-actions/header-bar-actions.story.ts @@ -1,10 +1,10 @@ import markdown from './readme.md'; import HeaderBarActions from './header-bar-actions.vue'; import { defineComponent } from '@vue/composition-api'; -import withPadding from '../../../../.storybook/decorators/with-padding'; +import withPadding from '../../../../../.storybook/decorators/with-padding'; export default { - title: 'Views / Private / Header Bar Actions', + title: 'Views / Private / Components / Header Bar Actions', decorators: [withPadding], parameters: { notes: markdown diff --git a/src/views/private-view/header-bar-actions/header-bar-actions.test.ts b/src/views/private/components/header-bar-actions/header-bar-actions.test.ts similarity index 100% rename from src/views/private-view/header-bar-actions/header-bar-actions.test.ts rename to src/views/private/components/header-bar-actions/header-bar-actions.test.ts diff --git a/src/views/private-view/header-bar-actions/header-bar-actions.vue b/src/views/private/components/header-bar-actions/header-bar-actions.vue similarity index 100% rename from src/views/private-view/header-bar-actions/header-bar-actions.vue rename to src/views/private/components/header-bar-actions/header-bar-actions.vue diff --git a/src/views/private-view/header-bar-actions/index.ts b/src/views/private/components/header-bar-actions/index.ts similarity index 100% rename from src/views/private-view/header-bar-actions/index.ts rename to src/views/private/components/header-bar-actions/index.ts diff --git a/src/views/private-view/header-bar-actions/readme.md b/src/views/private/components/header-bar-actions/readme.md similarity index 100% rename from src/views/private-view/header-bar-actions/readme.md rename to src/views/private/components/header-bar-actions/readme.md diff --git a/src/views/private-view/header-bar/header-bar.story.ts b/src/views/private/components/header-bar/header-bar.story.ts similarity index 97% rename from src/views/private-view/header-bar/header-bar.story.ts rename to src/views/private/components/header-bar/header-bar.story.ts index 11cc3d2f58..99e8096cf1 100644 --- a/src/views/private-view/header-bar/header-bar.story.ts +++ b/src/views/private/components/header-bar/header-bar.story.ts @@ -1,14 +1,14 @@ import { withKnobs, text, boolean } from '@storybook/addon-knobs'; import { action } from '@storybook/addon-actions'; import markdown from './readme.md'; -import withBackground from '../../../../.storybook/decorators/with-background'; +import withBackground from '../../../../../.storybook/decorators/with-background'; import { defineComponent } from '@vue/composition-api'; import HeaderBar from './header-bar.vue'; import VueRouter from 'vue-router'; export default { - title: 'Views / Private / Header Bar', + title: 'Views / Private / Components / Header Bar', decorators: [withKnobs, withBackground], parameters: { notes: markdown diff --git a/src/views/private-view/header-bar/header-bar.test.ts b/src/views/private/components/header-bar/header-bar.test.ts similarity index 100% rename from src/views/private-view/header-bar/header-bar.test.ts rename to src/views/private/components/header-bar/header-bar.test.ts diff --git a/src/views/private-view/header-bar/header-bar.vue b/src/views/private/components/header-bar/header-bar.vue similarity index 100% rename from src/views/private-view/header-bar/header-bar.vue rename to src/views/private/components/header-bar/header-bar.vue diff --git a/src/views/private-view/header-bar/index.ts b/src/views/private/components/header-bar/index.ts similarity index 100% rename from src/views/private-view/header-bar/index.ts rename to src/views/private/components/header-bar/index.ts diff --git a/src/views/private-view/header-bar/readme.md b/src/views/private/components/header-bar/readme.md similarity index 100% rename from src/views/private-view/header-bar/readme.md rename to src/views/private/components/header-bar/readme.md diff --git a/src/views/private-view/module-bar-logo/index.ts b/src/views/private/components/module-bar-logo/index.ts similarity index 100% rename from src/views/private-view/module-bar-logo/index.ts rename to src/views/private/components/module-bar-logo/index.ts diff --git a/src/views/private-view/module-bar-logo/module-bar-logo.story.ts b/src/views/private/components/module-bar-logo/module-bar-logo.story.ts similarity index 93% rename from src/views/private-view/module-bar-logo/module-bar-logo.story.ts rename to src/views/private/components/module-bar-logo/module-bar-logo.story.ts index 9b0c741afe..902e05a693 100644 --- a/src/views/private-view/module-bar-logo/module-bar-logo.story.ts +++ b/src/views/private/components/module-bar-logo/module-bar-logo.story.ts @@ -1,12 +1,12 @@ import markdown from './readme.md'; import ModuleBarLogo from './module-bar-logo.vue'; -import withPadding from '../../../../.storybook/decorators/with-padding'; +import withPadding from '../../../../../.storybook/decorators/with-padding'; import useRequestsStore from '@/stores/requests'; import useProjectsStore from '@/stores/projects'; import { defineComponent } from '@vue/composition-api'; export default { - title: 'Views / Private / Module Bar Logo', + title: 'Views / Private / Components / Module Bar Logo', decorators: [withPadding], parameters: { notes: markdown diff --git a/src/views/private-view/module-bar-logo/module-bar-logo.test.ts b/src/views/private/components/module-bar-logo/module-bar-logo.test.ts similarity index 100% rename from src/views/private-view/module-bar-logo/module-bar-logo.test.ts rename to src/views/private/components/module-bar-logo/module-bar-logo.test.ts diff --git a/src/views/private-view/module-bar-logo/module-bar-logo.vue b/src/views/private/components/module-bar-logo/module-bar-logo.vue similarity index 97% rename from src/views/private-view/module-bar-logo/module-bar-logo.vue rename to src/views/private/components/module-bar-logo/module-bar-logo.vue index 0a9d87e747..ee8bfe297e 100644 --- a/src/views/private-view/module-bar-logo/module-bar-logo.vue +++ b/src/views/private/components/module-bar-logo/module-bar-logo.vue @@ -72,7 +72,7 @@ export default defineComponent({ width: 40px; height: 32px; margin: 0 auto; - background-image: url('../../../assets/sprite.svg'); + background-image: url('./sprite.svg'); background-position: 0% 0%; background-size: 600px 32px; } diff --git a/src/views/private-view/module-bar-logo/readme.md b/src/views/private/components/module-bar-logo/readme.md similarity index 100% rename from src/views/private-view/module-bar-logo/readme.md rename to src/views/private/components/module-bar-logo/readme.md diff --git a/src/assets/sprite.svg b/src/views/private/components/module-bar-logo/sprite.svg similarity index 100% rename from src/assets/sprite.svg rename to src/views/private/components/module-bar-logo/sprite.svg diff --git a/src/views/private-view/module-bar/index.ts b/src/views/private/components/module-bar/index.ts similarity index 100% rename from src/views/private-view/module-bar/index.ts rename to src/views/private/components/module-bar/index.ts diff --git a/src/views/private-view/module-bar/module-bar.story.ts b/src/views/private/components/module-bar/module-bar.story.ts similarity index 91% rename from src/views/private-view/module-bar/module-bar.story.ts rename to src/views/private/components/module-bar/module-bar.story.ts index 55a7a6e52c..494d0fe05c 100644 --- a/src/views/private-view/module-bar/module-bar.story.ts +++ b/src/views/private/components/module-bar/module-bar.story.ts @@ -6,7 +6,7 @@ import useProjectsStore from '@/stores/projects'; import useRequestsStore from '@/stores/requests'; export default { - title: 'Views / Private / Module Bar', + title: 'Views / Private / Components / Module Bar', parameters: { notes: markdown } diff --git a/src/views/private-view/module-bar/module-bar.vue b/src/views/private/components/module-bar/module-bar.vue similarity index 100% rename from src/views/private-view/module-bar/module-bar.vue rename to src/views/private/components/module-bar/module-bar.vue diff --git a/src/views/private-view/module-bar/readme.md b/src/views/private/components/module-bar/readme.md similarity index 100% rename from src/views/private-view/module-bar/readme.md rename to src/views/private/components/module-bar/readme.md diff --git a/src/views/private-view/index.ts b/src/views/private/index.ts similarity index 100% rename from src/views/private-view/index.ts rename to src/views/private/index.ts diff --git a/src/views/private-view/private-view.story.ts b/src/views/private/private-view.story.ts similarity index 100% rename from src/views/private-view/private-view.story.ts rename to src/views/private/private-view.story.ts diff --git a/src/views/private-view/private-view.test.ts b/src/views/private/private-view.test.ts similarity index 100% rename from src/views/private-view/private-view.test.ts rename to src/views/private/private-view.test.ts diff --git a/src/views/private-view/private-view.vue b/src/views/private/private-view.vue similarity index 93% rename from src/views/private-view/private-view.vue rename to src/views/private/private-view.vue index cc03f8079f..1260050eb4 100644 --- a/src/views/private-view/private-view.vue +++ b/src/views/private/private-view.vue @@ -1,6 +1,11 @@