Skip to content

NMC 1017 folder and image separate view with new navigation option all media S… #1027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TSI-ashishsharma wants to merge 2 commits into from
Closed

NMC 1017 folder and image separate view with new navigation option all media S… #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f86bfd
folder and image separate view with new navigation option all media S…
TSI-ashishsharma Feb 7, 2022
a09328a
Merge branch 'master' into NMC_1017_photoapp_design
TSI-ashishsharma Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/Photos.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,20 @@
<Content app-name="photos">
<AppNavigation>
<template #list>
<AppNavigationItem :to="{name: 'timeline'}"
class="app-navigation__photos"
<AppNavigationItem
:to="{ name: 'timeline' }"
class="app-navigation__allmedia "
:title="t('photos', 'All Media')"
icon="icon-yourphotos allmedia"
exact
/>
<AppNavigationItem
to="/images"
class="app-navigation__photos "
:title="t('photos', 'Your photos')"
icon="icon-yourphotos"
exact />
icon="icon-yourphotos allphotos"

/>
<AppNavigationItem to="/videos" :title="t('photos', 'Your videos')" icon="icon-video" />
<AppNavigationItem to="/favorites" :title="t('photos', 'Favorites')" icon="icon-favorite" />
<AppNavigationItem :to="{name: 'thisday'}" :title="t('photos', 'On this day')" icon="icon-calendar-dark" />
Expand Down
11 changes: 10 additions & 1 deletion src/router/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import Vue from 'vue'

import isMapsInstalled from '../services/IsMapsInstalled'
import areTagsInstalled from '../services/AreTagsInstalled'
import { videoMimes } from '../services/AllowedMimes'
import { imageMimes,videoMimes } from '../services/AllowedMimes'

const Albums = () => import('../views/Albums')
const Tags = () => import('../views/Tags')
Expand Down Expand Up @@ -61,8 +61,17 @@ export default new Router({
path: '/',
component: Timeline,
name: 'timeline',
props: route => ({
rootTitle: t('photos', 'All media'),
}),
},
{
path: '/images',
component: Timeline,
name: 'images',
props: route => ({
rootTitle: t('photos', 'Your photos'),
mimesType: imageMimes,
}),
},
{
Expand Down
18 changes: 15 additions & 3 deletions src/views/Albums.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,19 @@
</EmptyContent>

<div v-else class="grid-container">
<VirtualGrid ref="virtualgrid"
:items="contentList"
<div class="folders" v-if="contentList.folders.length">
<div class="list-title" >Folders</div>
<VirtualGrid
ref="virtualgrid"
:items="contentList.folders"
:get-column-count="() => gridConfig.count"
:get-grid-gap="() => gridConfig.gap" />
</div>
<div class="spacing-between" v-if="contentList.folders.length" />
<div class="list-title" >Images</div>
<VirtualGrid
ref="virtualgrid"
:items="contentList.files"
:get-column-count="() => gridConfig.count"
:get-grid-gap="() => gridConfig.gap" />
</div>
Expand Down Expand Up @@ -169,7 +180,8 @@ export default {
}
})

return [...(folders || []), ...(files || [])]
//return [...(folders || []), ...(files || [])]
return {"folders": folders,"files":(files)}
},

// is current folder empty?
Expand Down