logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 891fbf996d7ddd415d99ea9065d54b0f493b5422
parent b5eba5974ca86cdb0b5f3caaa9c89466a07d8449
Author: Alexander Tumin <iamtakingiteasy@eientei.org>
Date:   Sat,  6 Aug 2022 21:39:08 +0300

Lists implementation: make route naming consistent

Diffstat:

Msrc/boot/routes.js4++--
Msrc/components/lists_card/lists_card.vue4++--
Msrc/components/lists_edit/lists_edit.js2+-
Msrc/components/lists_menu/lists_menu_content.vue2+-
Msrc/components/lists_new/lists_new.js2+-
Msrc/components/lists_timeline/lists_timeline.js2+-
Msrc/components/timeline_menu/timeline_menu.js2+-
7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/boot/routes.js b/src/boot/routes.js @@ -77,8 +77,8 @@ export default (store) => { { name: 'about', path: '/about', component: About }, { name: 'user-profile', path: '/:_(users)?/:name', component: UserProfile }, { name: 'lists', path: '/lists', component: Lists }, - { name: 'list-timeline', path: '/lists/:id', component: ListsTimeline }, - { name: 'list-edit', path: '/lists/:id/edit', component: ListsEdit } + { name: 'lists-timeline', path: '/lists/:id', component: ListsTimeline }, + { name: 'lists-edit', path: '/lists/:id/edit', component: ListsEdit } ] if (store.state.instance.pleromaChatMessagesAvailable) { diff --git a/src/components/lists_card/lists_card.vue b/src/components/lists_card/lists_card.vue @@ -1,13 +1,13 @@ <template> <div class="list-card"> <router-link - :to="{ name: 'list-timeline', params: { id: list.id } }" + :to="{ name: 'lists-timeline', params: { id: list.id } }" class="list-name" > {{ list.title }} </router-link> <router-link - :to="{ name: 'list-edit', params: { id: list.id } }" + :to="{ name: 'lists-edit', params: { id: list.id } }" class="button-list-edit" > <FAIcon diff --git a/src/components/lists_edit/lists_edit.js b/src/components/lists_edit/lists_edit.js @@ -79,7 +79,7 @@ const ListsNew = { this.$store.dispatch('setList', { id: this.id, title: this.title }) this.$store.dispatch('setListAccounts', { id: this.id, accountIds: this.selectedUserIds }) - this.$router.push({ name: 'list-timeline', params: { id: this.id } }) + this.$router.push({ name: 'lists-timeline', params: { id: this.id } }) }, deleteList () { this.$store.dispatch('deleteList', { id: this.id }) diff --git a/src/components/lists_menu/lists_menu_content.vue b/src/components/lists_menu/lists_menu_content.vue @@ -6,7 +6,7 @@ > <router-link class="menu-item" - :to="{ name: 'list-timeline', params: { id: list.id } }" + :to="{ name: 'lists-timeline', params: { id: list.id } }" > {{ list.title }} </router-link> diff --git a/src/components/lists_new/lists_new.js b/src/components/lists_new/lists_new.js @@ -70,7 +70,7 @@ const ListsNew = { this.$store.dispatch('createList', { title: this.title }) .then((list) => { this.$store.dispatch('setListAccounts', { id: list.id, accountIds: this.selectedUserIds }) - this.$router.push({ name: 'list-timeline', params: { id: list.id } }) + this.$router.push({ name: 'lists-timeline', params: { id: list.id } }) }) } } diff --git a/src/components/lists_timeline/lists_timeline.js b/src/components/lists_timeline/lists_timeline.js @@ -13,7 +13,7 @@ const ListsTimeline = { }, watch: { $route: function (route) { - if (route.name === 'list-timeline' && route.params.id !== this.listId) { + if (route.name === 'lists-timeline' && route.params.id !== this.listId) { this.listId = route.params.id this.$store.dispatch('stopFetchingTimeline', 'list') this.$store.commit('clearTimeline', { timeline: 'list' }) diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js @@ -58,7 +58,7 @@ const TimelineMenu = { if (route === 'tag-timeline') { return '#' + this.$route.params.tag } - if (route === 'list-timeline') { + if (route === 'lists-timeline') { return this.$store.getters.findListTitle(this.$route.params.id) } const i18nkey = timelineNames()[this.$route.name]