diff --git a/aleksis/core/assets/components/about/About.vue b/aleksis/core/assets/components/about/About.vue index c8da5616871a49ad38cc09be45025fc4c767ed97..6187d7c84503ce8633dc9a9559a88ac86b725d37 100644 --- a/aleksis/core/assets/components/about/About.vue +++ b/aleksis/core/assets/components/about/About.vue @@ -1,7 +1,7 @@ <template> <div class="mt-4 mb-4"> <about-aleksis></about-aleksis> - <installed-apps-list/> + <installed-apps-list /> </div> </template> @@ -11,7 +11,6 @@ import AboutAleksis from "./AboutAleksis.vue"; export default { name: "About", - components: {AboutAleksis, InstalledAppsList} -} + components: { AboutAleksis, InstalledAppsList }, +}; </script> - diff --git a/aleksis/core/assets/components/about/AboutAleksis.vue b/aleksis/core/assets/components/about/AboutAleksis.vue index 0263f02113aff4cd0683495c8eedfe5b92eab4aa..2f39581d430a06b57bec0a9367983023ddbb9f95 100644 --- a/aleksis/core/assets/components/about/AboutAleksis.vue +++ b/aleksis/core/assets/components/about/AboutAleksis.vue @@ -13,8 +13,12 @@ </v-card-text> <v-spacer></v-spacer> <v-card-actions> - <v-btn text color="primary" href="https://aleksis.org/">{{ $t("about.website_of_aleksis") }}</v-btn> - <v-btn text color="primary" href="https://edugit.org/AlekSIS/">{{ $t("about.source_code") }}</v-btn> + <v-btn text color="primary" href="https://aleksis.org/">{{ + $t("about.website_of_aleksis") + }}</v-btn> + <v-btn text color="primary" href="https://edugit.org/AlekSIS/">{{ + $t("about.source_code") + }}</v-btn> </v-card-actions> </v-card> </v-col> @@ -26,15 +30,24 @@ {{ $t("about.licence_information_1") }} </p> <p> - <v-chip color="green" text-color="white" small>{{ $t("about.free_open_source_licence") }}</v-chip> - <v-chip color="orange" text-color="white" small>{{ $t("about.other_licence") }}</v-chip> + <v-chip color="green" text-color="white" small>{{ + $t("about.free_open_source_licence") + }}</v-chip> + <v-chip color="orange" text-color="white" small>{{ + $t("about.other_licence") + }}</v-chip> </p> </v-card-text> <v-spacer></v-spacer> <v-card-actions> - <v-btn text color="primary" href="https://eupl.eu">{{ $t("about.full_licence_text") }}</v-btn> - <v-btn text color="primary" - href="https://joinup.ec.europa.eu/collection/eupl/guidelines-users-and-developers"> + <v-btn text color="primary" href="https://eupl.eu">{{ + $t("about.full_licence_text") + }}</v-btn> + <v-btn + text + color="primary" + href="https://joinup.ec.europa.eu/collection/eupl/guidelines-users-and-developers" + > {{ $t("about.more_information_eupl") }} </v-btn> </v-card-actions> @@ -45,10 +58,8 @@ <script> export default { - name: "AboutAleksis" -} + name: "AboutAleksis", +}; </script> -<style scoped> - -</style> +<style scoped></style> diff --git a/aleksis/core/assets/components/about/InstalledAppCard.vue b/aleksis/core/assets/components/about/InstalledAppCard.vue index a62eb352762f7ca0099f469ab3b53a478e59f0c0..796808abd127324caf48d71e5e79afcc24da8380 100644 --- a/aleksis/core/assets/components/about/InstalledAppCard.vue +++ b/aleksis/core/assets/components/about/InstalledAppCard.vue @@ -12,15 +12,27 @@ <v-card-text> <v-row v-if="app.licence" class="mb-2"> <v-col cols="6"> - {{ $t("about.licenced_under") }} <br/> - <strong class="text-body-1 black--text">{{ app.licence.verboseName }}</strong> + {{ $t("about.licenced_under") }} <br /> + <strong class="text-body-1 black--text">{{ + app.licence.verboseName + }}</strong> </v-col> <v-col cols="6"> - {{ $t("about.licence_type") }} <br/> - <v-chip v-if="app.licence.flags.isFsfLibre" color="green" text-color="white" small> + {{ $t("about.licence_type") }} <br /> + <v-chip + v-if="app.licence.flags.isFsfLibre" + color="green" + text-color="white" + small + > {{ $t("about.free_software") }} </v-chip> - <v-chip v-else-if="app.licence.flags.isOsiApproved" color="green" text-color="white" small> + <v-chip + v-else-if="app.licence.flags.isOsiApproved" + color="green" + text-color="white" + small + > {{ $t("about.open_source") }} </v-chip> <v-chip v-else color="orange" text-color="white" small> @@ -28,16 +40,30 @@ </v-chip> </v-col> - <v-col cols="12" v-if="app.licence.licences.length !== 0"> {{ $t("about.licence_consists_of") }} - <div v-for="licence in app.licence.licences" class="mb-2" :key="licence.name"> - <v-chip v-if="licence.isOsiApproved || licence.isFsfLibre" color="green" text-color="green" outlined - small - :href="licence.url"> + <div + v-for="licence in app.licence.licences" + class="mb-2" + :key="licence.name" + > + <v-chip + v-if="licence.isOsiApproved || licence.isFsfLibre" + color="green" + text-color="green" + outlined + small + :href="licence.url" + > {{ licence.name }} </v-chip> - <v-chip v-else color="orange" text-color="orange" outlined :href="licence.url"> + <v-chip + v-else + color="orange" + text-color="orange" + outlined + :href="licence.url" + > {{ licence.name }} </v-chip> </div> @@ -48,19 +74,15 @@ <v-spacer></v-spacer> <v-card-actions v-if="app.urls.length !== 0"> - <v-btn - text - color="primary" - @click="reveal = true" - > + <v-btn text color="primary" @click="reveal = true"> Show copyright </v-btn> <v-btn - v-for="url in app.urls" - color="primary" - text - :href="url.url" - :key="url.url" + v-for="url in app.urls" + color="primary" + text + :href="url.url" + :key="url.url" > {{ url.name }} </v-btn> @@ -68,29 +90,25 @@ <v-expand-transition> <v-card - v-if="reveal" - class="transition-fast-in-fast-out v-card--reveal d-flex flex-column" + v-if="reveal" + class="transition-fast-in-fast-out v-card--reveal d-flex flex-column" > <v-card-text class="pb-0"> <v-row> <v-col cols="12" v-if="app.copyrights.length !== 0"> <span v-for="(copyright, index) in app.copyrights" :key="index"> Copyright © {{ copyright.years }} - <a :href="'mailto:' + copyright.email">{{ copyright.name }}</a> - <br/> + <a :href="'mailto:' + copyright.email">{{ + copyright.name + }}</a> + <br /> </span> </v-col> </v-row> </v-card-text> <v-spacer></v-spacer> <v-card-actions class="pt-0"> - <v-btn - text - color="primary" - @click="reveal = false" - > - Close - </v-btn> + <v-btn text color="primary" @click="reveal = false"> Close </v-btn> </v-card-actions> </v-card> </v-expand-transition> @@ -109,5 +127,5 @@ export default { required: true, }, }, -} +}; </script> diff --git a/aleksis/core/assets/components/about/InstalledAppsList.vue b/aleksis/core/assets/components/about/InstalledAppsList.vue index 7ef713768c6a6215eb51aa74c23c716ab924ec4a..491e3df15ece49cf736f037212a0bc668a924bed 100644 --- a/aleksis/core/assets/components/about/InstalledAppsList.vue +++ b/aleksis/core/assets/components/about/InstalledAppsList.vue @@ -1,21 +1,28 @@ <template> - <ApolloQuery - :query="require('./installedApps.graphql')" - > - <template v-slot="{ result: { error, data }, isLoading }"> - <v-row> - <v-col v-if="isLoading" v-for="idx in 3" :key="idx" cols="12" md="6" lg="6" xl="4" class="d-flex align-stretch"> + <ApolloQuery :query="require('./installedApps.graphql')"> + <template #default="{ result: { error, data }, isLoading }"> + <v-row v-if="isLoading"> + <v-col + v-for="idx in 3" + :key="idx" + cols="12" + md="6" + lg="6" + xl="4" + class="d-flex align-stretch" + > <v-card class="d-flex flex-column flex-grow-1 pa-4"> <v-skeleton-loader - type="heading, actions, text@5" + type="heading, actions, text@5" ></v-skeleton-loader> </v-card> </v-col> - + </v-row> + <v-row v-if="data.installedApps"> <installed-app-card - v-for="app in data.installedApps" - :key="app.name" - :app="app" + v-for="app in data.installedApps" + :key="app.name" + :app="app" /> </v-row> </template> @@ -27,7 +34,6 @@ import InstalledAppCard from "./InstalledAppCard.vue"; export default { name: "InstalledAppsList", - components: {InstalledAppCard} -} + components: { InstalledAppCard }, +}; </script> - diff --git a/aleksis/core/assets/index.js b/aleksis/core/assets/index.js index 08734f663a4603c458f45d48b11159f6300cccea..416029ed7a943ba2c2d0f3b20dc1c6783f38b4e0 100644 --- a/aleksis/core/assets/index.js +++ b/aleksis/core/assets/index.js @@ -1,7 +1,7 @@ import "@mdi/font/css/materialdesignicons.css"; -import "./util" -import "./app" +import "./util"; +import "./app"; import About from "./components/about/About.vue";