Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
frodrigo committed Nov 25, 2024
2 parents 0b98462 + 98f0cf6 commit 975a9d8
Show file tree
Hide file tree
Showing 71 changed files with 2,619 additions and 1,413 deletions.
4 changes: 2 additions & 2 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CONFIG=vidos-config.json
NUXT_PUBLIC_SENTRY_DSN=
NUXT_PUBLIC_SENTRY_ENVIRONMENT=production
SENTRY_DSN=
SENTRY_ENVIRONMENT=production
21 changes: 19 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Full entry points documentation available on [api.yml](public/api.yaml) and on s
* Full page: `/`, `/{poi_Id}`, `/{category_ids}/` and `/{category_ids}/{poi_id}`.
* Parameters:
* `boundary`: an alternative boundary key from settings `polygons_extra`.
* `clipingPolygonSlug`: POI filtering by polygon (key from settings `polygons_extra`).
* Embedded: `/embedded/`, same subpath and parameters as full page.
* POI:
* details: `/poi/{id}/details`.
Expand Down Expand Up @@ -82,7 +83,7 @@ yarn start
```
cp .env.sample .env
docker compose build
docker-compose -f docker compose.yml run --rm vido yarn build-config
docker compose run --rm vido yarn build-config
docker compose up -d
```

Expand All @@ -108,7 +109,23 @@ Header set Content-Security-Policy "frame-ancestors *"

Vido is mainly building using:
- [MapLibre GL JS](https://maplibre.org/maplibre-gl-js-docs/api/map/)
- [Nxut3](https://nuxt.com/) and [Vue3](https://vuejs.org/), using the Options API
- [Nuxt 3](https://nuxt.com/) and [Vue 3](https://vuejs.org/), using both Options API / Composition API

### Setup hooks

Ensure that `core.hooksPath` is properly setup !

From your project root run:

```bash
git config core.hooksPath .git/hooks/
```

Then update your hooks with the following command:

```bash
yarn dlx simple-git-hooks
```

```
# serve with hot reload at localhost:3000
Expand Down
5 changes: 1 addition & 4 deletions components/Fields/Coordinates.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import type { PropType } from 'vue'
import { defineNuxtComponent } from '#app'
import ExternalLink from '~/components/UI/ExternalLink.vue'
import { coordinatesHref } from '~/lib/coordinates'
import { isIOS } from '~/utils/isIOS'
export function isCoordinatesEmpty(geom: GeoJSON.Geometry): boolean {
return !(geom && geom.type === 'Point' && geom.coordinates)
Expand All @@ -30,9 +29,7 @@ export default defineNuxtComponent({
},
mounted() {
// isOS is client side only
this.href
= isIOS !== undefined ? coordinatesHref(this.geom, isIOS()) : undefined
this.href = coordinatesHref(this.geom)
},
})
</script>
Expand Down
5 changes: 3 additions & 2 deletions components/Fields/Field.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import DateRange, { isDateRangeEmpty } from '~/components/Fields/DateRange.vue'
import Facebook from '~/components/Fields/Facebook.vue'
import LinkedIn from '~/components/Fields/LinkedIn.vue'
import Instagram from '~/components/Fields/Instagram.vue'
import OpeningHours, { isOpeningHoursSupportedOsmTags } from '~/components/Fields/OpeningHours.vue'
import OpeningHours from '~/components/Fields/OpeningHours.vue'
import { isOpeningHoursSupportedOsmTags } from '~/composables/useOpeningHours'
import Phone from '~/components/Fields/Phone.vue'
import RoutesField from '~/components/Fields/RoutesField.vue'
import Stars from '~/components/Fields/Stars.vue'
Expand Down Expand Up @@ -313,7 +314,7 @@ export default defineNuxtComponent({
"
:href="properties[field.field]"
class="d-inline-block pa-2 rounded-lg"
:style="{ backgroundColor: colorfill, color: '#ffffff' }"
:style="{ color: '#ffffff' }"
>
<FontAwesomeIcon icon="arrow-circle-down" />
{{ fieldTranslateK(field.field) }}
Expand Down
Loading

0 comments on commit 975a9d8

Please sign in to comment.