summaryrefslogtreecommitdiff
path: root/packages/frontend/src/pages
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-02-22 15:28:17 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-02-22 15:28:17 +0900
commit0fb9c372ddec7d5284d6402625cbaffc9ac7eb0b (patch)
treedfae9acf6103f3bb7a2bd0300326183659b3a29f /packages/frontend/src/pages
parentimprove performance of some tests (diff)
downloadmisskey-0fb9c372ddec7d5284d6402625cbaffc9ac7eb0b.tar.gz
misskey-0fb9c372ddec7d5284d6402625cbaffc9ac7eb0b.tar.bz2
misskey-0fb9c372ddec7d5284d6402625cbaffc9ac7eb0b.zip
lint
Diffstat (limited to 'packages/frontend/src/pages')
-rw-r--r--packages/frontend/src/pages/admin/_header_.vue2
-rw-r--r--packages/frontend/src/pages/auth.vue15
-rw-r--r--packages/frontend/src/pages/settings/profile.vue10
3 files changed, 14 insertions, 13 deletions
diff --git a/packages/frontend/src/pages/admin/_header_.vue b/packages/frontend/src/pages/admin/_header_.vue
index 599b16e465..372c63ff4c 100644
--- a/packages/frontend/src/pages/admin/_header_.vue
+++ b/packages/frontend/src/pages/admin/_header_.vue
@@ -113,7 +113,7 @@ function onTabClick(tab: Tab, ev: MouseEvent): void {
}
const calcBg = () => {
- const rawBg = metadata?.bg || 'var(--bg)';
+ const rawBg = metadata?.bg ?? 'var(--bg)';
const tinyBg = tinycolor(rawBg.startsWith('var(') ? getComputedStyle(document.documentElement).getPropertyValue(rawBg.slice(4, -1)) : rawBg);
tinyBg.setAlpha(0.85);
bg.value = tinyBg.toRgbString();
diff --git a/packages/frontend/src/pages/auth.vue b/packages/frontend/src/pages/auth.vue
index 50afffc460..4f8afb9ea2 100644
--- a/packages/frontend/src/pages/auth.vue
+++ b/packages/frontend/src/pages/auth.vue
@@ -1,12 +1,12 @@
<template>
<MkStickyContainer>
- <template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs" /></template>
+ <template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
<MkSpacer :content-max="500">
<div v-if="state == 'fetch-session-error'">
<p>{{ i18n.ts.somethingHappened }}</p>
</div>
<div v-else-if="$i && !session">
- <MkLoading />
+ <MkLoading/>
</div>
<div v-else-if="$i && session">
<XForm
@@ -21,15 +21,16 @@
</div>
<div v-if="state == 'accepted' && session">
<h1>{{ session.app.isAuthorized ? $t('already-authorized') : i18n.ts.allowed }}</h1>
- <p v-if="session.app.callbackUrl">{{ i18n.ts._auth.callback }}
- <MkEllipsis />
+ <p v-if="session.app.callbackUrl">
+ {{ i18n.ts._auth.callback }}
+ <MkEllipsis/>
</p>
<p v-if="!session.app.callbackUrl">{{ i18n.ts._auth.pleaseGoBack }}</p>
</div>
</div>
<div v-else>
<p :class="$style.loginMessage">{{ i18n.ts._auth.pleaseLogin }}</p>
- <MkSignin @login="onLogin" />
+ <MkSignin @login="onLogin"/>
</div>
</MkSpacer>
</MkStickyContainer>
@@ -37,12 +38,12 @@
<script lang="ts" setup>
import { onMounted } from 'vue';
+import { AuthSession } from 'misskey-js/built/entities';
import XForm from './auth.form.vue';
import MkSignin from '@/components/MkSignin.vue';
import * as os from '@/os';
import { $i, login } from '@/account';
import { definePageMetadata } from '@/scripts/page-metadata';
-import { AuthSession } from 'misskey-js/built/entities';
import { i18n } from '@/i18n';
const props = defineProps<{
@@ -82,7 +83,7 @@ onMounted(async () => {
} else {
state = 'waiting';
}
- } catch (e) {
+ } catch (err) {
state = 'fetch-session-error';
}
});
diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue
index a492a82588..41563c441f 100644
--- a/packages/frontend/src/pages/settings/profile.vue
+++ b/packages/frontend/src/pages/settings/profile.vue
@@ -124,11 +124,11 @@ function saveFields() {
function save() {
os.apiWithDialog('i/update', {
- name: profile.name || null,
- description: profile.description || null,
- location: profile.location || null,
- birthday: profile.birthday || null,
- lang: profile.lang || null,
+ name: profile.name ?? null,
+ description: profile.description ?? null,
+ location: profile.location ?? null,
+ birthday: profile.birthday ?? null,
+ lang: profile.lang ?? null,
isBot: !!profile.isBot,
isCat: !!profile.isCat,
showTimelineReplies: !!profile.showTimelineReplies,