From 779db446cf3e0caf8792d291f87527b6285c030d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 5 Dec 2018 17:27:27 +0900
Subject: [PATCH] [Client] Resolve #3500

---
 locales/ja-JP.yml                             |  5 --
 .../app/common/views/widgets/donation.vue     | 56 -------------------
 src/client/app/common/views/widgets/index.ts  |  2 -
 .../app/desktop/views/components/home.vue     |  2 -
 .../views/pages/deck/deck.widgets-column.vue  |  1 -
 src/client/app/mobile/views/pages/widgets.vue |  4 --
 src/client/theme/dark.json5                   |  3 -
 src/client/theme/light.json5                  |  3 -
 8 files changed, 76 deletions(-)
 delete mode 100644 src/client/app/common/views/widgets/donation.vue

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 139a8ab3d..f975527d6 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -171,7 +171,6 @@ common:
     polls: "アンケート"
     post-form: "投稿フォーム"
     server: "サーバー情報"
-    donation: "寄付のお願い"
     nav: "ナビゲーション"
     tips: "ヒント"
     hashtags: "ハッシュタグ"
@@ -530,10 +529,6 @@ common/views/widgets/calendar.vue:
   this-month: "今月:"
   this-year: "今年:"
 
-common/views/widgets/donation.vue:
-  title: "寄付のお願い"
-  text: "Misskeyの運営にはドメイン、サーバー等のコストが掛かります。Misskeyは広告を掲載したりしないため、収入を皆様からの寄付に頼っています。もしご興味があれば、{}までご連絡ください。ご協力ありがとうございます。"
-
 common/views/widgets/photo-stream.vue:
   title: "フォトストリーム"
   no-photos: "写真はありません"
diff --git a/src/client/app/common/views/widgets/donation.vue b/src/client/app/common/views/widgets/donation.vue
deleted file mode 100644
index 057813891..000000000
--- a/src/client/app/common/views/widgets/donation.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-<div>
-	<mk-widget-container :show-header="false">
-		<article class="dolfvtibguprpxxhfndqaosjitixjohx">
-			<h1><fa icon="heart"/>{{ $t('title') }}</h1>
-			<p v-if="meta">
-				{{ this.$t('text').substr(0, this.$t('text').indexOf('{')) }}
-				<a :href="'mailto:' + meta.maintainer.email">{{ meta.maintainer.name }}</a>
-				{{ this.$t('text').substr(this.$t('text').indexOf('}') + 1) }}
-			</p>
-		</article>
-	</mk-widget-container>
-</div>
-</template>
-
-<script lang="ts">
-import define from '../../../common/define-widget';
-import i18n from '../../../i18n';
-
-export default define({
-	name: 'donation'
-}).extend({
-	i18n: i18n('common/views/widgets/donation.vue'),
-	data() {
-		return {
-			meta: null
-		};
-	},
-	created() {
-		this.$root.getMeta().then(meta => {
-			this.meta = meta;
-		});
-	}
-});
-</script>
-
-<style lang="stylus" scoped>
-.dolfvtibguprpxxhfndqaosjitixjohx
-	padding 20px
-	background var(--donationBg)
-	color var(--donationFg)
-
-	> h1
-		margin 0 0 5px 0
-		font-size 1em
-
-		> [data-icon]
-			margin-right 0.25em
-
-	> p
-		display block
-		z-index 1
-		margin 0
-		font-size 0.8em
-
-</style>
diff --git a/src/client/app/common/views/widgets/index.ts b/src/client/app/common/views/widgets/index.ts
index 7d548ef35..7fca79f1f 100644
--- a/src/client/app/common/views/widgets/index.ts
+++ b/src/client/app/common/views/widgets/index.ts
@@ -11,7 +11,6 @@ import wCalendar from './calendar.vue';
 import wPhotoStream from './photo-stream.vue';
 import wSlideshow from './slideshow.vue';
 import wTips from './tips.vue';
-import wDonation from './donation.vue';
 import wNav from './nav.vue';
 import wHashtags from './hashtags.vue';
 
@@ -21,7 +20,6 @@ Vue.component('mkw-calendar', wCalendar);
 Vue.component('mkw-photo-stream', wPhotoStream);
 Vue.component('mkw-slideshow', wSlideshow);
 Vue.component('mkw-tips', wTips);
-Vue.component('mkw-donation', wDonation);
 Vue.component('mkw-broadcast', wBroadcast);
 Vue.component('mkw-server', wServer);
 Vue.component('mkw-posts-monitor', wPostsMonitor);
diff --git a/src/client/app/desktop/views/components/home.vue b/src/client/app/desktop/views/components/home.vue
index 9ebab08a9..cc0b48e89 100644
--- a/src/client/app/desktop/views/components/home.vue
+++ b/src/client/app/desktop/views/components/home.vue
@@ -26,7 +26,6 @@
 					<option value="hashtags">{{ $t('@.widgets.hashtags') }}</option>
 					<option value="posts-monitor">{{ $t('@.widgets.posts-monitor') }}</option>
 					<option value="server">{{ $t('@.widgets.server') }}</option>
-					<option value="donation">{{ $t('@.widgets.donation') }}</option>
 					<option value="nav">{{ $t('@.widgets.nav') }}</option>
 					<option value="tips">{{ $t('@.widgets.tips') }}</option>
 				</select>
@@ -95,7 +94,6 @@ const defaultDesktopHomeWidgets = {
 		'users',
 		'polls',
 		'server',
-		'donation',
 		'nav',
 		'tips'
 	]
diff --git a/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue b/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
index 2cdef5099..0798e2ccc 100644
--- a/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
@@ -26,7 +26,6 @@
 					<option value="hashtags">{{ $t('@.widgets.hashtags') }}</option>
 					<option value="posts-monitor">{{ $t('@.widgets.posts-monitor') }}</option>
 					<option value="server">{{ $t('@.widgets.server') }}</option>
-					<option value="donation">{{ $t('@.widgets.donation') }}</option>
 					<option value="nav">{{ $t('@.widgets.nav') }}</option>
 					<option value="tips">{{ $t('@.widgets.tips') }}</option>
 				</select>
diff --git a/src/client/app/mobile/views/pages/widgets.vue b/src/client/app/mobile/views/pages/widgets.vue
index 8db5399cf..d28a97dbc 100644
--- a/src/client/app/mobile/views/pages/widgets.vue
+++ b/src/client/app/mobile/views/pages/widgets.vue
@@ -20,7 +20,6 @@
 					<option value="version">{{ $t('@.widgets.version') }}</option>
 					<option value="server">{{ $t('@.widgets.server') }}</option>
 					<option value="memo">{{ $t('@.widgets.memo') }}</option>
-					<option value="donation">{{ $t('@.widgets.donation') }}</option>
 					<option value="nav">{{ $t('@.widgets.nav') }}</option>
 					<option value="tips">{{ $t('@.widgets.tips') }}</option>
 				</select>
@@ -89,9 +88,6 @@ export default Vue.extend({
 			}, {
 				name: 'photo-stream',
 				id: 'd', data: {}
-			}, {
-				name: 'donation',
-				id: 'e', data: {}
 			}, {
 				name: 'nav',
 				id: 'f', data: {}
diff --git a/src/client/theme/dark.json5 b/src/client/theme/dark.json5
index 446eac557..4445fe5c4 100644
--- a/src/client/theme/dark.json5
+++ b/src/client/theme/dark.json5
@@ -111,9 +111,6 @@
 		announcementsTitle: '#539eff',
 		announcementsText: '#fff',
 
-		donationBg: '#5d5242',
-		donationFg: '#e4dbce',
-
 		googleSearchBg: 'rgba(0, 0, 0, 0.2)',
 		googleSearchFg: '#dee4e8',
 		googleSearchBorder: 'rgba(255, 255, 255, 0.2)',
diff --git a/src/client/theme/light.json5 b/src/client/theme/light.json5
index 4a182c242..520dd768d 100644
--- a/src/client/theme/light.json5
+++ b/src/client/theme/light.json5
@@ -111,9 +111,6 @@
 		announcementsTitle: '#4078c0',
 		announcementsText: '#57616f',
 
-		donationBg: '#fbead4',
-		donationFg: '#777d71',
-
 		googleSearchBg: '#fff',
 		googleSearchFg: '#55595c',
 		googleSearchBorder: 'rgba(0, 0, 0, 0.2)',