diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-09-17 07:58:05 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-09-17 07:58:05 -0400 |
| commit | 91991e2ac1765a17bc5cd0038507c577a0d12045 (patch) | |
| tree | 3b76538396254fdcddf49e8b73d32db4ae41ee5c /src/main.js | |
| parent | 3eaaa4c16de3355e47d1a8c5c74e19cc492e37a5 (diff) | |
| parent | c96a7b582bfc12b4af437fbd0d75ed8762065288 (diff) | |
Merge branch 'feature/tag-timelines' into 'develop'
Add tag timeline view.
See merge request !121
Diffstat (limited to 'src/main.js')
| -rw-r--r-- | src/main.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.js b/src/main.js index e83e27c5..d1f99fa5 100644 --- a/src/main.js +++ b/src/main.js @@ -5,6 +5,7 @@ import App from './App.vue' import PublicTimeline from './components/public_timeline/public_timeline.vue' import PublicAndExternalTimeline from './components/public_and_external_timeline/public_and_external_timeline.vue' import FriendsTimeline from './components/friends_timeline/friends_timeline.vue' +import TagTimeline from './components/tag_timeline/tag_timeline.vue' import ConversationPage from './components/conversation-page/conversation-page.vue' import Mentions from './components/mentions/mentions.vue' import UserProfile from './components/user_profile/user_profile.vue' @@ -58,6 +59,7 @@ const routes = [ { path: '/main/all', component: PublicAndExternalTimeline }, { path: '/main/public', component: PublicTimeline }, { path: '/main/friends', component: FriendsTimeline }, + { path: '/tag/:tag', component: TagTimeline }, { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } }, { name: 'user-profile', path: '/users/:id', component: UserProfile }, { name: 'mentions', path: '/:username/mentions', component: Mentions }, |