From cbcf3fd7f1dd8a8a6f92d598712c0f6d97e227f9 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 3 Aug 2018 22:34:58 +0900
Subject: :v:

---
 src/client/app/desktop/script.ts                   |  9 ++--
 .../app/desktop/views/pages/games/reversi.vue      | 22 ++++++++++
 src/client/app/desktop/views/pages/reversi.vue     | 50 ----------------------
 3 files changed, 28 insertions(+), 53 deletions(-)
 create mode 100644 src/client/app/desktop/views/pages/games/reversi.vue
 delete mode 100644 src/client/app/desktop/views/pages/reversi.vue

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

diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts
index 297100e0e0..2526c2b933 100644
--- a/src/client/app/desktop/script.ts
+++ b/src/client/app/desktop/script.ts
@@ -34,7 +34,7 @@ import MkMessagingRoom from './views/pages/messaging-room.vue';
 import MkNote from './views/pages/note.vue';
 import MkSearch from './views/pages/search.vue';
 import MkTag from './views/pages/tag.vue';
-import MkReversi from './views/pages/reversi.vue';
+import MkReversi from './views/pages/games/reversi.vue';
 import MkShare from './views/pages/share.vue';
 import MkFollow from '../common/views/pages/follow.vue';
 
@@ -65,8 +65,11 @@ init(async (launch) => {
 			{ path: '/search', component: MkSearch },
 			{ path: '/tags/:tag', component: MkTag },
 			{ path: '/share', component: MkShare },
-			{ path: '/reversi', component: MkReversi },
-			{ path: '/reversi/:game', component: MkReversi },
+			{ path: '/reversi', component: MkReversi,
+				children: [{
+					path: ':game', component: MkReversi
+				}]
+			},
 			{ path: '/@:user', component: MkUser },
 			{ path: '/notes/:note', component: MkNote },
 			{ path: '/authorize-follow', component: MkFollow }
diff --git a/src/client/app/desktop/views/pages/games/reversi.vue b/src/client/app/desktop/views/pages/games/reversi.vue
new file mode 100644
index 0000000000..590bda2d86
--- /dev/null
+++ b/src/client/app/desktop/views/pages/games/reversi.vue
@@ -0,0 +1,22 @@
+<template>
+<component :is="ui ? 'mk-ui' : 'div'">
+	<mk-reversi :game-id="$route.params.game" @nav="nav"/>
+</component>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		ui: {
+			default: false
+		}
+	},
+	methods: {
+		nav(game) {
+			history.pushState(null, null, '/reversi/' + game.id);
+		},
+	}
+});
+</script>
diff --git a/src/client/app/desktop/views/pages/reversi.vue b/src/client/app/desktop/views/pages/reversi.vue
deleted file mode 100644
index b484b81b5d..0000000000
--- a/src/client/app/desktop/views/pages/reversi.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-<component :is="ui ? 'mk-ui' : 'div'">
-	<mk-reversi v-if="!fetching" :init-game="game" @gamed="onGamed"/>
-</component>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-import Progress from '../../../common/scripts/loading';
-
-export default Vue.extend({
-	props: {
-		ui: {
-			default: false
-		}
-	},
-	data() {
-		return {
-			fetching: false,
-			game: null
-		};
-	},
-	watch: {
-		$route: 'fetch'
-	},
-	created() {
-		this.fetch();
-	},
-	methods: {
-		fetch() {
-			if (this.$route.params.game == null) return;
-
-			Progress.start();
-			this.fetching = true;
-
-			(this as any).api('games/reversi/games/show', {
-				gameId: this.$route.params.game
-			}).then(game => {
-				this.game = game;
-				this.fetching = false;
-
-				Progress.done();
-			});
-		},
-		onGamed(game) {
-			history.pushState(null, null, '/reversi/' + game.id);
-		}
-	}
-});
-</script>
-- 
cgit v1.2.3-freya