From 9021bb5694bbe31cbff09d25d5d610fef0cfdda9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 14 Aug 2018 01:05:58 +0900
Subject: wip

---
 .../desktop/views/pages/admin/admin.dashboard.vue  | 27 +++++++++++++++
 .../views/pages/admin/admin.suspend-user.vue       | 39 ++++++++++++++++++++++
 src/client/app/desktop/views/pages/admin/admin.vue | 35 +++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 src/client/app/desktop/views/pages/admin/admin.dashboard.vue
 create mode 100644 src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
 create mode 100644 src/client/app/desktop/views/pages/admin/admin.vue

(limited to 'src/client/app/desktop')

diff --git a/src/client/app/desktop/views/pages/admin/admin.dashboard.vue b/src/client/app/desktop/views/pages/admin/admin.dashboard.vue
new file mode 100644
index 0000000000..ec43b93840
--- /dev/null
+++ b/src/client/app/desktop/views/pages/admin/admin.dashboard.vue
@@ -0,0 +1,27 @@
+<template>
+<div>
+	<header>%i18n:@dashboard%</header>
+
+	<p><b>%i18n:@all-users%</b><span>{ stats.usersCount | number }</span></p>
+	<p><b>%i18n:@original-users%</b><span>{ stats.originalUsersCount | number }</span></p>
+	<p><b>%i18n:@all-notes%</b><span>{ stats.notesCount | number }</span></p>
+	<p><b>%i18n:@original-notes%</b><span>{ stats.originalNotesCount | number }</span></p>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from "vue";
+
+export default Vue.extend({
+	data() {
+		return {
+			stats: null
+		};
+	},
+	created() {
+		(this as any).api('stats').then(stats => {
+			this.stats = stats;
+		});
+	}
+});
+</script>
diff --git a/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue b/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
new file mode 100644
index 0000000000..d47a4795ee
--- /dev/null
+++ b/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
@@ -0,0 +1,39 @@
+<template>
+<div>
+	<header>%i18n:@suspend-user%</header>
+	<input v-model="username"/>
+	<button @click="suspendUser" :disabled="suspending">%i18n:@suspend%</button>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from "vue";
+import parseAcct from "../../../../../../misc/acct/parse";
+
+export default Vue.extend({
+  data() {
+    return {
+      username: null,
+      suspending: false
+    };
+  },
+  methods: {
+    async suspendUser() {
+      this.suspending = true;
+
+      const user = await (this as any).os.api(
+        "users/show",
+        parseAcct(this.username)
+      );
+
+      await (this as any).os.api("admin/suspend-user", {
+        userId: user.id
+      });
+
+      this.suspending = false;
+
+      (this as any).os.apis.dialog("%i18n:@suspended%");
+    }
+  }
+});
+</script>
diff --git a/src/client/app/desktop/views/pages/admin/admin.vue b/src/client/app/desktop/views/pages/admin/admin.vue
new file mode 100644
index 0000000000..03a356c4a0
--- /dev/null
+++ b/src/client/app/desktop/views/pages/admin/admin.vue
@@ -0,0 +1,35 @@
+<template>
+<div>
+	<nav>
+		<ul>
+			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }">%i18n:@dashborad%</li>
+			<li @click="nav('drive')" :class="{ active: page == 'drive' }">%i18n:@drive%</li>
+			<li @click="nav('users')" :class="{ active: page == 'users' }">%i18n:@users%</li>
+			<li @click="nav('update')" :class="{ active: page == 'update' }">%i18n:@update%</li>
+		</ul>
+	</nav>
+	<main>
+		<div v-if="page == 'dashboard'">
+			<x-dashboard/>
+		</div>
+		<div v-if="page == 'drive'"></div>
+		<div v-if="page == 'users'">
+			<x-suspend-user/>
+		</div>
+		<div v-if="page == 'update'"></div>
+	</main>
+</div>
+</template>
+
+<script lang="ts">
+import Vue from "vue";
+import XDashboard from "./admin.dashboard.vue";
+import XSuspendUser from "./admin.suspend-user.vue";
+
+export default Vue.extend({
+  components: {
+		XDashboard,
+    XSuspendUser
+  }
+});
+</script>
-- 
cgit v1.3.1-freya


From 00119328f28d22c9d267de94ae53fa32f3d8b8c9 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 14 Aug 2018 01:19:05 +0900
Subject: wip

---
 src/client/app/desktop/script.ts | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/client/app/desktop')

diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index 8175ce9b66..8dc0482191 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -24,6 +24,7 @@ import updateBanner from './api/update-banner';
 
 import MkIndex from './views/pages/index.vue';
 import MkDeck from './views/pages/deck/deck.vue';
+import MkAdmin from './views/pages/admin/admin.vue';
 import MkUser from './views/pages/user/user.vue';
 import MkFavorites from './views/pages/favorites.vue';
 import MkSelectDrive from './views/pages/selectdrive.vue';
@@ -55,6 +56,7 @@ init(async (launch) => {
 		routes: [
 			{ path: '/', name: 'index', component: MkIndex },
 			{ path: '/deck', name: 'deck', component: MkDeck },
+			{ path: '/admin', name: 'admin', component: MkAdmin },
 			{ path: '/i/customize-home', component: MkHomeCustomize },
 			{ path: '/i/favorites', component: MkFavorites },
 			{ path: '/i/messaging/:user', component: MkMessagingRoom },
-- 
cgit v1.3.1-freya


From ba9340a26b2c907deaac0b3feeceb3c4b1c58d15 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 14 Aug 2018 01:24:46 +0900
Subject: wip

---
 src/client/app/desktop/views/pages/admin/admin.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/client/app/desktop')

diff --git a/src/client/app/desktop/views/pages/admin/admin.vue b/src/client/app/desktop/views/pages/admin/admin.vue
index 03a356c4a0..c96ebade0c 100644
--- a/src/client/app/desktop/views/pages/admin/admin.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.vue
@@ -2,7 +2,7 @@
 <div>
 	<nav>
 		<ul>
-			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }">%i18n:@dashborad%</li>
+			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }">%i18n:@dashboard%</li>
 			<li @click="nav('drive')" :class="{ active: page == 'drive' }">%i18n:@drive%</li>
 			<li @click="nav('users')" :class="{ active: page == 'users' }">%i18n:@users%</li>
 			<li @click="nav('update')" :class="{ active: page == 'update' }">%i18n:@update%</li>
@@ -27,9 +27,9 @@ import XDashboard from "./admin.dashboard.vue";
 import XSuspendUser from "./admin.suspend-user.vue";
 
 export default Vue.extend({
-  components: {
+	components: {
 		XDashboard,
-    XSuspendUser
-  }
+		XSuspendUser
+	}
 });
 </script>
-- 
cgit v1.3.1-freya


From 92e5cff285ef1968c168a10719477804e37858d3 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 14 Aug 2018 01:35:36 +0900
Subject: wip

---
 locales/ja.yml                                     |  2 +-
 src/client/app/desktop/views/pages/admin/admin.vue | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/client/app/desktop')

diff --git a/locales/ja.yml b/locales/ja.yml
index 580ade0ed3..08e437fbf7 100644
--- a/locales/ja.yml
+++ b/locales/ja.yml
@@ -903,7 +903,7 @@ desktop/views/pages/admin/admin.vue:
   users: "ユーザー"
   update: "更新"
 
-desktop/views/paages/admin/admin.dashboard.vue:
+desktop/views/pages/admin/admin.dashboard.vue:
   dashboard: "ダッシュボード"
   all-users: "全てのユーザー"
   original-users: "このインスタンスのユーザー"
diff --git a/src/client/app/desktop/views/pages/admin/admin.vue b/src/client/app/desktop/views/pages/admin/admin.vue
index c96ebade0c..91f6a23cdc 100644
--- a/src/client/app/desktop/views/pages/admin/admin.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.vue
@@ -30,6 +30,16 @@ export default Vue.extend({
 	components: {
 		XDashboard,
 		XSuspendUser
+	},
+	data() {
+		return {
+			page: 'dashboard'
+		};
+	},
+	methods: {
+		nav(page: string) {
+			this.page = page;
+		}
 	}
 });
 </script>
-- 
cgit v1.3.1-freya


From fb1e2efbddfcfe895be79c81d71e3f9b08b8a103 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 14 Aug 2018 01:37:23 +0900
Subject: wip

---
 src/client/app/desktop/views/pages/admin/admin.dashboard.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/client/app/desktop')

diff --git a/src/client/app/desktop/views/pages/admin/admin.dashboard.vue b/src/client/app/desktop/views/pages/admin/admin.dashboard.vue
index ec43b93840..8624ce32b6 100644
--- a/src/client/app/desktop/views/pages/admin/admin.dashboard.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.dashboard.vue
@@ -2,10 +2,10 @@
 <div>
 	<header>%i18n:@dashboard%</header>
 
-	<p><b>%i18n:@all-users%</b><span>{ stats.usersCount | number }</span></p>
-	<p><b>%i18n:@original-users%</b><span>{ stats.originalUsersCount | number }</span></p>
-	<p><b>%i18n:@all-notes%</b><span>{ stats.notesCount | number }</span></p>
-	<p><b>%i18n:@original-notes%</b><span>{ stats.originalNotesCount | number }</span></p>
+	<p><b>%i18n:@all-users%</b><span>{{ stats.usersCount | number }}</span></p>
+	<p><b>%i18n:@original-users%</b><span>{{ stats.originalUsersCount | number }}</span></p>
+	<p><b>%i18n:@all-notes%</b><span>{{ stats.notesCount | number }}</span></p>
+	<p><b>%i18n:@original-notes%</b><span>{{ stats.originalNotesCount | number }}</span></p>
 </div>
 </template>
 
-- 
cgit v1.3.1-freya


From ba08d1aa53be1060088e93abcd9b8f3786f50287 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 14 Aug 2018 01:48:11 +0900
Subject: wip

---
 .../views/pages/admin/admin.suspend-user.vue       | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'src/client/app/desktop')

diff --git a/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue b/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
index d47a4795ee..01d0301eb1 100644
--- a/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.suspend-user.vue
@@ -11,29 +11,29 @@ import Vue from "vue";
 import parseAcct from "../../../../../../misc/acct/parse";
 
 export default Vue.extend({
-  data() {
-    return {
-      username: null,
-      suspending: false
-    };
-  },
-  methods: {
-    async suspendUser() {
-      this.suspending = true;
+	data() {
+		return {
+			username: null,
+			suspending: false
+		};
+	},
+	methods: {
+		async suspendUser() {
+			this.suspending = true;
 
-      const user = await (this as any).os.api(
-        "users/show",
-        parseAcct(this.username)
-      );
+			const user = await (this as any).os.api(
+				"users/show",
+				parseAcct(this.username)
+			);
 
-      await (this as any).os.api("admin/suspend-user", {
-        userId: user.id
-      });
+			await (this as any).os.api("admin/suspend-user", {
+				userId: user.id
+			});
 
-      this.suspending = false;
+			this.suspending = false;
 
-      (this as any).os.apis.dialog("%i18n:@suspended%");
-    }
-  }
+			(this as any).os.apis.dialog({ text: "%i18n:@suspended%" });
+		}
+	}
 });
 </script>
-- 
cgit v1.3.1-freya


From 3b38979a347c4e21c76156c1fefe95d74477c511 Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 14 Aug 2018 04:30:42 +0900
Subject: wip

---
 .../desktop/views/pages/admin/admin.dashboard.vue  | 20 +++++---
 src/client/app/desktop/views/pages/admin/admin.vue | 57 +++++++++++++++++++---
 2 files changed, 65 insertions(+), 12 deletions(-)

(limited to 'src/client/app/desktop')

diff --git a/src/client/app/desktop/views/pages/admin/admin.dashboard.vue b/src/client/app/desktop/views/pages/admin/admin.dashboard.vue
index 8624ce32b6..4e6ada6cdb 100644
--- a/src/client/app/desktop/views/pages/admin/admin.dashboard.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.dashboard.vue
@@ -1,11 +1,10 @@
 <template>
 <div>
-	<header>%i18n:@dashboard%</header>
-
-	<p><b>%i18n:@all-users%</b><span>{{ stats.usersCount | number }}</span></p>
-	<p><b>%i18n:@original-users%</b><span>{{ stats.originalUsersCount | number }}</span></p>
-	<p><b>%i18n:@all-notes%</b><span>{{ stats.notesCount | number }}</span></p>
-	<p><b>%i18n:@original-notes%</b><span>{{ stats.originalNotesCount | number }}</span></p>
+	<h1>%i18n:@dashboard%</h1>
+	<p><b>%i18n:@all-users%</b>: <span>{{ stats.usersCount | number }}</span></p>
+	<p><b>%i18n:@original-users%</b>: <span>{{ stats.originalUsersCount | number }}</span></p>
+	<p><b>%i18n:@all-notes%</b>: <span>{{ stats.notesCount | number }}</span></p>
+	<p><b>%i18n:@original-notes%</b>: <span>{{ stats.originalNotesCount | number }}</span></p>
 </div>
 </template>
 
@@ -25,3 +24,12 @@ export default Vue.extend({
 	}
 });
 </script>
+
+<style lang="stylus" scoped>
+h1
+	margin 0 0 1em 0
+	padding 0 0 8px 0
+	font-size 1em
+	color #555
+	border-bottom solid 1px #eee
+</style>
diff --git a/src/client/app/desktop/views/pages/admin/admin.vue b/src/client/app/desktop/views/pages/admin/admin.vue
index 91f6a23cdc..36b2b8792d 100644
--- a/src/client/app/desktop/views/pages/admin/admin.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.vue
@@ -1,21 +1,21 @@
 <template>
-<div>
+<div class="mk-admin">
 	<nav>
 		<ul>
-			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }">%i18n:@dashboard%</li>
-			<li @click="nav('drive')" :class="{ active: page == 'drive' }">%i18n:@drive%</li>
-			<li @click="nav('users')" :class="{ active: page == 'users' }">%i18n:@users%</li>
-			<li @click="nav('update')" :class="{ active: page == 'update' }">%i18n:@update%</li>
+			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }">%fa:chalkboard .fw%%i18n:@dashboard%</li>
+			<li @click="nav('users')" :class="{ active: page == 'users' }">%fa:users .fw%%i18n:@users%</li>
+			<li @click="nav('drive')" :class="{ active: page == 'drive' }">%fa:cloud .fw%%i18n:@drive%</li>
+			<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">%i18n:@update%</li> -->
 		</ul>
 	</nav>
 	<main>
 		<div v-if="page == 'dashboard'">
 			<x-dashboard/>
 		</div>
-		<div v-if="page == 'drive'"></div>
 		<div v-if="page == 'users'">
 			<x-suspend-user/>
 		</div>
+		<div v-if="page == 'drive'"></div>
 		<div v-if="page == 'update'"></div>
 	</main>
 </div>
@@ -43,3 +43,48 @@ export default Vue.extend({
 	}
 });
 </script>
+
+<style lang="stylus" scoped>
+@import '~const.styl'
+
+.mk-admin
+	display flex
+	height 100%
+	margin 32px
+
+	> nav
+		flex 0 0 250px
+		width 100%
+		height 100%
+		padding 16px 0 0 0
+		overflow auto
+		border-right solid 1px #ddd
+
+		> ul
+			list-style none
+
+			> li
+				display block
+				padding 10px 16px
+				margin 0
+				color #666
+				cursor pointer
+				user-select none
+				transition margin-left 0.2s ease
+
+				> [data-fa]
+					margin-right 4px
+
+
+				&:hover
+					color #555
+
+				&.active
+					margin-left 8px
+					color $theme-color !important
+
+	> main
+		width 100%
+		padding 16px 32px
+
+</style>
-- 
cgit v1.3.1-freya


From 09b8e81a77ba0c70b2e5c60a461db3f29e0d6aac Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Tue, 14 Aug 2018 04:39:37 +0900
Subject: wip

---
 src/client/app/desktop/views/pages/admin/admin.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/client/app/desktop')

diff --git a/src/client/app/desktop/views/pages/admin/admin.vue b/src/client/app/desktop/views/pages/admin/admin.vue
index 36b2b8792d..a2b8d47ff6 100644
--- a/src/client/app/desktop/views/pages/admin/admin.vue
+++ b/src/client/app/desktop/views/pages/admin/admin.vue
@@ -3,8 +3,8 @@
 	<nav>
 		<ul>
 			<li @click="nav('dashboard')" :class="{ active: page == 'dashboard' }">%fa:chalkboard .fw%%i18n:@dashboard%</li>
-			<li @click="nav('users')" :class="{ active: page == 'users' }">%fa:users .fw%%i18n:@users%</li>
-			<li @click="nav('drive')" :class="{ active: page == 'drive' }">%fa:cloud .fw%%i18n:@drive%</li>
+			<!-- <li @click="nav('users')" :class="{ active: page == 'users' }">%fa:users .fw%%i18n:@users%</li> -->
+			<!-- <li @click="nav('drive')" :class="{ active: page == 'drive' }">%fa:cloud .fw%%i18n:@drive%</li> -->
 			<!-- <li @click="nav('update')" :class="{ active: page == 'update' }">%i18n:@update%</li> -->
 		</ul>
 	</nav>
-- 
cgit v1.3.1-freya