Merge branch 'develop' into sw-msg

2021-01-23 22:16:26 +09:00
parent b44b8ff953 bce65e2140
commit 6e8caf7966
26 changed files with 771 additions and 94 deletions
--- a/src/client/components/note-detailed.vue
+++ b/src/client/components/note-detailed.vue
@@ -52,10 +52,10 @@
 					<span class="localOnly" v-if="appearNote.localOnly"><Fa :icon="faBiohazard"/></span>
 				</div>
 				<div class="username"><MkAcct :user="appearNote.user"/></div>
+				<MkInstanceTicker class="ticker" :instance="appearNote.user.instance"/>
 			</div>
 		</header>
 		<div class="main">
-			<MkInstanceTicker v-if="showTicker" class="ticker" :instance="appearNote.user.instance"/>
 			<div class="body">
 				<p v-if="appearNote.cw != null" class="cw">
 					<Mfm v-if="appearNote.cw != ''" class="text" :text="appearNote.cw" :author="appearNote.user" :i="$i" :custom-emojis="appearNote.emojis"/>
@@ -1005,6 +1005,7 @@ export default defineComponent({
 				flex-direction: column;
 				justify-content: center;
 				padding-left: 16px;
+				font-size: 0.95em;

 				> .top {
 					> .name {
--- a/src/client/pages/settings/drive.vue
+++ b/src/client/pages/settings/drive.vue
@@ -1,33 +1,97 @@
 <template>
-<section class="uawsfosz _section">
-	<div class="_title"><Fa :icon="faCloud"/> {{ $ts.drive }}</div>
-	<div class="_content">
-		<span>{{ $ts.uploadFolder }}: {{ uploadFolder ? uploadFolder.name : '-' }}</span>
-		<MkButton primary @click="chooseUploadFolder()"><Fa :icon="faFolderOpen"/> {{ $ts.selectFolder }}</MkButton>
+<FormBase class="">
+	<FormGroup v-if="!fetching">
+		<template #label>{{ $ts.usageAmount }}</template>
+		<div class="_formItem uawsfosz">
+			<div class="_formPanel">
+				<div class="meter"><div :style="meterStyle"></div></div>
+			</div>
+		</div>
+		<FormKeyValueView>
+			<template #key>{{ $ts.capacity }}</template>
+			<template #value>{{ bytes(capacity, 1) }}</template>
+		</FormKeyValueView>
+		<FormKeyValueView>
+			<template #key>{{ $ts.inUse }}</template>
+			<template #value>{{ bytes(usage, 1) }}</template>
+		</FormKeyValueView>
+	</FormGroup>
+
+	<div class="_formItem">
+		<div class="_formLabel">{{ $ts.statistics }}</div>
+		<div class="_formPanel">
+			<div ref="chart"></div>
+		</div>
 	</div>
-</section>
+
+	<FormButton :center="false" @click="chooseUploadFolder()" primary>
+		{{ $ts.uploadFolder }}
+		<template #suffix>{{ uploadFolder ? uploadFolder.name : '-' }}</template>
+		<template #suffixIcon><Fa :icon="faFolderOpen"/></template>
+	</FormButton>
+</FormBase>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
+import * as tinycolor from 'tinycolor2';
+import ApexCharts from 'apexcharts';
 import { faCloud, faFolderOpen } from '@fortawesome/free-solid-svg-icons';
 import { faClock, faEyeSlash, faTrashAlt } from '@fortawesome/free-regular-svg-icons';
-import MkButton from '@/components/ui/button.vue';
+import FormButton from '@/components/form/button.vue';
+import FormGroup from '@/components/form/group.vue';
+import FormKeyValueView from '@/components/form/key-value-view.vue';
+import FormBase from '@/components/form/base.vue';
 import * as os from '@/os';
+import bytes from '@/filters/bytes';

 export default defineComponent({
 	components: {
-		MkButton,
+		FormBase,
+		FormButton,
+		FormGroup,
+		FormKeyValueView,
 	},

+	emits: ['info'],
+
 	data() {
 		return {
+			INFO: {
+				title: this.$ts.drive,
+				icon: faCloud
+			},
+			fetching: true,
+			usage: null,
+			capacity: null,
 			uploadFolder: null,
 			faCloud, faClock, faEyeSlash, faFolderOpen, faTrashAlt
 		}
 	},

+	computed: {
+		meterStyle(): any {
+			return {
+				width: `${this.usage / this.capacity * 100}%`,
+				background: tinycolor({
+					h: 180 - (this.usage / this.capacity * 180),
+					s: 0.7,
+					l: 0.5
+				})
+			};
+		}
+	},
+
 	async created() {
+		os.api('drive').then(info => {
+			this.capacity = info.capacity;
+			this.usage = info.usage;
+			this.fetching = false;
+			this.$nextTick(() => {
+				this.renderChart();
+			});
+		});
+
 		if (this.$store.state.uploadFolder) {
 			this.uploadFolder = await os.api('drive/folders/show', {
 				folderId: this.$store.state.uploadFolder
@@ -35,6 +99,10 @@ export default defineComponent({
 		}
 	},

+	mounted() {
+		this.$emit('info', this.INFO);
+	},
+
 	methods: {
 		chooseUploadFolder() {
 			os.selectDriveFolder(false).then(async folder => {
@@ -48,13 +116,127 @@ export default defineComponent({
 					this.uploadFolder = null;
 				}
 			});
-		}
+		},
+
+		renderChart() {
+			os.api('charts/user/drive', {
+				userId: this.$i.id,
+				span: 'day',
+				limit: 21
+			}).then(stats => {
+				const addition = [];
+				const deletion = [];
+				const now = new Date();
+				const y = now.getFullYear();
+				const m = now.getMonth();
+				const d = now.getDate();
+				for (let i = 0; i < 21; i++) {
+					const x = new Date(y, m, d - i);
+					addition.push([
+						x,
+						stats.incSize[i]
+					]);
+					deletion.push([
+						x,
+						-stats.decSize[i]
+					]);
+				}
+				const chart = new ApexCharts(this.$refs.chart, {
+					chart: {
+						type: 'bar',
+						stacked: true,
+						height: 150,
+						toolbar: {
+							show: false
+						},
+						zoom: {
+							enabled: false
+						}
+					},
+					plotOptions: {
+						bar: {
+							columnWidth: '80%'
+						}
+					},
+					grid: {
+						clipMarkers: false,
+						borderColor: 'rgba(0, 0, 0, 0.1)',
+						xaxis: {
+							lines: {
+								show: true,
+							}
+						},
+					},
+					tooltip: {
+						shared: true,
+						intersect: false,
+						theme: this.$store.state.darkMode ? 'dark' : 'light',
+					},
+					dataLabels: {
+						enabled: false
+					},
+					legend: {
+						show: false
+					},
+					series: [{
+						name: 'Additions',
+						data: addition
+					}, {
+						name: 'Deletions',
+						data: deletion
+					}],
+					xaxis: {
+						type: 'datetime',
+						labels: {
+							style: {
+								colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--fg')).toRgbString()
+							}
+						},
+						axisBorder: {
+							color: 'rgba(0, 0, 0, 0.1)'
+						},
+						axisTicks: {
+							color: 'rgba(0, 0, 0, 0.1)'
+						},
+						crosshairs: {
+							width: 1,
+							opacity: 1
+						}
+					},
+					yaxis: {
+						labels: {
+							formatter: v => bytes(v, 0),
+							style: {
+								colors: tinycolor(getComputedStyle(document.documentElement).getPropertyValue('--fg')).toRgbString()
+							}
+						}
+					}
+				});
+				chart.render();
+			});
+		},
+
+		bytes
 	}
 });
 </script>

 <style lang="scss" scoped>
 .uawsfosz {
+	> div {
+		padding: 24px;

+		> .meter {
+			$size: 12px;
+			background: rgba(0, 0, 0, 0.1);
+			border-radius: ($size / 2);
+			overflow: hidden;
+
+			> div {
+				height: $size;
+				border-radius: ($size / 2);
+			}
+		}
+	}
 }
 </style>
--- a/src/client/pages/settings/index.vue
+++ b/src/client/pages/settings/index.vue
@@ -6,6 +6,7 @@
 			<FormLink :active="page === 'profile'" replace to="/settings/profile"><template #icon><Fa :icon="faUser"/></template>{{ $ts.profile }}</FormLink>
 			<FormLink :active="page === 'privacy'" replace to="/settings/privacy"><template #icon><Fa :icon="faLockOpen"/></template>{{ $ts.privacy }}</FormLink>
 			<FormLink :active="page === 'reaction'" replace to="/settings/reaction"><template #icon><Fa :icon="faLaugh"/></template>{{ $ts.reaction }}</FormLink>
+			<FormLink :active="page === 'drive'" replace to="/settings/drive"><template #icon><Fa :icon="faCloud"/></template>{{ $ts.drive }}</FormLink>
 			<FormLink :active="page === 'notifications'" replace to="/settings/notifications"><template #icon><Fa :icon="faBell"/></template>{{ $ts.notifications }}</FormLink>
 			<FormLink :active="page === 'email'" replace to="/settings/email"><template #icon><Fa :icon="faEnvelope"/></template>{{ $ts.email }}</FormLink>
 			<FormLink :active="page === 'integration'" replace to="/settings/integration"><template #icon><Fa :icon="faShareAlt"/></template>{{ $ts.integration }}</FormLink>
@@ -42,7 +43,7 @@

 <script lang="ts">
 import { computed, defineAsyncComponent, defineComponent, nextTick, onMounted, reactive, ref, watch } from 'vue';
-import { faCog, faPalette, faPlug, faUser, faListUl, faLock, faCommentSlash, faMusic, faCogs, faEllipsisH, faBan, faShareAlt, faLockOpen, faKey, faBoxes } from '@fortawesome/free-solid-svg-icons';
+import { faCog, faPalette, faPlug, faUser, faListUl, faLock, faCommentSlash, faMusic, faCogs, faEllipsisH, faBan, faShareAlt, faLockOpen, faKey, faBoxes, faCloud } from '@fortawesome/free-solid-svg-icons';
 import { faLaugh, faBell, faEnvelope } from '@fortawesome/free-regular-svg-icons';
 import { i18n } from '@/i18n';
 import FormLink from '@/components/form/link.vue';
@@ -85,6 +86,7 @@ export default defineComponent({
 				case 'profile': return defineAsyncComponent(() => import('./profile.vue'));
 				case 'privacy': return defineAsyncComponent(() => import('./privacy.vue'));
 				case 'reaction': return defineAsyncComponent(() => import('./reaction.vue'));
+				case 'drive': return defineAsyncComponent(() => import('./drive.vue'));
 				case 'notifications': return defineAsyncComponent(() => import('./notifications.vue'));
 				case 'mute-block': return defineAsyncComponent(() => import('./mute-block.vue'));
 				case 'word-mute': return defineAsyncComponent(() => import('./word-mute.vue'));
@@ -106,6 +108,7 @@ export default defineComponent({
 				case 'plugins': return defineAsyncComponent(() => import('./plugins.vue'));
 				case 'import-export': return defineAsyncComponent(() => import('./import-export.vue'));
 				case 'account-info': return defineAsyncComponent(() => import('./account-info.vue'));
+				case 'update': return defineAsyncComponent(() => import('./update.vue'));
 				case 'registry': return defineAsyncComponent(() => import('./registry.vue'));
 				case 'experimental-features': return defineAsyncComponent(() => import('./experimental-features.vue'));
 			}
@@ -156,7 +159,7 @@ export default defineComponent({
 				localStorage.removeItem('theme');
 				location.reload();
 			},
-			faPalette, faPlug, faUser, faListUl, faLock, faLaugh, faCommentSlash, faMusic, faBell, faCogs, faEllipsisH, faBan, faShareAlt, faLockOpen, faKey, faBoxes, faEnvelope,
+			faPalette, faPlug, faUser, faListUl, faLock, faLaugh, faCommentSlash, faMusic, faBell, faCogs, faEllipsisH, faBan, faShareAlt, faLockOpen, faKey, faBoxes, faEnvelope, faCloud,
 		};
 	},
 });
--- a/src/client/pages/settings/other.vue
+++ b/src/client/pages/settings/other.vue
@@ -1,5 +1,7 @@
 <template>
 <FormBase>
+	<FormLink to="/settings/update">Misskey Update</FormLink>
+
 	<FormSwitch :value="$i.injectFeaturedNote" @update:value="onChangeInjectFeaturedNote">
 		{{ $ts.showFeaturedNotesInTimeline }}
 	</FormSwitch>
--- a/src/client/pages/settings/update.vue
+++ b/src/client/pages/settings/update.vue
@@ -0,0 +1,94 @@
+<template>
+<FormBase>
+	<template v-if="meta">
+		<MkInfo v-if="version === meta.version">{{ $ts.youAreRunningUpToDateClient }}</MkInfo>
+		<MkInfo v-else warn>{{ $ts.newVersionOfClientAvailable }}</MkInfo>
+	</template>
+	<FormGroup>
+		<template #label>{{ instanceName }}</template>
+		<FormKeyValueView>
+			<template #key>{{ $ts.currentVersion }}</template>
+			<template #value>{{ version }}</template>
+		</FormKeyValueView>
+		<FormKeyValueView>
+			<template #key>{{ $ts.latestVersion }}</template>
+			<template #value v-if="meta">{{ meta.version }}</template>
+			<template #value v-else><MkEllipsis/></template>
+		</FormKeyValueView>
+	</FormGroup>
+	<FormGroup>
+		<template #label>Misskey</template>
+		<FormKeyValueView>
+			<template #key>{{ $ts.latestVersion }}</template>
+			<template #value v-if="releases">{{ releases[0].tag_name }}</template>
+			<template #value v-else><MkEllipsis/></template>
+		</FormKeyValueView>
+		<template #caption v-if="releases"><MkTime :time="releases[0].published_at" mode="detail"/></template>
+	</FormGroup>
+</FormBase>
+</template>
+
+<script lang="ts">
+import { defineAsyncComponent, defineComponent } from 'vue';
+import { faInfoCircle, faSyncAlt } from '@fortawesome/free-solid-svg-icons';
+import FormSwitch from '@/components/form/switch.vue';
+import FormSelect from '@/components/form/select.vue';
+import FormLink from '@/components/form/link.vue';
+import FormBase from '@/components/form/base.vue';
+import FormGroup from '@/components/form/group.vue';
+import FormButton from '@/components/form/button.vue';
+import FormKeyValueView from '@/components/form/key-value-view.vue';
+import MkInfo from '@/components/ui/info.vue';
+import * as os from '@/os';
+import { version, instanceName } from '@/config';
+
+export default defineComponent({
+	components: {
+		FormBase,
+		FormSelect,
+		FormSwitch,
+		FormButton,
+		FormLink,
+		FormGroup,
+		FormKeyValueView,
+		MkInfo,
+	},
+
+	emits: ['info'],
+	
+	data() {
+		return {
+			INFO: {
+				title: 'Misskey Update',
+				icon: faSyncAlt
+			},
+			version,
+			instanceName,
+			releases: null,
+			meta: null
+		}
+	},
+
+	mounted() {
+		this.$emit('info', this.INFO);
+
+		os.api('meta', {
+			detail: false
+		}).then(meta => {
+			this.meta = meta;
+			localStorage.setItem('v', meta.version);
+		});
+
+		fetch('https://api.github.com/repos/syuilo/misskey/releases', {
+			method: 'GET',
+		})
+		.then(res => res.json())
+		.then(res => {
+			this.releases = res;
+		});
+	},
+
+	methods: {
+	}
+});
+</script>
--- a/src/client/pages/user/index.activity.vue
+++ b/src/client/pages/user/index.activity.vue
@@ -97,7 +97,8 @@ export default defineComponent({
 				},
 				tooltip: {
 					shared: true,
-					intersect: false
+					intersect: false,
+					theme: this.$store.state.darkMode ? 'dark' : 'light',
 				},
 				series: [{
 					name: 'Normal',
--- a/src/client/themes/l-apricot.json5
+++ b/src/client/themes/l-apricot.json5
@@ -16,5 +16,6 @@
 		mention: '@accent',
 		hashtag: '@accent',
 		inputBorder: 'rgba(0, 0, 0, 0.1)',
+		infoBg: 'rgb(226, 235, 241)',
 	},
 }