From 94f8a145eca5e1ed6b979c2c237e399cc7a96083 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Mon, 15 Apr 2019 12:10:40 +0900
Subject: Better permisson Fix #2341 (#4611)

* Better permisson Fix #2341

* add kinds.ts

* test

* fix

* v11

* fix
---
 src/client/app/dev/views/apps.vue    |  2 +-
 src/client/app/dev/views/new-app.vue | 44 ++++++++++++++++--------------------
 2 files changed, 20 insertions(+), 26 deletions(-)

(limited to 'src/client/app/dev/views')

diff --git a/src/client/app/dev/views/apps.vue b/src/client/app/dev/views/apps.vue
index 78a7cede98..b99ccdf576 100644
--- a/src/client/app/dev/views/apps.vue
+++ b/src/client/app/dev/views/apps.vue
@@ -1,6 +1,6 @@
 <template>
 <mk-ui>
-	<b-card :header="$t('header')">
+	<b-card :header="$t('manage-apps')">
 		<b-button to="/app/new" variant="primary">{{ $t('create-app') }}</b-button>
 		<hr>
 		<div class="apps">
diff --git a/src/client/app/dev/views/new-app.vue b/src/client/app/dev/views/new-app.vue
index 00f2ed60d9..6b67d220a7 100644
--- a/src/client/app/dev/views/new-app.vue
+++ b/src/client/app/dev/views/new-app.vue
@@ -1,35 +1,22 @@
 <template>
 <mk-ui>
-	<b-card :header="$t('header')">
+	<b-card :header="$t('new-app')">
+		<b-alert show variant="info"><fa icon="info-circle"/> {{ $t('new-app-info') }}</b-alert>
 		<b-form @submit.prevent="onSubmit" autocomplete="off">
-			<b-form-group :label="$t('app-name')" :description="$t('description')">
-				<b-form-input v-model="name" type="text" :placeholder="$t('placeholder')" autocomplete="off" required/>
+			<b-form-group :label="$t('app-name')" :description="$t('app-name-desc')">
+				<b-form-input v-model="name" type="text" :placeholder="$t('app-name-placeholder')" autocomplete="off" required/>
 			</b-form-group>
-			<b-form-group :label="$t('app-overview')" :description="$t('description')">
-				<b-textarea v-model="description" :placeholder="$t('placeholder')" autocomplete="off" required></b-textarea>
+			<b-form-group :label="$t('app-overview')" :description="$t('app-overview-desc')">
+				<b-textarea v-model="description" :placeholder="$t('app-overview-placeholder')" autocomplete="off" required></b-textarea>
 			</b-form-group>
-			<b-form-group :label="$t('callback-url')" :description="$t('description')">
-				<b-input v-model="cb" type="url" placeholder="ex) https://your.app.example.com/callback.php" autocomplete="off"/>
+			<b-form-group :label="$t('callback-url')" :description="$t('callback-url-desc')">
+				<b-input v-model="cb" type="url" :placeholder="$t('callback-url-placeholder')" autocomplete="off"/>
 			</b-form-group>
-			<b-card :header="$t('header')">
-				<b-form-group :description="$t('description')">
+			<b-card :header="$t('authority')">
+				<b-form-group :description="$t('authority-desc')">
 					<b-alert show variant="warning"><fa icon="exclamation-triangle"/> {{ $t('authority-warning') }}</b-alert>
 					<b-form-checkbox-group v-model="permission" stacked>
-						<b-form-checkbox value="read:account">{{ $t('read:account') }}</b-form-checkbox>
-						<b-form-checkbox value="write:account">{{ $t('write:account') }}</b-form-checkbox>
-						<b-form-checkbox value="write:notes">{{ $t('write:notes') }}</b-form-checkbox>
-						<b-form-checkbox value="read:reactions">{{ $t('read:reactions') }}</b-form-checkbox>
-						<b-form-checkbox value="write:reactions">{{ $t('write:reactions') }}</b-form-checkbox>
-						<b-form-checkbox value="read:following">{{ $t('read:following') }}</b-form-checkbox>
-						<b-form-checkbox value="write:following">{{ $t('write:following') }}</b-form-checkbox>
-						<b-form-checkbox value="read:mutes">{{ $t('read:mutes') }}</b-form-checkbox>
-						<b-form-checkbox value="write:mutes">{{ $t('write:mutes') }}</b-form-checkbox>
-						<b-form-checkbox value="read:blocks">{{ $t('read:blocks') }}</b-form-checkbox>
-						<b-form-checkbox value="write:blocks">{{ $t('write:blocks') }}</b-form-checkbox>
-						<b-form-checkbox value="read:drive">{{ $t('read:drive') }}</b-form-checkbox>
-						<b-form-checkbox value="write:drive">{{ $t('write:drive') }}</b-form-checkbox>
-						<b-form-checkbox value="read:notifications">{{ $t('read:notifications') }}</b-form-checkbox>
-						<b-form-checkbox value="write:notifications">{{ $t('write:notifications') }}</b-form-checkbox>
+						<b-form-checkbox v-for="v in permissionsList" :value="v" :key="v">{{ $t(`@.permissions.${v}`) }} ({{ v }})</b-form-checkbox>
 					</b-form-checkbox-group>
 				</b-form-group>
 			</b-card>
@@ -43,6 +30,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import i18n from '../../i18n';
+
 export default Vue.extend({
 	i18n: i18n('dev/views/new-app.vue'),
 	data() {
@@ -51,9 +39,15 @@ export default Vue.extend({
 			description: '',
 			cb: '',
 			nidState: null,
-			permission: []
+			permission: [],
+			permissionsList: []
 		};
 	},
+	created() {
+		this.$root.api('permissions').then(permissions => {
+			this.permissionsList = permissions
+		});
+	},
 	methods: {
 		onSubmit() {
 			this.$root.api('app/create', {
-- 
cgit v1.2.3-freya