Skip to content

[stable18] added headers for your photos and favs #172

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

Merged
skjnldsv merged 3 commits into from
Feb 4, 2020
Merged

[stable18] added headers for your photos and favs #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a935524
added headers for your photos and favs
jakobroehrl Jan 15, 2020
93213f5
Compile assets
npmbuildbot[bot] Feb 2, 2020
a10b0dd
Merge branch 'stable18' into backport/116
skjnldsv Feb 2, 2020
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
4 changes: 2 additions & 2 deletions js/photos.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/photos.js.map
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions src/router/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ export default new Router({
path: '/',
component: Timeline,
name: 'root',
props: route => ({
rootTitle: t('photos', 'Your photos'),
}),
},
{
path: '/albums/:path*',
Expand Down Expand Up @@ -77,9 +80,10 @@ export default new Router({
path: '/favorites',
component: Timeline,
name: 'favorites',
props: {
props: route => ({
rootTitle: t('photos', 'Favorites'),
onlyFavorites: true,
},
}),
},
{
path: '/tags/:path*',
Expand Down
30 changes: 24 additions & 6 deletions src/views/Timeline.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,20 @@
</EmptyContent>

<!-- Folder content -->
<VirtualGrid v-else-if="!loading"
:component="getComponent"
:list="fileList"
:loading-page="loadingPage"
:props="getProps"
@bottomReached="onBottomReached" />
<div v-else-if="!loading">
<Navigation
key="navigation"
:basename="path"
:filename="'/'"
:root-title="rootTitle" />

<VirtualGrid
:component="getComponent"
:list="fileList"
:loading-page="loadingPage"
:props="getProps"
@bottomReached="onBottomReached" />
</div>
</template>

<script>
Expand All @@ -50,6 +58,7 @@ import getPhotos from '../services/PhotoSearch'
import EmptyContent from '../components/EmptyContent'
import File from '../components/File'
import VirtualGrid from '../components/VirtualGrid'
import Navigation from '../components/Navigation'

import cancelableRequest from '../utils/CancelableRequest'
import GridConfigMixin from '../mixins/GridConfig'
Expand All @@ -59,6 +68,7 @@ export default {
components: {
EmptyContent,
VirtualGrid,
Navigation,
},
mixins: [GridConfigMixin],
props: {
Expand All @@ -70,6 +80,14 @@ export default {
type: Boolean,
default: false,
},
rootTitle: {
type: String,
required: true,
},
path: {
type: String,
default: '',
},
},

data() {
Expand Down