mirror of
https://github.com/paricafe/misskey.git
synced 2024-12-04 20:56:44 -06:00
a6a91fec3a
* add: safeFloatParserを追加 * fix: 欠けていた型を追加 * refactor: pageBlockTypesをjson-schemaに移植 * refactor: components/global内の型エラーが出ている箇所を修正 * lint: fix null check style * refactor: fix type error * refactor: fix some type errors * fix: 翻訳が抜けていた箇所を修正 * refactor: getJsonSchemaで正しいスキーマが返されるように修正 * fix: MkChartの型エラーとbytesオプションが機能していない問題を修正 * fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正 * refactor: fix some type errors * change: Captcha読み込み中の文言をLoadingに変更 * refactor(backend/misskey-js): MainEventの型を改善 * refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正 * update: misskey-js.api.md * refactor: fix some type errors * fix: backendのtypecheckが落ちていたのを修正 * update: misskey-js.api.md * add: json-schemaのnoteにpollの型定義を追加 * refactor: noteのjson-schemaの型を改善 * refactor: MkPoll * refactor: fix some type errors * change: UserLiteにisLockedを持たせるように * fix: notificationスキーマにroleが含まれていないのを修正 * Revert "change: UserLiteにisLockedを持たせるように" This reverts commit 1bb0c8e7a9b19a4e9f21bf7381712b98f27672a5. * fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正 * refactor: noteスキーマのvisibilityにenumを追加 * change: deepCloneのCloneableTypeにundefinedを追加 * refactor: fix some type errors * refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え * enhance: API 'retension' のresponseの型を追加 * fix: Chart関連のtooltipが正しい位置に表示されない問題を修正 * refactor: fix some type errors * fix: 型情報が不足していたのを修正 * enhance: announcementスキーマにenumを追加 * enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植 * refactor: policiesを`ref: RolePolicies`に統一 * fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正 * refactor: fix some type errors * fix: backendのlintが落ちているのを修正 * fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正 * fix: backendのtypecheckが落ちているのを修正 * update: run build-misskey-js-with-types * fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正 * update: CHANGELOG.md * refactor: MkUserSelectDialogの型を改善 * fix: deepCloneでundefinedはcloneしないように (#9207) * change: frontendのcloneをbackend側にも反映 * update: CHANGELOG.md * fix: RoleServiceからPackを通して型RolePoliciesに依存させないように * Update packages/frontend/src/scripts/get-note-summary.ts * revert RoleService.ts changes * change: optional chaining -> non-null assertion * remove: unused import * fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正 * change: fix null check style * refactor: fix type error * change: fix null check style * Update packages/frontend/src/components/MkDrive.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: css moduleでglobalを使わないように * refactor: roleのiconUrlは必ず存在するものとして扱うように * enhance: MenuButtonのactiveにcomputedを受け付けられるように * Update packages/frontend/src/components/MkNotePreview.vue * Update MkWindow.vue * refactor: notification.noteは必ず存在するものとして扱うように * Update packages/frontend/src/components/MkNotification.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正 * Update packages/frontend/src/scripts/clone.ts Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: 不要な返り値の型を削除 * refactor: 不要なnullチェックを削除 * update: misskey-js-autogen * update: clone.ts * refactor * Update MkNotification.vue * Update MkNotification.vue * ✌️ * Update MkNotification.vue * Update MkNotification.vue * Update MkNotification.vue * Update MkNotifications.vue * Update MkUserSetupDialog.Profile.vue * Update MkUserCardMini.vue * ✌️ * Update MkMenu.vue --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
192 lines
6 KiB
Vue
192 lines
6 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<div>
|
|
<div :class="$style.banner">
|
|
<i class="ti ti-checklist"></i>
|
|
</div>
|
|
<MkSpacer :marginMin="20" :marginMax="28">
|
|
<div class="_gaps_m">
|
|
<div v-if="instance.disableRegistration">
|
|
<MkInfo warn>{{ i18n.ts.invitationRequiredToRegister }}</MkInfo>
|
|
</div>
|
|
|
|
<div style="text-align: center;">
|
|
<div>{{ i18n.ts.pleaseConfirmBelowBeforeSignup }}</div>
|
|
<div style="font-weight: bold; margin-top: 0.5em;">{{ i18n.ts.beSureToReadThisAsItIsImportant }}</div>
|
|
</div>
|
|
|
|
<MkFolder v-if="availableServerRules" :defaultOpen="true">
|
|
<template #label>{{ i18n.ts.serverRules }}</template>
|
|
<template #suffix><i v-if="agreeServerRules" class="ti ti-check" style="color: var(--success)"></i></template>
|
|
|
|
<ol class="_gaps_s" :class="$style.rules">
|
|
<li v-for="item in instance.serverRules" :class="$style.rule"><div :class="$style.ruleText" v-html="item"></div></li>
|
|
</ol>
|
|
|
|
<MkSwitch :modelValue="agreeServerRules" style="margin-top: 16px;" @update:modelValue="updateAgreeServerRules">{{ i18n.ts.agree }}</MkSwitch>
|
|
</MkFolder>
|
|
|
|
<MkFolder v-if="availableTos || availablePrivacyPolicy" :defaultOpen="true">
|
|
<template #label>{{ tosPrivacyPolicyLabel }}</template>
|
|
<template #suffix><i v-if="agreeTosAndPrivacyPolicy" class="ti ti-check" style="color: var(--success)"></i></template>
|
|
<div class="_gaps_s">
|
|
<div v-if="availableTos"><a :href="instance.tosUrl ?? undefined" class="_link" target="_blank">{{ i18n.ts.termsOfService }} <i class="ti ti-external-link"></i></a></div>
|
|
<div v-if="availablePrivacyPolicy"><a :href="instance.privacyPolicyUrl ?? undefined" class="_link" target="_blank">{{ i18n.ts.privacyPolicy }} <i class="ti ti-external-link"></i></a></div>
|
|
</div>
|
|
|
|
<MkSwitch :modelValue="agreeTosAndPrivacyPolicy" style="margin-top: 16px;" @update:modelValue="updateAgreeTosAndPrivacyPolicy">{{ i18n.ts.agree }}</MkSwitch>
|
|
</MkFolder>
|
|
|
|
<MkFolder :defaultOpen="true">
|
|
<template #label>{{ i18n.ts.basicNotesBeforeCreateAccount }}</template>
|
|
<template #suffix><i v-if="agreeNote" class="ti ti-check" style="color: var(--success)"></i></template>
|
|
|
|
<a href="https://misskey-hub.net/docs/for-users/onboarding/warning/" class="_link" target="_blank">{{ i18n.ts.basicNotesBeforeCreateAccount }} <i class="ti ti-external-link"></i></a>
|
|
|
|
<MkSwitch :modelValue="agreeNote" style="margin-top: 16px;" data-cy-signup-rules-notes-agree @update:modelValue="updateAgreeNote">{{ i18n.ts.agree }}</MkSwitch>
|
|
</MkFolder>
|
|
|
|
<div v-if="!agreed" style="text-align: center;">{{ i18n.ts.pleaseAgreeAllToContinue }}</div>
|
|
|
|
<div class="_buttonsCenter">
|
|
<MkButton inline rounded @click="emit('cancel')">{{ i18n.ts.cancel }}</MkButton>
|
|
<MkButton inline primary rounded gradate :disabled="!agreed" data-cy-signup-rules-continue @click="emit('done')">{{ i18n.ts.continue }} <i class="ti ti-arrow-right"></i></MkButton>
|
|
</div>
|
|
</div>
|
|
</MkSpacer>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { computed, ref } from 'vue';
|
|
import { instance } from '@/instance.js';
|
|
import { i18n } from '@/i18n.js';
|
|
import MkButton from '@/components/MkButton.vue';
|
|
import MkFolder from '@/components/MkFolder.vue';
|
|
import MkSwitch from '@/components/MkSwitch.vue';
|
|
import MkInfo from '@/components/MkInfo.vue';
|
|
import * as os from '@/os.js';
|
|
|
|
const availableServerRules = instance.serverRules.length > 0;
|
|
const availableTos = instance.tosUrl != null && instance.tosUrl !== '';
|
|
const availablePrivacyPolicy = instance.privacyPolicyUrl != null && instance.privacyPolicyUrl !== '';
|
|
|
|
const agreeServerRules = ref(false);
|
|
const agreeTosAndPrivacyPolicy = ref(false);
|
|
const agreeNote = ref(false);
|
|
|
|
const agreed = computed(() => {
|
|
return (!availableServerRules || agreeServerRules.value) && ((!availableTos && !availablePrivacyPolicy) || agreeTosAndPrivacyPolicy.value) && agreeNote.value;
|
|
});
|
|
|
|
const emit = defineEmits<{
|
|
(ev: 'cancel'): void;
|
|
(ev: 'done'): void;
|
|
}>();
|
|
|
|
const tosPrivacyPolicyLabel = computed(() => {
|
|
if (availableTos && availablePrivacyPolicy) {
|
|
return i18n.ts.tosAndPrivacyPolicy;
|
|
} else if (availableTos) {
|
|
return i18n.ts.termsOfService;
|
|
} else if (availablePrivacyPolicy) {
|
|
return i18n.ts.privacyPolicy;
|
|
} else {
|
|
return '';
|
|
}
|
|
});
|
|
|
|
async function updateAgreeServerRules(v: boolean) {
|
|
if (v) {
|
|
const confirm = await os.confirm({
|
|
type: 'question',
|
|
title: i18n.ts.doYouAgree,
|
|
text: i18n.tsx.iHaveReadXCarefullyAndAgree({ x: i18n.ts.serverRules }),
|
|
});
|
|
if (confirm.canceled) return;
|
|
agreeServerRules.value = true;
|
|
} else {
|
|
agreeServerRules.value = false;
|
|
}
|
|
}
|
|
|
|
async function updateAgreeTosAndPrivacyPolicy(v: boolean) {
|
|
if (v) {
|
|
const confirm = await os.confirm({
|
|
type: 'question',
|
|
title: i18n.ts.doYouAgree,
|
|
text: i18n.tsx.iHaveReadXCarefullyAndAgree({
|
|
x: tosPrivacyPolicyLabel.value,
|
|
}),
|
|
});
|
|
if (confirm.canceled) return;
|
|
agreeTosAndPrivacyPolicy.value = true;
|
|
} else {
|
|
agreeTosAndPrivacyPolicy.value = false;
|
|
}
|
|
}
|
|
|
|
async function updateAgreeNote(v: boolean) {
|
|
if (v) {
|
|
const confirm = await os.confirm({
|
|
type: 'question',
|
|
title: i18n.ts.doYouAgree,
|
|
text: i18n.tsx.iHaveReadXCarefullyAndAgree({ x: i18n.ts.basicNotesBeforeCreateAccount }),
|
|
});
|
|
if (confirm.canceled) return;
|
|
agreeNote.value = true;
|
|
} else {
|
|
agreeNote.value = false;
|
|
}
|
|
}
|
|
</script>
|
|
|
|
<style lang="scss" module>
|
|
.banner {
|
|
padding: 16px;
|
|
text-align: center;
|
|
font-size: 26px;
|
|
background-color: var(--accentedBg);
|
|
color: var(--accent);
|
|
}
|
|
|
|
.rules {
|
|
counter-reset: item;
|
|
list-style: none;
|
|
padding: 0;
|
|
margin: 0;
|
|
}
|
|
|
|
.rule {
|
|
display: flex;
|
|
gap: 8px;
|
|
word-break: break-word;
|
|
|
|
&::before {
|
|
flex-shrink: 0;
|
|
display: flex;
|
|
position: sticky;
|
|
top: calc(var(--stickyTop, 0px) + 8px);
|
|
counter-increment: item;
|
|
content: counter(item);
|
|
width: 32px;
|
|
height: 32px;
|
|
line-height: 32px;
|
|
background-color: var(--accentedBg);
|
|
color: var(--accent);
|
|
font-size: 13px;
|
|
font-weight: bold;
|
|
align-items: center;
|
|
justify-content: center;
|
|
border-radius: 999px;
|
|
}
|
|
}
|
|
|
|
.ruleText {
|
|
padding-top: 6px;
|
|
}
|
|
</style>
|