From bb5d995b5d594e32c18b9b946aca9fe0fc1c84b4 Mon Sep 17 00:00:00 2001
From: Alexis <35.alexis.pele@gmail.com>
Date: Sat, 11 Jan 2025 20:44:08 +0100
Subject: [PATCH] Added some cantane data
---
.../maps/data/aldys/cantane/markers.json | 22 +++++++++++++++++++
src/components/maps/data/aldys/markers.json | 3 ++-
src/layouts/Layout.astro | 16 +++++++++-----
src/pages/aldys/cantane/index.astro | 8 +++++++
src/pages/index.astro | 10 ++++++++-
src/types/Head.ts | 10 +++++++++
tsconfig.json | 4 +++-
7 files changed, 65 insertions(+), 8 deletions(-)
create mode 100644 src/components/maps/data/aldys/cantane/markers.json
create mode 100644 src/types/Head.ts
diff --git a/src/components/maps/data/aldys/cantane/markers.json b/src/components/maps/data/aldys/cantane/markers.json
new file mode 100644
index 00000000..b717250e
--- /dev/null
+++ b/src/components/maps/data/aldys/cantane/markers.json
@@ -0,0 +1,22 @@
+{
+ "data": [
+ {
+ "group": "landmarks",
+ "title": "Pilier d'Ikami",
+ "description": "Abbaye locale dédiée au culte d'Ikami. Une tour de 30m de haut a été érigée à l'arrière de la nef pour servir de clocher.",
+ "markerCoords": {
+ "x": 142.6711747082816,
+ "y": -132.92203370330174
+ }
+ },
+ {
+ "group": "landmarks",
+ "title": "Quartiers du Duc",
+ "description": "Manoir du Duc de Cantane, Geil Brilâme. Beaucoup de grenouilles pataugent dans les douves et les étangs qui entourent la propriété.",
+ "markerCoords": {
+ "x": 171.29758708733308,
+ "y": -83.60967931316306
+ }
+ }
+ ]
+}
diff --git a/src/components/maps/data/aldys/markers.json b/src/components/maps/data/aldys/markers.json
index 5f00175a..8d3e9f1f 100644
--- a/src/components/maps/data/aldys/markers.json
+++ b/src/components/maps/data/aldys/markers.json
@@ -203,12 +203,13 @@
{
"group": "cities",
"title": "Cantane",
- "description": "",
+ "description": "Petite ville minière excentrée qui accueille les commerçants de gemmes des environs une fois par an.",
"link": "https://wiki.alexcreates.fr/index.php/Cantane",
"markerCoords": {
"x": 197.3492280183025,
"y": -210.87224307207197
},
+ "mapId": "/aldys/cantane",
"cover": "Cantane.jpg",
"coverAuthor": "Andreas Roller",
"coverLink": "https://en.wikipedia.org/wiki/Andreas_Roller"
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 1811abe8..7faddc9b 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -1,9 +1,12 @@
---
+import type { Head } from '@/types/Head';
+
interface Props {
title: string;
+ head?: Head
}
-const { title } = Astro.props;
+const { title, head } = Astro.props;
---
@@ -11,7 +14,7 @@ const { title } = Astro.props;
-
+ {head?.description && }
{title} — Leim Wiki
@@ -26,10 +29,13 @@ const { title } = Astro.props;
-
-
+
+
-
+ {head?.image && }
+
+ {head?.description && }
+ {head?.image && }
diff --git a/src/pages/aldys/cantane/index.astro b/src/pages/aldys/cantane/index.astro
index ea216bf2..d78b7aca 100644
--- a/src/pages/aldys/cantane/index.astro
+++ b/src/pages/aldys/cantane/index.astro
@@ -1,18 +1,26 @@
---
+import type { MapMarker, PlayerMarker } from '@/types/Leaflet';
+
import Layout from '@/layouts/Layout.astro';
import Map from '@/components/maps/Map.astro'
import MapOverlay from '@/components/maps/MapOverlay.astro'
+
+import markersData from '@/components/maps/data/aldys/cantane/markers.json'
+
+const markers = markersData.data as MapMarker[]
---