Merge branch 'feature/gvs-212' into 'develop'

Update GeoVisio to 2.1.2

See merge request geovisio/website!77
This commit is contained in:
Adrien Pavie
2023-08-20 20:22:57 +00:00
5 changed files with 1717 additions and 1680 deletions

View File

@@ -25,7 +25,7 @@
"axios": "^1.2.3",
"bootstrap": "^5.2.3",
"bootstrap-icons": "^1.10.3",
"geovisio": "2.1.1",
"geovisio": "2.1.2",
"moment": "^2.29.4",
"pinia": "^2.1.4",
"vue": "^3.2.45",

View File

@@ -35,7 +35,7 @@ async function fetchMapAndViewer(params?: OptionalViewerMapInterface) {
}
return new GeoVisio(
'viewer', // Div ID
`${import.meta.env.VITE_API_URL}api/search`,
`${import.meta.env.VITE_API_URL}/api/search`,
paramsGeovisio
)
}

View File

@@ -1,9 +1,4 @@
<template>
<link
rel="stylesheet"
type="text/css"
href="https://cdn.jsdelivr.net/npm/geovisio@2.1.1/build/index.css"
/>
<main class="entry-page">
<section id="viewer" class="entry-viewer">
<div v-if="mapIsLoaded" class="entry-report-button">
@@ -23,6 +18,7 @@ import { onMounted, computed, ref } from 'vue'
import Button from '@/components/Button.vue'
import { fetchMapAndViewer } from '@/utils/mapAndViewer'
import { getPicId } from '@/utils/image'
import 'geovisio/build/index.css'
const { t } = useI18n()
let mapIsLoaded = ref<boolean>(false)
@@ -59,12 +55,13 @@ onMounted(async () => {
width: 100vw;
position: relative;
min-height: calc(100vh - 8rem);
font-size: 160%; /* Cancels the rule set on HTML 62.5% */
}
.gvs-has-map .entry-report-button {
display: block;
position: absolute;
right: 1rem;
top: 2rem;
right: 120px;
top: 10px;
z-index: 1;
}
.gvs-focus-map .entry-report-button {

View File

@@ -1,9 +1,4 @@
<template>
<link
rel="stylesheet"
type="text/css"
href="https://cdn.jsdelivr.net/npm/geovisio@2.1.1/build/index.css"
/>
<main :class="['entry-page', { 'menu-is-open': menuIsOpen }]">
<div class="button-close">
<Button
@@ -193,6 +188,7 @@ import Pagination from '@/components/Pagination.vue'
import InputCheckbox from '@/components/InputCheckbox.vue'
import Loader from '@/components/Loader.vue'
import ImageItem from '@/components/ImageItem.vue'
import 'geovisio/build/index.css'
import { durationCalc, formatDate } from '@/utils/dates'
import {
deleteACollectionItem,

3376
yarn.lock

File diff suppressed because it is too large Load Diff