Lepsi verejna cast, ssr, lepsi prace s fotkamaa

src/components/flights/FlightBasicInfo.vue

@@ -11,7 +11,18 @@ const props = defineProps({
     type: Object,
     required: false,
     default: null
+  },
+  aircraftDetailRoute: {
+    type: Object,
+    required: false,
+    default: null
+  },
+  poiDetailRoute: {
+    type: Object,
+    required: false,
+    default: null
   }
+
 })
 </script>
 
@@ -22,7 +33,15 @@ const props = defineProps({
         <q-icon name="flight"/>
       </q-item-section>
       <q-item-section>
-        {{ flight.aircraft.callSign }}
+        <router-link
+            :to="{...aircraftDetailRoute, params: {...aircraftDetailRoute.params, id: flight.aircraft.id}}"
+            v-if="aircraftDetailRoute"
+        >
+          {{ flight.aircraft.callSign }}
+        </router-link>
+        <template v-else>
+          {{ flight.aircraft.callSign }}
+        </template>
       </q-item-section>
     </q-item>
 
@@ -53,12 +72,18 @@ const props = defineProps({
 
         <q-item v-for="poi in flight.track" :key="poi.id">
           <q-item-section avatar>
-            <q-icon name="place" v-if="poi.pointOfInterest" />
-            <q-icon name="local_airport" v-if="poi.airport" />
+            <q-icon name="place" v-if="poi.pointOfInterest"/>
+            <q-icon name="local_airport" v-if="poi.airport"/>
           </q-item-section>
           <q-item-section>
             <template v-if="poi.pointOfInterest">
-              {{ poi.pointOfInterest.name }}
+              <router-link
+                  :to="{name: poiDetailRoute.name, params: {...poiDetailRoute.params, id: poi.pointOfInterest.id}}"
+                  v-if="poi.pointOfInterest.isPublic"
+              >
+                {{ poi.pointOfInterest.name }}
+              </router-link>
+              <template v-else>{{ poi.pointOfInterest.name }}</template>
             </template>
             <span v-if="poi.airport">
               <strong>{{ poi.airport.icaoCode }}</strong> ({{ poi.airport.name }}),
@@ -98,8 +123,8 @@ const props = defineProps({
           </q-item-section>
           <q-item-section>
             <router-link
-              v-if="copilotDetailRoute"
-              :to="{name: copilotDetailRoute.name, params: {...copilotDetailRoute.params, id: copilot.id}}"
+                v-if="copilotDetailRoute"
+                :to="{name: copilotDetailRoute.name, params: {...copilotDetailRoute.params, id: copilot.id}}"
             >
               {{ copilot.name }}
             </router-link>

src/components/flights/FlightTrackMap.vue

@@ -7,11 +7,15 @@ const props = defineProps({
   flight: {
     type: Object,
     required: true
+  },
+  photos: {
+    type: Array,
+    required: false,
   }
 })
 
 
-const mapPhotos = computed(() => props.flight.photos.filter(photo => photo.gpsLatitude && photo.gpsLongitude));
+const mapPhotos = computed(() => props.photos.filter(photo => photo.gpsLatitude && photo.gpsLongitude));
 const poisWithGPS = computed(() => props.flight.track.map(poi => poi.pointOfInterest || poi.airport));
 
 const mapMarkers = [props.flight.takeoffAirport].concat(poisWithGPS.value).concat([props.flight.landingAirport]);

src/components/flights/FlightsList.vue

@@ -8,18 +8,18 @@ const props = defineProps({
     type: Array,
     required: true
   },
-  routeDetail: {
-    type: Object,
-    required: false,
-    default: () => ({name: 'flightDetail', params: {}})
-  },
-  displayVisibilityInfo: {
+  public: {
     type: Boolean,
-    required: false,
-    default: true
-  }
+    required: true
+  },
 });
 
+const routeDetail = (flight) => {
+  if (props.public)
+    return {name: "publicFlightDetail", params: {username: flight.pilot.publicUsername, id: flight.id}}
+  else
+    return {name: "flightDetail", params: {id: flight.id}}
+};
 </script>
 
 <template>
@@ -28,16 +28,22 @@ const props = defineProps({
       v-for="flight of items" :key="flight"
       ripple
       clickable
-      :to="{name: routeDetail.name, params: {...routeDetail.params, id: flight.id}}"
+      :to="routeDetail(flight)"
     >
       <q-item-section avatar>
-        <AvatarFromPhoto :size="120" v-if="flight.coverPhoto" :src="flight.coverPhoto.thumbnailUrl"/>
+        <AvatarFromPhoto :size="120" v-if="flight.titlePhoto" :src="flight.titlePhoto.thumbnailUrl"/>
       </q-item-section>
       <q-item-section>
         <div class="text-h5 q-mb-md">{{ flightName(flight) }}</div>
 
+        <div class="text-secondary" v-if="props.public">
+          <q-icon name="support_agent"/>
+          @{{flight.pilot.publicUsername}}
+        </div>
+
         <div class="text-secondary" v-if="flight.copilot">
           <q-icon name="person"/>
+          {{ flight.pilot.name }}
           {{ flight.copilot.name }}
         </div>
 
@@ -51,12 +57,13 @@ const props = defineProps({
         </div>
 
         <div class="text-secondary" v-if="flight.event">
-          <q-icon name="event" />
+          <q-icon name="event"/>
           {{ flight.event.name }}
         </div>
       </q-item-section>
 
-      <q-item-section side top v-if="flight.isPublic && displayVisibilityInfo">
+      <q-item-section side top v-if="flight.isPublic && !props.public">
+        <!-- Zobraz jen v adminu -->
         <q-icon name="visibility"></q-icon>
       </q-item-section>
     </q-item>