Merge branch 'main' of https://github.com/tainacan/tainacan-mobile
This commit is contained in:
commit
e39830ea78
|
@ -24724,49 +24724,6 @@
|
|||
"webpack-merge": "^5.7.3",
|
||||
"webpack-virtual-modules": "^0.4.2",
|
||||
"whatwg-fetch": "^3.6.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@vue/vue-loader-v15": {
|
||||
"version": "npm:vue-loader@15.10.0",
|
||||
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz",
|
||||
"integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@vue/component-compiler-utils": "^3.1.0",
|
||||
"hash-sum": "^1.0.2",
|
||||
"loader-utils": "^1.1.0",
|
||||
"vue-hot-reload-api": "^2.3.0",
|
||||
"vue-style-loader": "^4.1.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"hash-sum": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
|
||||
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"json5": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
|
||||
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"minimist": "^1.2.0"
|
||||
}
|
||||
},
|
||||
"loader-utils": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
|
||||
"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"big.js": "^5.2.2",
|
||||
"emojis-list": "^3.0.0",
|
||||
"json5": "^1.0.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"@vue/cli-shared-utils": {
|
||||
|
@ -25046,6 +25003,47 @@
|
|||
"dev": true,
|
||||
"requires": {}
|
||||
},
|
||||
"@vue/vue-loader-v15": {
|
||||
"version": "npm:vue-loader@15.10.0",
|
||||
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz",
|
||||
"integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@vue/component-compiler-utils": "^3.1.0",
|
||||
"hash-sum": "^1.0.2",
|
||||
"loader-utils": "^1.1.0",
|
||||
"vue-hot-reload-api": "^2.3.0",
|
||||
"vue-style-loader": "^4.1.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"hash-sum": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
|
||||
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
|
||||
"dev": true
|
||||
},
|
||||
"json5": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
|
||||
"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"minimist": "^1.2.0"
|
||||
}
|
||||
},
|
||||
"loader-utils": {
|
||||
"version": "1.4.0",
|
||||
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
|
||||
"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"big.js": "^5.2.2",
|
||||
"emojis-list": "^3.0.0",
|
||||
"json5": "^1.0.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"@vue/vue3-jest": {
|
||||
"version": "27.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@vue/vue3-jest/-/vue3-jest-27.0.0.tgz",
|
||||
|
|
|
@ -63,12 +63,11 @@ export default defineComponent({
|
|||
const thumbnailPlaceholder = computed (() => require('../../assets/placeholder_square_small.png'))
|
||||
const router = useRouter();
|
||||
const goToCollectionPage = (collection: any) => {
|
||||
router .push({
|
||||
router.push({
|
||||
name: 'collection',
|
||||
params: {
|
||||
id: collection.id,
|
||||
collection: JSON.stringify(collection)
|
||||
}
|
||||
id: collection.id
|
||||
},
|
||||
});
|
||||
}
|
||||
return {
|
||||
|
|
|
@ -7,6 +7,7 @@ export const translationStrings = {
|
|||
label_loading: 'Loading...',
|
||||
label_items_list: 'Items list',
|
||||
label_collections_list: 'Collections list',
|
||||
label_collection_items_list: 'Collection items list',
|
||||
collection: 'Collection',
|
||||
label_site_url: 'Archive site URL',
|
||||
placeholder_site_url: 'https://my-tainacan-archive.com',
|
||||
|
@ -45,6 +46,7 @@ export const translationStrings = {
|
|||
label_loading: 'Carregando...',
|
||||
label_items_list: 'Lista de itens',
|
||||
label_collections_list: 'Lista de coleções',
|
||||
label_collection_items_list: 'Lista de itens da coleção',
|
||||
collection: 'Coleção',
|
||||
label_site_url: 'URL do Site do Acervo',
|
||||
placeholder_site_url: 'https://meu-acervo-tainacan.com',
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<base-layout
|
||||
:page-title="(collectionObject && collectionObject.name) ? collectionObject.name : $t('collection')"
|
||||
:page-title="$t('label_collection_items_list')"
|
||||
page-default-back-link="/collections">
|
||||
<ion-refresher slot="fixed" @ionRefresh="doRefresh($event)">
|
||||
<ion-refresher-content></ion-refresher-content>
|
||||
|
@ -75,8 +75,7 @@ export default defineComponent({
|
|||
IonInfiniteScrollContent
|
||||
},
|
||||
props: {
|
||||
id: String,
|
||||
collection: String
|
||||
id: String
|
||||
},
|
||||
setup(props) {
|
||||
const isLoading = ref(false);
|
||||
|
@ -133,30 +132,30 @@ export default defineComponent({
|
|||
header: actionSheetLabels.value.header,
|
||||
cssClass: 'item-creation-action-sheet',
|
||||
buttons: [
|
||||
{
|
||||
text: actionSheetLabels.value.button1,
|
||||
icon: documentsOutline,
|
||||
data: 'multiple-items',
|
||||
handler: () => {
|
||||
wpStore.openInAppBrowser('?page=tainacan_admin&mobileAppMode=true#/collections/' + props.id + '/bulk-add');
|
||||
wpStore.listenEventInAppBrowser((event: InAppBrowserEvent) => {
|
||||
if (event &&
|
||||
event.data &&
|
||||
(
|
||||
(
|
||||
event.data.type === 'item_updated' &&
|
||||
event.data.item &&
|
||||
event.data.item.status !== 'auto-draft'
|
||||
)
|
||||
|| event.data.type === 'exited_from_navigation'
|
||||
)
|
||||
) {
|
||||
wpStore.hideInAppBrowser();
|
||||
loadItemsByCollection({}, true);
|
||||
}
|
||||
});
|
||||
},
|
||||
},
|
||||
// {
|
||||
// text: actionSheetLabels.value.button1,
|
||||
// icon: documentsOutline,
|
||||
// data: 'multiple-items',
|
||||
// handler: () => {
|
||||
// wpStore.openInAppBrowser('?page=tainacan_admin&mobileAppMode=true#/collections/' + props.id + '/bulk-add');
|
||||
// wpStore.listenEventInAppBrowser((event: InAppBrowserEvent) => {
|
||||
// if (event &&
|
||||
// event.data &&
|
||||
// (
|
||||
// (
|
||||
// event.data.type === 'item_updated' &&
|
||||
// event.data.item &&
|
||||
// event.data.item.status !== 'auto-draft'
|
||||
// )
|
||||
// || event.data.type === 'exited_from_navigation'
|
||||
// )
|
||||
// ) {
|
||||
// wpStore.hideInAppBrowser();
|
||||
// loadItemsByCollection({}, true);
|
||||
// }
|
||||
// });
|
||||
// },
|
||||
// },
|
||||
{
|
||||
text: actionSheetLabels.value.button3,
|
||||
icon: documentOutline,
|
||||
|
@ -186,8 +185,7 @@ export default defineComponent({
|
|||
const { role, data } = await actionSheet.onDidDismiss();
|
||||
console.log('onDidDismiss resolved with role and data', role, data);
|
||||
}
|
||||
const collectionObject = props.collection ? JSON.parse(props.collection + '') : false;
|
||||
|
||||
|
||||
let tainacanStore = useTainacanStore();
|
||||
return {
|
||||
isLoading,
|
||||
|
@ -201,7 +199,6 @@ export default defineComponent({
|
|||
add,
|
||||
actionSheetLabels,
|
||||
setActionSheetLabels,
|
||||
collectionObject,
|
||||
infiniteScroll,
|
||||
handleSearch,
|
||||
}
|
||||
|
|
|
@ -20,6 +20,10 @@
|
|||
size="small"
|
||||
routerLink="/collections">
|
||||
{{ $t('label_view_all_collections', [tainacanStore.totalHomeCollections]) }}
|
||||
<ion-icon
|
||||
slot="end"
|
||||
:icon="arrowForwardOutline"
|
||||
></ion-icon>
|
||||
</ion-button>
|
||||
<ion-list>
|
||||
<ion-list-header>
|
||||
|
@ -32,6 +36,10 @@
|
|||
size="small"
|
||||
routerLink="/items">
|
||||
{{ $t('label_view_all_items', [tainacanStore.totalHomeItems]) }}
|
||||
<ion-icon
|
||||
slot="end"
|
||||
:icon="arrowForwardOutline"
|
||||
></ion-icon>
|
||||
</ion-button>
|
||||
</ion-list>
|
||||
</base-layout>
|
||||
|
@ -46,7 +54,9 @@ import { ref } from 'vue';
|
|||
import CollectionsList from '@/components/lists/CollectionsList.vue';
|
||||
import ItemsList from '@/components/lists/ItemsList.vue';
|
||||
import BaseLayout from '@/components/base/BaseLayout.vue';
|
||||
import { arrowForwardOutline } from "ionicons/icons";
|
||||
import {
|
||||
IonIcon,
|
||||
IonButton,
|
||||
IonLoading,
|
||||
IonList,
|
||||
|
@ -57,6 +67,7 @@ import {
|
|||
|
||||
export default {
|
||||
components: {
|
||||
IonIcon,
|
||||
CollectionsList,
|
||||
ItemsList,
|
||||
BaseLayout,
|
||||
|
@ -83,6 +94,7 @@ export default {
|
|||
let tainacanStore = useTainacanStore();
|
||||
|
||||
return {
|
||||
arrowForwardOutline,
|
||||
tainacanStore,
|
||||
isLoading,
|
||||
setIsLoading,
|
||||
|
|
|
@ -19,6 +19,7 @@ ion-card {
|
|||
.searchbar-input {
|
||||
border-radius: 30px !important;
|
||||
box-shadow: none !important;
|
||||
--background: #efefef;
|
||||
}
|
||||
|
||||
.header-md::after {
|
||||
|
|
Loading…
Reference in New Issue