From ab1e20e6eb166f8602dcbdd285451192c7d10343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal.kvacek@performax.cz>
Date: Tue, 29 Aug 2023 21:28:29 +0200
Subject: [PATCH] Bugfixing

---
 deploy.sh                                  | 9 +++------
 docker-compose.prod.yml                    | 1 +
 src/components/flights/FlightBasicInfo.vue | 4 ++--
 src/components/photos/PhotoDetail.vue      | 7 +++++--
 src/composables/datetimeUtils.js           | 6 ++++--
 src/composables/objects/flight.js          | 5 ++++-
 src/graphql/fragments/flight_list.js       | 6 ++++++
 7 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 3f42bb9..e0dd186 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -6,13 +6,10 @@ TAG="latest"
 DOCKER_REGISTRY="docker.kvacek.cz"
 CONTAINER_IMAGE="$DOCKER_REGISTRY/$IMAGE_NAME:$TAG"
 
-docker login $DOCKER_REGISTRY
 # na Ubuntu je potreba sudo apt install gnupg2 pass
-
+docker login $DOCKER_REGISTRY
 docker build -t $CONTAINER_IMAGE .
 docker push $CONTAINER_IMAGE
 
-# TODO: nahrat docker-compose.prod.yml
-# TODO: spustit dc down && dc up
-# TODO: nahravat i config pro apache?
-# TODO: api -> alembic
+scp docker-compose.prod.yml michal@kvacek.cz:/var/www/poletani.cz/app/docker-compose.yml
+ssh michal@kvacek.cz "cd /var/www/poletani.cz/app && docker-compose pull && docker-compose down --remove-orphans && docker-compose up -d"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 5903c02..5070edc 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -2,5 +2,6 @@ version: "3.3"
 services:
   poletani-app:
     image: "docker.kvacek.cz/poletani/app:latest"
+    restart: always
     ports:
       - 9000:80
diff --git a/src/components/flights/FlightBasicInfo.vue b/src/components/flights/FlightBasicInfo.vue
index 92a3d2d..88acb71 100644
--- a/src/components/flights/FlightBasicInfo.vue
+++ b/src/components/flights/FlightBasicInfo.vue
@@ -44,7 +44,7 @@ const props = defineProps({
           </q-item-section>
           <q-item-section>
             <div>
-              <strong>{{ flight.takeoffAirport.name }}</strong>,
+              <strong>{{flight.takeoffAirport.icaoCode}}</strong> ({{ flight.takeoffAirport.name }}),
               čas vzletu: {{ formatDatetime(flight.takeoffDatetime, FORMAT_TIME) }}
 
               <WeatherInfo class="q-mx-sm" v-if="flight.takeoffWeatherInfo" :weather="flight.takeoffWeatherInfo"/>
@@ -67,7 +67,7 @@ const props = defineProps({
           </q-item-section>
           <q-item-section>
             <div>
-              <strong>{{ flight.landingAirport.name }}</strong>,
+              <strong>{{ flight.landingAirport.icaoCode }}</strong> ({{ flight.landingAirport.name }}),
               čas přistání: {{ formatDatetime(flight.landingDatetime, FORMAT_TIME) }}
               <WeatherInfo class="q-mx-sm" v-if="flight.landingWeatherInfo" :weather="flight.landingWeatherInfo"/>
             </div>
diff --git a/src/components/photos/PhotoDetail.vue b/src/components/photos/PhotoDetail.vue
index 4088a19..345b713 100644
--- a/src/components/photos/PhotoDetail.vue
+++ b/src/components/photos/PhotoDetail.vue
@@ -42,11 +42,14 @@ onMounted(() => {
 const photo = computed(() => props.photos[photoIndex.value]);
 
 const nextPhoto = () => {
+  if (imageFullscreen.value) return;
+
   if (photoIndex.value < props.photos.length - 1)
     photoIndex.value++
 }
 
 const prevPhoto = () => {
+  if (imageFullscreen.value) return;
   if (photoIndex.value > 0) photoIndex.value--;
 }
 
@@ -85,8 +88,8 @@ const imageFullscreen = ref(false);
         <div :class="{'relative-position': true, 'image-full-height': imageFullscreen}">
           <div class="text-center">
             <inner-image-zoom
-                move-type="pan"
-                :zoomScale="0.75"
+                move-type="drag"
+                :zoomScale="0.5"
                 :hide-hint="true"
                 :after-zoom-in="() => imageFullscreen = true"
                 :after-zoom-out="() => imageFullscreen = false"
diff --git a/src/composables/datetimeUtils.js b/src/composables/datetimeUtils.js
index e77a2d5..a9a2f57 100644
--- a/src/composables/datetimeUtils.js
+++ b/src/composables/datetimeUtils.js
@@ -6,9 +6,11 @@ export const FORMAT_DATE = "DD. MM. YYYY";
 export const FORMAT_TIME = "HH:mm"
 
 export const minutesToHumanReadable = (totalMinutes) => {
-  const hours = Math.round(totalMinutes / 60);
+  const hours = Math.floor(totalMinutes / 60);
   const minutes = totalMinutes % 60;
-  return `${hours}h ${minutes}min`
+
+  const hoursPart = hours > 0 ? `${hours}h ` : "";
+  return `${hoursPart}${minutes}min`
 }
 
 export const formatDatetimeNative = (date, format = "DD. MM. YYYY") => {
diff --git a/src/composables/objects/flight.js b/src/composables/objects/flight.js
index 152c0b5..59645bb 100644
--- a/src/composables/objects/flight.js
+++ b/src/composables/objects/flight.js
@@ -10,7 +10,10 @@ export const flightName = (flight) => {
   if (flight.name !== '') {
     return `${flight.name} (${date})`
   } else {
-    return `${flight.takeoffAirport.icaoCode} - ${flight.takeoffAirport.icaoCode} (${date})`;
+    const track = flight.track ? flight.track.map(t => t.pointOfInterest.name) : [];
+    const trackStr = track.length > 0 ? ` - ${track.join(" - ")} - ` : ' - ';
+
+    return `${flight.takeoffAirport.icaoCode} ${trackStr} ${flight.landingAirport.icaoCode} (${date})`;
   }
 }
 
diff --git a/src/graphql/fragments/flight_list.js b/src/graphql/fragments/flight_list.js
index 9fd843c..53c8749 100644
--- a/src/graphql/fragments/flight_list.js
+++ b/src/graphql/fragments/flight_list.js
@@ -15,6 +15,12 @@ fragment flightListInfo on Flight {
     thumbnailUrl
   }
 
+  track {
+    pointOfInterest {
+      name
+    }
+  }
+
   takeoffAirport {
     ...airportInfo
   }