Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-24 07:39:41 +02:00
Code Issues Releases Activity

feat: Remove Explore URLs and make the normal URLs public (#2632)

Browse source 
* add groupSlug to most routes

* fixed more routing issues

* fixed jank and incorrect routes

* remove public explore links

* remove unused groupSlug and explore routes

* nuked explore pages

* fixed public toolstore bug

* fixed various routes missing group slug

* restored public app header menu

* fix janky login redirect

* 404 recipe API call returns to login

* removed unused explore layout

* force redirect when using the wrong group slug

* fixed dead admin links

* removed unused middleware from earlier attempt

* 🧹

* improve cookbooks sidebar
fixed sidebar link not working
fixed sidebar link target
hide cookbooks header when there are none

* added group slug to user

* fix $auth typehints

* vastly simplified groupSlug logic

* allow logged-in users to view other groups

* fixed some edgecases that bypassed isOwnGroup

* fixed static home ref

* 🧹

* fixed redirect logic

* lint warning

* removed group slug from group and user pages
refactored all components to use route groupSlug or user group slug
moved some group pages to recipe pages

* fixed some bad types

* 🧹

* moved groupSlug routes under /g/groupSlug

* move /recipe/ to /r/

* fix backend url generation and metadata injection

* moved shopping lists to root/other route fixes

* changed shared from /recipes/ to /r/

* fixed 404 redirect not awaiting

* removed unused import

* fix doc links

* fix public recipe setting not affecting public API

* fixed backend tests

* fix nuxt-generate command

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
This commit is contained in:
Michael Genson 2023-11-05 19:07:02 -06:00 • committed by GitHub
parent 94cf690e8f
commit 80968b02bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
87 changed files with 555 additions and 501 deletions
Download patch file Download diff file Expand all files Collapse all files

48
frontend/layouts/error.vue
View file

@ -1,5 +1,5 @@
<template>
<div>
<div v-if="ready">
<v-card-title>
<slot>
<h1 class="mx-auto">{{ $t("page.404-page-not-found") }}</h1>
@ -28,7 +28,7 @@
</template>
<script lang="ts">
import { defineComponent, useContext, useMeta } from "@nuxtjs/composition-api";
import { defineComponent, ref, useContext, useMeta, useRoute, useRouter } from "@nuxtjs/composition-api";
export default defineComponent({
layout: "basic",
@ -39,7 +39,48 @@ export default defineComponent({
},
},
setup(props) {
const { $globals, i18n } = useContext();
const { $auth, $globals, i18n } = useContext();
const ready = ref(false);
const route = useRoute();
const router = useRouter();
async function insertGroupSlugIntoRoute() {
const groupSlug = ref($auth.user?.groupSlug);
if (!groupSlug.value) {
return;
}
let replaceRoute = false;
let routeVal = route.value.fullPath || "/";
if (routeVal[0] !== "/") {
routeVal = `/${routeVal}`;
}
// replace "recipe" in URL with "r"
if (routeVal.includes("/recipe/")) {
replaceRoute = true;
routeVal = routeVal.replace("/recipe/", "/r/");
}
// insert groupSlug into URL
const routeComponents = routeVal.split("/");
if (routeComponents.length < 2 || routeComponents[1].toLowerCase() !== "g") {
replaceRoute = true;
routeVal = `/g/${groupSlug.value}${routeVal}`;
}
if (replaceRoute) {
await router.replace(routeVal);
}
}
if (props.error.statusCode === 404) {
// see if adding the groupSlug fixes the error
insertGroupSlugIntoRoute().then(() => { ready.value = true });
} else {
ready.value = true;
}
useMeta({
title:
@ -54,6 +95,7 @@ export default defineComponent({
return {
buttons,
ready,
};
},
// Needed for useMeta