From 42a08642a4c4b356d15cedf87b5c788c1fa47f91 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 3 Nov 2018 17:04:33 +0900
Subject: Misskeyのバージョンもクライアントの環境変数に突っ込むように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/admin/views/index.vue               | 22 ++++++++++++++++++++--
 src/client/app/common/scripts/check-for-update.ts  |  2 +-
 src/client/app/common/views/widgets/version.vue    |  2 +-
 src/client/app/config.ts                           |  2 ++
 .../app/desktop/views/components/settings.vue      |  2 +-
 src/client/app/init.ts                             |  2 +-
 src/client/app/mios.ts                             |  2 +-
 src/client/app/mobile/views/pages/settings.vue     |  2 +-
 8 files changed, 28 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/client/app/admin/views/index.vue b/src/client/app/admin/views/index.vue
index a1001f8c51..7614d2609a 100644
--- a/src/client/app/admin/views/index.vue
+++ b/src/client/app/admin/views/index.vue
@@ -16,6 +16,9 @@
 			<!-- <li @click="nav('drive')" :class="{ active: page == 'drive' }">%fa:cloud .fw%%i18n:common.drive%</li> -->
 			<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">%i18n:@update%</li> -->
 		</ul>
+		<div class="version">
+			<small>Misskey {{ version }}</small>
+		</div>
 	</nav>
 	<main>
 		<div v-show="page == 'dashboard'"><x-dashboard/></div>
@@ -32,6 +35,7 @@
 
 <script lang="ts">
 import Vue from "vue";
+import { version } from '../../config';
 import XDashboard from "./dashboard.vue";
 import XInstance from "./instance.vue";
 import XEmoji from "./emoji.vue";
@@ -50,7 +54,8 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			page: 'dashboard'
+			page: 'dashboard',
+			version
 		};
 	},
 	methods: {
@@ -98,6 +103,15 @@ export default Vue.extend({
 				white-space nowrap
 				font-size 15px
 
+		> .version
+			margin 16px
+			padding-top 16px
+			border-top solid 1px #555
+			text-align center
+
+			> small
+				opacity 0.7
+
 		> ul
 			margin 0
 			padding 0
@@ -110,10 +124,14 @@ export default Vue.extend({
 				margin 0
 				cursor pointer
 				user-select none
+				color #eee
 				transition margin-left 0.2s ease
 
+				&:hover
+					color #fff
+
 				> [data-fa]
-					margin-right 4px
+					margin-right 6px
 
 				&.active
 					margin-left 8px
diff --git a/src/client/app/common/scripts/check-for-update.ts b/src/client/app/common/scripts/check-for-update.ts
index 91b165b45d..a4c59fd350 100644
--- a/src/client/app/common/scripts/check-for-update.ts
+++ b/src/client/app/common/scripts/check-for-update.ts
@@ -1,5 +1,5 @@
 import MiOS from '../../mios';
-import { version as current } from '../../config';
+import { clientVersion as current } from '../../config';
 
 export default async function(mios: MiOS, force = false, silent = false) {
 	const meta = await mios.getMeta(force);
diff --git a/src/client/app/common/views/widgets/version.vue b/src/client/app/common/views/widgets/version.vue
index 30b632b396..eb2bb9972e 100644
--- a/src/client/app/common/views/widgets/version.vue
+++ b/src/client/app/common/views/widgets/version.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="ts">
-import { version, codename } from '../../../config';
+import { clientVersion as version, codename } from '../../../config';
 import define from '../../../common/define-widget';
 export default define({
 	name: 'version'
diff --git a/src/client/app/config.ts b/src/client/app/config.ts
index c3bc427eab..2abc3f7226 100644
--- a/src/client/app/config.ts
+++ b/src/client/app/config.ts
@@ -3,6 +3,7 @@ declare const _LANGS_: string;
 declare const _THEME_COLOR_: string;
 declare const _COPYRIGHT_: string;
 declare const _VERSION_: string;
+declare const _CLIENT_VERSION_: string;
 declare const _CODENAME_: string;
 declare const _ENV_: string;
 
@@ -18,5 +19,6 @@ export const langs = _LANGS_;
 export const themeColor = _THEME_COLOR_;
 export const copyright = _COPYRIGHT_;
 export const version = _VERSION_;
+export const clientVersion = _CLIENT_VERSION_;
 export const codename = _CODENAME_;
 export const env = _ENV_;
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 74cedf9ecc..4bc2f80479 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -291,7 +291,7 @@ import X2fa from './settings.2fa.vue';
 import XApps from './settings.apps.vue';
 import XSignins from './settings.signins.vue';
 import XTags from './settings.tags.vue';
-import { url, langs, version } from '../../../config';
+import { url, langs, clientVersion as version } from '../../../config';
 import checkForUpdate from '../../../common/scripts/check-for-update';
 
 export default Vue.extend({
diff --git a/src/client/app/init.ts b/src/client/app/init.ts
index fc09c3eeaf..d027a70597 100644
--- a/src/client/app/init.ts
+++ b/src/client/app/init.ts
@@ -14,7 +14,7 @@ import VueHotkey from './common/hotkey';
 import App from './app.vue';
 import checkForUpdate from './common/scripts/check-for-update';
 import MiOS, { API } from './mios';
-import { version, codename, lang } from './config';
+import { clientVersion as version, codename, lang } from './config';
 import { builtinThemes, lightTheme, applyTheme } from './theme';
 
 if (localStorage.getItem('theme') == null) {
diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index 4350b41806..6b10992c61 100644
--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@@ -4,7 +4,7 @@ import { EventEmitter } from 'eventemitter3';
 import * as uuid from 'uuid';
 
 import initStore from './store';
-import { apiUrl, version, lang } from './config';
+import { apiUrl, clientVersion as version, lang } from './config';
 import Progress from './common/scripts/loading';
 
 import Err from './common/views/components/connect-failed.vue';
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index a77f5d4c3a..267cfdb440 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -154,7 +154,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import { apiUrl, version, codename, langs } from '../../../config';
+import { apiUrl, clientVersion as version, codename, langs } from '../../../config';
 import checkForUpdate from '../../../common/scripts/check-for-update';
 
 export default Vue.extend({
-- 
cgit v1.2.3-freya