kaslo/pawkey-sk
1
0
Fork 0
mirror of https://git.boykissers.com/pawkey/pawkey-sk.git synced 2025-12-20 04:04:16 +00:00
Code Packages Activity

fix: temp fix for approval email issue

Browse Source
This commit is contained in:
Leafus
2025-05-19 16:36:41 +00:00
committed by Bluey Heeler
parent e42e7e1e94
commit 5a5914be8d
3 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/src/components/MkSignupDialog.form.vue
View File

@@ -301,7 +301,7 @@ async function onSubmit(): Promise<void> {
os.alert({ os.alert({
type: 'success', type: 'success',
title: i18n.ts._signup.almostThere, title: i18n.ts._signup.almostThere,
text: i18n.tsx._signup.emailSent({ email: email.value }), text: i18n.ts._signup.approvalPending,
}); });
emit('signupEmailPending'); emit('signupEmailPending');
} else if (instance.approvalRequiredForSignup) { } else if (instance.approvalRequiredForSignup) {

49
packages/frontend/src/components/MkVisitorDashboard.vue
View File

@@ -4,38 +4,25 @@ SPDX-License-Identifier: AGPL-3.0-only
--> -->
<template> <template>
<div v-if="instance" :class="$style.root">
<PwVisitorMusic/> <PwVisitorMusic/>
<div v-if="instance" :class="$style.root"> <div :class="[$style.main, $style.panel]">
<div :class="[$style.main, $style.panel]"> <img
<img :src="instance.sidebarLogoUrl || instance.iconUrl || '/apple-touch-icon.png'" alt="" :src="instance.sidebarLogoUrl || instance.iconUrl || '/apple-touch-icon.png'" alt=""
:class="instance.sidebarLogoUrl ? $style.wideIcon : $style.mainIcon" /> :class="instance.sidebarLogoUrl ? $style.wideIcon : $style.mainIcon"
<button class="_button _acrylic" :class="$style.mainMenu" @click="showMenu"><i />
class="ti ti-dots"></i></button> <button class="_button _acrylic" :class="$style.mainMenu" @click="showMenu">
<div :class="$style.mainFg"> <i class="ti ti-dots"></i>
<h1 :class="$style.mainTitle"> </button>
<!-- 背景色によってはロゴが見えなくなるのでとりあえず無効に --> <div :class="$style.mainFg">
<!-- <img class="logo" v-if="instance.logoImageUrl" :src="instance.logoImageUrl"><span v-else class="text">{{ instanceName }}</span> --> <h1 :class="$style.mainTitle">
<span>{{ instanceName }}</span> <!-- 背景色によってはロゴが見えなくなるのでとりあえず無効に -->
</h1> <!-- <img class="logo" v-if="instance.logoImageUrl" :src="instance.logoImageUrl"><span v-else class="text">{{ instanceName }}</span> -->
<div :class="$style.mainAbout"> <span>{{ instanceName }}</span>
<!-- eslint-disable-next-line vue/no-v-html --> </h1>
<div v-html="sanitizeHtml(instance.description) || i18n.ts.headlineMisskey"></div> <div :class="$style.mainAbout">
</div> <!-- eslint-disable-next-line vue/no-v-html -->
<div v-if="instance.disableRegistration || instance.federation !== 'all'" :class="$style.mainWarn" <div v-html="sanitizeHtml(instance.description) || i18n.ts.headlineMisskey"></div>
class="_gaps_s">
<MkInfo v-if="instance.disableRegistration" warn>{{ i18n.ts.invitationRequiredToRegister }}</MkInfo>
<MkInfo v-if="instance.federation === 'specified'" warn>{{ i18n.ts.federationSpecified }}</MkInfo>
<MkInfo v-else-if="instance.federation === 'none'" warn>{{ i18n.ts.federationDisabled }}</MkInfo>
</div>
<div v-if="instance.approvalRequiredForSignup" :class="$style.mainWarn">
<MkInfo warn>{{ i18n.ts.approvalRequiredToRegister }}</MkInfo>
</div>
<div class="_gaps_s" :class="$style.mainActions">
<MkButton :class="$style.mainAction" full rounded gradate data-cy-signup style="margin-right: 12px;"
@click="signup()">{{ i18n.ts.joinThisServer }}</MkButton>
<MkButton :class="$style.mainAction" full rounded data-cy-signin @click="signin()">{{ i18n.ts.login
}}</MkButton>
</div>
</div> </div>
<div <div
v-if="instance.disableRegistration || instance.federation !== 'all'" :class="$style.mainWarn" v-if="instance.disableRegistration || instance.federation !== 'all'" :class="$style.mainWarn"

2
packages/frontend/src/pages/welcome.entrance.a.vue
View File

@@ -35,8 +35,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup> <script lang="ts" setup>
import { ref } from 'vue'; import { ref } from 'vue';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import XTimeline from './welcome.timeline.vue';
import MarqueeText from '@/components/MkMarquee.vue';
import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue'; import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
import misskeysvg from '/client-assets/pawkey.png'; import misskeysvg from '/client-assets/pawkey.png';
import { misskeyApiGet } from '@/scripts/misskey-api.js'; import { misskeyApiGet } from '@/scripts/misskey-api.js';