YunoHost-Apps/crabfit_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/crabfit_ynh.git synced 2024-09-03 18:16:21 +02:00
Code Issues Activity Actions

Rename patch with a 'main-' prefix, rename env variable & use process.env directly

Browse source
This commit is contained in:
Antoine Lima 2024-05-02 23:14:49 +02:00 • committed by Félix Piédallu
parent e39b4ea7bd
commit 7f01efa5de
2 changed files with 33 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
conf/front.env
View file

@ -1,4 +1,5 @@
NEXT_PUBLIC_API_URL=https://__DOMAIN__/api/ NEXT_PUBLIC_API_URL=https://__DOMAIN__/api/
NEXT_PUBLIC_DOMAIN_FRONT=__DOMAIN__
NEXT_TELEMETRY_DISABLED=1 NEXT_TELEMETRY_DISABLED=1
NODE_ENV=production NODE_ENV=production
NEXT_PUBLIC_DOMAIN_URL=__DOMAIN__

67
sources/patches/custom_url.patch → sources/patches/main-custom_url.patch
View file

@ -1,73 +1,68 @@
diff --git a/frontend/.env.local b/frontend/.env.local diff --git a/frontend/.env.local b/frontend/.env.local
index ee43468..f862dac 100644 index ee43468..6876cfc 100644
--- a/frontend/.env.local --- a/frontend/.env.local
+++ b/frontend/.env.local +++ b/frontend/.env.local
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
NEXT_PUBLIC_API_URL="http://127.0.0.1:3000" NEXT_PUBLIC_API_URL="http://127.0.0.1:3000"
+NEXT_PUBLIC_DOMAIN_BASE="crab.fit" +NEXT_PUBLIC_DOMAIN_FRONT="crab.fit"
# Google auth for calendar syncing, feature will be disabled if these aren't set # Google auth for calendar syncing, feature will be disabled if these aren't set
# NEXT_PUBLIC_GOOGLE_CLIENT_ID="" # NEXT_PUBLIC_GOOGLE_CLIENT_ID=""
diff --git a/frontend/src/app/[id]/page.tsx b/frontend/src/app/[id]/page.tsx diff --git a/frontend/src/app/[id]/page.tsx b/frontend/src/app/[id]/page.tsx
index a3af022..b807f1c 100644 index a3af022..c1350a6 100644
--- a/frontend/src/app/[id]/page.tsx --- a/frontend/src/app/[id]/page.tsx
+++ b/frontend/src/app/[id]/page.tsx +++ b/frontend/src/app/[id]/page.tsx
@@ -6,6 +6,7 @@ import { Temporal } from '@js-temporal/polyfill' @@ -13,6 +13,11 @@ import { makeClass, relativeTimeFormat } from '/src/utils'
import EventAvailabilities from './EventAvailabilities'
import styles from './page.module.scss'
import Content from '/src/components/Content/Content' +if (process.env.NEXT_PUBLIC_DOMAIN_FRONT === undefined) {
import Copyable from '/src/components/Copyable/Copyable' + throw new Error('Expected front domain name environment variable')
+import DOMAIN_URL from '/src/components/Copyable/Copyable' +}
import { getEvent } from '/src/config/api' +const DOMAIN_FRONT = process.env.NEXT_PUBLIC_DOMAIN_FRONT
import { useTranslation } from '/src/i18n/server' +
import { makeClass, relativeTimeFormat } from '/src/utils' interface PageProps {
@@ -49,10 +50,10 @@ const Page = async ({ params }: PageProps) => { params: { id: string }
}
@@ -49,10 +54,10 @@ const Page = async ({ params }: PageProps) => {
>{t('common:created', { date: relativeTimeFormat(Temporal.Instant.fromEpochSeconds(event.created_at), i18n.language) })}</span> >{t('common:created', { date: relativeTimeFormat(Temporal.Instant.fromEpochSeconds(event.created_at), i18n.language) })}</span>
<Copyable className={styles.info}> <Copyable className={styles.info}>
- {`https://crab.fit/${event.id}`} - {`https://crab.fit/${event.id}`}
+ {`https://${DOMAIN_URL}/${event.id}`} + {`https://${DOMAIN_FRONT}/${event.id}`}
</Copyable> </Copyable>
<p className={makeClass(styles.info, styles.noPrint)}> <p className={makeClass(styles.info, styles.noPrint)}>
- <Trans i18nKey="event:nav.shareinfo" t={t} i18n={i18n}>_<a href={`mailto:?subject=${encodeURIComponent(t('event:nav.email_subject', { event_name: event.name }))}&body=${encodeURIComponent(`${t('event:nav.email_body')} https://crab.fit/${event.id}`)}`}>_</a>_</Trans> - <Trans i18nKey="event:nav.shareinfo" t={t} i18n={i18n}>_<a href={`mailto:?subject=${encodeURIComponent(t('event:nav.email_subject', { event_name: event.name }))}&body=${encodeURIComponent(`${t('event:nav.email_body')} https://crab.fit/${event.id}`)}`}>_</a>_</Trans>
+ <Trans i18nKey="event:nav.shareinfo" t={t} i18n={i18n}>_<a href={`mailto:?subject=${encodeURIComponent(t('event:nav.email_subject', { event_name: event.name }))}&body=${encodeURIComponent(`${t('event:nav.email_body')} https://${DOMAIN_URL}/${event.id}`)}`}>_</a>_</Trans> + <Trans i18nKey="event:nav.shareinfo" t={t} i18n={i18n}>_<a href={`mailto:?subject=${encodeURIComponent(t('event:nav.email_subject', { event_name: event.name }))}&body=${encodeURIComponent(`${t('event:nav.email_body')} https://${DOMAIN_FRONT}/${event.id}`)}`}>_</a>_</Trans>
</p> </p>
</Content> </Content>
</Suspense> </Suspense>
diff --git a/frontend/src/components/Copyable/Copyable.tsx b/frontend/src/components/Copyable/Copyable.tsx
index aa14220..82b726c 100644
--- a/frontend/src/components/Copyable/Copyable.tsx
+++ b/frontend/src/components/Copyable/Copyable.tsx
@@ -7,6 +7,8 @@ import { makeClass } from '/src/utils'
import styles from './Copyable.module.scss'
+export const DOMAIN_URL = process.env.NEXT_PUBLIC_DOMAIN_URL
+
interface CopyableProps extends Omit<React.ComponentProps<'p'>, 'children'> {
children: string
}
diff --git a/frontend/src/components/CreateForm/components/EventInfo/EventInfo.tsx b/frontend/src/components/CreateForm/components/EventInfo/EventInfo.tsx diff --git a/frontend/src/components/CreateForm/components/EventInfo/EventInfo.tsx b/frontend/src/components/CreateForm/components/EventInfo/EventInfo.tsx
index 4376001..bb33518 100644 index 4376001..159eb82 100644
--- a/frontend/src/components/CreateForm/components/EventInfo/EventInfo.tsx --- a/frontend/src/components/CreateForm/components/EventInfo/EventInfo.tsx
+++ b/frontend/src/components/CreateForm/components/EventInfo/EventInfo.tsx +++ b/frontend/src/components/CreateForm/components/EventInfo/EventInfo.tsx
@@ -1,6 +1,7 @@ @@ -6,6 +6,11 @@ import { useTranslation } from '/src/i18n/client'
import { Trans } from 'react-i18next/TransWithoutContext'
import Copyable from '/src/components/Copyable/Copyable' import styles from './EventInfo.module.scss'
+import DOMAIN_URL from '/src/components/Copyable/Copyable'
import { EventResponse } from '/src/config/api'
import { useTranslation } from '/src/i18n/client'
@@ -16,10 +17,10 @@ const EventInfo = ({ event }: EventInfoProps) => { +if (process.env.NEXT_PUBLIC_DOMAIN_FRONT === undefined) {
+ throw new Error('Expected front domain name environment variable')
+}
+const DOMAIN_FRONT = process.env.NEXT_PUBLIC_DOMAIN_FRONT
+
interface EventInfoProps {
event: EventResponse
}
@@ -16,10 +21,10 @@ const EventInfo = ({ event }: EventInfoProps) => {
return <div className={styles.wrapper}> return <div className={styles.wrapper}>
<h2>{event.name}</h2> <h2>{event.name}</h2>
<Copyable className={styles.info}> <Copyable className={styles.info}>
- {`https://crab.fit/${event.id}`} - {`https://crab.fit/${event.id}`}
+ {`https://${DOMAIN_URL}/${event.id}`} + {`https://${DOMAIN_FRONT}/${event.id}`}
</Copyable> </Copyable>
<p className={styles.info}> <p className={styles.info}>
- <Trans i18nKey="event:nav.shareinfo_alt" t={t} i18n={i18n}>_<a href={`mailto:?subject=${encodeURIComponent(t('nav.email_subject', { event_name: event.name }))}&body=${encodeURIComponent(`${t('nav.email_body')} https://crab.fit/${event.id}`)}`} target="_blank">_</a>_</Trans> - <Trans i18nKey="event:nav.shareinfo_alt" t={t} i18n={i18n}>_<a href={`mailto:?subject=${encodeURIComponent(t('nav.email_subject', { event_name: event.name }))}&body=${encodeURIComponent(`${t('nav.email_body')} https://crab.fit/${event.id}`)}`} target="_blank">_</a>_</Trans>
+ <Trans i18nKey="event:nav.shareinfo_alt" t={t} i18n={i18n}>_<a href={`mailto:?subject=${encodeURIComponent(t('nav.email_subject', { event_name: event.name }))}&body=${encodeURIComponent(`${t('nav.email_body')} https://${DOMAIN_URL}/${event.id}`)}`} target="_blank">_</a>_</Trans> + <Trans i18nKey="event:nav.shareinfo_alt" t={t} i18n={i18n}>_<a href={`mailto:?subject=${encodeURIComponent(t('nav.email_subject', { event_name: event.name }))}&body=${encodeURIComponent(`${t('nav.email_body')} https://${DOMAIN_FRONT}/${event.id}`)}`} target="_blank">_</a>_</Trans>
</p> </p>
</div> </div>
} }