Refaktoring verejneho profilu, pridani zobrazeni udalosti

This commit is contained in:
Michal Kváček
2023-10-14 22:43:16 +02:00
parent 5b47c56c6f
commit 4c8952117b
12 changed files with 228 additions and 49 deletions
+3 -31
View File
@@ -1,11 +1,7 @@
<script setup>
import {FORMAT_DATE, formatDatetime} from "src/composables/datetimeUtils";
import {onMounted} from "vue";
import {useRoute} from "vue-router";
import FlightsListSkeleton from "components/flights/FlightsListSkeleton.vue";
import FlightsList from "components/flights/FlightsList.vue";
import AvatarFromPhoto from "components/avatars/AvatarFromPhoto.vue";
import {fetchFlights, flights, loading as flightsLoading} from "src/composables/objects/flight";
import {fetchFlights} from "src/composables/objects/flight";
import {fetchUser, user as pilot, loading as pilotLoading} from "src/composables/objects/user";
import PublicProfileSkeleton from "components/profile/PublicProfileSkeleton.vue";
import {storeToRefs} from "pinia";
@@ -15,40 +11,16 @@ import PilotProfileCard from "components/profile/PilotProfileCard.vue";
const loggedUser = storeToRefs(useUserStore()).user;
const username = useRoute().params.username;
onMounted(() => {
fetchUser(username).then(user => {
useAppStore().setPageTitle(user.publicUsername);
useAppStore().setBreadcrumbs([
{to: {name: 'homepage'}, label: "Polétání.cz"},
{label: `@${user.publicUsername}`},
])
})
fetchFlights(username);
})
</script>
<template>
<div class="row">
<div class="col-12 col-md-8">
<FlightsListSkeleton v-if="flightsLoading"/>
<q-banner class="bg-primary text-white" v-else-if="!flightsLoading && flights.length === 0">
Tento pilot zatím nepublikoval žádný let.
</q-banner>
<template v-else>
<FlightsList
:items="flights"
:displayVisibilityInfo="loggedUser.id === pilot.id"
:route-detail="{name: 'publicFlightDetail', params: {username: username}}"
class="q-mb-md"
/>
</template>
<router-view :logged-user="loggedUser" :username="username"/>
</div>
<div class="col-12 col-md-4">
<PublicProfileSkeleton v-if="pilotLoading"/>
<PilotProfileCard v-else :pilot="pilot" />
<PilotProfileCard v-else :pilot="pilot"/>
</div>
</div>
@@ -0,0 +1,74 @@
<script setup>
import {onMounted, watch} from "vue";
import {event, fetchEvent, loading} from "src/composables/objects/event";
import {useRoute} from "vue-router";
import {useAppStore} from "stores/App";
import FlightDetailSkeleton from "components/flights/FlightDetailSkeleton.vue";
import {fetchUser, loading as pilotLoading, user as pilot} from "src/composables/objects/user";
import PublicProfileSkeleton from "components/profile/PublicProfileSkeleton.vue";
import PilotProfileCard from "components/profile/PilotProfileCard.vue";
import EventDetailSkeleton from "components/event/EventDetailSkeleton.vue";
import {FORMAT_DATE, formatDatetime} from "src/composables/datetimeUtils";
import FAB from "components/FAB.vue";
import FlightsList from "components/flights/FlightsList.vue";
const routeParams = useRoute().params;
onMounted(() => {
fetchEvent(routeParams.id, routeParams.username);
fetchUser(routeParams.username)
})
watch(event, (newVal) => {
// const eventNameFormatted = eventName(newVal);
useAppStore().setPageTitle(newVal.name);
useAppStore().setBreadcrumbs([
{to: {name: 'homepage'}, label: "Polétání.cz"},
{to: {name: "publicProfileDetail", params: {username: routeParams.username}}, label: `@${routeParams.username}`},
{to: {name: "publicEventsList", params: {username: routeParams.username}}, label: "Události"},
{label: newVal.name}
]);
});
</script>
<template>
<div>
<EventDetailSkeleton v-if="loading || !event"/>
<template v-else>
<q-banner class="bg-warning text-white q-mx-md q-my-md" v-if="!event.isPublic">
Pozor! Tento event není publikován a nebude tak dostupný pro ostatní!
</q-banner>
<q-list bordered separator class="q-my-lg" v-if="event.dateFrom && event.dateTo">
<q-item>
<q-item-section>
Od: {{ formatDatetime(event.dateFrom, FORMAT_DATE) }}
</q-item-section>
</q-item>
<q-item>
<q-item-section>
Do: {{ formatDatetime(event.dateTo, FORMAT_DATE) }}
</q-item-section>
</q-item>
</q-list>
<article v-html="event.description"/>
<h3>Lety</h3>
<q-banner v-if="event.flights.length === 0" class="bg-light-blue text-white">
Zatím tu nemáš uložené žádné lety.
</q-banner>
<FlightsList
v-else
:items="event.flights"
:route-detail="{name: 'publicFlightDetail', params: {username: routeParams.username}}"
/>
</template>
</div>
</template>
@@ -0,0 +1,55 @@
<script setup>
import FlightsListSkeleton from "components/flights/FlightsListSkeleton.vue";
import {event, events, fetchEvents, loading} from "src/composables/objects/event";
import EventsList from "components/event/EventsList.vue";
import {onMounted, watch} from "vue";
import PublicFlightEventSwitcher from "components/navigation/PublicFlightEventSwitcher.vue";
import {useAppStore} from "stores/App";
const props = defineProps({
loggedUser: {
type: Object,
required: false
},
username: {
type: String,
required: true
}
});
watch(() => props.username, () => {
}, {immediate: true});
onMounted(() => {
// const eventNameFormatted = eventName(newVal);
useAppStore().setPageTitle(`${props.username}`);
useAppStore().setBreadcrumbs([
{to: {name: 'homepage'}, label: "Polétání.cz"},
{to: {name: "publicProfileDetail", params: {username: props.username}}, label: `@${props.username}`},
{label: "Události"}
]);
fetchEvents(props.username);
}
);
</script>
<template>
<PublicFlightEventSwitcher :username="username"/>
<FlightsListSkeleton v-if="loading"/>
<q-banner class="bg-primary text-white" v-else-if="!loading && events.length === 0">
Tento pilot zatím nepublikoval žádnou udalost.
</q-banner>
<template v-else>
<EventsList
:items="events"
:route-detail="{name: 'publicEventDetail', params: {username: username}}"
class="q-mb-md"
/>
</template>
</template>
@@ -53,8 +53,5 @@ watch(flight, (newVal) => {
</q-card-section>
</q-card>
</template>
<PublicProfileSkeleton v-if="pilotLoading"/>
<PilotProfileCard :pilot="pilot" v-else />
</div>
</template>
@@ -0,0 +1,52 @@
<script setup>
import {fetchFlights, flights, loading as flightsLoading} from "src/composables/objects/flight";
import {fetchUser, user as pilot} from "src/composables/objects/user";
import FlightsListSkeleton from "components/flights/FlightsListSkeleton.vue";
import FlightsList from "components/flights/FlightsList.vue";
import PublicFlightEventSwitcher from "components/navigation/PublicFlightEventSwitcher.vue";
import {onMounted} from "vue";
import {useAppStore} from "stores/App";
const props = defineProps({
loggedUser: {
type: Object,
required: false
},
username: {
type: String,
required: true
}
});
// TODO: onmounted presunout do child komponent, stejne jako fetch dat
onMounted(() => {
fetchUser(props.username).then(user => {
useAppStore().setPageTitle(user.publicUsername);
useAppStore().setBreadcrumbs([
{to: {name: 'homepage'}, label: "Polétání.cz"},
{label: `@${user.publicUsername}`},
])
})
fetchFlights(props.username);
})
</script>
<template>
<PublicFlightEventSwitcher :username="username" />
<FlightsListSkeleton v-if="flightsLoading"/>
<q-banner class="bg-primary text-white" v-else-if="!flightsLoading && flights.length === 0">
Tento pilot zatím nepublikoval žádný let.
</q-banner>
<template v-else>
<FlightsList
:items="flights"
:displayVisibilityInfo="loggedUser.id === pilot.id"
:route-detail="{name: 'publicFlightDetail', params: {username: username}}"
class="q-mb-md"
/>
</template>
</template>