mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
Rename 'hc-upload' or 'Upload' to AvatarUploader and moved 'ImageUploader' to folder 'Uploader'
This commit is contained in:
parent
d1b940b332
commit
ac0aacf776
@ -4,7 +4,7 @@ import ContributionForm from './ContributionForm.vue'
|
|||||||
import Vuex from 'vuex'
|
import Vuex from 'vuex'
|
||||||
import PostMutations from '~/graphql/PostMutations.js'
|
import PostMutations from '~/graphql/PostMutations.js'
|
||||||
|
|
||||||
import ImageUploader from '~/components/ImageUploader/ImageUploader'
|
import ImageUploader from '~/components/Uploader/ImageUploader'
|
||||||
import MutationObserver from 'mutation-observer'
|
import MutationObserver from 'mutation-observer'
|
||||||
|
|
||||||
global.MutationObserver = MutationObserver
|
global.MutationObserver = MutationObserver
|
||||||
|
|||||||
@ -83,7 +83,7 @@ import { mapGetters } from 'vuex'
|
|||||||
import HcEditor from '~/components/Editor/Editor'
|
import HcEditor from '~/components/Editor/Editor'
|
||||||
import PostMutations from '~/graphql/PostMutations.js'
|
import PostMutations from '~/graphql/PostMutations.js'
|
||||||
import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
|
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 links from '~/constants/links.js'
|
||||||
import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
|
import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
|
||||||
|
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
import { shallowMount } from '@vue/test-utils'
|
import { shallowMount } from '@vue/test-utils'
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
import Upload from '.'
|
import AvatarUploader from './AvatarUploader'
|
||||||
|
|
||||||
const localVue = global.localVue
|
const localVue = global.localVue
|
||||||
|
|
||||||
describe('Upload', () => {
|
describe('AvatarUploader', () => {
|
||||||
let wrapper
|
let wrapper
|
||||||
|
|
||||||
const mocks = {
|
const mocks = {
|
||||||
@ -33,7 +33,7 @@ describe('Upload', () => {
|
|||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
jest.useFakeTimers()
|
jest.useFakeTimers()
|
||||||
wrapper = shallowMount(Upload, { localVue, propsData, mocks })
|
wrapper = shallowMount(AvatarUploader, { localVue, propsData, mocks })
|
||||||
})
|
})
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
@ -7,10 +7,10 @@
|
|||||||
:class="{ 'disabled-content': group.disabled }"
|
:class="{ 'disabled-content': group.disabled }"
|
||||||
style="position: relative; height: auto; overflow: visible"
|
style="position: relative; height: auto; overflow: visible"
|
||||||
>
|
>
|
||||||
<!-- Wolle: <hc-upload v-if="isMyGroup" :user="user"> -->
|
<!-- Wolle: <avatar-uploader v-if="isMyGroup" :user="user"> -->
|
||||||
<hc-upload v-if="isMyGroup" :user="group">
|
<avatar-uploader v-if="isMyGroup" :user="group">
|
||||||
<!-- Wolle: <user-avatar :user="user" class="profile-avatar" size="large"></user-avatar> -->
|
<!-- Wolle: <user-avatar :user="user" class="profile-avatar" size="large"></user-avatar> -->
|
||||||
</hc-upload>
|
</avatar-uploader>
|
||||||
<!-- Wolle: <user-avatar v-else :user="user" class="profile-avatar" size="large" /> -->
|
<!-- Wolle: <user-avatar v-else :user="user" class="profile-avatar" size="large" /> -->
|
||||||
<!-- Menu -->
|
<!-- Menu -->
|
||||||
<!-- Wolle: <client-only>
|
<!-- Wolle: <client-only>
|
||||||
@ -181,7 +181,7 @@ import HcBadges from '~/components/Badges.vue'
|
|||||||
import FollowList from '~/components/features/FollowList/FollowList'
|
import FollowList from '~/components/features/FollowList/FollowList'
|
||||||
import HcEmpty from '~/components/Empty/Empty'
|
import HcEmpty from '~/components/Empty/Empty'
|
||||||
import ContentMenu from '~/components/ContentMenu/ContentMenu'
|
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 UserAvatar from '~/components/_new/generic/UserAvatar/UserAvatar'
|
||||||
import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
|
import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
|
||||||
import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue'
|
import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue'
|
||||||
@ -212,7 +212,7 @@ export default {
|
|||||||
HcEmpty,
|
HcEmpty,
|
||||||
UserAvatar,
|
UserAvatar,
|
||||||
ContentMenu,
|
ContentMenu,
|
||||||
HcUpload,
|
AvatarUploader,
|
||||||
MasonryGrid,
|
MasonryGrid,
|
||||||
MasonryGridItem,
|
MasonryGridItem,
|
||||||
FollowList,
|
FollowList,
|
||||||
|
|||||||
@ -7,9 +7,9 @@
|
|||||||
:class="{ 'disabled-content': user.disabled }"
|
:class="{ 'disabled-content': user.disabled }"
|
||||||
style="position: relative; height: auto; overflow: visible"
|
style="position: relative; height: auto; overflow: visible"
|
||||||
>
|
>
|
||||||
<hc-upload v-if="myProfile" :user="user">
|
<avatar-uploader v-if="myProfile" :user="user">
|
||||||
<user-avatar :user="user" class="profile-avatar" size="large"></user-avatar>
|
<user-avatar :user="user" class="profile-avatar" size="large"></user-avatar>
|
||||||
</hc-upload>
|
</avatar-uploader>
|
||||||
<user-avatar v-else :user="user" class="profile-avatar" size="large" />
|
<user-avatar v-else :user="user" class="profile-avatar" size="large" />
|
||||||
<!-- Menu -->
|
<!-- Menu -->
|
||||||
<client-only>
|
<client-only>
|
||||||
@ -178,7 +178,7 @@ import HcBadges from '~/components/Badges.vue'
|
|||||||
import FollowList from '~/components/features/FollowList/FollowList'
|
import FollowList from '~/components/features/FollowList/FollowList'
|
||||||
import HcEmpty from '~/components/Empty/Empty'
|
import HcEmpty from '~/components/Empty/Empty'
|
||||||
import ContentMenu from '~/components/ContentMenu/ContentMenu'
|
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 UserAvatar from '~/components/_new/generic/UserAvatar/UserAvatar'
|
||||||
import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
|
import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue'
|
||||||
import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue'
|
import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue'
|
||||||
@ -208,7 +208,7 @@ export default {
|
|||||||
HcEmpty,
|
HcEmpty,
|
||||||
UserAvatar,
|
UserAvatar,
|
||||||
ContentMenu,
|
ContentMenu,
|
||||||
HcUpload,
|
AvatarUploader,
|
||||||
MasonryGrid,
|
MasonryGrid,
|
||||||
MasonryGridItem,
|
MasonryGridItem,
|
||||||
FollowList,
|
FollowList,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user