From 7f01efa5dea540ba811e2506a9295297f2ea4683 Mon Sep 17 00:00:00 2001
From: Antoine Lima <antoine@sagou.in>
Date: Thu, 2 May 2024 23:14:49 +0200
Subject: [PATCH] Rename patch with a 'main-' prefix, rename env variable & use
 process.env directly

---
 conf/front.env                                |  3 +-
 ...custom_url.patch => main-custom_url.patch} | 67 +++++++++----------
 2 files changed, 33 insertions(+), 37 deletions(-)
 rename sources/patches/{custom_url.patch => main-custom_url.patch} (57%)

diff --git a/conf/front.env b/conf/front.env
index e869e1f..031a7f3 100644
--- a/conf/front.env
+++ b/conf/front.env
@@ -1,4 +1,5 @@
 NEXT_PUBLIC_API_URL=https://__DOMAIN__/api/
+NEXT_PUBLIC_DOMAIN_FRONT=__DOMAIN__
+
 NEXT_TELEMETRY_DISABLED=1
 NODE_ENV=production
-NEXT_PUBLIC_DOMAIN_URL=__DOMAIN__
diff --git a/sources/patches/custom_url.patch b/sources/patches/main-custom_url.patch
similarity index 57%
rename from sources/patches/custom_url.patch
rename to sources/patches/main-custom_url.patch
index 63a20b7..63f68c4 100644
--- a/sources/patches/custom_url.patch
+++ b/sources/patches/main-custom_url.patch
@@ -1,73 +1,68 @@
 diff --git a/frontend/.env.local b/frontend/.env.local
-index ee43468..f862dac 100644
+index ee43468..6876cfc 100644
 --- a/frontend/.env.local
 +++ b/frontend/.env.local
 @@ -1,4 +1,5 @@
  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
  # NEXT_PUBLIC_GOOGLE_CLIENT_ID=""
 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
 +++ 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'
- import Copyable from '/src/components/Copyable/Copyable'
-+import DOMAIN_URL from '/src/components/Copyable/Copyable'
- import { getEvent } from '/src/config/api'
- import { useTranslation } from '/src/i18n/server'
- import { makeClass, relativeTimeFormat } from '/src/utils'
-@@ -49,10 +50,10 @@ const Page = async ({ params }: PageProps) => {
++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 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>
  
          <Copyable className={styles.info}>
 -          {`https://crab.fit/${event.id}`}
-+          {`https://${DOMAIN_URL}/${event.id}`}
++          {`https://${DOMAIN_FRONT}/${event.id}`}
          </Copyable>
          <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://${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>
        </Content>
      </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
-index 4376001..bb33518 100644
+index 4376001..159eb82 100644
 --- a/frontend/src/components/CreateForm/components/EventInfo/EventInfo.tsx
 +++ b/frontend/src/components/CreateForm/components/EventInfo/EventInfo.tsx
-@@ -1,6 +1,7 @@
- import { Trans } from 'react-i18next/TransWithoutContext'
+@@ -6,6 +6,11 @@ import { useTranslation } from '/src/i18n/client'
  
- import Copyable from '/src/components/Copyable/Copyable'
-+import DOMAIN_URL from '/src/components/Copyable/Copyable'
- import { EventResponse } from '/src/config/api'
- import { useTranslation } from '/src/i18n/client'
+ import styles from './EventInfo.module.scss'
  
-@@ -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}>
      <h2>{event.name}</h2>
      <Copyable className={styles.info}>
 -      {`https://crab.fit/${event.id}`}
-+      {`https://${DOMAIN_URL}/${event.id}`}
++      {`https://${DOMAIN_FRONT}/${event.id}`}
      </Copyable>
      <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://${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>
    </div>
  }