Merge branch 'feat/link-to-sequence-from-viewer' into 'develop'

feat: add button to viewer to link to seuqence + refacto

Closes #48

See merge request geovisio/website!114

.gitignore

@@ -90,6 +90,7 @@ sw.*
 *.swp
 
 # Cypress generated screen and videos files
+cypress/downloads/*
 cypress/screenshot/
 cypress/videos/
 *.cy.ts.mp4

.gitlab-ci.yml

@@ -8,9 +8,10 @@ variables:
   DOCKER_BUILDKIT: 1 # use buildkit for better performance
   DOCKER_DRIVER: overlay2 # better docker driver to avoid copying too many files on each run
   GITLAB_REGISTRY: registry.gitlab.com # We use docker.io for official images and gitlab's registry to store temporary images
-  IMAGE_NAME: geovisio/api
+  IMAGE_NAME: geovisio/website
   CI_IMAGE_CACHE: $GITLAB_REGISTRY/$IMAGE_NAME:build_cache
-  DOCKER_TLS_CERTDIR: ""
+  DOCKER_TLS_CERTDIR: ''
+  DOCKER_HOST: tcp://docker:2375
 
 before_script:
   ## chmod is unfortunately currently mandatory : https://github.com/nodejs/docker-node/issues/661
@@ -22,28 +23,29 @@ cache:
 
 install:
   stage: Install
-  image: node:18.16.0
+  image: node:18.16.1
   script:
     - yarn install
     - ls node_modules/.bin/cypress
 
 test:unit:
   stage: Test
-  image: node:18.16.0
+  image: node:18.16.1
   script:
     - yarn test:unit
   coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
 
 test:e2e:
   stage: Test
-  image: cypress/browsers:node-18.16.0-chrome-113.0.5672.92-1-ff-113.0-edge-113.0.1774.35-1
+  image: node:18.16.1-alpine
+  services:
+    - docker:dind
   script:
-    - yarn install
-    - ./node_modules/.bin/cypress install
-    - echo "VITE_API_URL=https://geovisio-proxy-dev.osc-fr1.scalingo.io/" > .env
-    - echo "VITE_ENV=dev" >> .env
-    - PORT=5173 yarn start &
-    - yarn test:e2e
+    - apk add --update --no-cache docker-cli docker-cli-compose git
+    - PROJECT_DIR=$PWD docker compose -f cypress/docker-compose-geovisio.yml -f cypress/docker-compose-gitlab-override.yml run --rm e2e
+  after_script:
+    - PROJECT_DIR=$PWD docker compose -f cypress/docker-compose-geovisio.yml -f cypress/docker-compose-gitlab-override.yml logs web || true
+    - PROJECT_DIR=$PWD docker compose -f cypress/docker-compose-geovisio.yml -f cypress/docker-compose-gitlab-override.yml down || true
   coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
   artifacts:
     when: always
@@ -54,7 +56,7 @@ test:e2e:
 
 deploy:
   stage: Deploy
-  image: node:18.16.0
+  image: node:18.16.1
   cache:
     paths:
       - node_modules
@@ -74,7 +76,7 @@ deploy:develop:
   stage: Deploy
   image: docker:latest
   services:
-      - docker:dind
+    - docker:dind
   before_script:
     # login to the gitlab docker registry to use the cache and to publish
     - echo $CI_DEPLOY_PASSWORD | docker login -u $CI_DEPLOY_USER --password-stdin $GITLAB_REGISTRY
@@ -106,7 +108,7 @@ deploy:latest:
   stage: Deploy
   image: docker:latest
   services:
-      - docker:dind
+    - docker:dind
   before_script:
     # login to the gitlab docker registry to use the cache and to publish
     - echo $CI_DEPLOY_PASSWORD | docker login -u $CI_DEPLOY_USER --password-stdin $GITLAB_REGISTRY

CHANGELOG.md

@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Before _0.1.0_, website development was on rolling release, meaning there are no version tags.
 
+## [2.3.0] - 2023-12-06
+
+### Added
+
+- Add the possibility to an user to select a sequence in the list using the map : https://gitlab.com/geovisio/website/-/merge_requests/100
+- For a selected sequence in the list, if the sequence is not displayed in the map, fly to the sequence on the map : https://gitlab.com/geovisio/website/-/merge_requests/108
+- Add the pagination to the sequence with sort with API routes : https://gitlab.com/geovisio/website/-/merge_requests/107
+- Add Hungarian translation : https://gitlab.com/geovisio/website/-/merge_requests/105
+- Add the possibility to hide/delete a sequence in the sequence list : https://gitlab.com/geovisio/website/-/merge_requests/101
+- Add the possibility for the user to change the title of the sequence before upload the pictures : https://gitlab.com/geovisio/website/-/merge_requests/101
+- Add the possibility to resize the sequence page by dragging the blocs : https://gitlab.com/geovisio/website/-/merge_requests/101
+
+### Changed
+
+- GeoVisio web viewer updated to [2.3.0](https://gitlab.com/geovisio/web-viewer/-/compare/2.2.1...2.3.0)
+
+### Fixed
+
+- Nginx server in Docker container was not recognizing routes other than `/` on first loading.
+- Fix the cookie bug by decoding flask cookie : https://gitlab.com/geovisio/website/-/merge_requests/102
+
 ## [2.2.3] - 2023-11-03
 
 ### Added
@@ -16,6 +37,7 @@ Before _0.1.0_, website development was on rolling release, meaning there are no
 ### Changed
 
 - Page My Sequences, add the possibility to select a sequence in the list with the map :
+
   - the user can only see his sequences on the list
   - display the selected sequence in blue in the map
   - display a thumbnail the hovered sequence
@@ -125,7 +147,8 @@ Before _0.1.0_, website development was on rolling release, meaning there are no
 - Header have now a new entry `Mes photos` when the user is logged to access to the sequence list
 - The router guard for logged pages has been changed to not call the api to check the token
 
-[unreleased]: https://gitlab.com/geovisio/website/-/compare/2.2.3...develop
+[unreleased]: https://gitlab.com/geovisio/website/-/compare/2.3.0...develop
+[2.2.1]: https://gitlab.com/geovisio/website/-/compare/2.2.3...2.3.0
 [2.2.1]: https://gitlab.com/geovisio/website/-/compare/2.2.2...2.2.3
 [2.2.1]: https://gitlab.com/geovisio/website/-/compare/2.2.1...2.2.2
 [2.2.1]: https://gitlab.com/geovisio/website/-/compare/2.2.0...2.2.1

Dockerfile

@@ -2,7 +2,7 @@
 #- Build image
 #-
 
-FROM node:18.16.0-alpine AS build
+FROM node:18.16.1-alpine AS build
 
 WORKDIR /opt/geovisio
 

cypress.config.ts

@@ -12,6 +12,6 @@ export default defineConfig({
     setupNodeEvents(on, config) {
       // implement node event listeners here
     },
-    baseUrl: 'http://localhost:5173'
+    baseUrl: 'http://localhost:5173/'
   }
 })

cypress.env.json

@@ -0,0 +1,3 @@
+{
+  "api_url": "http://localhost:5000/"
+}

cypress/docker-compose-geovisio.yml

@@ -0,0 +1,79 @@
+services:
+  api:
+    image: geovisio/api:develop
+    command: api
+    restart: always
+    ports:
+      - 5000:5000
+    depends_on:
+      db:
+        condition: service_healthy
+      auth:
+        condition: service_healthy
+    environment:
+      DB_URL: postgres://gvs:gvspwd@db/geovisio
+      PICTURE_PROCESS_THREADS_LIMIT: 2
+      PICTURE_PROCESS_DERIVATES_STRATEGY: ON_DEMAND
+      API_FORCE_AUTH_ON_UPLOAD: 'true'
+      OAUTH_CLIENT_ID: geovisio
+      OAUTH_CLIENT_SECRET: what_a_secret
+      OAUTH_OIDC_URL: http://localhost:8183/realms/geovisio
+      OAUTH_PROVIDER: oidc
+      FLASK_SECRET_KEY: a_very_secret_key_never_to_be_used_in_production
+    healthcheck:
+      test: python -c "import requests; requests.get('http://localhost:5000/api').raise_for_status()"
+      interval: 5s
+      timeout: 5s
+      retries: 10
+    extra_hosts:
+      - 'localhost:host-gateway'
+
+    networks:
+      db: {}
+      geovisio:
+        aliases:
+          - api.localtest.me
+
+  db:
+    image: postgis/postgis:13-3.2
+    environment:
+      - POSTGRES_USER=gvs
+      - POSTGRES_PASSWORD=gvspwd
+      - POSTGRES_DB=geovisio
+    healthcheck:
+      test: pg_isready -q -d $$POSTGRES_DB -U $$POSTGRES_USER
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      db: {}
+
+  auth:
+    command: start-dev --import-realm
+    environment:
+      GEOVISIO_BASE_URL: http://localhost:5000
+      GEOVISIO_CLIENT_SECRET: what_a_secret
+      KEYCLOAK_ADMIN: admin
+      KEYCLOAK_ADMIN_PASSWORD: password
+      KEYCLOAK_FRONTEND_URL: http://localhost:5000/api/auth/login
+      KC_HTTP_PORT: 8183
+    ports:
+      - '8183:8183'
+    healthcheck:
+      test: curl --fail http://localhost:8183/realms/geovisio
+      timeout: 5s
+      interval: 2s
+      retries: 20
+      start_period: 15s
+    image: quay.io/keycloak/keycloak:20.0.1
+    volumes:
+      - ./keycloak-realm.json:/opt/keycloak/data/import/geovisio_realm.json
+
+    networks:
+      geovisio:
+        aliases:
+          - keycloak.localtest.me
+
+networks:
+  db: {}
+  geovisio: {}

cypress/docker-compose-gitlab-override.yml

@@ -0,0 +1,55 @@
+# Docker-compose used in gitlab-ci to run a container having access to all the other containers
+services:
+  web:
+    image: node:18.16.1-alpine
+    volumes:
+      - $PROJECT_DIR:/src
+    working_dir: /src
+    command: >
+      sh -c "apk add --update --no-cache curl && yarn install && yarn start"
+    environment:
+      PORT: 5173
+      VITE_API_URL: http://api.localtest.me:5000
+      VITE_ENV: dev
+    depends_on:
+      api:
+        condition: service_healthy
+      auth:
+        condition: service_healthy
+    ports:
+      - 5173:5173
+    healthcheck:
+      test: curl --fail http://0.0.0.0:5173
+      timeout: 10s
+      interval: 3s
+      retries: 20
+      start_period: 15s
+    networks:
+      geovisio:
+        aliases:
+          - front.localtest.me
+  e2e:
+    image: cypress/included:cypress-12.17.3-node-18.16.1-chrome-114.0.5735.133-1-ff-114.0.2-edge-114.0.1823.51-1
+    volumes:
+      - $PROJECT_DIR:/src
+    working_dir: /src
+    environment:
+      - CYPRESS_baseUrl=http://front.localtest.me:5173/
+      - CYPRESS_api_url=http://api.localtest.me:5000/
+      - LANG=fr
+    command: sleep 2 && yarn add --dev cypress && ./node_modules/.bin/cypress install && yarn test:e2e
+    depends_on:
+      web:
+        condition: service_healthy
+    networks:
+      geovisio: {}
+
+  api:
+    environment:
+      OAUTH_OIDC_URL: http://keycloak.localtest.me:8183/realms/geovisio
+      FLASK_SESSION_COOKIE_DOMAIN: localtest.me
+
+  auth:
+    environment:
+      GEOVISIO_BASE_URL: http://api.localtest.me:5000
+      KEYCLOAK_FRONTEND_URL: http://api.localtest.me:5000/api/auth/login

cypress/e2e/contribute.cy.ts

@@ -0,0 +1,29 @@
+describe('In the contribute page', () => {
+  it('go to the login page', () => {
+    cy.visit('/pourquoi-contribuer')
+    cy.get('.upload-text').scrollIntoView()
+    cy.fixture('contribute').then((contributeData: contributeInterface) => {
+      cy.contains(contributeData.textButtonContribute).click()
+    })
+  })
+  it('go to the doc pages', () => {
+    cy.visit('pourquoi-contribuer')
+    cy.fixture('contribute').then((contributeData: contributeInterface) => {
+      cy.get('.upload-text').scrollIntoView()
+      cy.contains(contributeData.textButtonDocPython).click()
+      cy.contains(contributeData.textButtonCli).click()
+      cy.contains(contributeData.textButtonDocCli).click()
+      cy.contains(contributeData.textButtonTiles).click()
+      cy.contains(contributeData.textButtonDoc).click()
+    })
+  })
+})
+interface contributeInterface {
+  textButtonContribute: string
+  textButtonDocPython: string
+  textButtonCli: string
+  textButtonDocCli: string
+  textButtonTiles: string
+  textButtonDoc: string
+}
+export {}

cypress/e2e/home.cy.ts

@@ -0,0 +1,16 @@
+describe('In the home page', () => {
+  it('click on the link in the footer to go to Panoramax.fr', () => {
+    cy.visit('/')
+    cy.fixture('home').then((homeData) => {
+      cy.contains(homeData.textLinkPanoramax).click()
+    })
+  })
+  it('click on the link in the footer to go to Gitlab', () => {
+    cy.visit('/')
+    cy.fixture('home').then((homeData) => {
+      cy.contains(homeData.textLinkGitlab).click()
+    })
+  })
+})
+
+export {}

cypress/e2e/login.cy.ts

@@ -1,7 +1,25 @@
 describe('In the login page', () => {
   it('type in the form to login', () => {
+    cy.visit(`${Cypress.env('api_url')}api/auth/login`)
+    cy.get('#username').type('Elysee')
+    cy.get('#password').type('my password')
+    cy.contains('Sign In').click()
     cy.visit('/')
   })
+  it('go to the register form and create an account', () => {
+    cy.visit(`${Cypress.env('api_url')}api/auth/login`)
+    cy.fixture('login').then((loginData) => {
+      cy.contains(loginData.textLinkRegister).click()
+      cy.get('#firstName').type('Tom')
+      cy.get('#lastName').type('Tom')
+      cy.get('#email').type('test@test123.com')
+      cy.get('#username').type('Elysee12445')
+      cy.get('#password').type('my password1')
+      cy.get('#password-confirm').type('my password1')
+      cy.get('form').submit()
+      cy.visit('/')
+    })
+  })
 })
 
 export {}

cypress/e2e/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "types": ["reflect-metadata", "jest", "cypress"],
+    "module": "commonjs",
+    "target": "es5",
+    "sourceMap": true
+  },
+  "exclude": ["node_modules"]
+}

cypress/e2e/upload.cy.ts

@@ -0,0 +1,32 @@
+describe('In the login page', () => {
+  it('login and go to the upload page to upload images', () => {
+    cy.visit(`${Cypress.env('api_url')}api/auth/login`)
+    cy.get('#username').type('Elysee')
+    cy.get('#password').type('my password')
+    cy.fixture('upload').then((uploadData: uploadInterface) => {
+      cy.contains(uploadData.textLinkLogin).click()
+      cy.visit('/envoyer')
+      cy.get('.edit-button').click()
+      cy.get('#upload-title').clear()
+      cy.get('#upload-title').type(uploadData.textTitle)
+      cy.contains(uploadData.textButtonTitle).click()
+      cy.contains(uploadData.textButtonUpload).click()
+    })
+    cy.get('.input-file').selectFile(
+      [
+        '/src/cypress/fixtures/images/image1.jpg',
+        '/src/cypress/fixtures/images/image2.jpg',
+        '/src/cypress/fixtures/images/image3.jpg'
+      ],
+      { force: true }
+    )
+  })
+})
+interface uploadInterface {
+  textLinkLogin: string
+  textLinkUpload: string
+  textButtonUpload: string
+  textTitle: string
+  textButtonTitle: string
+}
+export {}

cypress/fixtures/contribute.json

@@ -0,0 +1,8 @@
+{
+  "textButtonContribute": "Partager des images",
+  "textButtonDocCli": "Voir la documentation",
+  "textButtonDoc": "Retrouvez sa documentation ici",
+  "textButtonDocPython": "de python (au moins la version 3.8)",
+  "textButtonCli": "L'outil en ligne de commande",
+  "textButtonTiles": "de tuiles vectorielles"
+}

cypress/fixtures/home.json

@@ -0,0 +1,5 @@
+{
+  "textLinkContribute": "Pourquoi contribuer ?",
+  "textLinkPanoramax": "Découvrir Panoramax",
+  "textLinkGitlab": "Voir le code"
+}

cypress/fixtures/login.json

@@ -0,0 +1,4 @@
+{
+  "textLinkRegister": "Register",
+  "textLinkLogin": "Sign In"
+}

cypress/fixtures/upload.json

@@ -0,0 +1,7 @@
+{
+  "textLinkLogin": "Sign In",
+  "textLinkUpload": "Mes photos",
+  "textTitle": "My title",
+  "textButtonTitle": "Valider",
+  "textButtonUpload": "Glissez vos images ici ou cliquez sur"
+}

docker/nginx.conf

@@ -18,5 +18,10 @@ http {
 
         root /usr/share/nginx/html;
         gzip_static on;
+
+        location / {
+            root /usr/share/nginx/html;
+            try_files $uri /index.html;
+        }
     }
 }

package.json

@@ -1,8 +1,8 @@
 {
   "name": "geovisio-website",
-  "version": "2.2.3",
+  "version": "2.3.0",
   "engines": {
-    "node": "18.16.0"
+    "node": "18.16.1"
   },
   "private": true,
   "scripts": {
@@ -25,7 +25,7 @@
     "axios": "^1.2.3",
     "bootstrap": "^5.2.3",
     "bootstrap-icons": "^1.10.3",
-    "geovisio": "2.2.1-develop-acb9989e",
+    "geovisio": "2.3.0",
     "moment": "^2.29.4",
     "pako": "^2.1.0",
     "pinia": "^2.1.4",
@@ -42,6 +42,7 @@
   "devDependencies": {
     "@pinia/testing": "^0.1.2",
     "@rushstack/eslint-patch": "^1.1.4",
+    "@types/jest": "^29.5.4",
     "@types/jsdom": "^20.0.1",
     "@types/node": "^18.11.18",
     "@typescript-eslint/eslint-plugin": "^5.46.0",
@@ -52,12 +53,13 @@
     "@vue/eslint-config-typescript": "^11.0.0",
     "@vue/test-utils": "^2.2.4",
     "@vue/tsconfig": "^0.1.3",
-    "cypress": "^12.12.0",
+    "cypress": "^13.1.0",
     "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-vue": "^9.8.0",
+    "jest": "^29.6.4",
     "jsdom": "^20.0.3",
     "less": "^4.2.0",
     "less-loader": "^11.1.3",

src/App.vue

@@ -6,12 +6,10 @@ import { RouterView } from 'vue-router'
 import { useMeta } from 'vue-meta'
 import { useI18n } from 'vue-i18n'
 import { hasASessionCookieDecoded } from '@/utils/auth'
-import { useCookies } from 'vue3-cookies'
 import { title } from '@/utils/index'
 import authConfig from './composables/auth'
 const { authConf } = authConfig()
 const { t } = useI18n()
-const { cookies } = useCookies()
 
 let focusMap = ref<string>('focus-map')
 

src/components-viewer/reportLink.ts

@@ -1,3 +1,8 @@
 export function createLink(href: string, text: string): string {
   return `<a href='mailto:signalement.ign@panoramax.fr${href}' target='_blank' title='${text}' class='gvs-btn gvs-widget-bg gvs-btn-large' style='font-size: 1.6em;display: block'><i class="bi bi-exclamation-triangle"></i></a>`
 }
+export function createSequenceLink(href: string, title: string): string {
+  return `<a href='${href}' title='${title}' class='gvs-btn gvs-widget-bg gvs-btn-large' style='font-size: 1.6em;display: block; position: relative'>
+            <i class="bi bi-images"></i>
+          </a>`
+}

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;

src/components/EditText.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="entry-edit">
     <form
-      v-if="isEditTitle"
+      v-if="isEditTitle && !isDisabled"
       @submit.prevent="isEditTitle = false"
       class="edit-form"
     >
       <div class="wrapper-input">
         <Input
+          id="upload-title"
           :text="text || ''"
           :placeholder="$t('pages.upload.edit_placeholder_input')"
           @input="changeTextValue"
@@ -34,6 +35,7 @@
         look="no-text"
         icon="bi bi-pen"
         :tooltip="$t('pages.upload.edit_title_tooltip')"
+        :disabled="isDisabled"
         @trigger="goToEditMode"
       />
     </div>
@@ -49,7 +51,9 @@ const emit = defineEmits<{
   (e: 'triggerNewText', value: string | null): void
 }>()
 const props = defineProps({
-  defaultText: { type: String, default: null }
+  defaultText: { type: String, default: null },
+  isLoading: { type: Boolean, default: false },
+  isLoaded: { type: Boolean, default: false }
 })
 let titleToEdit = ref<string | null>(null)
 let isEditTitle = ref<boolean>(false)
@@ -75,6 +79,8 @@ const text = computed<string | null>(() => {
   if (props.defaultText) return props.defaultText
   return null
 })
+
+const isDisabled = computed<boolean>(() => props.isLoading && !props.isLoaded)
 </script>
 
 <style scoped lang="scss">

src/components/Header.vue

@@ -128,7 +128,6 @@ onClickOutside(list, () => closeModal())
 function closeModal(): void {
   menuIsClosed.value = true
 }
-
 function toggleMenu(): void {
   menuIsClosed.value = !menuIsClosed.value
 }

src/components/Input.vue

@@ -11,7 +11,7 @@
 
 <script lang="ts" setup>
 const emit = defineEmits<{ (e: 'input', value: string): void }>()
-const props = defineProps({
+defineProps({
   text: { type: String, default: null },
   placeholder: { type: String, default: '' }
 })

src/components/Link.vue

@@ -55,7 +55,7 @@ const props = defineProps({
 })
 
 const titleImg = computed<string>(() =>
-  props.disabled ? t('general.header.contribute_text') : ''
+  props.disabled ? t('general.header.about_text') : ''
 )
 function triggerButton() {
   if (props.disabled) return

src/components/Modal.vue

@@ -19,7 +19,7 @@
           <ul>
             <li v-for="item in uploadErrors" class="error-item">
               <span>{{ item.name }} - </span>
-              <span>{{ item.message }}</span>
+              <span>{{ item.details.error }}</span>
             </li>
           </ul>
         </div>

src/components/Viewer.vue

@@ -3,13 +3,18 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, onUnmounted, ref } from 'vue'
-import type { ViewerInterface, MapInterface } from '@/views/interfaces/common'
-import { getIgnTiles } from '@/utils/mapAndViewer'
+import axios from 'axios'
+import { onMounted, onUnmounted, ref, computed } from 'vue'
+import { useSequenceStore } from '@/store/sequence'
 import { Viewer, StandaloneMap } from 'geovisio'
+import { getIgnTiles } from '@/utils/mapAndViewer'
 import { createUrlLink } from '@/utils'
-import { createLink } from '@/components-viewer/reportLink'
+import { createLink, createSequenceLink } from '@/components-viewer/reportLink'
 import { useI18n } from 'vue-i18n'
+import { hasASessionCookieDecoded } from '@/utils/auth'
+import type { ViewerInterface, MapInterface } from '@/views/interfaces/common'
+
+const sequenceStore = useSequenceStore()
 const { t } = useI18n()
 let mapIsLoaded = ref<boolean>(false)
 let viewer = ref()
@@ -20,113 +25,152 @@ const props = defineProps({
   bbox: { type: Array, default: null },
   userId: { type: String, default: '' }
 })
+const isLogged = computed((): boolean => {
+  const cookie = hasASessionCookieDecoded()
+  return !!(cookie && cookie.account)
+})
+const userName = computed((): string => {
+  const cookie = hasASessionCookieDecoded()
+  if (cookie && cookie.account) return cookie.account.name
+  return ''
+})
 defineExpose({
   viewer
 })
-onMounted(async () => {
-  const tiles = import.meta.env.VITE_TILES
+async function getSequenceId(imgId: string): Promise<{
+  sequenceId: string
+  username: string
+}> {
+  const { data } = await axios.get(`api/search?ids=${imgId}`)
+  return {
+    sequenceId: data.features[0].collection,
+    username: data.features[0].properties['geovisio:producer']
+  }
+}
+function createViewerButton(link: HTMLDivElement): void {
+  viewer.value.addEventListener(
+    'picture-loaded',
+    async (e: { detail: { picId: string } }): Promise<void> => {
+      const sequenceInformation = await getSequenceId(e.detail.picId)
+      let href: string
+      if (isLogged.value && sequenceInformation.username === userName.value) {
+        href = `${window.location.origin}/sequence/${sequenceInformation.sequenceId}?currentPic=${e.detail.picId}`
+        link.innerHTML = createSequenceLink(
+          href,
+          t('pages.home.sequence_title')
+        )
+        sequenceStore.addSequence(e.detail.picId)
+      } else {
+        href = t('pages.home.report_mail', {
+          picId: e.detail.picId,
+          link: createUrlLink(e.detail.picId)
+        })
+        link.innerHTML = createLink(href, t('pages.home.report_button_text'))
+      }
+    }
+  )
+}
+async function setupViewerMap(tiles: string): Promise<void> {
   const maxZoom = import.meta.env.VITE_MAX_ZOOM
   const zoom = import.meta.env.VITE_ZOOM
   const center = import.meta.env.VITE_CENTER
-  let paramsViewer: ViewerInterface
-  let paramsMap: MapInterface
-
-  try {
-    if (props.geovisioViewer) {
-      paramsViewer = { map: { startWide: true } }
-      if (center && center !== '') {
-        const centerMap = center.split(',').map((el: string) => parseInt(el))
-        paramsViewer = {
-          map: {
-            ...paramsViewer.map,
-            center: centerMap
-          }
-        }
+  let paramsViewer: ViewerInterface = { map: { startWide: true } }
+  if (center && center !== '') {
+    const centerMap = center.split(',').map((el: string) => parseInt(el))
+    paramsViewer = {
+      map: {
+        ...paramsViewer.map,
+        center: centerMap
       }
-      if (zoom && zoom !== '') {
-        paramsViewer = {
-          map: {
-            ...paramsViewer.map,
-            zoom: parseFloat(zoom)
-          }
-        }
-      }
-      if (maxZoom && maxZoom !== '') {
-        paramsViewer = {
-          map: {
-            ...paramsViewer.map,
-            maxZoom: parseInt(maxZoom)
-          }
-        }
-      }
-      if (tiles) {
-        const style = tiles.includes('wxs.ign.fr') ? await getIgnTiles() : tiles
-        paramsViewer = {
-          map: {
-            ...paramsViewer.map,
-            style
-          }
-        }
-      }
-      if (props.fetchOptions) {
-        paramsViewer = {
-          ...paramsViewer,
-          ...props.fetchOptions
-        }
-      }
-      const reportLink = document.createElement('div')
-      reportLink.className = 'gvs-group gvs-group-large gvs-group-btnpanel'
-      viewer.value = new Viewer(
-        'viewer', // Div ID
-        `${import.meta.env.VITE_API_URL}/api/search`,
-        {
-          ...paramsViewer,
-          widgets: { customWidget: reportLink }
-        }
-      )
-      if (viewer.value && viewer.value.addEventListener) {
-        viewer.value.addEventListener(
-          'picture-loaded',
-          async (e: { detail: { picId: string } }): Promise<void> => {
-            const href = t('pages.home.report_mail', {
-              picId: e.detail.picId,
-              link: createUrlLink(e.detail.picId)
-            })
-            reportLink.innerHTML = createLink(
-              href,
-              t('pages.home.report_button_text')
-            )
-          }
-        )
-      }
-    } else {
-      paramsMap = { minZoom: 7 }
-      if (tiles) {
-        const style = tiles.includes('wxs.ign.fr') ? await getIgnTiles() : tiles
-        paramsMap = {
-          ...paramsMap,
-          style
-        }
-      }
-      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]],
-          zoom: 9
-        }
-      )
-      viewer.value.addEventListener('ready', () => {
-        viewer.value.setFilters({ user: props.userId }, true)
-      })
     }
-    mapIsLoaded.value = true
+  }
+  if (zoom && zoom.length) {
+    paramsViewer = {
+      map: {
+        ...paramsViewer.map,
+        zoom: parseFloat(zoom)
+      }
+    }
+  }
+  if (maxZoom && maxZoom.length) {
+    paramsViewer = {
+      map: {
+        ...paramsViewer.map,
+        maxZoom: parseInt(maxZoom)
+      }
+    }
+  }
+  if (tiles && tiles.length) {
+    const style = tiles.includes('wxs.ign.fr') ? await getIgnTiles() : tiles
+    paramsViewer = {
+      map: {
+        ...paramsViewer.map,
+        style
+      }
+    }
+  }
+  if (props.fetchOptions) {
+    paramsViewer = {
+      ...paramsViewer,
+      ...props.fetchOptions
+    }
+  }
+  const reportLink = document.createElement('div')
+  reportLink.className = 'gvs-group gvs-group-large gvs-group-btnpanel'
+  viewer.value = new Viewer(
+    'viewer', // Div ID
+    `${import.meta.env.VITE_API_URL}/api/search`,
+    {
+      ...paramsViewer,
+      widgets: { customWidget: reportLink }
+    }
+  )
+  if (viewer.value && viewer.value.addEventListener) {
+    createViewerButton(reportLink)
+  }
+  mapIsLoaded.value = true
+}
+async function setupMap(tiles: string): Promise<void> {
+  let paramsMap: MapInterface
+  paramsMap = { minZoom: 7 }
+  if (tiles && tiles.length) {
+    const style = tiles.includes('wxs.ign.fr') ? await getIgnTiles() : tiles
+    paramsMap = {
+      ...paramsMap,
+      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: bbox,
+      zoom: 14
+    }
+  )
+  viewer.value.addEventListener('ready', () => {
+    viewer.value.setFilters({ user: props.userId }, true)
+    viewer.value.fitBounds(bbox, {
+      padding: { top: 70, bottom: 70, left: 70, right: 70 },
+      maxZoom: 14,
+      speed: 10
+    })
+  })
+  mapIsLoaded.value = true
+}
+onMounted(async (): Promise<void> => {
+  const tiles = import.meta.env.VITE_TILES
+  try {
+    if (props.geovisioViewer) return await setupViewerMap(tiles)
+    return await setupMap(tiles)
   } catch (err) {
+    mapIsLoaded.value = true
     console.log(err)
   }
 })
-onUnmounted(() => {
+onUnmounted((): void => {
   if (viewer.value && props.geovisioViewer) viewer.value.destroy()
 })
 </script>

src/components/header/HeaderOpen.vue

@@ -110,7 +110,7 @@ ul {
   width: toRem(25);
   top: toRem(8);
   right: 0;
-  z-index: 2;
+  z-index: 3;
   background-color: var(--white);
   box-shadow: 0 toRem(0.2) toRem(0.4) rgb(0 0 0 / 10%);
   border-radius: toRem(1);

src/locales/en.json

@@ -37,7 +37,8 @@
   "pages": {
     "home": {
       "report_mail": "?subject=⚠️ Report on picture {picId}&body=HEllo, %0D%0A%0D%0A Problem on image (keep type of problem reported) : %0D%0A%0D%0A %0D%0A%0D%0A inappropriate content / lack of blurring on an element to be anonymized or blurred for security reasons / overblurring (too much blurring) %0D%0A%0D%0A Link to affected photo : {link} %0D%0A%0D%0A Details of affected elements (especially for blurring problems - what should be blurred or unblurred?) :",
-      "report_button_text": "Report this picture"
+      "report_button_text": "Report this picture",
+      "sequence_title": "See the séquence"
     },
     "settings": {
       "title": "My tokens",

src/locales/fr.json

@@ -37,7 +37,8 @@
   "pages": {
     "home": {
       "report_mail": "?subject=⚠️ Signalement sur l`image {picId}&body=Bonjour, %0D%0A%0D%0A Problème sur l`image (garder le type de problème signalé) : %0D%0A%0D%0A contenu inapproprié / absence de floutage sur un élément à anonymiser ou flouter pour des raisons de sécurité /surfloutage (floutage en trop) %0D%0A%0D%0A Lien vers la photo concernée : {link} %0D%0A%0D%0A Précision sur les éléments concernés (en particulier pour les problèmes de floutage - que faut-il flouter ou déflouter?) :",
-      "report_button_text": "Signaler la photo"
+      "report_button_text": "Signaler la photo",
+      "sequence_title": "Voir la séquence"
     },
     "settings": {
       "title": "Mes Tokens",
@@ -137,7 +138,7 @@
       "description_title_sequence": "Le titre d'une séquence est par défaut la date du jour. Vous pouvez, si vous le souhaitez le modifier ci-dessous.",
       "text_import": "Déposez ici vos fichiers jpg. Chaque image ou série d’images constitue une « séquence ». Vous pourrez ensuite les retrouver dans la section « mes images » et choisir de les masquer, les afficher ou les supprimer.",
       "subtitle_process": "Traitements de l'import",
-      "uploading_process": "Téléchargement en cours...",
+      "uploading_process": "Envoi en cours...",
       "sequence_title": "Séquence du ",
       "import": "Imports",
       "upload_pending": "Transfert en cours...",
@@ -148,7 +149,7 @@
       "edit_title_tooltip": "Modifier le titre de la séquence",
       "edit_placeholder_input": "Modifier le titre de la séquence",
       "ok_button": "Valider",
-      "pictures_error": "{count} image n'a pas pu être chargée| {count} image n'ont pas pu être chargées",
+      "pictures_error": "{count} image n'a pas pu être chargée| {count} images n'ont pas pu être chargées",
       "sequence_loading_information": "Une fois chargée, la séquence sera en traitement et accessible sur Panoramax dans les prochaines minutes.",
       "sequence_loaded_information": "La séquence est chargée et est en cours de traitement. Elle sera accessible sur Panoramax dans quelques minutes.",
       "leave_message": "⚠️ Attention, le téléchargement sera interrompu si vous quittez la page avant la fin.",

src/locales/hu.json

@@ -0,0 +1,185 @@
+{
+  "general": {
+    "title": "Panoramax-példány",
+    "meta": {
+      "title": "Panoramax-példány",
+      "description": "Panoramax, szabad alternatíva a világ fotós feltérképezéséhez"
+    },
+    "header": {
+      "login_text": "Kapcsolódás",
+      "register_text": "Regisztráció",
+      "contribute_text": "Miért működjön közre?",
+      "my_account": "Saját fiók",
+      "upload_text": "+ Fényképek megosztása",
+      "sequences_text": "Saját fényképek",
+      "alt_logo": "A példány logója",
+      "alt_photos": "Képek ikon",
+      "alt_information": "Felhasználó ikon",
+      "alt_settings": "Paraméterek ikon",
+      "alt_logout": "Kijelentkezés ikon",
+      "title": "Panoramax",
+      "beta_text": "Béta verzió",
+      "logout_text": "Kijelentkezés",
+      "my_information_text": "Saját adatok",
+      "my_settings_text": "Saját beállítások",
+      "burger_menu_aria_label_open": "A menü megjelenítése",
+      "burger_menu_aria_label_closed": "A menü bezárása"
+    },
+    "footer": {
+      "panoramax_site": "A Panoramax felfedezése",
+      "information_gitlab": "Forráskód megjelenítése",
+      "gitlab_logo": "Gitlab logó",
+      "ay11_text": "Akadálymentesítés: nem felel meg"
+    },
+    "error_text": "Hiba történt",
+    "success_text": "Sikeres frissítés"
+  },
+  "pages": {
+    "home": {
+      "report_mail": "?subject=⚠️ Report on picture {picId}&body=Hello, %0D%0A%0D%0A Problem on image (keep type of problem reported) : %0D%0A%0D%0A %0D%0A%0D%0A inappropriate content / lack of blurring on an element to be anonymized or blurred for security reasons / overblurring (too much blurring) %0D%0A%0D%0A Link to affected photo : {link} %0D%0A%0D%0A Details of affected elements (especially for blurring problems - what should be blurred or unblurred?) :",
+      "report_button_text": "Fénykép jelentése",
+      "sequence_title": "lásd a sorrendet"
+    },
+    "settings": {
+      "title": "Saját tokenek",
+      "setting_tooltip": "A token megjelenítése vagy elrejtése"
+    },
+    "sequence": {
+      "sequence_published": "Közzétéve",
+      "sequence_waiting": "Feldolgozás alatt",
+      "sequence_hidden": "Rejtett",
+      "hide_sequence_tooltip": "A sorozat elrejtése",
+      "delete_sequence_tooltip": "A sorozat végleges törlése",
+      "hide_photo_tooltip": "A kiválasztott fényképek elrejtése",
+      "delete_photo_tooltip": "A kiválasztottt fényképek végleges törlése",
+      "confirm_pictures_dialog": "⚠️ A kiválasztott fényképek véglegesen elvesznek",
+      "confirm_sequence_dialog": "⚠️ A kiválasztott sorozat véglegesen elvész",
+      "created": "Feltöltés ideje:",
+      "taken": "Elkészítés ideje:",
+      "duration": "Hossz:",
+      "duration_begin": "Kezdet:",
+      "duration_end": "Vég:",
+      "camera": "Kamera:",
+      "button_delete": "Törlés",
+      "button_disable": "Elrejtés",
+      "button_enable": "Megjelenítés",
+      "picture_selected": "{count} fénykép kiválasztva| {count} fénykép kiválasztva",
+      "hours": "{count} óra| {count} óra",
+      "minutes": "{count} perc| {count} perc",
+      "seconds": "{count} másodperc| {count} másodperc",
+      "select_text": "Kiválasztás",
+      "unselect_text": "Kiválasztás törlése",
+      "select_shift_text": "Több elemet a Shift segítségével választhat ki",
+      "waiting_process": "A fénykép feldolgozás alatt áll",
+      "broken": "Fénykép-feldolgozási hiba",
+      "no_image": "Nincsenek fényképek ebben a sorozatban"
+    },
+    "sequences": {
+      "title": "Saját fényképsorozatok",
+      "sequence_name": "Név",
+      "sequence_photos": "Fényképek",
+      "sequence_date": "Elkészítés ideje",
+      "sequence_creation": "Feltöltés ideje",
+      "sequence_status": "Állapot",
+      "sequence_published": "Közzétéve",
+      "sequence_waiting": "Feldolgozás alatt",
+      "sequence_hidden": "Rejtett",
+      "no_sequences_text": "Még nincsenek közzétett fényképei \uD83D\uDE22",
+      "button_upload": "Fényképek feltöltése",
+      "sequence_deleted": "A sorozat törlésre került"
+    },
+    "share_pictures": {
+      "title": "Miért működjön közre a Panoramaxban?",
+      "description": "A Panoramaxban való közreműködés azt jelenti, hogy részt vesz egy közös, független, szabad és újrafelhasználható digitális erőforrás fejlesztésében. A Panoramaxon található minden georeferált fénykép bárki által használható, számos célra, például egy önkormányzat megtekintheti az utai állapotát, vagy egy távközlési vállalat felkészülhet a beavatkozásaira.\n\nMinden közreműködő beküldheti a saját képsorozatait, módosíthatja és megnézheti azokat, ahogyan ezt teheti a közösség más tagjai által feltöltött képekkel is. Az arcok és rendszámtáblák kötelező kitakarását maga a platform automatizálja.",
+      "alt_img_map": "Illusztráció egy nőről, aki egy térképet néz a földrajzi helymeghatározással rendelkező okostelefonján",
+      "card_photo1": "Közútról látható helyek",
+      "card_photo2": "Közzétett fényképek 360°-os vagy más formátumban",
+      "card_photo3": "Könnyen újrafelhasználható fényképek",
+      "card_photo4": "Képek gyors és egyszerű megosztása",
+      "card_alt_photo1": "Egy épületet tartalmazó kép",
+      "card_alt_photo2": "Egy 360°-ot megjelenítő kép",
+      "card_alt_photo3": "Egy kép egy térképről mutatóval",
+      "card_alt_photo4": "Egy mutatót ábrázoló kép",
+      "card_description1": "Minden közútról készült kép elfogadható, ha az georeferált és a földről készült.",
+      "card_description2": "A 360°-os képek nem kötelezők: az okostelefonnal készült képek is megfelelők. Az előfeltételek a dátum, a helyszín és a jpg formátum használata.",
+      "card_description3": "Minden fénykép fiók nélkül is könnyedén elérhető és felhasználható: a weboldalon vagy egy szabványos API-n keresztül (STAC szabvány).",
+      "card_description4": "Számos eszköz elérhető a közreműködések lehetővé tételéhez, köztük egy parancssoros és egy webes felület is.",
+      "upload_subtitle": "Töltse fel egyszerűen a fényképeit",
+      "upload_illustration_alt": "Online képfeltöltést ábrázoló illusztráció",
+      "upload_description": "A Panoramax webalkalmazása lehetővé teszi, hogy egy gombnyomással feltöltse az összes fényképét JPG formátumban. Programozói készségek nem szükségesek. Sok kép esetén viszont a parancssoros eszköz használatát javasoljuk.",
+      "upload_button": "+ Képek feltöltése",
+      "command_line_subtitle": "Parancssoros eszköz",
+      "comment_install": "A geovisio parancssoros eszköz telepítése",
+      "comment_upload": "A képfeltöltési parancs indítása a kiválasztott mappán",
+      "description_terminal": "<a href='https://gitlab.com/geovisio/cli' target='_blank' style='color:black'>A parancssor</a> lehetővé teszi, hogy nagy számú képet osszon meg. A folyamat egyszerű, és <a target='_blank' href='https://www.python.org/downloads/' style='color:black'>Pythont (3.8-as vagy újabb verzió)</a> igényli.\n\nAz importálás előtt az eszköz bekéri a bejelentkezési adatait. Amint a képek felöltésre kerültek, azok közzététele előtt feldolgozási idő szükséges.",
+      "terminal_install": "pip install geovisio_cli",
+      "terminal_text": "geovisio upload --api-url {webcím} <FÉNYKÉPMAPPA>",
+      "button_copy": "Másolás",
+      "information_subtitle": "Itt a fényképek mindenki számára elérhetők: ",
+      "information_text1": "Automatikusan kitakarva, a törvényi előírásoknak megfelelően.",
+      "information_text2": "A feltöltött képek a következő alatt lesznek közzétéve: {word}",
+      "information_text3": "Az eredeti formátumban és felbontásban, számos újrafeldolgozáshoz.",
+      "information_about_title": "Hozzá kell férnie a fényképeihez?",
+      "information_about_description": "Az API elérhető az összes metaadat és kép letöltéséhez. <a href='{docLink}' target='_blank' style='color:#0a1f69'>\nTudjon meg többet itt.</a>\nAz adatok <a href='{docTiles}' target='_blank' style='color:#0a1f69'>vektorcsempék</a> formájában is megjelennek.",
+      "doc_subtitle": "Segítségre van szüksége a Panoramaxban történő közreműködéshez?",
+      "doc_description": "A Panoramax dokumentációja elérhető tőlünk, oktatóanyagokat pedig a geo-commons fórumán találhat.",
+      "doc_button": "A dokumentáció megtekintése",
+      "doc_illustration_alt": "Illusztráció egy karakterről dokumentumokkal"
+    },
+    "upload": {
+      "title": "Közreműködés a Panoramax projektben",
+      "description": "Nagy számú fényképhez a parancssoros eszköz jobban megfelelő.",
+      "know_more_button": "További tudnivalók",
+      "input_label": "Húzza ide a képeket, vagy kattintson a",
+      "import_word": "feltöltésre",
+      "import_type": "Csak JPEG formátum",
+      "subtitle_import": "Képfeltöltés",
+      "title_sequence": "Sorozat címe",
+      "description_title_sequence": "Alapértelmezés szerint a sorozat cím a nap dátuma lesz. Ha akarja, itt szerkesztheti a címet.",
+      "text_import": "Ide töltse fel a JPG-fájljait. Minden kép vagy képsorozat egy „sorozatot” alkot. Megtalálhatja azokat a „saját fényképek” szakaszban, és elrejtheti, megjelenítheti vagy törölheti azokat.",
+      "subtitle_process": "Feltöltés feldolgozása",
+      "uploading_process": "Feltöltés folyamatban…",
+      "sequence_title": "Sorozat ",
+      "import": "Feltöltések",
+      "upload_pending": "Feltöltés folyamatban…",
+      "images_count_text": "Feltöltött képek",
+      "no_img_text": "még nem volt képfeltöltés",
+      "upload_done": "A sorozat feltöltése elkészült",
+      "sequence_link": "A sorozat megjelenítése",
+      "edit_title_tooltip": "A sorozat címének szerkesztése",
+      "edit_placeholder_input": "A sorozat címének szerkesztése",
+      "ok_button": "OK",
+      "pictures_error": "{count} kép feltöltése nem sikerült| {count} kép feltöltése nem sikerült",
+      "sequence_loading_information": "Amint feltöltötte, a sorozat feldolgozásra, majd közzétételre került a Panoramaxon (általában néhány perc múlva).",
+      "sequence_loaded_information": "A sorozatok fel lettek töltve, és feldolgozás alatt vannak. Néhány perc múlva nyilvánosan elérhetőnek kellene lenniük a Panoramaxon.",
+      "leave_message": "⚠️ FIGYELMEZTETÉS, a feltöltés meg fog szakadni, ha a végezte előtt hagyja el a lapot.",
+      "error_button": "Hibák megjelenítése",
+      "modal_error_title": "A hibában érintett képek"
+    },
+    "ay11": {
+      "title": "Déclaration d’accessibilité",
+      "date": "Établie le 18 septembre 2023.",
+      "introduction": "IGN s’engage à rendre son service accessible, conformément à l’article 47 de la loi n° 2005-102 du 11 février 2005.\n Cette déclaration d’accessibilité s’applique à Panoramax Instance IGN : https://panoramax.ign.fr",
+      "subtitle_conformity": "État de conformité",
+      "conformity_text": "Panoramax Instance IGN est non conforme avec le ",
+      "conformity_text2": "Le site n’a encore pas été audité.",
+      "subtitle_conformity2": "Contenus non accessibles",
+      "subtitle_increase": "Amélioration et contact",
+      "increase_text": "Si vous n’arrivez pas à accéder à un contenu ou à un service, vous pouvez\n      contacter le responsable de Panoramax Instance IGN pour être orienté vers une alternative accessible ou obtenir le contenu sous une autre forme.",
+      "phone": "Téléphone : +33 14 398 84 61",
+      "email_text": "E-mail :",
+      "email": "signalement.ign@panoramax.fr",
+      "address": "Adresse : IGN, Saint-Mandé",
+      "increase_info": "Nous essayons de répondre dans les 5 jours ouvrés.",
+      "subtitle_to_do": "Voie de recours",
+      "to_do_text": "Cette procédure est à utiliser dans le cas suivant : vous avez signalé au responsable du site internet un défaut d’accessibilité qui vous\n      empêche d’accéder à un contenu ou à un des services du portail et vous n’avez pas obtenu de réponse satisfaisante. \n vous pouvez :",
+      "write_message": "Écrire un message au",
+      "defenseur_droits": "Défenseur des droits",
+      "contact": "Contacter",
+      "contact_text": "le délégué du Défenseur des droits dans votre région",
+      "send_letter": "Envoyer un courrier par la poste (gratuit, ne pas mettre de\n  timbre):\n Défenseur des droits\n Libre réponse 71120 75342 Paris CEDEX 07",
+      "end": "Cette déclaration d’accessibilité a été créé le\n 18 septembre 2023 grâce au",
+      "generator_betagouv": "Générateur de Déclaration d’Accessibilité de BetaGouv"
+    }
+  }
+}

src/main.ts

@@ -4,12 +4,12 @@ import App from './App.vue'
 import router from './router'
 import axios from 'axios'
 import VueAxios from 'vue-axios'
-import { globalCookiesConfig } from 'vue3-cookies'
 import { createMetaManager } from 'vue-meta'
 import { VueDraggableResizable } from 'vue-draggable-resizable-vue3'
 import { pinia } from './store'
 import fr from './locales/fr.json'
 import en from './locales/en.json'
+import hu from './locales/hu.json'
 import './assets/main.scss'
 import 'bootstrap/dist/css/bootstrap.css'
 import 'bootstrap-icons/font/bootstrap-icons.css'
@@ -26,12 +26,10 @@ const i18n = createI18n({
   legacy: false,
   messages: {
     fr,
-    en
+    en,
+    hu
   }
 })
-globalCookiesConfig({
-  expireTimes: '7d'
-})
 
 const app = createApp(App)
 

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<RouteRecordRaw> = [
   {
     path: '/',

src/store/sequence.ts

@@ -3,7 +3,8 @@ import { defineStore } from 'pinia'
 export const useSequenceStore = defineStore('sequence', {
   state: () => ({
     toastText: <string>'',
-    toastLook: <string>''
+    toastLook: <string>'',
+    picId: <string>''
   }),
   actions: {
     addToastText(text: string, look: string): void {
@@ -12,6 +13,9 @@ export const useSequenceStore = defineStore('sequence', {
       setTimeout(() => {
         this.toastText = ''
       }, 3000)
+    },
+    addSequence(id: string): void {
+      this.picId = id
     }
   }
 })

src/tests/unit/components/Modal.spec.js

@@ -30,7 +30,13 @@ describe('Template', () => {
     })
     it('should render the props filled', async () => {
       document.body.innerHTML = '<div id="bs-modal"></div>'
-      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')
     })
   })
 })

src/utils/mapAndViewer.ts

@@ -7,7 +7,7 @@ async function getIgnTiles(): Promise<object> {
   data.sources.plan_ign.scheme = 'xyz'
   data.sources.plan_ign.attribution = 'Données cartographiques : © IGN'
   const objIndex = data.layers.findIndex(
-    (el: any) => el.id === 'toponyme - parcellaire - adresse'
+    (el: { id: string }) => el.id === 'toponyme - parcellaire - adresse'
   )
   data.layers[objIndex].layout = {
     ...data.layers[objIndex].layout,

src/views/MySequenceView.vue

@@ -245,7 +245,7 @@ let isLoading = ref<boolean>(false)
 const collapseMenu = ref<HTMLDivElement>()
 const deleteAll = ref<HTMLDivElement>()
 const menuHeight = ref<string>()
-const viewerRef = ref()
+const viewerRef = ref<InstanceType<typeof Viewer>>()
 
 onMounted(async () => {
   try {
@@ -266,37 +266,54 @@ onMounted(async () => {
     )
     pictures.value = collectionItems
     setHeightValue()
-    if (itemSelected.value.length || !collectionItemsReady[0]) return
+    if (
+      itemSelected.value.length ||
+      !getCurrentPicId(collectionItemsReady[0].id)
+    ) {
+      return
+    }
+    if (!viewerRef.value) return
     viewerRef.value.viewer._api.onceReady().then(() => {
+      if (!viewerRef.value) return
       viewerRef.value.viewer.goToPicture(
-        collectionItemsReady[0].id,
+        getCurrentPicId(collectionItemsReady[0].id),
         sequence.value?.id
       )
     })
-    itemSelected.value = collectionItemsReady[0].id
-    scrollIntoSelected(collectionItemsReady[0].id, pictures.value)
+    itemSelected.value = getCurrentPicId(collectionItemsReady[0].id)
+    if (!pictureExistInList(getCurrentPicId(collectionItemsReady[0].id))) {
+      await goToTheGoodPage(getCurrentPicId(collectionItemsReady[0].id))
+    }
+    scrollIntoSelected(
+      itemSelected.value,
+      pictures.value.map((e) => e.id)
+    )
   } catch (err) {
     console.log(err)
   }
 })
 
 watchEffect(async () => {
-  if (!viewerExist(viewerRef)) return
+  if (!viewerRef || !viewerRef.value || !viewerRef.value.viewer) return
   viewerRef.value.viewer.addEventListener(
     'picture-loaded',
     async (e: { detail: { picId: string } }): Promise<void> => {
-      if (itemSelected.value === e.detail.picId) return
-      if (!pictureExistInList(e.detail.picId)) {
-        await goToTheGoodPage(e.detail.picId)
+      if (!pictureExistInList(getCurrentPicId(e.detail.picId))) {
+        await goToTheGoodPage(getCurrentPicId(e.detail.picId))
       }
-      itemSelected.value = e.detail.picId
-      scrollIntoSelected(e.detail.picId, pictures.value)
+      itemSelected.value = getCurrentPicId(e.detail.picId)
+      scrollIntoSelected(
+        getCurrentPicId(e.detail.picId),
+        pictures.value.map((e) => e.id)
+      )
     }
   )
 })
 
-function viewerExist(viewerRef: any): boolean {
-  return !!(viewerRef && viewerRef.value && viewerRef.value.viewer)
+function getCurrentPicId(id: string): string {
+  const parseParams = new URLSearchParams(window.location.search)
+  const pict = parseParams.get('currentPic')
+  return pict && pict.length ? pict : id
 }
 
 const isSequenceOwner = computed((): boolean => {
@@ -421,7 +438,7 @@ async function patchCollection(): Promise<void> {
     const { data } = await fetchCollectionItems(route.params.id, '?limit=100')
     pictures.value = data.features
   }
-  viewerRef.value.viewer.reloadVectorTiles()
+  if (viewerRef.value) viewerRef.value.viewer.reloadVectorTiles()
   isLoading.value = false
 }
 
@@ -429,13 +446,16 @@ function fullImagesToDelete(): ResponseUserPhotoInterface[] {
   return pictures.value.filter((el) => picturesToDelete.value.includes(el.id))
 }
 
-async function goToNextPage(value: string) {
+async function goToNextPage(value: string): Promise<void> {
   isLoading.value = true
   const { data } = await fetchCollectionItemsWithFullUrl(value)
   selfLink.value = data.links.filter((el) => el.rel === 'self')
   paginationLinks.value = formatPaginationItems(data.links)
   pictures.value = data.features
-  scrollIntoSelected(pictures.value[0].id, pictures.value)
+  scrollIntoSelected(
+    pictures.value[0].id,
+    pictures.value.map((e) => e.id)
+  )
   picturesToDelete.value = []
   isLoading.value = false
   setHeightValue()
@@ -484,16 +504,26 @@ function selectPhotoToDeleteOrPatch(
 async function selectImageAndMove(
   item: ResponseUserPhotoInterface
 ): Promise<void> {
+  const parseParams = new URLSearchParams(window.location.search)
+  const pict = parseParams.get('currentPic')
+  if (pict && pict.length) {
+    await router.push({ name: 'sequence', params: { id: route.params.id } })
+  }
   selectPhotoToDeleteOrPatch(item)
   if (
     picturesToDelete.value.length < 2 &&
     item.properties['geovisio:status'] === 'ready'
   ) {
-    const viewerMap = await viewerRef.value.viewer
-    viewerMap.goToPicture(item.id, sequence.value?.id)
+    if (viewerRef.value) {
+      const viewerMap = await viewerRef.value.viewer
+      viewerMap.goToPicture(item.id, sequence.value?.id)
+    }
     itemSelected.value = item.id
     await goToTheGoodPage(item.id)
-    scrollIntoSelected(item.id, pictures.value)
+    scrollIntoSelected(
+      item.id,
+      pictures.value.map((e) => e.id)
+    )
   }
 }
 
@@ -553,9 +583,14 @@ async function patchOrDeleteCollectionItems(
     const { data } = await fetchCollectionItems(route.params.id, '?limit=100')
     pictures.value = data.features
     isLoading.value = false
-    viewerRef.value.viewer.reloadVectorTiles()
-    viewerRef.value.viewer.goToPicture(pictures.value[0].id, route.params.id)
-    scrollIntoSelected(picturesToDelete.value[0], pictures.value)
+    if (viewerRef.value) {
+      viewerRef.value.viewer.reloadVectorTiles()
+      viewerRef.value.viewer.goToPicture(pictures.value[0].id, route.params.id)
+    }
+    scrollIntoSelected(
+      picturesToDelete.value[0],
+      pictures.value.map((e) => e.id)
+    )
     picturesToDelete.value = []
     sequenceStore.addToastText(t('general.success_text'), 'success')
   } catch (e) {

src/views/MySequencesView.vue

@@ -26,65 +26,53 @@
         />
       </vue-draggable-resizable>
     </section>
-    <section :style="{ width: `${listWidth}px` }" class="section-sequence">
-      <h1 class="sequences-title">{{ $t('pages.sequences.title') }}</h1>
-      <ul v-if="!isLoading" class="sequence-list">
-        <li class="sequence-item sequence-item-head">
-          <div class="sequence-header-item"></div>
-          <div class="sequence-header-item">
-            <Button
-              :text="$t('pages.sequences.sequence_name')"
-              look="link--grey"
-              icon="bi bi-arrow-down-up"
-              data-test="button-sort-title"
-              @trigger="sortAlpha('title')"
-            />
-          </div>
-          <div class="sequence-header-item">
-            <Button
-              :text="$t('pages.sequences.sequence_photos')"
-              look="link--grey"
-              icon="bi bi-arrow-down-up"
-              data-test="button-sort-number"
-              @trigger="sortNum('num')"
-            />
-          </div>
-          <div class="sequence-header-item">
-            <Button
-              :text="$t('pages.sequences.sequence_date')"
-              look="link--grey"
-              icon="bi bi-arrow-down-up"
-              data-test="button-sort-date"
-              @trigger="sortNum('date')"
-            />
-          </div>
-          <div class="sequence-header-item">
-            <Button
-              :text="$t('pages.sequences.sequence_creation')"
-              look="link--grey"
-              icon="bi bi-arrow-down-up"
-              data-test="button-sort-date"
-              @trigger="sortNum('date', 'created')"
-            />
-          </div>
-          <div class="sequence-header-item">
-            <Button
-              :text="$t('pages.sequences.sequence_status')"
-              look="link--grey"
-              icon="bi bi-arrow-down-up"
-              data-test="button-sort-date"
-              @trigger="sortAlpha('geovisio:status')"
-            />
-          </div>
-        </li>
+    <section
+      :style="{ width: `${listWidth}px` }"
+      class="section-sequence"
+      @scroll="handleScroll"
+    >
+      <h1 id="sequenceTitle" class="sequences-title">
+        {{ $t('pages.sequences.title') }}
+      </h1>
+      <div
+        ref="headerList"
+        :class="['sequence-item sequence-item-head', headerListClass]"
+        :style="{ width: `${listWidth}px`, borderRadius: '0px' }"
+      >
+        <div class="sequence-header-item"></div>
+        <div class="sequence-header-item">
+          <span>{{ $t('pages.sequences.sequence_name') }}</span>
+        </div>
+        <div class="sequence-header-item">
+          <span>{{ $t('pages.sequences.sequence_photos') }}</span>
+        </div>
+        <div class="sequence-header-item">
+          <Button
+            :text="$t('pages.sequences.sequence_date')"
+            look="link--grey"
+            icon="bi bi-arrow-down-up"
+            data-test="button-sort-date"
+            @trigger="sortList('datetime')"
+          />
+        </div>
+        <div class="sequence-header-item">
+          <Button
+            :text="$t('pages.sequences.sequence_creation')"
+            look="link--grey"
+            icon="bi bi-arrow-down-up"
+            data-test="button-sort-date"
+            @trigger="sortList('created')"
+          />
+        </div>
+        <div class="sequence-header-item">
+          <span>{{ $t('pages.sequences.sequence_status') }}</span>
+        </div>
+      </div>
+      <ul v-if="!isLoading" ref="list" class="sequence-list">
         <li
           v-if="userSequences.length"
-          v-for="(item, i) in userSequences"
-          :id="`el-list${i}`"
-          :class="[
-            'sequence-item',
-            item.id === seqId ? 'button-item-hover' : ''
-          ]"
+          v-for="item in userSequences"
+          class="sequence-item"
           @mouseover="goToSequence(item)"
         >
           <router-link
@@ -179,17 +167,29 @@
       <div v-else class="loader">
         <Loader look="sm" :is-loaded="false" />
       </div>
+      <div class="entry-pagination">
+        <Pagination
+          v-for="item in paginationLinks"
+          :type="item.rel"
+          :href="item.href"
+          :self-link="selfLink[0]"
+          @trigger="goToNextPage"
+        />
+      </div>
       <Toast :text="toastText" :look="toastLook" @trigger="toastText = ''" />
     </section>
   </main>
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref, watchEffect, computed } from 'vue'
+import { onMounted, ref, watchEffect, computed, nextTick } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useSequenceStore } from '@/store/sequence'
 import { storeToRefs } from 'pinia'
-import { scrollIntoSelected } from '@/views/utils/sequence/index'
+import {
+  scrollIntoSelected,
+  formatPaginationItems
+} from '@/views/utils/sequence/index'
 import { useCookies } from 'vue3-cookies'
 import axios from 'axios'
 import Viewer from '@/components/Viewer.vue'
@@ -197,30 +197,44 @@ import Button from '@/components/Button.vue'
 import Link from '@/components/Link.vue'
 import Toast from '@/components/Toast.vue'
 import Loader from '@/components/Loader.vue'
-import type {
-  SequenceLinkInterface,
-  ExtentSequenceLinkInterface
-} from './interfaces/MySequencesView'
+import Pagination from '@/components/Pagination.vue'
+import type { SequenceLinkInterface } from './interfaces/MySequencesView'
+import type { ResponseUserPhotoLinksInterface } from './interfaces/MySequenceView'
 import { formatDate } from '@/utils/dates'
 import {
   deleteACollection,
   patchACollection
 } from '@/views/utils/sequence/request'
+
 const { t } = useI18n()
 const { cookies } = useCookies()
 const sequenceStore = useSequenceStore()
 const { toastText, toastLook } = storeToRefs(sequenceStore)
+interface PositionInterface {
+  bottom: number
+  top: number
+  right: number
+  left: number
+  y: number
+  x: number
+}
 let userSequences = ref<SequenceLinkInterface[]>([])
+let paginationLinks = ref<ResponseUserPhotoLinksInterface[] | []>([])
+let selfLink = ref<ResponseUserPhotoLinksInterface[] | []>([])
 let collectionBbox = ref<number[]>([])
-let isSorted = ref<boolean>(false)
 let isLoading = ref<boolean>(false)
+let isSorted = ref<boolean>(false)
 let seqId = ref<string>('')
 let width = ref<number>(0)
 let mapWidth = ref<number>(window.innerWidth / 3)
 let listWidth = ref<number>(window.innerWidth / 1.5)
 const windowWidth = ref<number>(window.innerWidth)
 const windowHeight = ref<number>(window.innerHeight - 80)
-const viewerRef = ref<any>(null)
+const viewerRef = ref<InstanceType<typeof Viewer>>()
+const headerList = ref<HTMLDivElement | null>(null)
+const list = ref<HTMLDListElement | null>(null)
+const listPos = ref<PositionInterface | null>(null)
+const headerLisPos = ref<PositionInterface | null>(null)
 
 async function fetchAndFormatSequence(): Promise<void> {
   const { data } = await axios.get('api/users/me/collection')
@@ -235,7 +249,7 @@ async function patchCollection(sequence: SequenceLinkInterface): Promise<void> {
   else visible = 'true'
   await patchACollection(sequence.id, visible)
   await fetchAndFormatSequence()
-  viewerRef.value.viewer.reloadVectorTiles()
+  if (viewerRef.value) viewerRef.value.viewer.reloadVectorTiles()
   isLoading.value = false
 }
 async function deleteCollection(
@@ -245,7 +259,7 @@ async function deleteCollection(
   if (confirm(t('pages.sequence.confirm_sequence_dialog'))) {
     await deleteACollection(sequence.id)
     await fetchAndFormatSequence()
-    viewerRef.value.viewer.reloadVectorTiles()
+    if (viewerRef.value) viewerRef.value.viewer.reloadVectorTiles()
   }
   isLoading.value = false
 }
@@ -254,63 +268,116 @@ function sequenceStatus(status: string): string {
   if (status === 'hidden') return t('pages.sequences.sequence_hidden')
   return t('pages.sequences.sequence_waiting')
 }
-function sortAlpha<TKey extends keyof SequenceLinkInterface>(key: TKey): void {
-  const sorted = userSequences.value.sort(
-    (
-      a: { [K in TKey]: SequenceLinkInterface[TKey] },
-      b: { [K in TKey]: SequenceLinkInterface[TKey] }
-    ) => {
-      if (a[key] < b[key]) return !isSorted.value ? -1 : 1
-      if (a[key] > b[key]) return !isSorted.value ? 1 : -1
-      return 0
-    }
-  )
-  isSorted.value = !isSorted.value
-  userSequences.value = sorted
-}
-function onResizeMap(width: any) {
+function onResizeMap(width: any): void {
   if (width) {
     width.value = width
     mapWidth.value = width.value.width
     listWidth.value = window.innerWidth - width.value.width
   }
 }
-function sortNum(type: string, dateToSort?: string): void {
-  let aa, bb: number
-  const sorted = userSequences.value.sort(
-    (a: ExtentSequenceLinkInterface, b: ExtentSequenceLinkInterface) => {
-      aa = new Date(a.extent.temporal.interval[0][0]).getTime()
-      bb = new Date(b.extent.temporal.interval[0][0]).getTime()
-      if (dateToSort === 'created') {
-        aa = new Date(a.created).getTime()
-        bb = new Date(b.created).getTime()
-      }
-      if (type === 'num') {
-        aa = Number(a['stats:items'].count)
-        bb = Number(b['stats:items'].count)
-      }
-      if (aa < bb) return !isSorted.value ? -1 : 1
-      if (aa > bb) return !isSorted.value ? 1 : -1
-      return 0
-    }
-  )
-  isSorted.value = !isSorted.value
-  userSequences.value = sorted
+const handleScroll = async () => {
+  await nextTick()
+  if (headerList.value && headerList.value.getBoundingClientRect()) {
+    headerLisPos.value = headerList.value.getBoundingClientRect()
+  }
+  if (list.value && list.value.getBoundingClientRect()) {
+    listPos.value = list.value.getBoundingClientRect()
+  }
 }
-function goToSequence(sequence: SequenceLinkInterface) {
+async function sortList(dateToSort: string): Promise<void> {
+  isLoading.value = true
+  let sortBy = `+${dateToSort}`
+  if (isSorted.value) sortBy = `-${dateToSort}`
+  const { data } = await axios.get(
+    `api/users/me/collection?limit=50&sortby=${encodeURIComponent(sortBy)}`
+  )
+  selfLink.value = data.links.filter(
+    (el: SequenceLinkInterface) => el.rel === 'self'
+  )
+  paginationLinks.value = formatPaginationItems(data.links)
+  userSequences.value = getRelChild(data.links)
+  isSorted.value = !isSorted.value
+  scrollToElement()
+  isLoading.value = false
+}
+
+function bboxIsInsideOther(mainBbox: number[], bboxInside: number[]): boolean {
+  return (
+    bboxInside[0] <= mainBbox[0] &&
+    bboxInside[1] <= mainBbox[1] &&
+    bboxInside[2] >= mainBbox[2] &&
+    bboxInside[3] >= mainBbox[3]
+  )
+}
+function goToSequence(sequence: SequenceLinkInterface): void {
+  if (!viewerRef.value) return
+  const currentBbox = [
+    viewerRef.value.viewer._map.getBounds()._ne.lng,
+    viewerRef.value.viewer._map.getBounds()._ne.lat,
+    viewerRef.value.viewer._map.getBounds()._sw.lng,
+    viewerRef.value.viewer._map.getBounds()._sw.lat
+  ]
+  if (
+    seqId.value === sequence.id &&
+    bboxIsInsideOther(currentBbox, sequence.extent.spatial.bbox[0])
+  ) {
+    return
+  }
   seqId.value = sequence.id
   viewerRef.value.viewer.select(seqId.value)
+  viewerRef.value.viewer._map.flyTo({
+    center: [
+      sequence.extent.spatial.bbox[0][0],
+      sequence.extent.spatial.bbox[0][1]
+    ],
+    zoom: 10,
+    duration: 0
+  })
 }
-function getRelChild(sequences: SequenceLinkInterface[]) {
+function getRelChild(
+  sequences: SequenceLinkInterface[]
+): SequenceLinkInterface[] {
   return sequences.filter((el: SequenceLinkInterface) => el.rel === 'child')
 }
-const getUserId = computed<string>(() => cookies.get('user_id'))
+function scrollToElement(): void {
+  const elementTarget = document.querySelector('#sequenceTitle')
+  if (elementTarget) elementTarget.scrollIntoView({ behavior: 'smooth' })
+}
+async function goToNextPage(value: string): Promise<void> {
+  isLoading.value = true
+  const { data } = await axios.get(value)
+  selfLink.value = data.links.filter(
+    (el: SequenceLinkInterface) => el.rel === 'self'
+  )
+  paginationLinks.value = formatPaginationItems(data.links)
+  userSequences.value = getRelChild(data.links)
+  scrollToElement()
+  isLoading.value = false
+}
+const getUserId = computed<string>((): string => cookies.get('user_id'))
+const headerListClass = computed<string>((): string => {
+  if (headerLisPos.value && listPos.value) {
+    return headerLisPos.value.y != 0 && listPos.value.top < 180
+      ? 'item-head-fixed'
+      : ''
+  }
+  return ''
+})
 onMounted(async () => {
   isLoading.value = true
   try {
-    const { data } = await axios.get('api/users/me/collection')
-    collectionBbox.value = data.extent.spatial.bbox[0]
+    const { data } = await axios.get('api/users/me/collection?limit=50')
+    selfLink.value = data.links.filter(
+      (el: SequenceLinkInterface) => el.rel === 'self'
+    )
+    paginationLinks.value = formatPaginationItems(data.links)
     userSequences.value = getRelChild(data.links)
+    collectionBbox.value = [
+      userSequences.value[0].extent.spatial.bbox[0][0],
+      userSequences.value[0].extent.spatial.bbox[0][1],
+      userSequences.value[0].extent.spatial.bbox[0][2],
+      userSequences.value[0].extent.spatial.bbox[0][3]
+    ]
     isLoading.value = false
   } catch (err) {
     isLoading.value = false
@@ -322,9 +389,13 @@ watchEffect(() => {
     viewerRef.value.viewer.addEventListener(
       'hover',
       (e: { detail: { seqId: string } }) => {
+        if (seqId.value === e.detail.seqId) return
         seqId.value = e.detail.seqId
-        scrollIntoSelected(e.detail.seqId, userSequences.value)
-        viewerRef.value.viewer.select(e.detail.seqId)
+        scrollIntoSelected(
+          e.detail.seqId,
+          userSequences.value.map((e) => e.id)
+        )
+        if (viewerRef.value) viewerRef.value.viewer.select(e.detail.seqId)
       }
     )
   }
@@ -387,41 +458,48 @@ watchEffect(() => {
   margin: auto;
   background-color: var(--blue-pale);
   padding: toRem(2);
-  &:first-child {
-    margin-bottom: toRem(1);
-    padding: toRem(1) toRem(2);
-    border-bottom: toRem(0.1) solid var(--grey);
-    border-radius: toRem(2) toRem(2) 0rem 0rem;
-    background-color: var(--white);
-  }
   &:nth-child(2n) {
     background-color: var(--white);
   }
+  &:hover {
+    background-color: var(--blue);
+    color: var(--white);
+    .button-item {
+      & > *,
+      & > :nth-child(2) {
+        color: var(--white);
+      }
+    }
+  }
 }
 .wrapper-button {
   position: absolute;
-  right: toRem(2);
-  bottom: toRem(2);
+  right: toRem(1);
+  bottom: 0;
   display: flex;
   align-items: center;
+  flex-direction: column;
+  justify-content: center;
+  height: 100%;
   .button--white:first-child {
-    margin-right: toRem(1);
+    margin-bottom: toRem(1);
   }
 }
-.button-item-hover {
-  background-color: var(--blue);
-  &:nth-child(2n) {
-    background-color: var(--blue);
-  }
-  .button-item {
-    & > *,
-    & > :nth-child(2) {
-      color: var(--white);
-    }
-  }
+.item-head-fixed {
+  position: fixed;
+  top: toRem(8);
+  width: 100%;
+  z-index: 2;
+}
+.sequence-item-head {
+  margin-bottom: toRem(1);
+  padding: toRem(1) toRem(2);
+  border-bottom: toRem(0.1) solid var(--grey);
+  border-radius: toRem(2) toRem(2) 0rem 0rem;
+  background-color: var(--white);
 }
 .sequence-item-head:hover {
-  background-color: initial;
+  background-color: var(--white);
   color: initial;
 }
 .wrapper-title {
@@ -497,7 +575,6 @@ watchEffect(() => {
 }
 .sequence-header-item {
   width: calc(31% - #{toRem(4.75)});
-  margin-left: toRem(-1);
   &:first-child {
     margin-right: toRem(2);
   }
@@ -533,6 +610,13 @@ watchEffect(() => {
   margin-left: auto;
   width: fit-content;
 }
+.entry-pagination {
+  margin-top: toRem(4);
+  margin-bottom: toRem(4);
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
 @media (max-width: toRem(102.4)) {
   .section-viewer {
     width: 30%;
@@ -554,7 +638,7 @@ watchEffect(() => {
   .section-sequence {
     width: 100% !important;
   }
-  .sequence-item:first-child {
+  .sequence-item-head {
     display: none;
   }
   .button-item {
@@ -576,11 +660,17 @@ watchEffect(() => {
     flex-direction: column;
   }
   .wrapper-button {
+    flex-direction: row;
     position: relative;
     right: 0;
     bottom: 0;
     justify-content: center;
     margin-top: toRem(1);
+    margin-bottom: 0;
+    .button--white:first-child {
+      margin-right: toRem(1);
+      margin-bottom: 0;
+    }
   }
 }
 </style>

src/views/UploadPicturesView.vue

@@ -41,6 +41,8 @@
         </p>
         <EditText
           :default-text="newSequenceTitle || sequenceTitle"
+          :is-loading="isLoading"
+          :is-loaded="isLoaded"
           @triggerNewText="setNewSequenceTitle"
         />
         <form>
@@ -148,7 +150,7 @@ onUnmounted(() => {
   window.onbeforeunload = null
 })
 onBeforeRouteLeave((to, from, next) => {
-  if (isLoading.value) {
+  if (!isLoaded.value && isLoading.value) {
     const answer = window.confirm(t('pages.upload.leave_message'))
     if (answer) return next()
     return next(false)
@@ -227,7 +229,7 @@ async function uploadPicture(): Promise<void> {
     body.append('picture', el)
     try {
       const pictureUploaded = await createAPictureToASequence(data.id, body)
-      const pictures = { ...pictureUploaded.data, name: el.name }
+      const pictures = { ...pictureUploaded, name: el.name }
       picturesUploadingSize.value = picturesUploadingSize.value + el.size
       uploadedSequence.value.pictures = [
         ...uploadedSequence.value.pictures,
@@ -238,6 +240,7 @@ async function uploadPicture(): Promise<void> {
       picturesUploadingSize.value = picturesUploadingSize.value + el.size
       const picturesOnError = {
         message: err.response.data.message,
+        details: { error: err.response.data.details.error },
         name: el.name
       }
       uploadedSequence.value.picturesOnError = [

src/views/interfaces/MySequencesView.ts

@@ -5,14 +5,7 @@ export interface SequenceLinkInterface {
   title: string
   type: string
   created: Date
-  extent: { temporal: { interval: [Date[]] } }
+  extent: { temporal: { interval: [Date[]] }; spatial: { bbox: [number[]] } }
   ['stats:items']: { count: number }
   ['geovisio:status']: string
 }
-
-export interface ExtentSequenceLinkInterface {
-  extent: { temporal: { interval: [Date[]] } }
-  ['stats:items']: { count: number }
-  title: string
-  created: Date
-}

src/views/interfaces/UploadPicturesView.ts

@@ -8,5 +8,6 @@ export interface SequenceInterface {
 }
 export interface uploadErrorInterface {
   message: string
+  details: { error: string }
   name: string
 }

src/views/utils/sequence/index.ts

@@ -7,9 +7,8 @@ function imageStatus(imageStatus: string, sequenceStatus: string): string {
   if (sequenceStatus === 'hidden') return sequenceStatus
   return imageStatus
 }
-//TODO REMOVE ANY
-function scrollIntoSelected(id: string, userPhotos: any): void {
-  const itemPosition = userPhotos.map((el: any) => el.id).indexOf(id)
+function scrollIntoSelected(id: string, userPhotos: string[]): void {
+  const itemPosition = userPhotos.map((el: string) => el).indexOf(id)
   const elementTarget = document.querySelector(`#el-list${itemPosition}`)
   if (elementTarget) elementTarget.scrollIntoView({ behavior: 'smooth' })
 }

src/views/utils/upload/request.ts

@@ -19,12 +19,32 @@ interface SequenceCreatedInterface {
   }
 }
 
+interface PictureCreatedInterface {
+  data: {
+    assets: object
+    bbox: number[]
+    collection: string
+    geometry: object
+    id: string
+    links: object[]
+    properties: object
+    providers: object[]
+    stac_extensions: string[]
+    stac_version: string
+    type: string
+  }
+}
+
 function createASequence(title: string): Promise<SequenceCreatedInterface> {
   return axios.post('api/collections', { title: title })
 }
 
-async function createAPictureToASequence(id: string, body: any): Promise<any> {
-  return await axios.post(`api/collections/${id}/items`, body)
+async function createAPictureToASequence(
+  id: string,
+  body: FormData
+): Promise<PictureCreatedInterface> {
+  const { data } = await axios.post(`api/collections/${id}/items`, body)
+  return data
 }
 
 export { createASequence, createAPictureToASequence }