rpdata/frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix files page not working when logged out.
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
gisle
2020-08-09 16:51:06 +02:00
parent 79c3a76300
commit a10b29a0ea
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
marko/page/data/components/files-page/index.marko
+2 -2
View File
@@ -1,9 +1,9 @@
<data-menu categories=input.categories selected=(input.selected || {}) user=input.user on-open("open") /> <data-menu categories=input.categories selected=(input.selected || {}) user=input.user on-open("open") />
<main class="data-file-page"> <main class="data-file-page">
<h1 class="file-list-headers color-primary">Your Private Files</h1> <h1 if(state.privates && state.privates.length > 0) class="file-list-headers color-primary">Your Private Files</h1>
<file-list user=input.user files=state.privates on-removed("fileRemoved") on-edited("fileEdited") on-nicks("fileNicksChanged") /> <file-list user=input.user files=state.privates on-removed("fileRemoved") on-edited("fileEdited") on-nicks("fileNicksChanged") />
<h1 class="file-list-headers color-primary">Public Files</h1> <h1 if(state.publics && state.publics.length > 0) class="file-list-headers color-primary">Public Files</h1>
<file-list user=input.user files=state.publics on-removed("fileRemoved") on-edited("fileEdited") on-nicks("fileNicksChanged") /> <file-list user=input.user files=state.publics on-removed("fileRemoved") on-edited("fileEdited") on-nicks("fileNicksChanged") />
</main> </main>
<add-channel-modal enabled=(state.modal === "channel.add") user=input.user on-close("close") /> <add-channel-modal enabled=(state.modal === "channel.add") user=input.user on-close("close") />
routes/data/files.js
+2 -2
View File
@@ -8,13 +8,13 @@ const filesTemplate = require("../../marko/page/data/files.marko")
router.get("/", async(req, res) => { router.get("/", async(req, res) => {
let privates = [] let privates = []
if (res.locals.user) { if (res.locals.user && res.locals.user.loggedIn) {
privates = fileApi.list({public: false}, {token: generateToken(res.locals.user.name)}) privates = fileApi.list({public: false}, {token: generateToken(res.locals.user.name)})
} }
res.markoAsync(filesTemplate, { res.markoAsync(filesTemplate, {
privates: privates, privates: privates,
publics: fileApi.list(), publics: fileApi.list({public: true}),
selected: {files: true}, selected: {files: true},
}) })
}) })