RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

folder: fixes for timeline view

pull/363/head
Varun Patil 2023-01-17 21:18:27 -08:00
parent 1b14fc4901
commit fbbfbf18ec
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Controller/ApiBase.php
View File

@ -222,7 +222,7 @@ class ApiBase extends Controller
protected function isRecursive() protected function isRecursive()
{ {
return null === $this->request->getParam('folder') || "1" === $this->request->getParam('recursive'); return null === $this->request->getParam('folder') || $this->request->getParam('recursive');
} }
protected function isArchive() protected function isArchive()

2
src/components/Timeline.vue
View File

@ -637,7 +637,7 @@ export default defineComponent({
// Folder // Folder
if (this.$route.name === "folders") { if (this.$route.name === "folders") {
query.set("folder", utils.getFolderRoutePath(this.config_foldersPath)); query.set("folder", utils.getFolderRoutePath(this.config_foldersPath));
if(this.$route.query.recursive === "1") { if (this.$route.query.recursive) {
query.set("recursive", "1"); query.set("recursive", "1");
} }
} }

20
src/components/top-matter/FolderTopMatter.vue
View File

@ -20,7 +20,11 @@
:to="{ query: recursive ? {} : { recursive: '1' } }" :to="{ query: recursive ? {} : { recursive: '1' } }"
close-after-click close-after-click
> >
{{ t("memories", recursive ? "Show folders" : "Timeline") }} {{
recursive
? t("memories", "Folder View")
: t("memories", "Timeline View")
}}
<template #icon> <template #icon>
<FoldersIcon v-if="recursive" :size="20" /> <FoldersIcon v-if="recursive" :size="20" />
<TimelineIcon v-else :size="20" /> <TimelineIcon v-else :size="20" />
@ -72,12 +76,12 @@ export default defineComponent({
HomeIcon, HomeIcon,
ShareIcon, ShareIcon,
TimelineIcon, TimelineIcon,
FoldersIcon FoldersIcon,
}, },
data: () => ({ data: () => ({
topMatter: null as TopMatterFolder | null, topMatter: null as TopMatterFolder | null,
recursive: false recursive: false,
}), }),
watch: { watch: {
@ -109,13 +113,13 @@ export default defineComponent({
}; };
}), }),
}; };
this.recursive = this.$route.query.recursive === '1' this.recursive = this.$route.query.recursive === "1";
} else { } else {
this.topMatter = null; this.topMatter = null;
this.recursive = false; this.recursive = false;
} }
} },
} },
}); });
</script> </script>
@ -134,6 +138,10 @@ export default defineComponent({
@media (max-width: 768px) { @media (max-width: 768px) {
margin-right: 10px; margin-right: 10px;
} }
:deep span {
cursor: pointer;
}
} }
} }
</style> </style>