From 81fadfa4ffdac357de4a13b4f63434a4c0817244 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 7 Jun 2019 20:34:05 +0900
Subject: [PATCH] Fix bug

---
 .../views/components/games/reversi/reversi.game.vue    | 10 +++++-----
 .../app/common/views/components/settings/settings.vue  |  8 ++++----
 src/client/app/store.ts                                |  8 ++------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/client/app/common/views/components/games/reversi/reversi.game.vue b/src/client/app/common/views/components/games/reversi/reversi.game.vue
index 315fb464b2..3f481e8eb5 100644
--- a/src/client/app/common/views/components/games/reversi/reversi.game.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue
@@ -23,11 +23,11 @@
 	</div>
 
 	<div class="board">
-		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+		<div class="labels-x" v-if="$store.state.settings.gamesReversiShowBoardLabels">
 			<span v-for="i in game.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 		<div class="flex">
-			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+			<div class="labels-y" v-if="$store.state.settings.gamesReversiShowBoardLabels">
 				<div v-for="i in game.map.length">{{ i }}</div>
 			</div>
 			<div class="cells" :style="cellsStyle">
@@ -35,7 +35,7 @@
 						:class="{ empty: stone == null, none: o.map[i] == 'null', isEnded: game.isEnded, myTurn: !game.isEnded && isMyTurn, can: turnUser ? o.canPut(turnUser.id == blackUser.id, i) : null, prev: o.prevPos == i }"
 						@click="set(i)"
 						:title="`${String.fromCharCode(65 + o.transformPosToXy(i)[0])}${o.transformPosToXy(i)[1] + 1}`">
-					<template v-if="$store.state.settings.games.reversi.useAvatarStones">
+					<template v-if="$store.state.settings.gamesReversiUseAvatarStones">
 						<img v-if="stone === true" :src="blackUser.avatarUrl" alt="black">
 						<img v-if="stone === false" :src="whiteUser.avatarUrl" alt="white">
 					</template>
@@ -45,11 +45,11 @@
 					</template>
 				</div>
 			</div>
-			<div class="labels-y" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+			<div class="labels-y" v-if="this.$store.state.settings.gamesReversiShowBoardLabels">
 				<div v-for="i in game.map.length">{{ i }}</div>
 			</div>
 		</div>
-		<div class="labels-x" v-if="this.$store.state.settings.games.reversi.showBoardLabels">
+		<div class="labels-x" v-if="this.$store.state.settings.gamesReversiShowBoardLabels">
 			<span v-for="i in game.map[0].length">{{ String.fromCharCode(64 + i) }}</span>
 		</div>
 	</div>
diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue
index 4d4cac0976..0cbc40da57 100644
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -472,13 +472,13 @@ export default Vue.extend({
 		},
 
 		games_reversi_showBoardLabels: {
-			get() { return this.$store.state.settings.games.reversi.showBoardLabels; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.showBoardLabels', value }); }
+			get() { return this.$store.state.settings.gamesReversiShowBoardLabels; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'gamesReversiShowBoardLabels', value }); }
 		},
 
 		games_reversi_useAvatarStones: {
-			get() { return this.$store.state.settings.games.reversi.useAvatarStones; },
-			set(value) { this.$store.dispatch('settings/set', { key: 'games.reversi.useAvatarStones', value }); }
+			get() { return this.$store.state.settings.gamesReversiUseAvatarStones; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'gamesReversiUseAvatarStones', value }); }
 		},
 
 		disableAnimatedMfm: {
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index b137f79989..f229a2b7be 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -31,12 +31,8 @@ const defaultSettings = {
 	wallpaper: null,
 	webSearchEngine: 'https://www.google.com/?#q={{query}}',
 	mutedWords: [],
-	games: {
-		reversi: {
-			showBoardLabels: false,
-			useAvatarStones: true,
-		}
-	}
+	gamesReversiShowBoardLabels: false,
+	gamesReversiUseAvatarStones: true,
 };
 
 const defaultDeviceSettings = {