mirror of
https://git.joinfirefish.org/firefish/firefish.git
synced 2024-05-19 16:01:09 +02:00
Merge branch 'develop' into refactor/blind-upgrade
This commit is contained in:
ThatOneCalculator
commit
ad78efb46f
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "firefish",
|
||||
"version": "1.0.5-dev5",
|
||||
"version": "1.0.5-dev6",
|
||||
"codename": "aqua",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@
|
|||
import MkButton from "@/components/MkButton.vue";
|
||||
import MkSwitch from "@/components/form/switch.vue";
|
||||
import MkKeyValue from "@/components/MkKeyValue.vue";
|
||||
import { acct, userPage } from "@/filters/user";
|
||||
import * as os from "@/os";
|
||||
import { i18n } from "@/i18n";
|
||||
|
||||
|
|
|
|||
|
|
@ -108,14 +108,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {
|
||||
computed,
|
||||
nextTick,
|
||||
onBeforeUnmount,
|
||||
onMounted,
|
||||
ref,
|
||||
shallowRef,
|
||||
} from "vue";
|
||||
import { computed, onBeforeUnmount, onMounted } from "vue";
|
||||
import tinycolor from "tinycolor2";
|
||||
import { globalEvents } from "@/events.js";
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
<script lang="ts" setup>
|
||||
import type { PropType } from "vue";
|
||||
import { onMounted, onUnmounted, ref, watch } from "vue";
|
||||
import { onMounted, ref, watch } from "vue";
|
||||
import {
|
||||
ArcElement,
|
||||
BarController,
|
||||
|
|
@ -183,9 +183,9 @@ const render = () => {
|
|||
document.documentElement,
|
||||
).getPropertyValue("--fg");
|
||||
|
||||
const maxes = chartData.series.map((x, i) =>
|
||||
Math.max(...x.data.map((d) => d.y)),
|
||||
);
|
||||
// const maxes = chartData.series.map((x, i) =>
|
||||
// Math.max(...x.data.map((d) => d.y)),
|
||||
// );
|
||||
|
||||
chartInstance = new Chart(chartEl.value, {
|
||||
type: props.bar ? "bar" : "line",
|
||||
|
|
|
|||
|
|
@ -21,10 +21,6 @@ const emit = defineEmits<{
|
|||
}>();
|
||||
|
||||
const dialog = $ref<InstanceType<typeof XModalWindow>>();
|
||||
|
||||
function close(res) {
|
||||
dialog.close();
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
|
||||
<script lang="ts" setup>
|
||||
import { onBeforeUnmount, onMounted } from "vue";
|
||||
import MkMenu from "./MkMenu.vue";
|
||||
import type { MenuItem } from "./types/menu.vue";
|
||||
import MkMenu from "@/components/MkMenu.vue";
|
||||
import type { MenuItem } from "@/types/menu";
|
||||
import contains from "@/scripts/contains";
|
||||
import * as os from "@/os";
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { nextTick, onMounted } from "vue";
|
||||
import { onMounted } from "vue";
|
||||
import type * as misskey from "firefish-js";
|
||||
import Cropper from "cropperjs";
|
||||
import tinycolor from "tinycolor2";
|
||||
|
|
|
|||
|
|
@ -198,10 +198,6 @@ function onDragend() {
|
|||
emit("dragend");
|
||||
}
|
||||
|
||||
function go() {
|
||||
emit("move", props.folder.id);
|
||||
}
|
||||
|
||||
function rename() {
|
||||
os.inputText({
|
||||
title: i18n.ts.renameFolder,
|
||||
|
|
|
|||
|
|
@ -42,14 +42,6 @@ function onClick() {
|
|||
emit("move", props.folder);
|
||||
}
|
||||
|
||||
function onMouseover() {
|
||||
hover.value = true;
|
||||
}
|
||||
|
||||
function onMouseout() {
|
||||
hover.value = false;
|
||||
}
|
||||
|
||||
function onDragover(ev: DragEvent) {
|
||||
if (!ev.dataTransfer) return;
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
@dragend="isDragSource = false"
|
||||
/>
|
||||
<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
|
||||
<div v-for="(n, i) in 16" :key="i" class="padding"></div>
|
||||
<div v-for="(_, i) in 16" :key="i" class="padding"></div>
|
||||
<MkButton v-if="moreFolders" ref="moreFolders">{{
|
||||
i18n.ts.loadMore
|
||||
}}</MkButton>
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
@dragend="isDragSource = false"
|
||||
/>
|
||||
<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
|
||||
<div v-for="(n, i) in 16" :key="i" class="padding"></div>
|
||||
<div v-for="(_, i) in 16" :key="i" class="padding"></div>
|
||||
<MkButton
|
||||
v-show="moreFiles"
|
||||
ref="loadMoreFiles"
|
||||
|
|
@ -132,7 +132,6 @@
|
|||
|
||||
<script lang="ts" setup>
|
||||
import {
|
||||
markRaw,
|
||||
nextTick,
|
||||
onActivated,
|
||||
onBeforeUnmount,
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, onMounted, onBeforeUnmount } from "vue";
|
||||
import { ref } from "vue";
|
||||
import MkModal from "@/components/MkModal.vue";
|
||||
import MkEmojiPicker from "@/components/MkEmojiPicker.vue";
|
||||
import { defaultStore } from "@/store";
|
||||
|
|
|
|||
|
|
@ -52,13 +52,10 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed } from "vue";
|
||||
import * as Acct from "firefish-js/built/acct";
|
||||
import MkSwitch from "@/components/ui/switch.vue";
|
||||
import MkPagination from "@/components/MkPagination.vue";
|
||||
import MkDriveFileThumbnail from "@/components/MkDriveFileThumbnail.vue";
|
||||
import bytes from "@/filters/bytes";
|
||||
import * as os from "@/os";
|
||||
import { i18n } from "@/i18n";
|
||||
|
||||
const props = defineProps<{
|
||||
|
|
|
|||
|
|
@ -235,13 +235,13 @@ onBeforeUnmount(() => {
|
|||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
//background: mix($primary, #fff, 20);
|
||||
}
|
||||
// &:hover {
|
||||
// background: mix($primary, #fff, 20);
|
||||
// }
|
||||
|
||||
&:active {
|
||||
//background: mix($primary, #fff, 40);
|
||||
}
|
||||
// &:active {
|
||||
// background: mix($primary, #fff, 40);
|
||||
// }
|
||||
|
||||
&.active {
|
||||
color: var(--fgOnAccent);
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
</template>
|
||||
|
||||
<MkSpacer :margin-min="20" :margin-max="32">
|
||||
<div class="xkpnjxcv _formRoot">
|
||||
<div class="_formRoot">
|
||||
<template
|
||||
v-for="item in Object.keys(form).filter(
|
||||
(item) => !form[item].hidden,
|
||||
|
|
@ -221,8 +221,3 @@ export default defineComponent({
|
|||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.xkpnjxcv {
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
|
||||
<script lang="ts">
|
||||
import { defineComponent, defineAsyncComponent } from "vue";
|
||||
import * as os from "@/os";
|
||||
|
||||
export default defineComponent({
|
||||
components: {
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import { userName } from "@/filters/user";
|
||||
import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
|
||||
|
||||
const props = defineProps<{
|
||||
|
|
|
|||
|
|
@ -8,21 +8,11 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {
|
||||
markRaw,
|
||||
version as vueVersion,
|
||||
onMounted,
|
||||
onBeforeUnmount,
|
||||
nextTick,
|
||||
watch,
|
||||
} from "vue";
|
||||
import { onMounted, nextTick, watch } from "vue";
|
||||
import { Chart } from "chart.js";
|
||||
import tinycolor from "tinycolor2";
|
||||
import { MatrixController, MatrixElement } from "chartjs-chart-matrix";
|
||||
import * as os from "@/os";
|
||||
import { defaultStore } from "@/store";
|
||||
import { useChartTooltip } from "@/scripts/use-chart-tooltip";
|
||||
import { chartVLine } from "@/scripts/chart-vline";
|
||||
import { alpha } from "@/scripts/color";
|
||||
import { initChart } from "@/scripts/init-chart";
|
||||
import { $i } from "@/account";
|
||||
|
|
|
|||
|
|
@ -62,14 +62,11 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import MkModal from "@/components/MkModal.vue";
|
||||
import { navbarItemDef } from "@/navbar";
|
||||
import { instanceName } from "@/config";
|
||||
import { defaultStore } from "@/store";
|
||||
import { i18n } from "@/i18n";
|
||||
import { deviceKind } from "@/scripts/device-kind";
|
||||
import * as os from "@/os";
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import { shallowRef } from "vue";
|
|||
import MkModal from "@/components/MkModal.vue";
|
||||
import MkButton from "@/components/MkButton.vue";
|
||||
import { i18n } from "@/i18n";
|
||||
import * as os from "@/os";
|
||||
|
||||
const modal = shallowRef<InstanceType<typeof MkModal>>();
|
||||
const checkAnnouncements = () => {
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ import XBanner from "@/components/MkMediaBanner.vue";
|
|||
import XMedia from "@/components/MkMedia.vue";
|
||||
import * as os from "@/os";
|
||||
import { FILE_TYPE_BROWSERSAFE } from "@/const";
|
||||
import { defaultStore } from "@/store";
|
||||
|
||||
const props = defineProps<{
|
||||
mediaList: misskey.entities.DriveFile[];
|
||||
|
|
|
|||
|
|
@ -12,15 +12,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { on } from "events";
|
||||
import {
|
||||
nextTick,
|
||||
onBeforeUnmount,
|
||||
onMounted,
|
||||
onUnmounted,
|
||||
ref,
|
||||
watch,
|
||||
} from "vue";
|
||||
import { nextTick, onMounted, ref } from "vue";
|
||||
import MkMenu from "./MkMenu.vue";
|
||||
import { MenuItem } from "@/types/menu";
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
@contextmenu.self="(e) => e.preventDefault()"
|
||||
tabindex="-1"
|
||||
>
|
||||
<template v-for="(item, i) in items2">
|
||||
<template v-for="item in items2">
|
||||
<div v-if="item === null" class="divider"></div>
|
||||
<span v-else-if="item.type === 'label'" class="label item">
|
||||
<span :style="item.textStyle || ''">{{
|
||||
|
|
@ -204,18 +204,12 @@
|
|||
|
||||
<script lang="ts" setup>
|
||||
import {
|
||||
computed,
|
||||
menu,
|
||||
defineAsyncComponent,
|
||||
nextTick,
|
||||
onBeforeUnmount,
|
||||
onMounted,
|
||||
onUnmounted,
|
||||
Ref,
|
||||
ref,
|
||||
watch,
|
||||
} from "vue";
|
||||
import { focusPrev, focusNext } from "@/scripts/focus";
|
||||
import FormSwitch from "@/components/form/switch.vue";
|
||||
import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from "@/types/menu";
|
||||
import * as os from "@/os";
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { onUnmounted, watch } from "vue";
|
||||
import { watch } from "vue";
|
||||
import { v4 as uuid } from "uuid";
|
||||
import tinycolor from "tinycolor2";
|
||||
import { useInterval } from "@/scripts/use-interval";
|
||||
|
|
@ -41,7 +41,6 @@ let polylinePoints = $ref("");
|
|||
let polygonPoints = $ref("");
|
||||
let headX = $ref<number | null>(null);
|
||||
let headY = $ref<number | null>(null);
|
||||
let clock = $ref<number | null>(null);
|
||||
const accent = tinycolor(
|
||||
getComputedStyle(document.documentElement).getPropertyValue("--accent"),
|
||||
);
|
||||
|
|
|
|||
|
|
@ -60,11 +60,7 @@ import { url } from "@/config";
|
|||
import * as os from "@/os";
|
||||
import { mainRouter, routes } from "@/router";
|
||||
import { i18n } from "@/i18n";
|
||||
import {
|
||||
PageMetadata,
|
||||
provideMetadataReceiver,
|
||||
setPageMetadata,
|
||||
} from "@/scripts/page-metadata";
|
||||
import { PageMetadata, provideMetadataReceiver } from "@/scripts/page-metadata";
|
||||
import { Router } from "@/nirax";
|
||||
|
||||
const props = defineProps<{
|
||||
|
|
|
|||
|
|
@ -255,23 +255,18 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, inject, onMounted, onUnmounted, reactive, ref } from "vue";
|
||||
import { computed, inject, onMounted, ref } from "vue";
|
||||
import * as mfm from "mfm-js";
|
||||
import type { Ref } from "vue";
|
||||
import type * as misskey from "firefish-js";
|
||||
import MkNoteSub from "@/components/MkNoteSub.vue";
|
||||
import MkSubNoteContent from "./MkSubNoteContent.vue";
|
||||
import XNoteHeader from "@/components/MkNoteHeader.vue";
|
||||
import XNoteSimple from "@/components/MkNoteSimple.vue";
|
||||
import XMediaList from "@/components/MkMediaList.vue";
|
||||
import XCwButton from "@/components/MkCwButton.vue";
|
||||
import XPoll from "@/components/MkPoll.vue";
|
||||
import XRenoteButton from "@/components/MkRenoteButton.vue";
|
||||
import XReactionsViewer from "@/components/MkReactionsViewer.vue";
|
||||
import XStarButton from "@/components/MkStarButton.vue";
|
||||
import XStarButtonNoEmoji from "@/components/MkStarButtonNoEmoji.vue";
|
||||
import XQuoteButton from "@/components/MkQuoteButton.vue";
|
||||
import MkUrlPreview from "@/components/MkUrlPreview.vue";
|
||||
import MkVisibility from "@/components/MkVisibility.vue";
|
||||
import copyToClipboard from "@/scripts/copy-to-clipboard";
|
||||
import { url } from "@/config";
|
||||
|
|
|
|||
|
|
@ -150,22 +150,12 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {
|
||||
computed,
|
||||
inject,
|
||||
onMounted,
|
||||
onUnmounted,
|
||||
onUpdated,
|
||||
reactive,
|
||||
ref,
|
||||
} from "vue";
|
||||
import { onMounted, onUnmounted, onUpdated, ref } from "vue";
|
||||
import * as misskey from "firefish-js";
|
||||
import MkTab from "@/components/MkTab.vue";
|
||||
import MkNote from "@/components/MkNote.vue";
|
||||
import MkNoteSub from "@/components/MkNoteSub.vue";
|
||||
import XStarButton from "@/components/MkStarButton.vue";
|
||||
import XRenoteButton from "@/components/MkRenoteButton.vue";
|
||||
import MkPagination from "@/components/MkPagination.vue";
|
||||
import MkUserCardMini from "@/components/MkUserCardMini.vue";
|
||||
import MkReactedUsers from "@/components/MkReactedUsers.vue";
|
||||
import { pleaseLogin } from "@/scripts/please-login";
|
||||
|
|
@ -181,7 +171,6 @@ import { useNoteCapture } from "@/scripts/use-note-capture";
|
|||
import { deepClone } from "@/scripts/clone";
|
||||
import { stream } from "@/stream";
|
||||
import { NoteUpdatedEvent } from "firefish-js/built/streaming.types";
|
||||
import appear from "@/directives/appear";
|
||||
|
||||
const props = defineProps<{
|
||||
note: misskey.entities.Note;
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import type * as misskey from "firefish-js";
|
||||
import { defaultStore, noteViewInterruptors } from "@/store";
|
||||
import { defaultStore } from "@/store";
|
||||
import MkVisibility from "@/components/MkVisibility.vue";
|
||||
import MkInstanceTicker from "@/components/MkInstanceTicker.vue";
|
||||
import { notePage } from "@/filters/note";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import * as misskey from "firefish-js";
|
||||
import XNoteHeader from "@/components/MkNoteHeader.vue";
|
||||
import MkSubNoteContent from "@/components/MkSubNoteContent.vue";
|
||||
|
|
|
|||
|
|
@ -46,20 +46,12 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {
|
||||
defineComponent,
|
||||
markRaw,
|
||||
onUnmounted,
|
||||
onMounted,
|
||||
computed,
|
||||
ref,
|
||||
} from "vue";
|
||||
import { onUnmounted, onMounted, computed, ref } from "vue";
|
||||
import { notificationTypes } from "firefish-js";
|
||||
import MkPagination, { Paging } from "@/components/MkPagination.vue";
|
||||
import XNotification from "@/components/MkNotification.vue";
|
||||
import XList from "@/components/MkDateSeparatedList.vue";
|
||||
import XNote from "@/components/MkNote.vue";
|
||||
import * as os from "@/os";
|
||||
import { stream } from "@/stream";
|
||||
import { $i } from "@/account";
|
||||
import { i18n } from "@/i18n";
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, reactive, watch } from "vue";
|
||||
import { reactive, watch } from "vue";
|
||||
import gsap from "gsap";
|
||||
import number from "@/filters/number";
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { computed, defineComponent, reactive, ref } from "vue";
|
||||
import { defineComponent, reactive } from "vue";
|
||||
import number from "@/filters/number";
|
||||
|
||||
export default defineComponent({
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<div class="zhyxdalp">
|
||||
<div>
|
||||
<XValue :value="value" :collapsed="false" />
|
||||
</div>
|
||||
</template>
|
||||
|
|
@ -12,8 +12,3 @@ const props = defineProps<{
|
|||
value: Record<string, unknown>;
|
||||
}>();
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.zhyxdalp {
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -30,21 +30,16 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ComputedRef, inject, provide } from "vue";
|
||||
import { ComputedRef, provide } from "vue";
|
||||
import RouterView from "@/components/global/RouterView.vue";
|
||||
import XWindow from "@/components/MkWindow.vue";
|
||||
import { popout as _popout } from "@/scripts/popout";
|
||||
import copyToClipboard from "@/scripts/copy-to-clipboard";
|
||||
import { url } from "@/config";
|
||||
import * as os from "@/os";
|
||||
import { mainRouter, routes } from "@/router";
|
||||
import { Router } from "@/nirax";
|
||||
import { i18n } from "@/i18n";
|
||||
import {
|
||||
PageMetadata,
|
||||
provideMetadataReceiver,
|
||||
setPageMetadata,
|
||||
} from "@/scripts/page-metadata";
|
||||
import { PageMetadata, provideMetadataReceiver } from "@/scripts/page-metadata";
|
||||
|
||||
const props = defineProps<{
|
||||
initialPath: string;
|
||||
|
|
@ -128,10 +123,6 @@ const contextmenu = $computed(() => [
|
|||
},
|
||||
]);
|
||||
|
||||
function menu(ev) {
|
||||
os.popupMenu(contextmenu, ev.currentTarget ?? ev.target);
|
||||
}
|
||||
|
||||
function back() {
|
||||
history.pop();
|
||||
router.replace(
|
||||
|
|
|
|||
|
|
@ -67,10 +67,8 @@ import {
|
|||
computed,
|
||||
ComputedRef,
|
||||
isRef,
|
||||
markRaw,
|
||||
onActivated,
|
||||
onDeactivated,
|
||||
Ref,
|
||||
ref,
|
||||
watch,
|
||||
} from "vue";
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import MkModal from "./MkModal.vue";
|
||||
import MkMenu from "./MkMenu.vue";
|
||||
import { MenuItem } from "@/types/menu";
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ import { onMounted, watch } from "vue";
|
|||
import * as misskey from "firefish-js";
|
||||
import MkReactionIcon from "@/components/MkReactionIcon.vue";
|
||||
import MkUserCardMini from "@/components/MkUserCardMini.vue";
|
||||
import { i18n } from "@/i18n";
|
||||
import * as os from "@/os";
|
||||
|
||||
const props = defineProps<{
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
|
||||
const props = defineProps<{
|
||||
reaction: string;
|
||||
customEmojis?: any[]; // TODO
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import MkTooltip from "./MkTooltip.vue";
|
||||
import XReactionIcon from "@/components/MkReactionIcon.vue";
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import MkTooltip from "./MkTooltip.vue";
|
||||
import XReactionIcon from "@/components/MkReactionIcon.vue";
|
||||
|
||||
|
|
|
|||
|
|
@ -160,7 +160,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import Vue3OtpInput from "vue3-otp-input";
|
||||
import { defineAsyncComponent } from "vue";
|
||||
import { toUnicode } from "punycode/";
|
||||
import MkButton from "@/components/MkButton.vue";
|
||||
|
|
@ -180,16 +179,11 @@ let password = $ref("");
|
|||
let token = $ref("");
|
||||
let host = $ref(toUnicode(configHost));
|
||||
let totpLogin = $ref(false);
|
||||
let credential = $ref(null);
|
||||
let challengeData = $ref(null);
|
||||
let queryingKey = $ref(false);
|
||||
let hCaptchaResponse = $ref(null);
|
||||
let reCaptchaResponse = $ref(null);
|
||||
|
||||
const updateToken = (value: string) => {
|
||||
token = value.toString();
|
||||
};
|
||||
|
||||
const meta = $computed(() => instance);
|
||||
|
||||
const emit = defineEmits<{
|
||||
|
|
|
|||
|
|
@ -284,7 +284,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import getPasswordStrength from "syuilo-password-strength";
|
||||
import { toUnicode } from "punycode/";
|
||||
import MkButton from "./MkButton.vue";
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import XSignup from "@/components/MkSignup.vue";
|
||||
import XModalWindow from "@/components/MkModalWindow.vue";
|
||||
import { i18n } from "@/i18n";
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@ import Ripple from "@/components/MkRipple.vue";
|
|||
import XDetails from "@/components/MkUsersTooltip.vue";
|
||||
import { pleaseLogin } from "@/scripts/please-login";
|
||||
import * as os from "@/os";
|
||||
import { defaultStore } from "@/store";
|
||||
import { i18n } from "@/i18n";
|
||||
import { instance } from "@/instance";
|
||||
import { useTooltip } from "@/scripts/use-tooltip";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<div v-if="group.title" class="title">{{ group.title }}</div>
|
||||
|
||||
<div class="items">
|
||||
<template v-for="(item, i) in group.items">
|
||||
<template v-for="item in group.items">
|
||||
<a
|
||||
v-if="item.type === 'a'"
|
||||
:href="item.href"
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { defineComponent, ref, unref } from "vue";
|
||||
import { defineComponent } from "vue";
|
||||
|
||||
export default defineComponent({
|
||||
props: {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { onMounted, ref, watch, PropType, onBeforeUnmount } from "vue";
|
||||
import { onMounted, watch, onBeforeUnmount } from "vue";
|
||||
import tinycolor from "tinycolor2";
|
||||
|
||||
const loaded = !!window.TagCanvas;
|
||||
|
|
|
|||
|
|
@ -28,10 +28,9 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, watch, computed, provide, onUnmounted } from "vue";
|
||||
import { computed, provide, onUnmounted } from "vue";
|
||||
import XNotes from "@/components/MkNotes.vue";
|
||||
import MkInfo from "@/components/MkInfo.vue";
|
||||
import * as os from "@/os";
|
||||
import { stream } from "@/stream";
|
||||
import * as sound from "@/scripts/sound";
|
||||
import { $i } from "@/account";
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { onMounted, ref } from "vue";
|
||||
import { onMounted } from "vue";
|
||||
import * as os from "@/os";
|
||||
|
||||
defineProps<{
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { reactive, computed } from "vue";
|
||||
import { computed } from "vue";
|
||||
import XSettings from "@/pages/settings/profile.vue";
|
||||
import XModalWindow from "@/components/MkModalWindow.vue";
|
||||
import MkButton from "@/components/MkButton.vue";
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { onMounted, onUnmounted } from "vue";
|
||||
import { onUnmounted } from "vue";
|
||||
import { url as local, lang } from "@/config";
|
||||
import { i18n } from "@/i18n";
|
||||
import { defaultStore } from "@/store";
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
import { ref } from "vue";
|
||||
import MkUserInfo from "@/components/MkUserInfo.vue";
|
||||
import MkPagination, { Paging } from "@/components/MkPagination.vue";
|
||||
import { userPage } from "@/filters/user";
|
||||
import { i18n } from "@/i18n";
|
||||
|
||||
const props = defineProps<{
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import * as misskey from "firefish-js";
|
||||
import { i18n } from "@/i18n";
|
||||
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { nextTick, onMounted } from "vue";
|
||||
import { onMounted } from "vue";
|
||||
import * as misskey from "firefish-js";
|
||||
import MkInput from "@/components/form/input.vue";
|
||||
import FormSplit from "@/components/form/split.vue";
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { nextTick, onMounted } from "vue";
|
||||
import { onMounted } from "vue";
|
||||
import * as misskey from "firefish-js";
|
||||
import MkInput from "@/components/form/input.vue";
|
||||
import FormSplit from "@/components/form/split.vue";
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref } from "vue";
|
||||
import XDetails from "@/components/MkUsersTooltip.vue";
|
||||
import * as os from "@/os";
|
||||
import { useTooltip } from "@/scripts/use-tooltip";
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { defineAsyncComponent, reactive, ref, computed } from "vue";
|
||||
import { ref, computed } from "vue";
|
||||
import { v4 as uuid } from "uuid";
|
||||
import { VueDraggable } from "vue-draggable-plus";
|
||||
import MkSelect from "@/components/form/select.vue";
|
||||
|
|
|
|||
|
|
@ -46,15 +46,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {
|
||||
computed,
|
||||
nextTick,
|
||||
onMounted,
|
||||
onUnmounted,
|
||||
ref,
|
||||
toRefs,
|
||||
watch,
|
||||
} from "vue";
|
||||
import { nextTick, onMounted, ref, toRefs, watch } from "vue";
|
||||
import { debounce } from "throttle-debounce";
|
||||
import MkButton from "@/components/MkButton.vue";
|
||||
import { useInterval } from "@/scripts/use-interval";
|
||||
|
|
@ -101,7 +93,6 @@ const id = Math.random().toString(); // TODO: uuid?
|
|||
const focused = ref(false);
|
||||
const changed = ref(false);
|
||||
const invalid = ref(false);
|
||||
const filled = computed(() => v.value !== "" && v.value != null);
|
||||
const inputEl = ref<HTMLElement>();
|
||||
const prefixEl = ref<HTMLElement>();
|
||||
const suffixEl = ref<HTMLElement>();
|
||||
|
|
@ -136,7 +127,7 @@ watch(modelValue, (newValue) => {
|
|||
v.value = newValue;
|
||||
});
|
||||
|
||||
watch(v, (newValue) => {
|
||||
watch(v, (_) => {
|
||||
if (!props.manualSave) {
|
||||
if (props.debounce) {
|
||||
debouncedUpdated();
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
|
||||
const props = defineProps<{
|
||||
to: string;
|
||||
active?: boolean;
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
|
||||
const props = defineProps<{
|
||||
modelValue: any;
|
||||
value: any;
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@ const focused = ref(false);
|
|||
const opening = ref(false);
|
||||
const changed = ref(false);
|
||||
const invalid = ref(false);
|
||||
const filled = computed(() => v.value !== "" && v.value != null);
|
||||
const inputEl = ref(null);
|
||||
const prefixEl = ref(null);
|
||||
const suffixEl = ref(null);
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ import {
|
|||
defineComponent,
|
||||
nextTick,
|
||||
onMounted,
|
||||
onUnmounted,
|
||||
ref,
|
||||
toRefs,
|
||||
watch,
|
||||
|
|
|
|||
|
|
@ -10,11 +10,10 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { inject } from "vue";
|
||||
import * as os from "@/os";
|
||||
import copyToClipboard from "@/scripts/copy-to-clipboard";
|
||||
import { url } from "@/config";
|
||||
import { popout as popout_ } from "@/scripts/popout";
|
||||
// import { popout as popout_ } from "@/scripts/popout";
|
||||
import { i18n } from "@/i18n";
|
||||
import { useRouter } from "@/router";
|
||||
|
||||
|
|
@ -93,9 +92,9 @@ function modalWindow() {
|
|||
os.modalPageWindow(props.to);
|
||||
}
|
||||
|
||||
function popout() {
|
||||
popout_(props.to);
|
||||
}
|
||||
// function popout() {
|
||||
// popout_(props.to);
|
||||
// }
|
||||
|
||||
function nav(ev: MouseEvent) {
|
||||
if (!ev.ctrlKey && props.behavior !== "browser") {
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { onMounted, watch } from "vue";
|
||||
import { watch } from "vue";
|
||||
import type * as misskey from "firefish-js";
|
||||
import { getStaticImageUrl } from "@/scripts/get-static-image-url";
|
||||
import { extractAvgColorFromBlurhash } from "@/scripts/extract-avg-color-from-blurhash";
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { computed, ref, watch } from "vue";
|
||||
import { computed } from "vue";
|
||||
import type { CustomEmoji } from "firefish-js/built/entities";
|
||||
import { getStaticImageUrl } from "@/scripts/get-static-image-url";
|
||||
import { char2filePath } from "@/scripts/twemoji-base";
|
||||
|
|
|
|||
|
|
@ -30,8 +30,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
|
||||
const props = withDefaults(
|
||||
defineProps<{
|
||||
inline?: boolean;
|
||||
|
|
|
|||
|
|
@ -121,21 +121,10 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {
|
||||
computed,
|
||||
inject,
|
||||
nextTick,
|
||||
onMounted,
|
||||
onUnmounted,
|
||||
reactive,
|
||||
ref,
|
||||
shallowReactive,
|
||||
watch,
|
||||
} from "vue";
|
||||
import { inject, nextTick, onMounted, onUnmounted, ref, watch } from "vue";
|
||||
import MkFollowButton from "@/components/MkFollowButton.vue";
|
||||
import { popupMenu } from "@/os";
|
||||
import { scrollToTop } from "@/scripts/scroll";
|
||||
import { globalEvents } from "@/events";
|
||||
import { injectPageMetadata } from "@/scripts/page-metadata";
|
||||
import { $i, openAccountMenu as openAccountMenu_ } from "@/account";
|
||||
import { i18n } from "@/i18n";
|
||||
|
|
@ -182,7 +171,6 @@ const tabHighlightEl = $ref<HTMLElement | null>(null);
|
|||
const tabsEl = $ref<HTMLElement | null>(null);
|
||||
const bg = ref(null);
|
||||
let narrow = $ref(false);
|
||||
const height = ref(0);
|
||||
const hasTabs = $computed(() => props.tabs && props.tabs.length > 0);
|
||||
const hasActions = $computed(() => props.actions && props.actions.length > 0);
|
||||
const show = $computed(() => {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { inject, onMounted, onUnmounted, ref } from "vue";
|
||||
import { inject, onMounted, onUnmounted } from "vue";
|
||||
import { deviceKind } from "@/scripts/device-kind";
|
||||
import { ui } from "@/config";
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {} from "vue";
|
||||
import type * as misskey from "firefish-js";
|
||||
|
||||
const props = withDefaults(
|
||||
|
|
|
|||
|
|
@ -18,15 +18,7 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import {
|
||||
inject,
|
||||
nextTick,
|
||||
onBeforeUnmount,
|
||||
onMounted,
|
||||
onUnmounted,
|
||||
provide,
|
||||
watch,
|
||||
} from "vue";
|
||||
import { inject, onBeforeUnmount, provide } from "vue";
|
||||
import type { Resolved, Router } from "@/nirax";
|
||||
import { defaultStore } from "@/store";
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
|
||||
<script lang="ts">
|
||||
import { defineComponent, onMounted, PropType, Ref, ref } from "vue";
|
||||
import * as os from "@/os";
|
||||
import { CanvasBlock } from "@/scripts/hpml/block";
|
||||
import { Hpml } from "@/scripts/hpml/evaluator";
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@
|
|||
<script lang="ts">
|
||||
import { computed, defineComponent, PropType } from "vue";
|
||||
import MkButton from "../MkButton.vue";
|
||||
import * as os from "@/os";
|
||||
import { CounterVarBlock } from "@/scripts/hpml/block";
|
||||
import { Hpml } from "@/scripts/hpml/evaluator";
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,8 @@
|
|||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { defineComponent, PropType } from "vue";
|
||||
import { PropType } from "vue";
|
||||
import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
|
||||
import * as os from "@/os";
|
||||
import { ImageBlock } from "@/scripts/hpml/block";
|
||||
import { Hpml } from "@/scripts/hpml/evaluator";
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
<script lang="ts">
|
||||
import { computed, defineComponent, PropType } from "vue";
|
||||
import MkInput from "../form/input.vue";
|
||||
import * as os from "@/os";
|
||||
import { Hpml } from "@/scripts/hpml/evaluator";
|
||||
import { NumberInputVarBlock } from "@/scripts/hpml/block";
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
<script lang="ts">
|
||||
import { computed, defineComponent, PropType } from "vue";
|
||||
import MkRadio from "../form/radio.vue";
|
||||
import * as os from "@/os";
|
||||
import { Hpml } from "@/scripts/hpml/evaluator";
|
||||
import { RadioButtonVarBlock } from "@/scripts/hpml/block";
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
|
||||
<script lang="ts">
|
||||
import { defineComponent, defineAsyncComponent, PropType } from "vue";
|
||||
import * as os from "@/os";
|
||||
import { SectionBlock } from "@/scripts/hpml/block";
|
||||
import { Hpml } from "@/scripts/hpml/evaluator";
|
||||
|
||||
|
|
@ -59,8 +58,8 @@ export default defineComponent({
|
|||
margin: 0 0 0.5em 0;
|
||||
}
|
||||
|
||||
> .children {
|
||||
//padding 16px
|
||||
}
|
||||
// > .children {
|
||||
// padding: 16px;
|
||||
// }
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
<script lang="ts">
|
||||
import { computed, defineComponent, PropType } from "vue";
|
||||
import MkSwitch from "../form/switch.vue";
|
||||
import * as os from "@/os";
|
||||
import { Hpml } from "@/scripts/hpml/evaluator";
|
||||
import { SwitchVarBlock } from "@/scripts/hpml/block";
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
<script lang="ts">
|
||||
import { computed, defineComponent, PropType } from "vue";
|
||||
import MkInput from "../form/input.vue";
|
||||
import * as os from "@/os";
|
||||
import { Hpml } from "@/scripts/hpml/evaluator";
|
||||
import { TextInputVarBlock } from "@/scripts/hpml/block";
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,7 @@
|
|||
<script lang="ts">
|
||||
import { computed, defineComponent, PropType } from "vue";
|
||||
import MkTextarea from "../form/textarea.vue";
|
||||
import * as os from "@/os";
|
||||
import { Hpml } from "@/scripts/hpml/evaluator";
|
||||
import { HpmlTextInput } from "@/scripts/hpml";
|
||||
import { TextInputVarBlock } from "@/scripts/hpml/block";
|
||||
|
||||
export default defineComponent({
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { Directive } from "vue";
|
||||
import { defaultStore } from "@/store";
|
||||
// import { defaultStore } from "@/store";
|
||||
|
||||
export default {
|
||||
mounted(el, binding, vn) {
|
||||
|
|
|
|||
|
|
@ -339,8 +339,11 @@ const menu = (ev: MouseEvent) => {
|
|||
icon: "ph-info ph-bold ph-lg",
|
||||
text: i18n.ts.emojiPackCreator,
|
||||
action: () => {
|
||||
window.open("https://git.joinfirefish.org/firefish/emoji-gen", "_blank");
|
||||
}
|
||||
window.open(
|
||||
"https://git.joinfirefish.org/firefish/emoji-gen",
|
||||
"_blank",
|
||||
);
|
||||
},
|
||||
},
|
||||
],
|
||||
ev.currentTarget ?? ev.target,
|
||||
|
|
|
|||
Loading…
Reference in a new issue