summaryrefslogtreecommitdiff
path: root/src/client/components
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-12-11 21:43:28 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-12-11 21:43:28 +0900
commit629991443ae759d315c280fc7c6227a902028ffe (patch)
tree015c1135c6a6f66eec8fc156659c6f3a638fd751 /src/client/components
parentショートカットからお気に入りとRenote時にダイアログを... (diff)
downloadsharkey-629991443ae759d315c280fc7c6227a902028ffe.tar.gz
sharkey-629991443ae759d315c280fc7c6227a902028ffe.tar.bz2
sharkey-629991443ae759d315c280fc7c6227a902028ffe.zip
Update vetur
Diffstat (limited to 'src/client/components')
-rw-r--r--src/client/components/global/a.vue (renamed from src/client/components/ui/a.vue)0
-rw-r--r--src/client/components/global/acct.vue (renamed from src/client/components/acct.vue)0
-rw-r--r--src/client/components/global/avatar.vue (renamed from src/client/components/avatar.vue)2
-rw-r--r--src/client/components/global/ellipsis.vue (renamed from src/client/components/ellipsis.vue)0
-rw-r--r--src/client/components/global/emoji.vue (renamed from src/client/components/emoji.vue)2
-rw-r--r--src/client/components/global/error.vue (renamed from src/client/components/error.vue)2
-rw-r--r--src/client/components/global/loading.vue (renamed from src/client/components/loading.vue)0
-rw-r--r--src/client/components/global/misskey-flavored-markdown.vue (renamed from src/client/components/misskey-flavored-markdown.vue)2
-rw-r--r--src/client/components/global/time.vue (renamed from src/client/components/time.vue)0
-rw-r--r--src/client/components/global/url.vue (renamed from src/client/components/url.vue)0
-rw-r--r--src/client/components/global/user-name.vue (renamed from src/client/components/user-name.vue)0
-rw-r--r--src/client/components/index.ts22
-rw-r--r--src/client/components/mfm.ts22
13 files changed, 26 insertions, 26 deletions
diff --git a/src/client/components/ui/a.vue b/src/client/components/global/a.vue
index f6c66257b3..f6c66257b3 100644
--- a/src/client/components/ui/a.vue
+++ b/src/client/components/global/a.vue
diff --git a/src/client/components/acct.vue b/src/client/components/global/acct.vue
index 9d434de6cd..9d434de6cd 100644
--- a/src/client/components/acct.vue
+++ b/src/client/components/global/acct.vue
diff --git a/src/client/components/avatar.vue b/src/client/components/global/avatar.vue
index d90607bb8a..1cfead919d 100644
--- a/src/client/components/avatar.vue
+++ b/src/client/components/global/avatar.vue
@@ -11,7 +11,7 @@
import { defineComponent } from 'vue';
import { getStaticImageUrl } from '@/scripts/get-static-image-url';
import { extractAvgColorFromBlurhash } from '@/scripts/extract-avg-color-from-blurhash';
-import { acct, userPage } from '../filters/user';
+import { acct, userPage } from '@/filters/user';
export default defineComponent({
props: {
diff --git a/src/client/components/ellipsis.vue b/src/client/components/global/ellipsis.vue
index 0a46f486d6..0a46f486d6 100644
--- a/src/client/components/ellipsis.vue
+++ b/src/client/components/global/ellipsis.vue
diff --git a/src/client/components/emoji.vue b/src/client/components/global/emoji.vue
index b2bf7f0169..e93cdb6f3b 100644
--- a/src/client/components/emoji.vue
+++ b/src/client/components/global/emoji.vue
@@ -8,7 +8,7 @@
<script lang="ts">
import { defineComponent } from 'vue';
import { getStaticImageUrl } from '@/scripts/get-static-image-url';
-import { twemojiSvgBase } from '../../misc/twemoji-base';
+import { twemojiSvgBase } from '@/../misc/twemoji-base';
export default defineComponent({
props: {
diff --git a/src/client/components/error.vue b/src/client/components/global/error.vue
index cac24efc8c..311093dacf 100644
--- a/src/client/components/error.vue
+++ b/src/client/components/global/error.vue
@@ -11,7 +11,7 @@
<script lang="ts">
import { defineComponent } from 'vue';
import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
-import MkButton from './ui/button.vue';
+import MkButton from '@/components/ui/button.vue';
export default defineComponent({
components: {
diff --git a/src/client/components/loading.vue b/src/client/components/global/loading.vue
index b4693258b9..b4693258b9 100644
--- a/src/client/components/loading.vue
+++ b/src/client/components/global/loading.vue
diff --git a/src/client/components/misskey-flavored-markdown.vue b/src/client/components/global/misskey-flavored-markdown.vue
index 3123d7aa80..a89d2d3a27 100644
--- a/src/client/components/misskey-flavored-markdown.vue
+++ b/src/client/components/global/misskey-flavored-markdown.vue
@@ -4,7 +4,7 @@
<script lang="ts">
import { defineComponent } from 'vue';
-import MfmCore from './mfm';
+import MfmCore from '@/components/mfm';
export default defineComponent({
components: {
diff --git a/src/client/components/time.vue b/src/client/components/global/time.vue
index 544746c24b..544746c24b 100644
--- a/src/client/components/time.vue
+++ b/src/client/components/global/time.vue
diff --git a/src/client/components/url.vue b/src/client/components/global/url.vue
index c7e93094f5..c7e93094f5 100644
--- a/src/client/components/url.vue
+++ b/src/client/components/global/url.vue
diff --git a/src/client/components/user-name.vue b/src/client/components/global/user-name.vue
index bc93a8ea30..bc93a8ea30 100644
--- a/src/client/components/user-name.vue
+++ b/src/client/components/global/user-name.vue
diff --git a/src/client/components/index.ts b/src/client/components/index.ts
index 92a29ded15..cccb5d766a 100644
--- a/src/client/components/index.ts
+++ b/src/client/components/index.ts
@@ -1,16 +1,16 @@
import { App } from 'vue';
-import mfm from './misskey-flavored-markdown.vue';
-import a from './ui/a.vue';
-import acct from './acct.vue';
-import avatar from './avatar.vue';
-import emoji from './emoji.vue';
-import userName from './user-name.vue';
-import ellipsis from './ellipsis.vue';
-import time from './time.vue';
-import url from './url.vue';
-import loading from './loading.vue';
-import error from './error.vue';
+import mfm from './global/misskey-flavored-markdown.vue';
+import a from './global/a.vue';
+import acct from './global/acct.vue';
+import avatar from './global/avatar.vue';
+import emoji from './global/emoji.vue';
+import userName from './global/user-name.vue';
+import ellipsis from './global/ellipsis.vue';
+import time from './global/time.vue';
+import url from './global/url.vue';
+import loading from './global/loading.vue';
+import error from './global/error.vue';
export default function(app: App) {
app.component('Mfm', mfm);
diff --git a/src/client/components/mfm.ts b/src/client/components/mfm.ts
index 1960461a13..a403e9a68c 100644
--- a/src/client/components/mfm.ts
+++ b/src/client/components/mfm.ts
@@ -1,15 +1,15 @@
import { VNode, defineComponent, h } from 'vue';
-import { MfmForest } from '../../mfm/prelude';
-import { parse, parsePlain } from '../../mfm/parse';
-import MkUrl from './url.vue';
-import MkLink from './link.vue';
-import MkMention from './mention.vue';
-import MkEmoji from './emoji.vue';
-import { concat } from '../../prelude/array';
-import MkFormula from './formula.vue';
-import MkCode from './code.vue';
-import MkGoogle from './google.vue';
-import MkA from './ui/a.vue';
+import { MfmForest } from '@/../mfm/prelude';
+import { parse, parsePlain } from '@/../mfm/parse';
+import MkUrl from '@/components/global/url.vue';
+import MkLink from '@/components/link.vue';
+import MkMention from '@/components/mention.vue';
+import MkEmoji from '@/components/global/emoji.vue';
+import { concat } from '@/../prelude/array';
+import MkFormula from '@/components/formula.vue';
+import MkCode from '@/components/code.vue';
+import MkGoogle from '@/components/google.vue';
+import MkA from '@/components/global/a.vue';
import { host } from '@/config';
export default defineComponent({