From ac0aacf776fc3f85fcae2fac2af3a51f8af412b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 29 Aug 2022 12:10:23 +0200 Subject: [PATCH] Rename 'hc-upload' or 'Upload' to AvatarUploader and moved 'ImageUploader' to folder 'Uploader' --- .../ContributionForm/ContributionForm.spec.js | 2 +- .../components/ContributionForm/ContributionForm.vue | 2 +- .../spec.js => Uploader/AvatarUploader.spec.js} | 6 +++--- .../{Upload/index.vue => Uploader/AvatarUploader.vue} | 0 .../{ImageUploader => Uploader}/ImageUploader.spec.js | 0 .../{ImageUploader => Uploader}/ImageUploader.vue | 0 webapp/pages/group/_id/_slug.vue | 10 +++++----- webapp/pages/profile/_id/_slug.vue | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) rename webapp/components/{Upload/spec.js => Uploader/AvatarUploader.spec.js} (93%) rename webapp/components/{Upload/index.vue => Uploader/AvatarUploader.vue} (100%) rename webapp/components/{ImageUploader => Uploader}/ImageUploader.spec.js (100%) rename webapp/components/{ImageUploader => Uploader}/ImageUploader.vue (100%) diff --git a/webapp/components/ContributionForm/ContributionForm.spec.js b/webapp/components/ContributionForm/ContributionForm.spec.js index f5083a8a0..0e14841d1 100644 --- a/webapp/components/ContributionForm/ContributionForm.spec.js +++ b/webapp/components/ContributionForm/ContributionForm.spec.js @@ -4,7 +4,7 @@ import ContributionForm from './ContributionForm.vue' import Vuex from 'vuex' import PostMutations from '~/graphql/PostMutations.js' -import ImageUploader from '~/components/ImageUploader/ImageUploader' +import ImageUploader from '~/components/Uploader/ImageUploader' import MutationObserver from 'mutation-observer' global.MutationObserver = MutationObserver diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue index 3d4bb8e7c..6eb1ebbbc 100644 --- a/webapp/components/ContributionForm/ContributionForm.vue +++ b/webapp/components/ContributionForm/ContributionForm.vue @@ -83,7 +83,7 @@ import { mapGetters } from 'vuex' import HcEditor from '~/components/Editor/Editor' import PostMutations from '~/graphql/PostMutations.js' import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect' -import ImageUploader from '~/components/ImageUploader/ImageUploader' +import ImageUploader from '~/components/Uploader/ImageUploader' import links from '~/constants/links.js' import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue' diff --git a/webapp/components/Upload/spec.js b/webapp/components/Uploader/AvatarUploader.spec.js similarity index 93% rename from webapp/components/Upload/spec.js rename to webapp/components/Uploader/AvatarUploader.spec.js index baf1a3b59..568e4f3a8 100644 --- a/webapp/components/Upload/spec.js +++ b/webapp/components/Uploader/AvatarUploader.spec.js @@ -1,10 +1,10 @@ import { shallowMount } from '@vue/test-utils' import Vue from 'vue' -import Upload from '.' +import AvatarUploader from './AvatarUploader' const localVue = global.localVue -describe('Upload', () => { +describe('AvatarUploader', () => { let wrapper const mocks = { @@ -33,7 +33,7 @@ describe('Upload', () => { beforeEach(() => { jest.useFakeTimers() - wrapper = shallowMount(Upload, { localVue, propsData, mocks }) + wrapper = shallowMount(AvatarUploader, { localVue, propsData, mocks }) }) afterEach(() => { diff --git a/webapp/components/Upload/index.vue b/webapp/components/Uploader/AvatarUploader.vue similarity index 100% rename from webapp/components/Upload/index.vue rename to webapp/components/Uploader/AvatarUploader.vue diff --git a/webapp/components/ImageUploader/ImageUploader.spec.js b/webapp/components/Uploader/ImageUploader.spec.js similarity index 100% rename from webapp/components/ImageUploader/ImageUploader.spec.js rename to webapp/components/Uploader/ImageUploader.spec.js diff --git a/webapp/components/ImageUploader/ImageUploader.vue b/webapp/components/Uploader/ImageUploader.vue similarity index 100% rename from webapp/components/ImageUploader/ImageUploader.vue rename to webapp/components/Uploader/ImageUploader.vue diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue index 326cce74a..b04874047 100644 --- a/webapp/pages/group/_id/_slug.vue +++ b/webapp/pages/group/_id/_slug.vue @@ -7,10 +7,10 @@ :class="{ 'disabled-content': group.disabled }" style="position: relative; height: auto; overflow: visible" > - - + + - + @@ -178,7 +178,7 @@ import HcBadges from '~/components/Badges.vue' import FollowList from '~/components/features/FollowList/FollowList' import HcEmpty from '~/components/Empty/Empty' import ContentMenu from '~/components/ContentMenu/ContentMenu' -import HcUpload from '~/components/Upload' +import AvatarUploader from '~/components/Uploader/AvatarUploader' import UserAvatar from '~/components/_new/generic/UserAvatar/UserAvatar' import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue' import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue' @@ -208,7 +208,7 @@ export default { HcEmpty, UserAvatar, ContentMenu, - HcUpload, + AvatarUploader, MasonryGrid, MasonryGridItem, FollowList,