Merge branch 'navigation-update' into shigusegubu-vue3

* navigation-update:
  fix routes and tests
  fix lists not having pins in edit mode
  fix edit mode checkbox showing up for anon users
This commit is contained in:
Henry Jameson 2022-08-17 21:25:23 +03:00
commit 47d6071d72
2 changed files with 3 additions and 3 deletions

View file

@ -80,7 +80,7 @@ export default (store) => {
{ name: 'lists', path: '/lists', component: Lists }, { name: 'lists', path: '/lists', component: Lists },
{ name: 'lists-timeline', path: '/lists/:id', component: ListsTimeline }, { name: 'lists-timeline', path: '/lists/:id', component: ListsTimeline },
{ name: 'lists-edit', path: '/lists/:id/edit', component: ListsEdit }, { name: 'lists-edit', path: '/lists/:id/edit', component: ListsEdit },
{ name: 'lists-edit', path: '/lists/new', component: ListsEdit }, { name: 'lists-new', path: '/lists/new', component: ListsEdit },
{ name: 'edit-navigation', path: '/nav-edit', component: NavPanel, props: () => ({ forceExpand: true, forceEditMode: true }), beforeEnter: validateAuthenticatedRoute } { name: 'edit-navigation', path: '/nav-edit', component: NavPanel, props: () => ({ forceExpand: true, forceEditMode: true }), beforeEnter: validateAuthenticatedRoute }
] ]

View file

@ -83,7 +83,7 @@
class="timelines-background" class="timelines-background"
> >
<ListsMenuContent <ListsMenuContent
:show-pin="editMode" :show-pin="editMode || forceEditMode"
class="timelines" class="timelines"
/> />
</div> </div>
@ -95,7 +95,7 @@
:item="item" :item="item"
/> />
<div <div
v-if="!forceEditMode" v-if="!forceEditMode && currentUser"
class="panel-footer" class="panel-footer"
> >
<Checkbox v-model="editMode"> <Checkbox v-model="editMode">