diff --git a/aleksis/core/frontend/components/app/ErrorPage.vue b/aleksis/core/frontend/components/app/ErrorPage.vue index b26cbca46be3a7566231e2b3cbcb74f445cc892a..7de45dac644f794317d754d96f4020d5b54a9e94 100644 --- a/aleksis/core/frontend/components/app/ErrorPage.vue +++ b/aleksis/core/frontend/components/app/ErrorPage.vue @@ -6,7 +6,8 @@ <h1 class="text-h2">{{ $t(shortErrorMessageKey) }}</h1> <div>{{ $t(longErrorMessageKey) }}</div> <v-btn color="secondary" :to="{ name: 'dashboard' }"> - {{ $t("network_errors.take_me_back") }} + <v-icon left>mdi-home-outline</v-icon> + {{ $t("network_errors.back_to_start") }} </v-btn> </div> </template> diff --git a/aleksis/core/frontend/components/generic/ObjectOverview.vue b/aleksis/core/frontend/components/generic/ObjectOverview.vue index 7f7498de7e575ebab0ca7fe71efbc2883cb7702c..3f400d6bbfa0fcd82d237dcb7e5efd4f81b13f39 100644 --- a/aleksis/core/frontend/components/generic/ObjectOverview.vue +++ b/aleksis/core/frontend/components/generic/ObjectOverview.vue @@ -58,6 +58,7 @@ export default { this.$root.$setPageTitle(this.getTitleAttr(data.object)); } }, + error() {} }; }, }, diff --git a/aleksis/core/frontend/messages/de.json b/aleksis/core/frontend/messages/de.json index 7725ebccf231f2a866eee0c434a8b7ac60a8257d..809b16585192d117427ae880bbfc90e18e4142c4 100644 --- a/aleksis/core/frontend/messages/de.json +++ b/aleksis/core/frontend/messages/de.json @@ -130,7 +130,7 @@ "offline_notification": "Sie sind offline. Einige Funktionen werden nicht funktionieren und einige Daten werden nicht aktuell sein.", "page_not_found": "Die aufgerufene Seite oder Ressource konnte nicht gefunden werden.", "snackbar_error_message": "Es ist ein Netzwerkfehler aufgetreten. Bitte versuchen Sie es erneut.", - "take_me_back": "Zurück zur Seite" + "back_to_start": "Zurück zur Startseite" }, "notifications": { "mark_as_read": "Als gelesen markieren", diff --git a/aleksis/core/frontend/messages/en.json b/aleksis/core/frontend/messages/en.json index 49f40d949b63ec6fe2ed3afde6e9e7ae34643f29..13b8604861bdafec310801a15bb84a7b1babdccf 100644 --- a/aleksis/core/frontend/messages/en.json +++ b/aleksis/core/frontend/messages/en.json @@ -185,7 +185,7 @@ "network_errors": { "error_404": "404", "page_not_found": "The requested page or resource could not be found.", - "take_me_back": "Take me back", + "back_to_start": "Back to home page", "snackbar_error_message": "A network error occurred. Please try again.", "offline_notification": "You are offline. Some features may not work and some data may not be up to date." }, diff --git a/aleksis/core/vite.config.js b/aleksis/core/vite.config.js index b459ae1f3b761875a59de70dfdf39cb9a26e32ca..6ac603e6af9c42fd28817123a341c47488d57679 100644 --- a/aleksis/core/vite.config.js +++ b/aleksis/core/vite.config.js @@ -97,22 +97,6 @@ function generateAppImporter(appDetails) { return code; } -/** - * Generate a mapping of esbuild import aliases for apps. - * - * App code locations are discovered by the `aleksis-admin` vite wrapper and passed - * in the django_values hints. - */ -function generateAppAliases(appDetails) { - let aliases = { "aleksis.core": django_values.coreAssetDir }; - - for (const [appPackage, appMeta] of Object.entries(appDetails)) { - aliases[appPackage] = appMeta.assetDir; - } - - return aliases; -} - export default defineConfig({ // root must always be the base directory of the AlekSIS-Core source tree // Changing this will mangle the manifest key of the entrypoint! @@ -309,8 +293,14 @@ export default defineConfig({ alias: { "@": path.resolve(django_values.node_modules), vue: path.resolve(django_values.node_modules + "/vue/dist/vue.esm.js"), + "aleksis.core": django_values.coreAssetDir, // Add aliases for every app using their package name - ...generateAppAliases(django_values.appDetails), + ...Object.fromEntries( + Object.entries(django_values.appDetails).map(([name, appMeta]) => [ + name, + appMeta.assetDir, + ]) + ), }, }, });