From 4e96900dee13c86168c3582a6e47721208d98a52 Mon Sep 17 00:00:00 2001 From: David Sevilla Martin Date: Fri, 31 Jan 2020 17:02:10 -0500 Subject: [PATCH] forum: fix index.filter route overriding 'settings' route --- js/src/forum/Forum.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/js/src/forum/Forum.ts b/js/src/forum/Forum.ts index ad5a0b781..7bad2b5dc 100644 --- a/js/src/forum/Forum.ts +++ b/js/src/forum/Forum.ts @@ -13,15 +13,18 @@ import Discussion from "../common/models/Discussion"; export default class Forum extends Application { routes = { - 'index': { path: '/', component: IndexPage }, - 'index.filter': { path: '/:filter', component: IndexPage }, + 'index': { path: '/all', component: IndexPage }, + + 'discussion': { path: '/d/:id', component: IndexPage }, + 'discussion.near': { path: '/d/:id/:near', component: IndexPage }, 'user': { path: '/u/:username', component: PostsUserPage }, 'user.posts': { path: '/u/:username', component: PostsUserPage }, - 'user.discussions': { path: '/u/:username', component: PostsUserPage }, - 'settings': { path: '/u/:username', component: PostsUserPage }, + 'user.discussions': { path: '/u/:username/discussions', component: PostsUserPage }, - 'discussion': { path: '/d/:id', IndexPage }, + 'settings': { path: '/settings', component: PostsUserPage }, + + 'index.filter': { path: '/:filter', component: IndexPage }, }; /**