diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-07-20 22:24:26 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-07-20 22:24:26 +0900 |
| commit | 50e3ca19bc45c1fd4fd7432bdb30a130f2691076 (patch) | |
| tree | 44415cdf4dd1bfd0abdf440dd4a19e310ee8fd87 /packages/client/src/widgets | |
| parent | chore(deps): bump terser from 5.9.0 to 5.14.2 (#9024) (diff) | |
| download | misskey-50e3ca19bc45c1fd4fd7432bdb30a130f2691076.tar.gz misskey-50e3ca19bc45c1fd4fd7432bdb30a130f2691076.tar.bz2 misskey-50e3ca19bc45c1fd4fd7432bdb30a130f2691076.zip | |
refactor(client): :sparkles:
Diffstat (limited to 'packages/client/src/widgets')
| -rw-r--r-- | packages/client/src/widgets/activity.vue | 3 | ||||
| -rw-r--r-- | packages/client/src/widgets/aiscript.vue | 9 | ||||
| -rw-r--r-- | packages/client/src/widgets/calendar.vue | 6 | ||||
| -rw-r--r-- | packages/client/src/widgets/federation.vue | 3 | ||||
| -rw-r--r-- | packages/client/src/widgets/memo.vue | 9 | ||||
| -rw-r--r-- | packages/client/src/widgets/notifications.vue | 9 | ||||
| -rw-r--r-- | packages/client/src/widgets/online-users.vue | 3 | ||||
| -rw-r--r-- | packages/client/src/widgets/photos.vue | 10 | ||||
| -rw-r--r-- | packages/client/src/widgets/server-metric/index.vue | 7 | ||||
| -rw-r--r-- | packages/client/src/widgets/slideshow.vue | 3 | ||||
| -rw-r--r-- | packages/client/src/widgets/trends.vue | 3 |
11 files changed, 38 insertions, 27 deletions
diff --git a/packages/client/src/widgets/activity.vue b/packages/client/src/widgets/activity.vue index 7252d65403..97e354e1bb 100644 --- a/packages/client/src/widgets/activity.vue +++ b/packages/client/src/widgets/activity.vue @@ -1,6 +1,6 @@ <template> <MkContainer :show-header="widgetProps.showHeader" :naked="widgetProps.transparent" class="mkw-activity"> - <template #header><i class="fas fa-chart-simple"></i>{{ $ts._widgets.activity }}</template> + <template #header><i class="fas fa-chart-simple"></i>{{ i18n.ts._widgets.activity }}</template> <template #func><button class="_button" @click="toggleView()"><i class="fas fa-sort"></i></button></template> <div> @@ -22,6 +22,7 @@ import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; import MkContainer from '@/components/ui/container.vue'; import { $i } from '@/account'; +import { i18n } from '@/i18n'; const name = 'activity'; diff --git a/packages/client/src/widgets/aiscript.vue b/packages/client/src/widgets/aiscript.vue index 9fed292a69..6ae1a9877b 100644 --- a/packages/client/src/widgets/aiscript.vue +++ b/packages/client/src/widgets/aiscript.vue @@ -1,6 +1,6 @@ <template> <MkContainer :show-header="widgetProps.showHeader" class="mkw-aiscript"> - <template #header><i class="fas fa-terminal"></i>{{ $ts._widgets.aiscript }}</template> + <template #header><i class="fas fa-terminal"></i>{{ i18n.ts._widgets.aiscript }}</template> <div class="uylguesu _monospace"> <textarea v-model="widgetProps.script" placeholder="(1 + 1)"></textarea> @@ -14,13 +14,14 @@ <script lang="ts" setup> import { onMounted, onUnmounted, ref, watch } from 'vue'; -import { GetFormResultType } from '@/scripts/form'; +import { AiScript, parse, utils } from '@syuilo/aiscript'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; +import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; import MkContainer from '@/components/ui/container.vue'; -import { AiScript, parse, utils } from '@syuilo/aiscript'; import { createAiScriptEnv } from '@/scripts/aiscript/api'; import { $i } from '@/account'; +import { i18n } from '@/i18n'; const name = 'aiscript'; @@ -88,7 +89,7 @@ const run = async () => { }); break; default: break; } - } + }, }); let ast; diff --git a/packages/client/src/widgets/calendar.vue b/packages/client/src/widgets/calendar.vue index 3a0dc8970c..99bd36e2fc 100644 --- a/packages/client/src/widgets/calendar.vue +++ b/packages/client/src/widgets/calendar.vue @@ -11,19 +11,19 @@ </div> <div class="info"> <div> - <p>{{ $ts.today }}: <b>{{ dayP.toFixed(1) }}%</b></p> + <p>{{ i18n.ts.today }}: <b>{{ dayP.toFixed(1) }}%</b></p> <div class="meter"> <div class="val" :style="{ width: `${dayP}%` }"></div> </div> </div> <div> - <p>{{ $ts.thisMonth }}: <b>{{ monthP.toFixed(1) }}%</b></p> + <p>{{ i18n.ts.thisMonth }}: <b>{{ monthP.toFixed(1) }}%</b></p> <div class="meter"> <div class="val" :style="{ width: `${monthP}%` }"></div> </div> </div> <div> - <p>{{ $ts.thisYear }}: <b>{{ yearP.toFixed(1) }}%</b></p> + <p>{{ i18n.ts.thisYear }}: <b>{{ yearP.toFixed(1) }}%</b></p> <div class="meter"> <div class="val" :style="{ width: `${yearP}%` }"></div> </div> diff --git a/packages/client/src/widgets/federation.vue b/packages/client/src/widgets/federation.vue index ac87cdac2e..9619aa53ee 100644 --- a/packages/client/src/widgets/federation.vue +++ b/packages/client/src/widgets/federation.vue @@ -1,6 +1,6 @@ <template> <MkContainer :show-header="widgetProps.showHeader" :foldable="foldable" :scrollable="scrollable" class="mkw-federation"> - <template #header><i class="fas fa-globe"></i>{{ $ts._widgets.federation }}</template> + <template #header><i class="fas fa-globe"></i>{{ i18n.ts._widgets.federation }}</template> <div class="wbrkwalb"> <MkLoading v-if="fetching"/> @@ -26,6 +26,7 @@ import MkContainer from '@/components/ui/container.vue'; import MkMiniChart from '@/components/mini-chart.vue'; import * as os from '@/os'; import { useInterval } from '@/scripts/use-interval'; +import { i18n } from '@/i18n'; const name = 'federation'; diff --git a/packages/client/src/widgets/memo.vue b/packages/client/src/widgets/memo.vue index 8670cb2bac..14cc2a4e4a 100644 --- a/packages/client/src/widgets/memo.vue +++ b/packages/client/src/widgets/memo.vue @@ -1,21 +1,22 @@ <template> <MkContainer :show-header="widgetProps.showHeader" class="mkw-memo"> - <template #header><i class="fas fa-sticky-note"></i>{{ $ts._widgets.memo }}</template> + <template #header><i class="fas fa-sticky-note"></i>{{ i18n.ts._widgets.memo }}</template> <div class="otgbylcu"> - <textarea v-model="text" :placeholder="$ts.placeholder" @input="onChange"></textarea> - <button :disabled="!changed" class="_buttonPrimary" @click="saveMemo">{{ $ts.save }}</button> + <textarea v-model="text" :placeholder="i18n.ts.placeholder" @input="onChange"></textarea> + <button :disabled="!changed" class="_buttonPrimary" @click="saveMemo">{{ i18n.ts.save }}</button> </div> </MkContainer> </template> <script lang="ts" setup> import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'; -import { GetFormResultType } from '@/scripts/form'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; +import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; import MkContainer from '@/components/ui/container.vue'; import { defaultStore } from '@/store'; +import { i18n } from '@/i18n'; const name = 'memo'; diff --git a/packages/client/src/widgets/notifications.vue b/packages/client/src/widgets/notifications.vue index 18c546ee74..05b24e5cba 100644 --- a/packages/client/src/widgets/notifications.vue +++ b/packages/client/src/widgets/notifications.vue @@ -1,6 +1,6 @@ <template> <MkContainer :style="`height: ${widgetProps.height}px;`" :show-header="widgetProps.showHeader" :scrollable="true" class="mkw-notifications"> - <template #header><i class="fas fa-bell"></i>{{ $ts.notifications }}</template> + <template #header><i class="fas fa-bell"></i>{{ i18n.ts.notifications }}</template> <template #func><button class="_button" @click="configureNotification()"><i class="fas fa-cog"></i></button></template> <div> @@ -10,12 +10,13 @@ </template> <script lang="ts" setup> -import { GetFormResultType } from '@/scripts/form'; +import { defineAsyncComponent } from 'vue'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; +import { GetFormResultType } from '@/scripts/form'; import MkContainer from '@/components/ui/container.vue'; import XNotifications from '@/components/notifications.vue'; import * as os from '@/os'; -import { defineAsyncComponent } from 'vue'; +import { i18n } from '@/i18n'; const name = 'notifications'; @@ -57,7 +58,7 @@ const configureNotification = () => { const { includingTypes } = res; widgetProps.includingTypes = includingTypes; save(); - } + }, }, 'closed'); }; diff --git a/packages/client/src/widgets/online-users.vue b/packages/client/src/widgets/online-users.vue index 4122a82657..e9ab79b111 100644 --- a/packages/client/src/widgets/online-users.vue +++ b/packages/client/src/widgets/online-users.vue @@ -1,6 +1,6 @@ <template> <div class="mkw-onlineUsers" :class="{ _panel: !widgetProps.transparent, pad: !widgetProps.transparent }"> - <I18n v-if="onlineUsersCount" :src="$ts.onlineUsersCount" text-tag="span" class="text"> + <I18n v-if="onlineUsersCount" :src="i18n.ts.onlineUsersCount" text-tag="span" class="text"> <template #n><b>{{ onlineUsersCount }}</b></template> </I18n> </div> @@ -12,6 +12,7 @@ import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExp import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; import { useInterval } from '@/scripts/use-interval'; +import { i18n } from '@/i18n'; const name = 'onlineUsers'; diff --git a/packages/client/src/widgets/photos.vue b/packages/client/src/widgets/photos.vue index 5d9b9e2984..41bec5dc56 100644 --- a/packages/client/src/widgets/photos.vue +++ b/packages/client/src/widgets/photos.vue @@ -1,11 +1,12 @@ <template> <MkContainer :show-header="widgetProps.showHeader" :naked="widgetProps.transparent" :class="$style.root" :data-transparent="widgetProps.transparent ? true : null" class="mkw-photos"> - <template #header><i class="fas fa-camera"></i>{{ $ts._widgets.photos }}</template> + <template #header><i class="fas fa-camera"></i>{{ i18n.ts._widgets.photos }}</template> <div class=""> <MkLoading v-if="fetching"/> <div v-else :class="$style.stream"> - <div v-for="(image, i) in images" :key="i" + <div + v-for="(image, i) in images" :key="i" :class="$style.img" :style="`background-image: url(${thumbnail(image)})`" ></div> @@ -16,13 +17,14 @@ <script lang="ts" setup> import { onMounted, onUnmounted, reactive, ref } from 'vue'; -import { GetFormResultType } from '@/scripts/form'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; +import { GetFormResultType } from '@/scripts/form'; import { stream } from '@/stream'; import { getStaticImageUrl } from '@/scripts/get-static-image-url'; import * as os from '@/os'; import MkContainer from '@/components/ui/container.vue'; import { defaultStore } from '@/store'; +import { i18n } from '@/i18n'; const name = 'photos'; @@ -70,7 +72,7 @@ const thumbnail = (image: any): string => { os.api('drive/stream', { type: 'image/*', - limit: 9 + limit: 9, }).then(res => { images.value = res; fetching.value = false; diff --git a/packages/client/src/widgets/server-metric/index.vue b/packages/client/src/widgets/server-metric/index.vue index 9e86b811d1..3350620ad8 100644 --- a/packages/client/src/widgets/server-metric/index.vue +++ b/packages/client/src/widgets/server-metric/index.vue @@ -1,6 +1,6 @@ <template> <MkContainer :show-header="widgetProps.showHeader" :naked="widgetProps.transparent"> - <template #header><i class="fas fa-server"></i>{{ $ts._widgets.serverMetric }}</template> + <template #header><i class="fas fa-server"></i>{{ i18n.ts._widgets.serverMetric }}</template> <template #func><button class="_button" @click="toggleView()"><i class="fas fa-sort"></i></button></template> <div v-if="meta" class="mkw-serverMetric"> @@ -15,16 +15,17 @@ <script lang="ts" setup> import { onMounted, onUnmounted, ref } from 'vue'; -import { GetFormResultType } from '@/scripts/form'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from '../widget'; -import MkContainer from '@/components/ui/container.vue'; import XCpuMemory from './cpu-mem.vue'; import XNet from './net.vue'; import XCpu from './cpu.vue'; import XMemory from './mem.vue'; import XDisk from './disk.vue'; +import MkContainer from '@/components/ui/container.vue'; +import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; import { stream } from '@/stream'; +import { i18n } from '@/i18n'; const name = 'serverMetric'; diff --git a/packages/client/src/widgets/slideshow.vue b/packages/client/src/widgets/slideshow.vue index c286312161..e317b8ab94 100644 --- a/packages/client/src/widgets/slideshow.vue +++ b/packages/client/src/widgets/slideshow.vue @@ -2,7 +2,7 @@ <div class="kvausudm _panel mkw-slideshow" :style="{ height: widgetProps.height + 'px' }"> <div @click="choose"> <p v-if="widgetProps.folderId == null"> - {{ $ts.folder }} + {{ i18n.ts.folder }} </p> <p v-if="widgetProps.folderId != null && images.length === 0 && !fetching">{{ $t('no-image') }}</p> <div ref="slideA" class="slide a"></div> @@ -17,6 +17,7 @@ import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExp import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; import { useInterval } from '@/scripts/use-interval'; +import { i18n } from '@/i18n'; const name = 'slideshow'; diff --git a/packages/client/src/widgets/trends.vue b/packages/client/src/widgets/trends.vue index 0f34ea6341..8d11b69cb8 100644 --- a/packages/client/src/widgets/trends.vue +++ b/packages/client/src/widgets/trends.vue @@ -1,6 +1,6 @@ <template> <MkContainer :show-header="widgetProps.showHeader" class="mkw-trends"> - <template #header><i class="fas fa-hashtag"></i>{{ $ts._widgets.trends }}</template> + <template #header><i class="fas fa-hashtag"></i>{{ i18n.ts._widgets.trends }}</template> <div class="wbrkwala"> <MkLoading v-if="fetching"/> @@ -25,6 +25,7 @@ import MkContainer from '@/components/ui/container.vue'; import MkMiniChart from '@/components/mini-chart.vue'; import * as os from '@/os'; import { useInterval } from '@/scripts/use-interval'; +import { i18n } from '@/i18n'; const name = 'hashtags'; |