Skip to content

Commit

Permalink
Merge pull request #261 from SpeciesFileGroup/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
José Luis Pereira authored and GitHub committed Mar 19, 2025
2 parents f1aabae + a9e8ee3 commit 871d25c
Show file tree
Hide file tree
Showing 11 changed files with 704 additions and 463 deletions.
2 changes: 1 addition & 1 deletion README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ Steps to replace the default layout
2. Inside this folder, create a file named default.vue.
3. Define your custom layout structure inside this file as needed.

Example of layout/default.vue
Example of layouts/default.vue

```vuejs
<template>
Expand Down
1,083 changes: 656 additions & 427 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,38 +15,38 @@
"lint": "eslint --ext .js,.vue --ignore-path .gitignore --fix src"
},
"dependencies": {
"@geoman-io/leaflet-geoman-free": "^2.18.1",
"@geoman-io/leaflet-geoman-free": "^2.18.3",
"@nuxt/devalue": "^2.0.2",
"@sfgrp/distinguish": "^0.4.0",
"@sfgrp/pinpoint": "^0.0.12",
"@unhead/ssr": "^1.11.15",
"axios": "^1.7.9",
"@unhead/ssr": "^1.11.20",
"axios": "^1.8.3",
"glob": "^11.0.1",
"js-yaml": "^4.1.0",
"leaflet": "^1.9.4",
"leaflet.markercluster": "^1.5.3",
"markdown-it-anchor": "^9.2.0",
"pinia": "^2.3.0",
"unhead": "^1.11.15",
"unplugin-vue-markdown": "^28.0.0",
"pinia": "^3.0.1",
"unhead": "^1.11.20",
"unplugin-vue-markdown": "^28.3.1",
"vue": "^3.5.13",
"vue-router": "^4.5.0"
},
"devDependencies": {
"@tailwindcss/typography": "^0.5.16",
"@unhead/ssr": "^1.11.15",
"@vitejs/plugin-vue": "^5.2.1",
"autoprefixer": "^10.4.20",
"compression": "^1.7.5",
"eslint": "^9.17.0",
"@unhead/ssr": "^1.11.20",
"@vitejs/plugin-vue": "^5.2.3",
"autoprefixer": "^10.4.21",
"compression": "^1.8.0",
"eslint": "^9.22.0",
"eslint-plugin-vue": "^9.32.0",
"express": "^4.21.2",
"minimist": "^1.2.8",
"postcss": "^8.4.49",
"sass": "^1.83.1",
"postcss": "^8.5.3",
"sass": "^1.86.0",
"tailwindcss": "^3.4.17",
"vite": "^6.0.7",
"vite-plugin-pages": "^0.32.4",
"vite-plugin-radar": "^0.9.6"
"vite": "^6.2.2",
"vite-plugin-pages": "^0.32.5",
"vite-plugin-radar": "^0.10.0"
}
}
1 change: 1 addition & 0 deletions src/components/Autocomplete/Autocomplete.global.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ watch(typed, (newVal) => {
isSearching.value = false
list.value = data
})
.catch(() => {})
}, delay)
} else {
list.value = []
Expand Down
1 change: 1 addition & 0 deletions src/components/Gallery/useGallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export function useGallery({ props }) {
props.depictionId.indexOf(b.id)
)
})
.catch(() => {})
}
},
{ immediate: true }
Expand Down
5 changes: 4 additions & 1 deletion src/components/Layout/LayoutHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@
</ClientOnly>
</div>
<div class="flex items-center ml-2 border-base-muted">
<TrackerReport icon />
<TrackerReport
icon
button-class="text-primary-content"
/>
</div>
</div>
</div>
Expand Down
17 changes: 10 additions & 7 deletions src/components/ProjectStats.global.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,16 @@ function filterStats(currentStats) {
}
onMounted(() => {
makeAPIRequest.get('/stats').then((response) => {
const data = Object.entries(response.data.data).map(([key, value]) => [
key.toLowerCase(),
value.toLocaleString()
])
makeAPIRequest
.get('/stats')
.then((response) => {
const data = Object.entries(response.data.data).map(([key, value]) => [
key.toLowerCase(),
value.toLocaleString()
])
stats.value.data = data
})
stats.value.data = data
})
.catch(() => {})
})
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ watch(
.then(({ data }) => {
taxonomy.value = data
})
.catch(() => {})
.finally(() => (isLoading.value = false))
},
{ immediate: true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ function loadOTUs(geojson) {
list.value = data
isTableVisible.value = true
})
.catch(() => {})
.finally((_) => {
isLoading.value = false
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ export const useDistributionStore = defineStore('distributionStore', {
},

loadCachedMap(mapId) {
TaxonWorks.getCachedMap(mapId, { signal: this.controller.signal }).then(
(response) => {
TaxonWorks.getCachedMap(mapId, { signal: this.controller.signal })
.then((response) => {
this.distribution.cachedMap = response.data
}
)
})
.catch(() => {})
},

async getAggregateShape(otuId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,15 @@ watch(
useOtuPageRequest('panel:typeMaterial', () =>
TaxonWorks.getOtuTypeMaterial(props.otuId)
).then(({ data }) => {
typeMaterials.value = data.type_materials_catalog_labels.sort(
(a, b) =>
SPECIMEN_TYPES.indexOf(a.type_type) -
SPECIMEN_TYPES.indexOf(b.type_type)
)
})
)
.then(({ data }) => {
typeMaterials.value = data.type_materials_catalog_labels.sort(
(a, b) =>
SPECIMEN_TYPES.indexOf(a.type_type) -
SPECIMEN_TYPES.indexOf(b.type_type)
)
})
.catch(() => {})
},
{ immediate: true }
)
Expand Down

0 comments on commit 871d25c

Please sign in to comment.