diff --git a/src/components/Button.vue b/src/components/Button.vue index c88a95d..f78ac50 100644 --- a/src/components/Button.vue +++ b/src/components/Button.vue @@ -35,7 +35,7 @@ defineProps({ } } .default { - height: toRem(3.5); + height: toRem(3); min-width: toRem(3.5); @include text(s-regular); display: flex; diff --git a/src/components/Modal.vue b/src/components/Modal.vue index 15af7fc..63f9514 100644 --- a/src/components/Modal.vue +++ b/src/components/Modal.vue @@ -19,7 +19,7 @@ diff --git a/src/components/Viewer.vue b/src/components/Viewer.vue index a4f0b29..2309eba 100644 --- a/src/components/Viewer.vue +++ b/src/components/Viewer.vue @@ -108,17 +108,21 @@ onMounted(async () => { style } } + const bbox = [props.bbox[0], props.bbox[1], props.bbox[2], props.bbox[3]] viewer.value = new StandaloneMap( 'viewer', // Div ID `${import.meta.env.VITE_API_URL}/api/search`, { ...paramsMap, - bounds: [props.bbox[0], props.bbox[1], props.bbox[2], props.bbox[3]], + bounds: bbox, zoom: 9 } ) viewer.value.addEventListener('ready', () => { viewer.value.setFilters({ user: props.userId }, true) + viewer.value.fitBounds(bbox, { + padding: { top: 70, bottom: 70, left: 70, right: 70 } + }) }) } mapIsLoaded.value = true diff --git a/src/router/index.ts b/src/router/index.ts index 280f006..318088f 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,5 +1,4 @@ import { createRouter, createWebHistory } from 'vue-router' -import { useCookies } from 'vue3-cookies' import type { RouteRecordRaw, NavigationGuardNext, @@ -15,7 +14,6 @@ import MySequenceView from '../views/MySequenceView.vue' import SharePicturesView from '../views/SharePicturesView.vue' import UploadPicturesView from '../views/UploadPicturesView.vue' import Ay11View from '../views/Ay11View.vue' -const { cookies } = useCookies() let routes: Array = [ { path: '/', diff --git a/src/tests/unit/components/Modal.spec.js b/src/tests/unit/components/Modal.spec.js index ff1bf9e..b9d0ac8 100644 --- a/src/tests/unit/components/Modal.spec.js +++ b/src/tests/unit/components/Modal.spec.js @@ -30,7 +30,13 @@ describe('Template', () => { }) it('should render the props filled', async () => { document.body.innerHTML = '
' - const uploadErrors = [{ message: 'my message', name: 'my name' }] + const uploadErrors = [ + { + details: { error: 'my error' }, + message: 'my message', + name: 'my name' + } + ] const wrapper = shallowMount(Modal, { global: { plugins: [i18n], @@ -45,7 +51,7 @@ describe('Template', () => { expect(wrapper.vm.uploadErrors).toEqual(uploadErrors) expect(wrapper.html()).contains('my name - ') - expect(wrapper.html()).contains('my message') + expect(wrapper.html()).contains('my error') }) }) }) diff --git a/src/views/MySequenceView.vue b/src/views/MySequenceView.vue index 5e8ac3f..4fb5b75 100644 --- a/src/views/MySequenceView.vue +++ b/src/views/MySequenceView.vue @@ -429,7 +429,7 @@ function fullImagesToDelete(): ResponseUserPhotoInterface[] { return pictures.value.filter((el) => picturesToDelete.value.includes(el.id)) } -async function goToNextPage(value: string) { +async function goToNextPage(value: string): Promise { isLoading.value = true const { data } = await fetchCollectionItemsWithFullUrl(value) selfLink.value = data.links.filter((el) => el.rel === 'self') diff --git a/src/views/MySequencesView.vue b/src/views/MySequencesView.vue index 5ab4f82..61c1133 100644 --- a/src/views/MySequencesView.vue +++ b/src/views/MySequencesView.vue @@ -26,61 +26,52 @@ /> -
-

{{ $t('pages.sequences.title') }}

-
    -
  • -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    • +
    +

    + {{ $t('pages.sequences.title') }} +

    +
    +
    +
    + {{ $t('pages.sequences.sequence_name') }} +
    +
    + {{ $t('pages.sequences.sequence_photos') }} +
    +
    +
    +
    +
    +
    + {{ $t('pages.sequences.sequence_status') }} +
    +
    +
    • +
      + +