diff --git a/.env.example b/.env.example index e38ae7581d6894da0a989d3366e2c5e5ed075b54..b21acaf2d10b8dc0d0a937008d794c230a5af7b2 100644 --- a/.env.example +++ b/.env.example @@ -3,5 +3,5 @@ PUBLIC_SENDINBLUE_POST_FORM_EN=https://abc.sibforms.com/serve/123 PUBLIC_MAPBOX_TOKEN=abc123 PUBLIC_HEAD_INJECT='<script async defer data-website-id="abc123" src="https://analytics.com"></script>' PUBLIC_SITE_TITLE='Fab City OS Suite' -EDIT_LINK_BASE="https://gitlab.fabcity.hamburg/software/fchh-website-content/-/edit/%s/src/pages" +PUBLIC_EDIT_LINK_BASE="https://gitlab.fabcity.hamburg/fcos-suite/fcos-suite-astro/-/edit/%s/src/pages" BASE_URL="/" \ No newline at end of file diff --git a/src/layouts/ArticleLayout.astro b/src/layouts/ArticleLayout.astro index 82059e4b31e42af33e6699781c3aa0c261cfcbe0..bd0711a348d5d50da8b265f9f8dc188b37d8ecc0 100644 --- a/src/layouts/ArticleLayout.astro +++ b/src/layouts/ArticleLayout.astro @@ -25,12 +25,13 @@ type Props = MarkdownLayoutProps<{ const { frontmatter, url } = Astro.props; -const { EDIT_LINK_BASE, EDIT_LINK_BRANCH = "main" } = import.meta.env; +const { PUBLIC_EDIT_LINK_BASE, PUBLIC_EDIT_LINK_BRANCH = "main" } = import.meta + .env; const editButtonLink = - EDIT_LINK_BASE && - EDIT_LINK_BRANCH && - format(EDIT_LINK_BASE, EDIT_LINK_BRANCH) + url + ".mdx"; + PUBLIC_EDIT_LINK_BASE && + PUBLIC_EDIT_LINK_BRANCH && + format(PUBLIC_EDIT_LINK_BASE, PUBLIC_EDIT_LINK_BRANCH) + url + ".mdx"; const rawContent = await Astro.glob<IPage>("../pages/**/*.mdx"); @@ -61,10 +62,7 @@ const breadcrumbs = buildBreadcrumbs(breadcrumbItems, url as string, baseUrl); hideFooterSeparator={frontmatter.hideFooterSeparator} title={frontmatter.title} subtitle={frontmatter.subtitle} - titleImage={prefixWithBaseIfNotUrl( - frontmatter.headerImage, - baseUrl - )} + titleImage={frontmatter.headerImage} tags={frontmatter.tags} teaser={frontmatter.teaser || frontmatter.description} dateAndAuthor={`${frontmatter.date || ""}${ diff --git a/src/layouts/HomeLayout.astro b/src/layouts/HomeLayout.astro index 1d16cc4d816f87047e6e0c9077fb5cb93112199d..e77df694fc524ae926846d0fb955e421e527a68a 100644 --- a/src/layouts/HomeLayout.astro +++ b/src/layouts/HomeLayout.astro @@ -6,7 +6,6 @@ import type { MarkdownLayoutProps } from "astro"; import { getBaseUrl, buildPageTree } from "@utils"; import { LANGUAGES } from "@config"; import type { IPage } from "@interfaces/IPage"; -import { prefixWithBaseIfNotUrl } from "@utils/Url"; type Props = MarkdownLayoutProps<{ title: string; diff --git a/src/pages/de/dokumentation/beispiele.mdx b/src/pages/de/dokumentation/beispiele.mdx index 43f3145b7bbb498f7c72173c0fa5f2d15c418640..63068c29610e0c611f440f41854e7c54462ccfb7 100644 --- a/src/pages/de/dokumentation/beispiele.mdx +++ b/src/pages/de/dokumentation/beispiele.mdx @@ -10,7 +10,7 @@ headerImageTag: Moritz Kindler (Unsplash) ## Markdown Bilder -Bilder können in Markdown fie folgt verwendet werden: `` +Bilder können in Markdown wie folgt verwendet werden: ``  ## Bilder mit Beschriftung