diff --git a/src/boot/routes.js b/src/boot/routes.js
index 93a94a9b..470f1345 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -24,6 +24,7 @@ import ListEdit from 'components/list_edit/list_edit.vue'
import AnnouncementsPage from 'components/announcements_page/announcements_page.vue'
import RegistrationRequestSent from 'components/registration_request_sent/registration_request_sent.vue'
import AwaitingEmailConfirmation from 'components/awaiting_email_confirmation/awaiting_email_confirmation.vue'
+import SocialTimeline from '../components/social_timeline/social_timeline'
export default (store) => {
const validateAuthenticatedRoute = (to, from, next) => {
@@ -46,6 +47,7 @@ export default (store) => {
{ name: 'public-external-timeline', path: '/main/all', component: PublicAndExternalTimeline },
{ name: 'public-timeline', path: '/main/public', component: PublicTimeline },
{ name: 'bubble-timeline', path: '/main/bubble', component: BubbleTimeline },
+ { name: 'social-timeline', path: '/main/social', component: BubbleTimeline },
{ name: 'friends', path: '/main/friends', component: FriendsTimeline, beforeEnter: validateAuthenticatedRoute },
{ name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline },
{ name: 'bookmarks', path: '/bookmarks', component: BookmarkTimeline },
diff --git a/src/components/social_timeline/social_timeline.js b/src/components/social_timeline/social_timeline.js
new file mode 100644
index 00000000..f3ed4a82
--- /dev/null
+++ b/src/components/social_timeline/social_timeline.js
@@ -0,0 +1,18 @@
+import Timeline from '../timeline/timeline.vue'
+const SocialTimeline = {
+ components: {
+ Timeline
+ },
+ computed: {
+ timeline () { return this.$store.state.statuses.timelines.bubble }
+ },
+ created () {
+ this.$store.dispatch('startFetchingTimeline', { timeline: 'social' })
+ },
+ unmounted () {
+ this.$store.dispatch('stopFetchingTimeline', 'bubble')
+ }
+
+}
+
+export default SocialTimeline
diff --git a/src/components/social_timeline/social_timeline.vue b/src/components/social_timeline/social_timeline.vue
new file mode 100644
index 00000000..a25f45dd
--- /dev/null
+++ b/src/components/social_timeline/social_timeline.vue
@@ -0,0 +1,9 @@
+
+