diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index bf4d206..eb4e1a5 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -55,6 +55,6 @@ jobs: run: | docker login git.hacecalor.net -u ${{ secrets.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }} docker compose pull - docker stack deploy -c docker-compose.yml zlb + docker stack deploy --with-registry-auth -c docker-compose.yml zlb docker image prune -f - run: 'echo "This job status is ${{ job.status }}"' diff --git a/docker-compose.yml b/docker-compose.yml index 46f79d2..13530ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,12 +1,8 @@ services: zlb: - image: git.hacecalor.net/Ichitux/zlb:latest - build: - context: . - dockerfile: Dockerfile + image: git.hacecalor.net/ichitux/zlb:latest ports: - "35207:80" - restart: unless-stopped deploy: replicas: 1 update_config: diff --git a/src/assets/staff/djgui.jpg b/src/assets/staff/djgui.jpg new file mode 100644 index 0000000..bd8b19c Binary files /dev/null and b/src/assets/staff/djgui.jpg differ diff --git a/src/components/PracticalSection.tsx b/src/components/PracticalSection.tsx index 9ffe6f1..0e49b0d 100644 --- a/src/components/PracticalSection.tsx +++ b/src/components/PracticalSection.tsx @@ -66,9 +66,9 @@ const PracticalSection = () => {
{PRACTICAL_INFO.airports.map((a) => ( -
-

{a.name}

-

{a.distance}

+
+

{t(a.nameKey)}

+

{t(a.distanceKey)}

))}
@@ -82,12 +82,18 @@ const PracticalSection = () => {
{PRACTICAL_INFO.howToGet.map((h) => { const methodLabel = - h.method === "Metro" ? t("info.metro") : h.method === "Bus" ? t("info.bus") : h.method === "Taxi/Uber" ? t("info.taxi") : h.method; + h.method === "Metro" + ? t("info.metro") + : h.method === "Bus" + ? t("info.bus") + : h.method === "Taxi/Uber" + ? t("info.taxi") + : h.method; return (

{methodLabel}

-

{h.details}

+

{t(h.detailsKey)}

{h.link && ( { rel="noopener noreferrer" className="inline-block mt-2 px-3 py-1 bg-primary text-primary-foreground text-xs rounded hover:bg-primary/90 transition-colors" > - {t("info.viewOnMap")} + {t(h.linkLabelKey ?? "info.viewOnMap")} )}
diff --git a/src/data/event-data.ts b/src/data/event-data.ts index cc19990..29ec434 100644 --- a/src/data/event-data.ts +++ b/src/data/event-data.ts @@ -30,6 +30,7 @@ import djhique from "@/assets/staff/djhique.jpg"; import djgg from "@/assets/staff/djgg.jpg"; import djgalzo from "@/assets/staff/djgalzo.jpg"; import aiysha from "@/assets/staff/aiysha.jpg"; +import djgui from "@/assets/staff/djgui.jpg"; import gal1 from "@/assets/gallery/gal1.jpg"; import gal2 from "@/assets/gallery/gal2.jpg"; @@ -206,6 +207,12 @@ export const STAFF = [ name: "Aiysha", role: "Specials" as const, image: aiysha, + }, + { + id: "20", + name: "DJ Gui", + role: "DJ" as const, + image: djgui, } ]; @@ -276,12 +283,18 @@ export const HOTEL_ROOMS = [ // ---- INFORMACIÓN PRÁCTICA ---- export const PRACTICAL_INFO = { airports: [ - { name: "Aeropuerto de Barcelona-El Prat (BCN)", distance: "~85 km del Hotel" }, - { name: "Aeropuerto de Girona (GRO)", distance: "~48 km del Hotel" }, + { + nameKey: "info.airportBCNName", + distanceKey: "info.airportBCNDistance", + }, ], howToGet: [ - { method: "Metro", details: "Línea y parada más cercana", link: "https://maps.app.goo.gl/YVyASwX2odX1mW5J6" }, - { method: "Taxi/Uber", details: "Disponible desde cualquier punto de Barcelona" }, + { + method: "Bus", + detailsKey: "info.bus603Details", + link: "https://share.google/gZWgcLkbz4JbNLJ0O", + linkLabelKey: "info.viewInfo", + }, ], }; diff --git a/src/locales/en.json b/src/locales/en.json index c56f053..c5e5e21 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -175,6 +175,10 @@ "nearestStop": "[Nearest line and stop]", "busLines": "[Nearby bus lines]", "taxiDetails": "Available from anywhere in Barcelona", + "airportBCNName": "Barcelona Airport (BCN)", + "airportBCNDistance": "~85 km from the hotel", + "bus603Details": "Bus number 603 from airport terminal T1 to Santa Susana, passing through central Barcelona.", + "viewInfo": "View info", "venue": "Event Venue", "mapTitle": "Event Location", "viewOnMap": "View on map" diff --git a/src/locales/es.json b/src/locales/es.json index 50772df..80834a4 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -175,6 +175,10 @@ "nearestStop": "[Línea y parada más cercana]", "busLines": "[Líneas de bus cercanas]", "taxiDetails": "Disponible desde cualquier punto de Barcelona", + "airportBCNName": "Aeropuerto de Barcelona-El Prat (BCN)", + "airportBCNDistance": "~85 km del hotel", + "bus603Details": "Bus número 603 desde la terminal T1 al Santa Susana, pasando por el centro de Barcelona.", + "viewInfo": "Ver info", "venue": "Lugar del Evento", "mapTitle": "Ubicación del evento", "viewOnMap": "Ver en mapa"