Sprava eventu a organizaci

src/pages/profile/aircraft/AircraftDetailPage.vue

@@ -9,6 +9,10 @@ import {loading, aircraft, fetchAircraft} from "src/composables/objects/aircraft
 import {useAppStore} from "stores/App";
 import FlightsList from "components/flights/FlightsList.vue";
 import AircraftDetailCard from "components/aircrafts/AircraftDetailCard.vue";
+import {poi} from "src/composables/objects/poi";
+import AccessDeniedBanner from "components/banners/AccessDeniedBanner.vue";
+import {storeToRefs} from "pinia";
+import {useUserStore} from "stores/User";
 
 const $q = useQuasar();
 const $router = useRouter();

src/pages/profile/aircraft/AircraftsPage.vue

@@ -19,7 +19,11 @@ onMounted(() => {
     :route-add="{name: 'addAircraft'}"
     label-add="Vytvořit letadlo"
   >
-    Aktuálně nemáš přidané žádné letadlo.
+    Aktuálně nemáš přidané žádné letadlo. Přidej se k existující organizaci nebo si sem ulož vlastní letadlo.
+
+    <br>
+
+    Letadlo můžeš založit i během ukládání informace k tvému prvnímu letu. A pak si ho tu jen doupravit.
   </BasicInfoBanner>
 
   <AircraftsList

src/pages/profile/aircraft/EditAircraftPage.vue

@@ -8,11 +8,16 @@ import AircraftEditSkeleton from "components/aircrafts/AircraftEditSkeleton.vue"
 import {successObject} from "src/composables/dialog";
 import {aircraft, fetchAircraft, loading, isRequestPending} from "src/composables/objects/aircraft";
 import {useAppStore} from "stores/App";
+import {fetchOrganizations, organizations} from "src/composables/objects/organization";
+import AccessDeniedBanner from "components/banners/AccessDeniedBanner.vue";
+import {storeToRefs} from "pinia";
+import {useUserStore} from "stores/User";
 
 
 const $router = useRouter();
 const $q = useQuasar();
 const aircraftId = parseInt(useRoute().params.id);
+const loggedUser = storeToRefs(useUserStore()).user;
 
 const handleSave = (formData) => {
   useAircraftsStore().update(aircraftId, formData).then(() => {
@@ -29,18 +34,24 @@ onMounted(() => {
       {to: {name: "aircraftDetail", params: {id: aircraftId}}, label: aircraft.value.callSign},
       {label: "Editace"}
     ])
-  })
+  });
 });
 </script>
 
 <template>
   <AircraftEditSkeleton v-if="loading"/>
 
+  <AccessDeniedBanner
+    v-else-if="aircraft.createdById !== loggedUser.id"
+    :route-back="{name: 'aircraftDetail', params: {id: aircraftId}}"
+  />
+
   <q-card v-else class="q-mx-md">
     <q-card-section>
       <AircraftForm
         @save="handleSave"
         :default-values="aircraft"
+        :organizations="loggedUser.organizations"
         :is-request-pending="isRequestPending"
       />
     </q-card-section>

src/pages/profile/aircraft/NewAircraftsPage.vue

@@ -3,13 +3,17 @@ import AircraftForm from "components/aircrafts/AircraftForm.vue";
 import {useAircraftsStore} from "stores/Aircrafts";
 import {useRouter} from "vue-router";
 import {useQuasar} from "quasar";
-import {ref} from "vue";
 import {useAppStore} from "stores/App";
 import {successObject} from "src/composables/dialog";
 import {isRequestPending} from "src/composables/objects/aircraft";
+import {fetchOrganizations, organizations} from "src/composables/objects/organization";
+import {onMounted} from "vue";
+import {storeToRefs} from "pinia";
+import {useUserStore} from "stores/User";
 
 const $q = useQuasar();
 const router = useRouter();
+const loggedUser = storeToRefs(useUserStore()).user;
 
 const handleSave = (formData) => {
   useAircraftsStore().create(formData).then(() => {
@@ -18,17 +22,24 @@ const handleSave = (formData) => {
   });
 };
 
-useAppStore().setPageTitle("Nové letadlo");
-useAppStore().setBreadcrumbs([
-  {to: {name: "aircrafts"}, label: "Letadla"},
-  {label: "Nové"}
-]);
+onMounted(() => {
+  fetchOrganizations();
+  useAppStore().setPageTitle("Nové letadlo");
+  useAppStore().setBreadcrumbs([
+    {to: {name: "aircrafts"}, label: "Letadla"},
+    {label: "Nové"}
+  ]);
+});
 </script>
 
 <template>
   <q-card class="q-mx-md q-my-md">
     <q-card-section>
-      <AircraftForm @save="handleSave" :is-request-pending="isRequestPending"/>
+      <AircraftForm
+        :is-request-pending="isRequestPending"
+        :organizations="loggedUser.organizations"
+        @save="handleSave"
+      />
     </q-card-section>
   </q-card>
 </template>

src/pages/profile/copilot/CopilotsPage.vue

@@ -20,6 +20,8 @@ onMounted(() => {
     v-else-if="!loading && copilots.length === 0"
     :router-add="{name: 'addCopilot'}"
   >
+    V tomto seznamu budou uvedeni všichni, kteří s tebou absolvovali nějaký tvůj let.
+    <br>
     Zatím tu není nikdo. Přidej si let s někým nebo kopilota vytvoř ručně tu.
   </BasicInfoBanner>
 

src/pages/profile/event/EventsPage.vue

@@ -21,7 +21,12 @@ useAppStore().setPageTitle("Letecké události")
     :route-add="{name: 'addEvent'}"
     label-add="Přidat"
   >
-    Nemáš tu uloženou žádnou událost. Události slouží ke sloučení letů z jedné akce/výletu do přehledné skupiny.
+    Události slouží ke sloučení letů z jedné akce/výletu do přehledné skupiny. Aktuálně tu nemáš vytvořenou žádnou
+    událost, ke které bys mohl napárovat svoje lety.
+
+    <br>
+
+    Událost můžeš vytvořit i v rámci uložení letu.
   </BasicInfoBanner>
 
   <EventsList

src/pages/profile/flight/EditFlightPage.vue

@@ -37,7 +37,7 @@ const airports = storeToRefs(useAirportsStore()).items;
 const copilots = storeToRefs(useCopilotsStore()).items;
 
 
-const formStep = ref("");
+const formStep = ref("basic");
 watch(() => $route.params.step, (val) => formStep.value = val);
 
 onMounted(() => {
@@ -81,8 +81,6 @@ const handlePhotosUpload = (data) => {
   }
 
   Promise.allSettled(promises).then((values) => {
-    console.log(values.map(v => v.status));
-
     const success = values.filter(v => v.status === 'fulfilled');
     const failed = values.filter(v => v.status === 'rejected'); // TODO: nebo vse - success?
 

src/pages/profile/flight/NewFlightPage.vue

@@ -46,7 +46,7 @@ const handleSave = (formData) => {
 <template>
   <FlightFormSteps :disabled="['copilot', 'track', 'photos', 'notes']"/>
 
-  <FlightEditSkeleton v-if="loading"/>
+  <FlightEditSkeleton step="basic" v-if="loading"/>
   <template v-else>
     <FlightFormBasic
       @save="handleSave"

src/pages/profile/organization/EditOrganizationPage.vue

@@ -0,0 +1,45 @@
+<script setup>
+import {onMounted} from "vue";
+import {loading, organization, fetchOrganization, isRequestPending} from "src/composables/objects/organization";
+import {useAppStore} from "stores/App";
+import {useRoute, useRouter} from "vue-router";
+import {useOrganizationsStore} from "stores/Organizations";
+import {successObject} from "src/composables/dialog";
+import {useQuasar} from "quasar";
+import OrganizationEditSkeleton from "components/organization/OrganizationEditSkeleton.vue";
+import OrganizationForm from "components/organization/OrganizationForm.vue";
+
+const organizationId = parseInt(useRoute().params.id);
+
+onMounted(() => {
+  fetchOrganization(organizationId).then(() => {
+    useAppStore().setPageTitle(`${organization.value.name} - editace`);
+    useAppStore().setBreadcrumbs([
+      {to: {name: "organizations"}, label: "Organizace"},
+      {to: {name: "organizationDetail", params: {id: organizationId}}, label: organization.value.name},
+      {label: "Editace"}
+    ])
+  })
+});
+
+const $q = useQuasar();
+const $router = useRouter();
+
+const handleSave = (formData) => {
+  useOrganizationsStore().update(organizationId, formData).then(() => {
+    $q.notify(successObject("Organizace úspěšně upravena"));
+    $router.push({name: "organizationDetail", params: {id: organizationId}});
+  });
+}
+</script>
+
+<template>
+  <OrganizationEditSkeleton v-if="loading"/>
+
+  <OrganizationForm
+    v-else
+    :organization="organization"
+    :is-request-pending="isRequestPending"
+    @save="handleSave"
+  />
+</template>

src/pages/profile/organization/NewOrganizationPage.vue

@@ -0,0 +1,28 @@
+<script setup>
+import {useRouter} from "vue-router";
+import {useQuasar} from "quasar";
+import {successObject} from "src/composables/dialog";
+import {useOrganizationsStore} from "stores/Organizations";
+import {useAppStore} from "stores/App";
+import {isRequestPending} from "src/composables/objects/organization";
+import OrganizationForm from "components/organizations/OrganizationForm.vue";
+
+const $q = useQuasar();
+const router = useRouter();
+const handleSave = (formData) => {
+  useOrganizationsStore().create(formData).then(() => {
+    $q.notify(successObject("Organizace úspěšně vytvořena"));
+    router.push({name: "organizations"});
+  });
+};
+
+useAppStore().setPageTitle("Nová organizace");
+useAppStore().setBreadcrumbs([
+  {to: {name: "organizations"}, label: "Organizace"},
+  {label: "Nová"}
+]);
+</script>
+
+<template>
+  <OrganizationForm @save="handleSave" :is-request-pending="isRequestPending"/>
+</template>

src/pages/profile/organization/OrganizationDetailPage.vue

@@ -0,0 +1,76 @@
+<script setup>
+import {useRoute} from "vue-router";
+import {onMounted} from "vue";
+import {organization, fetchOrganization, loading, myOrganizationIds, addToOrganization, removeFromOrganization} from "src/composables/objects/organization";
+import {useAppStore} from "stores/App";
+import FAB from "components/FAB.vue";
+import {storeToRefs} from "pinia";
+import {useUserStore} from "stores/User";
+import BasicListSkeleton from "components/basicSkeletons/BasicListSkeleton.vue";
+import AircraftsList from "components/aircrafts/AircraftsList.vue";
+import BasicInfoBanner from "components/banners/BasicInfoBanner.vue";
+import {useQuasar} from "quasar";
+import AvatarFromPhoto from "components/avatars/AvatarFromPhoto.vue";
+
+const organizationId = parseInt(useRoute().params.id);
+const loggedUser = storeToRefs(useUserStore()).user;
+const $q = useQuasar();
+
+onMounted(() => {
+  fetchOrganization(organizationId).then(() => {
+    useAppStore().setPageTitle(organization.value.name);
+    useAppStore().setBreadcrumbs([
+      {to: {name: "organizations"}, label: "Organizace"},
+      {label: organization.value.name}
+    ])
+  });
+});
+
+</script>
+
+<template>
+  <h3>Členové</h3>
+
+  <BasicListSkeleton :items-count-min="1" :items-count-max="5" v-if="loading || !organization"/>
+
+  <template v-else>
+    <q-list bordered separator v-if="organization.users.length > 0">
+      <q-item v-for="user in organization.users" :key="user">
+        <q-item-section avatar>
+          <AvatarFromPhoto :src="user.avatarImageUrl" v-if="user.avatarImageUrl" size="50"/>
+          <q-avatar icon="person" v-else class="bg-primary text-white" />
+        </q-item-section>
+        <q-item-section>
+          {{ user.name || user.email }}
+          <template v-if="loggedUser.id === user.id">(já)</template>
+        </q-item-section>
+      </q-item>
+    </q-list>
+    <BasicInfoBanner v-else>
+      Zatím nikdo...
+    </BasicInfoBanner>
+
+    <q-btn color="positive" size="lg" @click="addToOrganization()" v-if="!myOrganizationIds.includes(organizationId)">
+      <q-icon name="plus"/>
+      Přidat se
+    </q-btn>
+    <q-btn color="warning" size="lg" @click="removeFromOrganization()" v-else>
+      <q-icon name="minus"/>
+      Opustit organizaci
+    </q-btn>
+
+    <h3>Letadla</h3>
+
+    <BasicListSkeleton :items-count-min="1" :items-count-max="5" v-if="loading"/>
+    <AircraftsList :items="organization.aircrafts" v-if="organization.aircrafts.length > 0"/>
+    <BasicInfoBanner v-else>
+      Žádné letadlo
+    </BasicInfoBanner>
+
+    <FAB
+      mode="edit"
+      v-if="organization.createdById === loggedUser.id"
+      :router-link="{name: 'organizationEdit', params: {id: organizationId}}"
+    />
+  </template>
+</template>

src/pages/profile/organization/OrganizationsPage.vue

@@ -1,7 +1,25 @@
 <script setup>
+import BasicListSkeleton from "components/basicSkeletons/BasicListSkeleton.vue";
+import { onMounted} from "vue";
+import {fetchOrganizations, loading, myOrganizationIds, organizations} from "src/composables/objects/organization";
+import {useAppStore} from "stores/App";
+import FAB from "components/FAB.vue";
+import OrganizationsList from "components/organizations/OrganizationsList.vue";
+import BasicInfoBanner from "components/banners/BasicInfoBanner.vue";
+
+onMounted(() => {
+  fetchOrganizations();
+  useAppStore().setPageTitle("Organizace");
+});
 
 </script>
 
 <template>
-  organizace
+  <BasicListSkeleton v-if="loading"/>
+  <BasicInfoBanner v-else-if="!loading && organizations.length === 0" :route-add='{name: "addOrganization"}'>
+    Aktuálně nejsou dostupné žádné organizace, ke kterým by ses mohl/a přidat.
+    Zaregistruj sem svůj aeroklub, abyste mohli sdílet letadla.
+  </BasicInfoBanner>
+  <OrganizationsList :items="organizations" :my-organizations-ids="myOrganizationIds" v-else/>
+  <FAB :router-link="{name: 'addOrganization'}" mode="add"/>
 </template>