From 815137cb4cb92bcd027fae7c5e61245209bb1f36 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Tue, 28 Nov 2023 09:59:20 +0100 Subject: [PATCH 01/58] remove login button --- emails/sign-in.tsx | 11 ++++------- src/components/Elements/SizedImage.tsx | 1 - 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/emails/sign-in.tsx b/emails/sign-in.tsx index d9f65a51..97ff3fa1 100644 --- a/emails/sign-in.tsx +++ b/emails/sign-in.tsx @@ -1,4 +1,3 @@ -import { Button } from '@react-email/button' import { Html } from '@react-email/html' import * as React from 'react' import { Tailwind } from '@react-email/tailwind' @@ -41,12 +40,10 @@ export default function SignInEmail({ url }: SignInProps) { Danke, dass Du Mapstories nutzen möchtest. Wir freuen uns sehr dich dabei zu haben. Um Mapstories nutzen zu können, melde dich bitte an: - + Kopiere den folgenden Link in deinen Browser, um dich anzumelden: +
+
+
{url}
diff --git a/src/components/Elements/SizedImage.tsx b/src/components/Elements/SizedImage.tsx index a4fa9007..a7956491 100644 --- a/src/components/Elements/SizedImage.tsx +++ b/src/components/Elements/SizedImage.tsx @@ -55,7 +55,6 @@ export default function SizedImage({ 'max-h-[20rem] object-scale-down', size == 'xs' ? 'h-10 w-10' : '', size == 's' ? 'h-20 w-20' : '', - size == 'm' ? 'h-60 w-60' : '', variant == 'round' ? 'rounded-full' : '', )} // className="max-h-[20rem] object-scale-down" From 9e4e2e1c227a54d0591cb2314e2fc3b883d82622 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Tue, 28 Nov 2023 16:54:53 +0100 Subject: [PATCH 02/58] adjust spotify and youtube embed --- .../Viewer/ContentTypes/EmbedContent.tsx | 16 +++++++++------- .../Viewer/ContentTypes/MediaContent.tsx | 3 ++- src/components/embeds/SpotifyEmbed.tsx | 5 ++++- src/styles/elements.scss | 2 -- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/components/Viewer/ContentTypes/EmbedContent.tsx b/src/components/Viewer/ContentTypes/EmbedContent.tsx index 4f14e6ca..b17c3c09 100644 --- a/src/components/Viewer/ContentTypes/EmbedContent.tsx +++ b/src/components/Viewer/ContentTypes/EmbedContent.tsx @@ -11,13 +11,15 @@ interface EmbedContentEditProps extends React.HTMLAttributes { export function EmbedContent({ content }: EmbedContentEditProps) { return ( -
- {content.content && ( - - )} +
+
+ {content.content && ( + + )} +
) } diff --git a/src/components/Viewer/ContentTypes/MediaContent.tsx b/src/components/Viewer/ContentTypes/MediaContent.tsx index b68c20cd..2a64c5df 100644 --- a/src/components/Viewer/ContentTypes/MediaContent.tsx +++ b/src/components/Viewer/ContentTypes/MediaContent.tsx @@ -30,6 +30,7 @@ export function MediaContent({ content }: MediaContentProps) { // get media file from s3 const response = await getS3Image(media) setMediaUrl(response) + setIsLoading(false) } if (content.type === 'EXTERNALIMAGE' && mediaUrl === null) { @@ -45,7 +46,7 @@ export function MediaContent({ content }: MediaContentProps) { }, []) return ( -
+
{isLoading && (
diff --git a/src/components/embeds/SpotifyEmbed.tsx b/src/components/embeds/SpotifyEmbed.tsx index 8deb27c4..15ea5a88 100644 --- a/src/components/embeds/SpotifyEmbed.tsx +++ b/src/components/embeds/SpotifyEmbed.tsx @@ -21,7 +21,10 @@ export function SpotifyEmbed({ return (
p { From 1a3b471373428a819181ab4b851311da41d3369c Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Tue, 28 Nov 2023 17:21:28 +0100 Subject: [PATCH 03/58] edit about page to fit on mobile --- .../about/MapstoriesTab/MapstoriesTab.tsx | 19 ++++++++++++------- .../[lng]/(main)/(sub)/about/PageContent.tsx | 12 +++++++++--- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/app/[lng]/(main)/(sub)/about/MapstoriesTab/MapstoriesTab.tsx b/src/app/[lng]/(main)/(sub)/about/MapstoriesTab/MapstoriesTab.tsx index 427adf08..7bafd951 100644 --- a/src/app/[lng]/(main)/(sub)/about/MapstoriesTab/MapstoriesTab.tsx +++ b/src/app/[lng]/(main)/(sub)/about/MapstoriesTab/MapstoriesTab.tsx @@ -39,7 +39,7 @@ export default function MapstoriesTab() { {/* @ts-ignore */} {t('text2_2')}
-
+
Workshop Foto {/* @ts-ignore */} @@ -50,11 +50,14 @@ export default function MapstoriesTab() {
-
+
{/* @ts-ignore */}
{/* @ts-ignore */} -
{t('supportedBy')}
+
+ {/* @ts-ignore */} + {t('supportedBy')} +
-
+
{/* @ts-ignore */} -
{t('supportBZM')}
+
{t('supportBZM')}
-
+
{/* @ts-ignore */} -
{t('supportedBy')}
+
+ {t('supportedBy')} +
- + {/* @ts-ignore */} {t('tab1_title')} {/* @ts-ignore */} @@ -42,10 +42,16 @@ export default function PageContent() { {/* @ts-ignore */} {t('tab5_title')} - + - + From 700a2af428e4006cdafcec865db8c1f8acae131e Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Tue, 28 Nov 2023 17:22:19 +0100 Subject: [PATCH 04/58] adjust mobile on ourstory --- src/app/[lng]/(main)/(sub)/about/OurStoryTab/OurStoryTab.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/[lng]/(main)/(sub)/about/OurStoryTab/OurStoryTab.tsx b/src/app/[lng]/(main)/(sub)/about/OurStoryTab/OurStoryTab.tsx index 0447840e..fa8670e5 100644 --- a/src/app/[lng]/(main)/(sub)/about/OurStoryTab/OurStoryTab.tsx +++ b/src/app/[lng]/(main)/(sub)/about/OurStoryTab/OurStoryTab.tsx @@ -51,7 +51,7 @@ export default function OurStoryTab() {
-
+
{/* @ts-ignore */}
Vamos logo From e3dc2ded57d5e56e83f1603ffa8028588c10d214 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Tue, 28 Nov 2023 17:31:27 +0100 Subject: [PATCH 05/58] forcemount for tabs --- .../(main)/(sub)/about/OfferTab/OfferTab.tsx | 7 ++- .../[lng]/(main)/(sub)/about/PageContent.tsx | 48 ++++++++++++++++--- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/app/[lng]/(main)/(sub)/about/OfferTab/OfferTab.tsx b/src/app/[lng]/(main)/(sub)/about/OfferTab/OfferTab.tsx index 2c457900..0c87f349 100644 --- a/src/app/[lng]/(main)/(sub)/about/OfferTab/OfferTab.tsx +++ b/src/app/[lng]/(main)/(sub)/about/OfferTab/OfferTab.tsx @@ -27,18 +27,20 @@ export default function OfferTab() {
-
+
{/* @ts-ignore */} {t('text2Title')} {/* @ts-ignore */}

{t('text2')}

+

{/* @ts-ignore */} {t('text3Title')} {/* @ts-ignore */}

{t('text3')}

+

@@ -59,6 +61,7 @@ export default function OfferTab() { {t('text4_part2')}

+

@@ -69,7 +72,7 @@ export default function OfferTab() {

{t('text5')}

-
+
Workshop Foto {/* @ts-ignore */} {t('imageSubtitle')} diff --git a/src/app/[lng]/(main)/(sub)/about/PageContent.tsx b/src/app/[lng]/(main)/(sub)/about/PageContent.tsx index e097dad1..6d95b8a1 100644 --- a/src/app/[lng]/(main)/(sub)/about/PageContent.tsx +++ b/src/app/[lng]/(main)/(sub)/about/PageContent.tsx @@ -16,10 +16,11 @@ import { } from '@/src/components/Elements/Tabs' import MapstoriesTab from './MapstoriesTab/MapstoriesTab' +import { cx } from 'class-variance-authority' export default function PageContent() { const [isShowing, setIsShowing] = useState(false) - + const [activeTab, setActiveTab] = useState('mapstories') useEffect(() => { setIsShowing(true) }, []) @@ -29,7 +30,11 @@ export default function PageContent() { const { t } = useTranslation(lng, 'about') return ( - + setActiveTab(e)} + orientation="vertical" + > {/* @ts-ignore */} {t('tab1_title')} @@ -43,24 +48,53 @@ export default function PageContent() { {t('tab5_title')} - + - + - + From 727bf52b0770a8b3480510fda55a1b4d0a60b781 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Tue, 28 Nov 2023 18:08:08 +0100 Subject: [PATCH 06/58] ts lints --- src/app/[lng]/(main)/(index)/PageContent.tsx | 10 +++++----- .../(main)/(sub)/about/MapstoriesTab/MapstoriesTab.tsx | 2 +- .../(main)/(sub)/about/OurStoryTab/OurStoryTab.tsx | 1 - src/app/[lng]/(main)/(sub)/about/page.tsx | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/app/[lng]/(main)/(index)/PageContent.tsx b/src/app/[lng]/(main)/(index)/PageContent.tsx index c7921a50..d2553ba5 100644 --- a/src/app/[lng]/(main)/(index)/PageContent.tsx +++ b/src/app/[lng]/(main)/(index)/PageContent.tsx @@ -29,7 +29,7 @@ export default function PageContent() { leaveTo="opacity-0" show={isShowing} > -
+
Mapstories{t('startText')}

-
+
-
- -
+
- {/* @ts-ignore */}
+ {/* @ts-ignore */} {t('supportedBy')}
- {' '} {/* @ts-ignore */} {t('here')} diff --git a/src/app/[lng]/(main)/(sub)/about/page.tsx b/src/app/[lng]/(main)/(sub)/about/page.tsx index 83996534..cdb4802f 100644 --- a/src/app/[lng]/(main)/(sub)/about/page.tsx +++ b/src/app/[lng]/(main)/(sub)/about/page.tsx @@ -16,7 +16,7 @@ export default function Page() {
-
+
From 9c46ede29e2391f69fd09d3776dba7bec092c698 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Wed, 29 Nov 2023 15:55:11 +0100 Subject: [PATCH 07/58] adjust orientation and distances of containers --- src/app/[lng]/(main)/(sub)/about/PageContent.tsx | 2 +- src/app/[lng]/(main)/(sub)/about/page.tsx | 2 +- .../Studio/ContentTypes/MediaContentType.tsx | 16 +++++++++------- .../Viewer/ContentTypes/MediaContent.tsx | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/app/[lng]/(main)/(sub)/about/PageContent.tsx b/src/app/[lng]/(main)/(sub)/about/PageContent.tsx index 6d95b8a1..696767b1 100644 --- a/src/app/[lng]/(main)/(sub)/about/PageContent.tsx +++ b/src/app/[lng]/(main)/(sub)/about/PageContent.tsx @@ -35,7 +35,7 @@ export default function PageContent() { onValueChange={e => setActiveTab(e)} orientation="vertical" > - + {/* @ts-ignore */} {t('tab1_title')} {/* @ts-ignore */} diff --git a/src/app/[lng]/(main)/(sub)/about/page.tsx b/src/app/[lng]/(main)/(sub)/about/page.tsx index cdb4802f..beff8660 100644 --- a/src/app/[lng]/(main)/(sub)/about/page.tsx +++ b/src/app/[lng]/(main)/(sub)/about/page.tsx @@ -16,7 +16,7 @@ export default function Page() {
-
+
diff --git a/src/components/Studio/ContentTypes/MediaContentType.tsx b/src/components/Studio/ContentTypes/MediaContentType.tsx index df54edff..b55991f6 100644 --- a/src/components/Studio/ContentTypes/MediaContentType.tsx +++ b/src/components/Studio/ContentTypes/MediaContentType.tsx @@ -241,7 +241,7 @@ export function MediaContentEdit({ )}
-
+
{isLoading && (
@@ -258,12 +258,14 @@ export function MediaContentEdit({
)} {fileType === 'AUDIO' && ( - +
+ +
)}
{/* input field to give a source */} diff --git a/src/components/Viewer/ContentTypes/MediaContent.tsx b/src/components/Viewer/ContentTypes/MediaContent.tsx index 2a64c5df..02fae8c4 100644 --- a/src/components/Viewer/ContentTypes/MediaContent.tsx +++ b/src/components/Viewer/ContentTypes/MediaContent.tsx @@ -64,7 +64,7 @@ export function MediaContent({ content }: MediaContentProps) { {!isLoading && content.type === 'AUDIO' && ( From 8963ac1e03334f183d82214ca229cd33b986c86f Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Wed, 29 Nov 2023 15:59:54 +0100 Subject: [PATCH 08/58] center welcome modal in gallery --- src/components/Viewer/Gallery/GalleryList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Viewer/Gallery/GalleryList.tsx b/src/components/Viewer/Gallery/GalleryList.tsx index ba273b16..9542a57e 100644 --- a/src/components/Viewer/Gallery/GalleryList.tsx +++ b/src/components/Viewer/Gallery/GalleryList.tsx @@ -24,7 +24,7 @@ export function GalleryList({ stories }: Props) { appear enter="transition duration-1000" enterFrom="opacity-0 -translate-x-80" - enterTo="opacity-100 translate-x-0" + enterTo="opacity-100 translate-x-1/2" leave="transition-opacity duration-1000" leaveFrom="opacity-100" leaveTo="opacity-0 " From f853bca5f91d00316e4686a76f7df20aa021e472 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Wed, 29 Nov 2023 16:06:41 +0100 Subject: [PATCH 09/58] charity banner in all languages --- src/app/i18n/locales/de/charity.json | 8 ++++++++ src/app/i18n/locales/en/charity.json | 8 ++++++++ src/app/i18n/locales/es/charity.json | 8 ++++++++ src/app/i18n/locales/fr/charity.json | 10 ++++++++++ src/components/Index/CharityBanner.tsx | 22 +++++++++++----------- 5 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 src/app/i18n/locales/de/charity.json create mode 100644 src/app/i18n/locales/en/charity.json create mode 100644 src/app/i18n/locales/es/charity.json create mode 100644 src/app/i18n/locales/fr/charity.json diff --git a/src/app/i18n/locales/de/charity.json b/src/app/i18n/locales/de/charity.json new file mode 100644 index 00000000..1edb5a9e --- /dev/null +++ b/src/app/i18n/locales/de/charity.json @@ -0,0 +1,8 @@ +{ + "text1_bold": "Ihre finanzielle Unterstützung ist entscheidend", + "text2": " um die Weiterentwicklung von Mapstories zu gewährleisten. Mit Ihren", + "donations": "Spenden", + "text4": "an Vamos e.V. können wir Mapstories verbessern, Schulungsangebote erweitern und neue Funktionen entwickeln, um noch mehr Menschen zu erreichen.", + "text5_bold": "Jeder Beitrag, ob groß oder klein, ist wertvoll und hilft uns, unsere Ziele zu verwirklichen.", + "donateNow": "Jetzt spenden!" +} diff --git a/src/app/i18n/locales/en/charity.json b/src/app/i18n/locales/en/charity.json new file mode 100644 index 00000000..3e44a5b4 --- /dev/null +++ b/src/app/i18n/locales/en/charity.json @@ -0,0 +1,8 @@ +{ + "text1_bold": "Your financial support is crucial", + "text2": " to ensure the further development of Mapstories. With your", + "donations": "Donations", + "text4": "to Vamos e.V. we can improve Mapstories, expand training offers and develop new functions to reach even more people.", + "text5_bold": "Every contribution, big or small, is valuable and helps us to realize our goals.", + "donateNow": "Donate now!" +} diff --git a/src/app/i18n/locales/es/charity.json b/src/app/i18n/locales/es/charity.json new file mode 100644 index 00000000..3e22039c --- /dev/null +++ b/src/app/i18n/locales/es/charity.json @@ -0,0 +1,8 @@ +{ + "text1_bold": "Su apoyo financiero es crucial", + "text2": " para garantizar el desarrollo de Mapstories. Con tus", + "donaciones": "Donaciones", + "text4": "a Vamos e.V. podemos mejorar Mapstories, ampliar los programas de formación y desarrollar nuevas funciones para llegar aún a más gente", + "text5_bold": "Cada contribución, grande o pequeña, es valiosa y nos ayuda a hacer realidad nuestros objetivos", + "donateNow": "¡Dona ahora!" +} diff --git a/src/app/i18n/locales/fr/charity.json b/src/app/i18n/locales/fr/charity.json new file mode 100644 index 00000000..f8689c7d --- /dev/null +++ b/src/app/i18n/locales/fr/charity.json @@ -0,0 +1,10 @@ +{ + "text1_bold" : "votre soutien financier est essentiel", + "text2" : " pour assurer le développement de Mapstories. Avec vos", + "donations" : "dons", + "text4" : "à Vamos e.V., nous pouvons améliorer Mapstories, élargir les offres de formation et développer de nouvelles fonctionnalités pour atteindre encore plus de personnes", + "text5_bold" : "chaque contribution, petite ou grande, est précieuse et nous aide à réaliser nos objectifs", + "donateNow" : "Faites un don maintenant !" +} + +Traduit avec DeepL.com (version gratuite) \ No newline at end of file diff --git a/src/components/Index/CharityBanner.tsx b/src/components/Index/CharityBanner.tsx index 67018111..a841926b 100644 --- a/src/components/Index/CharityBanner.tsx +++ b/src/components/Index/CharityBanner.tsx @@ -1,5 +1,7 @@ 'use client' +import { useTranslation } from '@/src/app/i18n/client' +import { useBoundStore } from '@/src/lib/store/store' import { Transition } from '@headlessui/react' import { XMarkIcon } from '@heroicons/react/24/outline' import { useEffect, useState } from 'react' @@ -8,6 +10,10 @@ import { Button } from '../Elements/Button' export function CharityBanner({}) { const [isShowing, setIsShowing] = useState(false) + const lng = useBoundStore(state => state.language) + /* @ts-ignore */ + const { t } = useTranslation(lng, 'charity') + useEffect(() => { setIsShowing(true) }, []) @@ -30,21 +36,15 @@ export function CharityBanner({}) { onClick={() => setIsShowing(false)} />

- Ihre finanzielle Unterstützung ist entscheidend um die - Weiterentwicklung von Mapstories zu gewährleisten. Mit Ihren{' '} + {t('text1_bold')} + {t('text2')}{' '} - Spenden + {t('donations')} {' '} - an Vamos e.V. können wir Mapstories verbessern, Schulungsangebote - erweitern und neue Funktionen entwickeln, um noch mehr Menschen zu - erreichen.{' '} - - Jeder Beitrag, ob groß oder klein, ist wertvoll und hilft uns, - unsere Ziele zu verwirklichen. - + {t('text4')} {t('text5_bold')}

- +
From bf43767aa56f1bc53d0273421795d01446a1e993 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Wed, 29 Nov 2023 16:06:51 +0100 Subject: [PATCH 10/58] remove deepl tag --- src/app/i18n/locales/fr/charity.json | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/app/i18n/locales/fr/charity.json b/src/app/i18n/locales/fr/charity.json index f8689c7d..fd371235 100644 --- a/src/app/i18n/locales/fr/charity.json +++ b/src/app/i18n/locales/fr/charity.json @@ -1,10 +1,8 @@ { - "text1_bold" : "votre soutien financier est essentiel", - "text2" : " pour assurer le développement de Mapstories. Avec vos", - "donations" : "dons", - "text4" : "à Vamos e.V., nous pouvons améliorer Mapstories, élargir les offres de formation et développer de nouvelles fonctionnalités pour atteindre encore plus de personnes", - "text5_bold" : "chaque contribution, petite ou grande, est précieuse et nous aide à réaliser nos objectifs", - "donateNow" : "Faites un don maintenant !" + "text1_bold": "votre soutien financier est essentiel", + "text2": " pour assurer le développement de Mapstories. Avec vos", + "donations": "dons", + "text4": "à Vamos e.V., nous pouvons améliorer Mapstories, élargir les offres de formation et développer de nouvelles fonctionnalités pour atteindre encore plus de personnes", + "text5_bold": "chaque contribution, petite ou grande, est précieuse et nous aide à réaliser nos objectifs", + "donateNow": "Faites un don maintenant !" } - -Traduit avec DeepL.com (version gratuite) \ No newline at end of file From ad23f51b7319bddfe8c9eb10596caacbfb3e104d Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Wed, 29 Nov 2023 16:10:58 +0100 Subject: [PATCH 11/58] limit file size for media upload --- src/components/Studio/ContentTypes/MediaContentType.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/Studio/ContentTypes/MediaContentType.tsx b/src/components/Studio/ContentTypes/MediaContentType.tsx index b55991f6..69794aa3 100644 --- a/src/components/Studio/ContentTypes/MediaContentType.tsx +++ b/src/components/Studio/ContentTypes/MediaContentType.tsx @@ -94,6 +94,8 @@ export function MediaContentEdit({ useDropzone({ accept: { 'image/*': [], 'audio/*': [] }, onDrop, + // max 50mb + maxSize: 50242880, }) const style = useMemo( From 1d4747b1d20e6f283f7b7052638129725b6fe061 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Wed, 29 Nov 2023 16:38:11 +0100 Subject: [PATCH 12/58] remove 2nd play button in embed, translate for login --- emails/sign-in.tsx | 7 +++++-- src/components/Studio/Mapstories/MediaPlatformIcons.tsx | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/emails/sign-in.tsx b/emails/sign-in.tsx index 97ff3fa1..6eee8f6a 100644 --- a/emails/sign-in.tsx +++ b/emails/sign-in.tsx @@ -6,6 +6,7 @@ import { Heading } from '@react-email/heading' import { Text } from '@react-email/text' import { Font } from '@react-email/font' import { Container } from '@react-email/container' +import Link from 'next/link' interface SignInProps { url: string @@ -40,10 +41,12 @@ export default function SignInEmail({ url }: SignInProps) { Danke, dass Du Mapstories nutzen möchtest. Wir freuen uns sehr dich dabei zu haben. Um Mapstories nutzen zu können, melde dich bitte an: - Kopiere den folgenden Link in deinen Browser, um dich anzumelden: + Kopiere diesen Link in deinen Browser, um dich anzumelden / Copy this + link to sign in / Copia este enlace para iniciar sesión / Copiez ce + lien pour vous connecter:

-
{url}
+ {url} diff --git a/src/components/Studio/Mapstories/MediaPlatformIcons.tsx b/src/components/Studio/Mapstories/MediaPlatformIcons.tsx index 64bf2131..58af1263 100644 --- a/src/components/Studio/Mapstories/MediaPlatformIcons.tsx +++ b/src/components/Studio/Mapstories/MediaPlatformIcons.tsx @@ -63,7 +63,12 @@ export default function MediaIconList({ usedMediaType }: MediaIconListProps) { return (
{Object.keys(newObject) - .filter(t => !['TITLE', 'TEXT', 'IMAGE', 'VIDEO'].includes(t)) // Only the social media types + .filter( + t => + !['TITLE', 'TEXT', 'IMAGE', 'VIDEO', 'GOOGLESTREETVIEW'].includes( + t, + ), + ) // Only the social media types .filter(t => { if (!usedMediaType) { return true From b5798ffc4b158175ecad722e67a3fc71008f3563 Mon Sep 17 00:00:00 2001 From: Thiemann96 Date: Wed, 29 Nov 2023 16:44:06 +0100 Subject: [PATCH 13/58] have navbar in foreground --- src/components/Auth/UserAccountNav.tsx | 2 +- src/components/LangSwitcher.tsx | 2 +- src/components/Layout/InverseNavbar.tsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Auth/UserAccountNav.tsx b/src/components/Auth/UserAccountNav.tsx index 4d1614fb..78e673b7 100644 --- a/src/components/Auth/UserAccountNav.tsx +++ b/src/components/Auth/UserAccountNav.tsx @@ -22,7 +22,7 @@ export function UserAccountNav({ user }: UserAccountNavProps) { - +
{user.name &&

{user.name}

} diff --git a/src/components/LangSwitcher.tsx b/src/components/LangSwitcher.tsx index e9009fe3..e2907bbc 100644 --- a/src/components/LangSwitcher.tsx +++ b/src/components/LangSwitcher.tsx @@ -26,7 +26,7 @@ export function LangSwitcher() { {pathname?.split('/')[1].toUpperCase()} - + changeLanguage('de')} diff --git a/src/components/Layout/InverseNavbar.tsx b/src/components/Layout/InverseNavbar.tsx index 6d0e5734..eee6fe0c 100644 --- a/src/components/Layout/InverseNavbar.tsx +++ b/src/components/Layout/InverseNavbar.tsx @@ -134,12 +134,12 @@ function MobileNav({ return (