Skip to content
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

Jump to bottom

Test for integrating grid system as a replacement for the card group. #464

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Test for integrating grid system as a replacement for the card group. #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 33 additions & 18 deletions src/components/Catalog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
<template>
<b-card no-body :class="classes" v-b-visible.400="load" :img-right="isList">
<b-card-img-lazy v-if="hasImage" class="thumbnail" offset="200" v-bind="thumbnail" />
<b-card-body>
<b-card-title>
<StacLink :data="[data, catalog]" class="stretched-link" />
</b-card-title>
<b-card-text v-if="data && (fileFormats.length > 0 || data.description || data.deprecated)" class="intro">
<b-badge v-if="data.deprecated" variant="warning" class="mr-1 mt-1 deprecated">{{ $t('deprecated') }}</b-badge>
<b-badge v-for="format in fileFormats" :key="format" variant="secondary" class="mr-1 mt-1 fileformat">{{ format | formatMediaType }}</b-badge>
{{ data.description | summarize }}
</b-card-text>
<Keywords v-if="showKeywordsInCatalogCards && keywords.length > 0" :keywords="keywords" variant="primary" :center="!isList" />
<b-card-text v-if="temporalExtent" class="datetime"><small v-html="temporalExtent" /></b-card-text>
</b-card-body>
<b-card-footer>
<slot name="footer" :data="data" />
</b-card-footer>
</b-card>
<div :class="containerClasses">
<b-card no-body :class="classes" v-b-visible.400="load" :img-right="isList">
<b-card-img-lazy v-if="hasImage" class="thumbnail" offset="200" v-bind="thumbnail" />
<b-card-body>
<b-card-title>
<StacLink :data="[data, catalog]" class="stretched-link" />
</b-card-title>
<b-card-text v-if="data && (fileFormats.length > 0 || data.description || data.deprecated)" class="intro">
<b-badge v-if="data.deprecated" variant="warning" class="mr-1 mt-1 deprecated">{{ $t('deprecated') }}</b-badge>
<b-badge v-for="format in fileFormats" :key="format" variant="secondary" class="mr-1 mt-1 fileformat">{{ format | formatMediaType }}</b-badge>
{{ data.description | summarize }}
</b-card-text>
<Keywords v-if="showKeywordsInCatalogCards && keywords.length > 0" :keywords="keywords" variant="primary" :center="!isList" />
<b-card-text v-if="temporalExtent" class="datetime"><small v-html="temporalExtent" /></b-card-text>
</b-card-body>
<b-card-footer>
<slot name="footer" :data="data" />
</b-card-footer>
</b-card>
</div>
</template>

<script>
Expand Down Expand Up @@ -46,6 +48,10 @@ export default {
catalog: {
type: Object,
required: true
},
isList: {
type: Boolean,
required: true,
}
},
computed: {
Expand All @@ -67,6 +73,15 @@ export default {
}
return classes;
},
containerClasses() {
let classes = ['p-1', 'm-0']
if (this.isList) {
classes.push('w-100')
} else {
classes.push(...['col-sm-6', 'col-md-4'])
}
return classes;
},
data() {
return this.getStac(this.catalog);
},
Expand Down
6 changes: 3 additions & 3 deletions src/components/Catalogs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<b-alert v-if="hasSearchCritera && catalogView.length === 0" variant="warning" class="mt-2" show>{{ $t('catalogs.noMatches') }}</b-alert>
<section class="list">
<Loading v-if="loading" fill top />
<component :is="cardsComponent" v-bind="cardsComponentProps">
<Catalog v-for="catalog in catalogView" :catalog="catalog" :key="catalog.href">
<div class="row">
<Catalog v-for="catalog in catalogView" :catalog="catalog" :isList="isList" :key="catalog.href" >
<template #footer="{data}">
<slot name="catalogFooter" :data="data" />
</template>
</Catalog>
</component>
</div>
</section>
<Pagination v-if="showPagination" :pagination="pagination" @paginate="paginate" />
<b-button v-else-if="hasMore" @click="loadMore" variant="primary" v-b-visible.300="loadMore">{{ $t('catalogs.loadMore') }}</b-button>
Expand Down
44 changes: 23 additions & 21 deletions src/components/Item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<template>
<b-card no-body class="item-card" :class="{queued: !data, deprecated: isDeprecated, description: hasDescription}" v-b-visible.400="load">
<b-card-img-lazy v-if="hasImage" class="thumbnail" offset="200" v-bind="thumbnail" />
<b-card-body>
<b-card-title>
<StacLink :data="[data, item]" class="stretched-link" />
</b-card-title>
<b-card-text v-if="fileFormats.length > 0 || hasDescription || isDeprecated" class="intro">
<b-badge v-if="isDeprecated" variant="warning" class="mr-1 mt-1 deprecated">{{ $t('deprecated') }}</b-badge>
<b-badge v-for="format in fileFormats" :key="format" variant="secondary" class="mr-1 mt-1 fileformat">{{ format | formatMediaType }}</b-badge>
<template v-if="hasDescription">{{ data.properties.description | summarize }}</template>
</b-card-text>
<Keywords v-if="showKeywordsInItemCards && keywords.length > 0" :keywords="keywords" variant="primary" center />
<b-card-text>
<small class="text-muted">
<template v-if="extent">{{ extent | formatTemporalExtent }}</template>
<template v-else-if="data && data.properties.datetime">{{ data.properties.datetime | formatTimestamp }}</template>
<template v-else>{{ $t('items.noTime') }}</template>
</small>
</b-card-text>
</b-card-body>
</b-card>
<div class="p-1 m-0 col-sm-6 col-md-4">
<b-card no-body class="item-card" :class="{queued: !data, deprecated: isDeprecated, description: hasDescription}" v-b-visible.400="load">
<b-card-img-lazy v-if="hasImage" class="thumbnail" offset="200" v-bind="thumbnail" />
<b-card-body>
<b-card-title>
<StacLink :data="[data, item]" class="stretched-link" />
</b-card-title>
<b-card-text v-if="fileFormats.length > 0 || hasDescription || isDeprecated" class="intro">
<b-badge v-if="isDeprecated" variant="warning" class="mr-1 mt-1 deprecated">{{ $t('deprecated') }}</b-badge>
<b-badge v-for="format in fileFormats" :key="format" variant="secondary" class="mr-1 mt-1 fileformat">{{ format | formatMediaType }}</b-badge>
<template v-if="hasDescription">{{ data.properties.description | summarize }}</template>
</b-card-text>
<Keywords v-if="showKeywordsInItemCards && keywords.length > 0" :keywords="keywords" variant="primary" center />
<b-card-text>
<small class="text-muted">
<template v-if="extent">{{ extent | formatTemporalExtent }}</template>
<template v-else-if="data && data.properties.datetime">{{ data.properties.datetime | formatTimestamp }}</template>
<template v-else>{{ $t('items.noTime') }}</template>
</small>
</b-card-text>
</b-card-body>
</b-card>
</div>
</template>

<script>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Items.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

<section class="list">
<Loading v-if="loading" fill top />
<b-card-group v-if="chunkedItems.length > 0" columns>
<div v-if="chunkedItems.length > 0" class="row">
<Item v-for="item in chunkedItems" :item="item" :key="item.href" />
</b-card-group>
</div>
<b-alert v-else :variant="hasFilters ? 'warning' : 'info'" show>
<template v-if="hasFilters">{{ $t('search.noItemsFound') }}</template>
<template v-else>{{ $t('items.noneAvailableForCollection') }}</template>
Expand Down
18 changes: 2 additions & 16 deletions src/components/ViewMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,8 @@ export default {
ViewButtons
},
computed: {
cardsComponent() {
return (this.view === 'list') ? 'div' : 'b-card-group';
},
cardsComponentProps() {
if (this.view === 'list') {
return {
class: [
'card-list'
]
};
}
else {
return {
columns: true
};
}
isList() {
return this.view === 'list'
},
view: {
get() {
Expand Down