1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-13 22:28:58 +09:00
This commit is contained in:
syuilo 2018-12-11 21:17:57 +09:00
parent 6a97f0b7f6
commit 69f246ce7f
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
4 changed files with 23 additions and 14 deletions

View File

@ -1,10 +1,10 @@
<template> <template>
<figure> <figure class="megtcxgu">
<img :src="src" alt=""> <img :src="src" alt="">
<figcaption> <figcaption>
<h1><span>404</span></h1> <h1><span>Not found</span></h1>
<p><span>{{ $t('page-not-found') }}</span></p> <p><span>{{ $t('page-not-found') }}</span></p>
</figcaption> </figcaption>
</figure> </figure>
</template> </template>
@ -16,7 +16,7 @@ export default Vue.extend({
i18n: i18n('common/views/pages/404.vue'), i18n: i18n('common/views/pages/404.vue'),
data() { data() {
return { return {
src: '/assets/error.jpg' src: ''
} }
}, },
created() { created() {
@ -29,7 +29,7 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
figure .megtcxgu
align-items center align-items center
bottom 0 bottom 0
display flex display flex
@ -40,7 +40,10 @@ figure
right 0 right 0
top 0 top 0
figcaption > img
width 500px
> figcaption
margin 8px margin 8px
h1, h1,
@ -53,10 +56,10 @@ figure
position relative position relative
width 100% width 100%
@media (max-width: 767px) @media (max-width: 767px)
figure
flex-flow column flex-flow column
figcaption > figcaption
text-align center text-align center
</style> </style>

View File

@ -18,7 +18,8 @@ const defaultMeta: any = {
enableDiscordIntegration: false, enableDiscordIntegration: false,
enableExternalUserRecommendation: false, enableExternalUserRecommendation: false,
externalUserRecommendationEngine: "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}", externalUserRecommendationEngine: "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-misskey-api.cgi?{{host}}+{{user}}+{{limit}}+{{offset}}",
externalUserRecommendationTimeout: 300000 externalUserRecommendationTimeout: 300000,
errorImageUrl: 'https://ai.misskey.xyz/aiart/yubitun.png'
}; };
export default async function(): Promise<IMeta> { export default async function(): Promise<IMeta> {

View File

@ -443,6 +443,10 @@ export default define(meta, (ps) => new Promise(async (res, rej) => {
set.smtpPass = ps.smtpPass; set.smtpPass = ps.smtpPass;
} }
if (ps.errorImageUrl !== undefined) {
set.errorImageUrl = ps.errorImageUrl;
}
await Meta.update({}, { await Meta.update({}, {
$set: set $set: set
}, { upsert: true }); }, { upsert: true });

View File

@ -65,6 +65,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
recaptchaSiteKey: instance.recaptchaSiteKey, recaptchaSiteKey: instance.recaptchaSiteKey,
swPublickey: config.sw ? config.sw.public_key : null, swPublickey: config.sw ? config.sw.public_key : null,
bannerUrl: instance.bannerUrl, bannerUrl: instance.bannerUrl,
errorImageUrl: instance.errorImageUrl,
maxNoteTextLength: instance.maxNoteTextLength, maxNoteTextLength: instance.maxNoteTextLength,
emojis: emojis, emojis: emojis,
enableEmail: instance.enableEmail, enableEmail: instance.enableEmail,