Skip to content

Commit

Permalink
Merge branch 'feature/standardized-popup' into preview
Browse files Browse the repository at this point in the history
  • Loading branch information
Olivier Ribiere committed Mar 2, 2024
2 parents d46ed3a + eaf6caf commit d9d6cae
Show file tree
Hide file tree
Showing 41 changed files with 1,336 additions and 620 deletions.
8 changes: 7 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@formkit/tempo": "^0.0.12",
"@types/geojson": "^7946.0.10",
"@vuepic/vue-datepicker": "^4.3.0",
"core-js": "^3.30.1",
Expand All @@ -19,7 +20,7 @@
"fs-monkey": "^1.0.5",
"geo-coordinates-parser": "^1.5.8",
"jquery": "^3.6.4",
"mapbox-gl": "^2.14.1",
"mapbox-gl": "^2.15.0",
"merge-descriptors": "^2.0.0",
"vue": "^3.3.4",
"vue-i18n": "^9.1.10"
Expand Down
11 changes: 11 additions & 0 deletions public/basemaps-icons/deaths.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/basemaps-icons/incident.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/basemaps-icons/shipwreck.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/basemaps-icons/srr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 15 additions & 24 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="flex flex-col h-screen overflow-hidden">
<!-- <AppHeader/> -->
<AppHeader/>
<KeyNumbersMobile/>
<BaseMap/>
</div>
Expand All @@ -11,32 +11,23 @@
<HistogramSlider/>
</div>
<AppLegend/>
<VirtualVisit v-if="reactiveStore.virtualVisitAlreadyOpened"/>
<VirtualVisit v-if="store.getState().virtualVisitAlreadyOpened"/>
</template>

<script lang="ts">
import { store, reactiveStore } from "./Store"
import { defineAsyncComponent, defineComponent, onMounted } from "vue"
<script lang="ts" setup>
import { store } from "./main"
import { onMounted } from "vue"
import AppHeader from "./components/Header.vue"
import AppLegend from "./components/MapLegend.vue"
import BaseMap from "./components/BaseMap.vue"
import HistogramSlider from "./components/HistogramSlider.vue"
import KeyNumbers from "./components/KeyNumbers.vue"
import PopUp from "./components/PopUp.vue"
import Stats from "./components/Stats.vue"
import VirtualVisit from "./components/VirtualVisit.vue"
export default defineComponent({
components: {
// AppHeader: defineAsyncComponent(() => import("./components/Header.vue")),
AppLegend: defineAsyncComponent(() => import("./components/Legend.vue")),
BaseMap: defineAsyncComponent(() => import("./components/BaseMap.vue")),
HistogramSlider: defineAsyncComponent(() => import("./components/HistogramSlider.vue")),
KeyNumbers: defineAsyncComponent(() => import("./components/KeyNumbers.vue")),
KeyNumbersMobile: defineAsyncComponent(() => import("./components/KeyNumbersMobile.vue")),
PopUp: defineAsyncComponent(() => import("./components/PopUp.vue")),
Stats: defineAsyncComponent(() => import("./components/Stats.vue")),
VirtualVisit: defineAsyncComponent(() => import("./components/VirtualVisit.vue"))
},
setup () {
onMounted(() => {
store.initStore()
})
return { reactiveStore }
}
onMounted(() => {
store.initStore()
})
</script>
Loading

0 comments on commit d9d6cae

Please sign in to comment.