diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 728016f..afde029 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -48,20 +48,13 @@ jobs: deploy: needs: build-push - runs-on: ubuntu-latest + runs-on: self-hosted steps: - - name: SSH to remote server and update Swarm service - uses: appleboy/ssh-action@v1.0.3 - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - password: ${{ secrets.PASSWORD }} - port: ${{ secrets.PORT }} - script: | - cd /home/zouklambadabcn.com/public_html/ - git pull - 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 image prune -f + - uses: actions/checkout@v4 + - name: Deploy Swarm stack + 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 image prune -f - run: 'echo "This job status is ${{ job.status }}"' diff --git a/src/components/MixedBookingSection.tsx b/src/components/MixedBookingSection.tsx index ebfebd0..5c449e2 100644 --- a/src/components/MixedBookingSection.tsx +++ b/src/components/MixedBookingSection.tsx @@ -131,9 +131,14 @@ const MixedBookingSection = () => {

)} {hasHotel && ( -

- {t(`mixedBooking.roomTypes.${selectedRoom}`)}: {roomPrice}€ -

+ <> +

+ {t(`mixedBooking.roomTypes.${selectedRoom}`)}: {roomPrice}€ +

+

+ {t("mixedBooking.fullBoardPrice")} +

+ )} diff --git a/src/locales/en.json b/src/locales/en.json index 9d69410..c56f053 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -140,6 +140,7 @@ "hotelYes": "Yes", "hotelNo": "No", "nonHotelNote": "+50€ fee for not staying in hotel", + "fullBoardPrice": "Full board price", "validUntilJuly": "From now until 15 July", "validUntilSeptember": "From now until 1 September", "roomTypes": { diff --git a/src/locales/es.json b/src/locales/es.json index 150b5b8..50772df 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -140,6 +140,7 @@ "hotelYes": "Sí", "hotelNo": "No", "nonHotelNote": "+50€ por no alojarse en hotel", + "fullBoardPrice": "Precio con pensión completa", "validUntilJuly": "Desde ahora hasta el 15 de julio", "validUntilSeptember": "Desde ahora hasta el 1 de septiembre", "roomTypes": {