all repos — caroster @ 52ad6be503528baa3feff0e610b44f0f82ffc2a3

[Octree] Group carpool to your event https://caroster.io

fix: 🐛 FAQ link leads to wrong url
Simon Mulquin simon@octree.ch
Thu, 04 Jul 2024 15:18:24 +0000
commit

52ad6be503528baa3feff0e610b44f0f82ffc2a3

parent

1608cf0361137ddf0c6bb0c00b38cc4aadd5cb20

12 files changed, 9 insertions(+), 34 deletions(-)

jump to
M backend/src/api/setting/content-types/setting/schema.json → backend/src/api/setting/content-types/setting/schema.json 
@@ -33,14 +33,6 @@ }
       },
       "type": "string"
     },
-    "faq_link": {
-      "pluginOptions": {
-        "i18n": {
-          "localized": false
-        }
-      },
-      "type": "string"
-    },
     "announcement": {
       "pluginOptions": {
         "i18n": {
M backend/types/generated/contentTypes.d.ts → backend/types/generated/contentTypes.d.ts 
@@ -1110,12 +1110,6 @@ i18n: {
           localized: false;
         };
       }>;
-    faq_link: Attribute.String &
-      Attribute.SetPluginOptions<{
-        i18n: {
-          localized: false;
-        };
-      }>;
     announcement: Attribute.RichText &
       Attribute.SetPluginOptions<{
         i18n: {
M e2e/constants.ts → e2e/constants.ts 
@@ -68,11 +68,9 @@ 
 export const SETTING_FR: Partial<Setting> = {
   announcement: "Annonce en français",
   about_link: "https://about.test",
-  faq_link: "https://faq.test",
 };
 
 export const SETTING_EN: Partial<Setting> = {
   announcement: "Annoucement in english",
   about_link: "https://about.test",
-  faq_link: "https://faq.test",
 };
M e2e/graphql.ts → e2e/graphql.ts 
@@ -1354,7 +1354,6 @@ announcement?: Maybe<Scalars['String']>;
   code_link?: Maybe<Scalars['String']>;
   createdAt?: Maybe<Scalars['DateTime']>;
   data_policy_link?: Maybe<Scalars['String']>;
-  faq_link?: Maybe<Scalars['String']>;
   gtm_id?: Maybe<Scalars['String']>;
   locale?: Maybe<Scalars['String']>;
   localizations?: Maybe<SettingRelationResponseCollection>;

@@ -1381,7 +1380,6 @@ about_link?: InputMaybe<Scalars['String']>;
   announcement?: InputMaybe<Scalars['String']>;
   code_link?: InputMaybe<Scalars['String']>;
   data_policy_link?: InputMaybe<Scalars['String']>;
-  faq_link?: InputMaybe<Scalars['String']>;
   gtm_id?: InputMaybe<Scalars['String']>;
   matomo_script_url?: InputMaybe<Scalars['String']>;
   opencollective_link?: InputMaybe<Scalars['String']>;

@@ -2446,7 +2444,6 @@ id
       attributes {
         gtm_id
         about_link
-        faq_link
         announcement
         matomo_script_url
         opencollective_link

@@ -2764,7 +2761,7 @@ locale: Scalars['I18NLocaleCode'];
 }>;
 
 
-export type SettingQuery = { __typename?: 'Query', setting?: { __typename?: 'SettingEntityResponse', data?: { __typename?: 'SettingEntity', id?: string | null, attributes?: { __typename?: 'Setting', gtm_id?: string | null, about_link?: string | null, faq_link?: string | null, announcement?: string | null, matomo_script_url?: string | null, opencollective_link?: string | null, code_link?: string | null, stripe_dashboard_link?: string | null, tos_link?: string | null, data_policy_link?: string | null } | null } | null } | null };
+export type SettingQuery = { __typename?: 'Query', setting?: { __typename?: 'SettingEntityResponse', data?: { __typename?: 'SettingEntity', id?: string | null, attributes?: { __typename?: 'Setting', gtm_id?: string | null, about_link?: string | null, announcement?: string | null, matomo_script_url?: string | null, opencollective_link?: string | null, code_link?: string | null, stripe_dashboard_link?: string | null, tos_link?: string | null, data_policy_link?: string | null } | null } | null } | null };
 
 export type TravelFieldsFragment = { __typename?: 'TravelEntity', id?: string | null, attributes?: { __typename?: 'Travel', meeting?: string | null, meeting_latitude?: number | null, meeting_longitude?: number | null, departure?: any | null, details?: string | null, vehicleName?: string | null, phone_number?: string | null, seats?: number | null, passengers?: { __typename?: 'PassengerRelationResponseCollection', data: Array<{ __typename?: 'PassengerEntity', id?: string | null, attributes?: { __typename?: 'Passenger', name: string, location?: string | null, phone?: string | null, user?: { __typename?: 'UsersPermissionsUserEntityResponse', data?: { __typename?: 'UsersPermissionsUserEntity', id?: string | null, attributes?: { __typename?: 'UsersPermissionsUser', firstName?: string | null, lastName?: string | null, email: string } | null } | null } | null } | null }> } | null } | null };
M frontend/containers/NewTravelDialog/FAQLink.tsx → frontend/containers/NewTravelDialog/FAQLink.tsx 
@@ -1,16 +1,14 @@ 
 import Link, {LinkProps} from '@mui/material/Link';
-import useSettings from '../../hooks/useSettings';
 
 interface Props {
   text: string;
   link: string;
 }
 
-const FAQLink = ({text, link, sx}: Props & LinkProps) => {
-  const settings = useSettings();
+const FAQLink = ({text, link}: Props & LinkProps) => {
 
   return (
-    <Link sx={sx} target="_blank" href={`${settings?.faq_link}${link}`}>
+    <Link target="_blank" href={link}>
       {text}
     </Link>
   );
M frontend/generated/graphql.tsx → frontend/generated/graphql.tsx 
@@ -1358,7 +1358,6 @@ announcement?: Maybe<Scalars['String']['output']>;
   code_link?: Maybe<Scalars['String']['output']>;
   createdAt?: Maybe<Scalars['DateTime']['output']>;
   data_policy_link?: Maybe<Scalars['String']['output']>;
-  faq_link?: Maybe<Scalars['String']['output']>;
   gtm_id?: Maybe<Scalars['String']['output']>;
   locale?: Maybe<Scalars['String']['output']>;
   localizations?: Maybe<SettingRelationResponseCollection>;

@@ -1385,7 +1384,6 @@ about_link?: InputMaybe<Scalars['String']['input']>;
   announcement?: InputMaybe<Scalars['String']['input']>;
   code_link?: InputMaybe<Scalars['String']['input']>;
   data_policy_link?: InputMaybe<Scalars['String']['input']>;
-  faq_link?: InputMaybe<Scalars['String']['input']>;
   gtm_id?: InputMaybe<Scalars['String']['input']>;
   matomo_script_url?: InputMaybe<Scalars['String']['input']>;
   opencollective_link?: InputMaybe<Scalars['String']['input']>;

@@ -2183,7 +2181,7 @@ locale: Scalars['I18NLocaleCode']['input'];
 }>;
 
 
-export type SettingQuery = { __typename?: 'Query', setting?: { __typename?: 'SettingEntityResponse', data?: { __typename?: 'SettingEntity', id?: string | null, attributes?: { __typename?: 'Setting', gtm_id?: string | null, about_link?: string | null, faq_link?: string | null, announcement?: string | null, matomo_script_url?: string | null, opencollective_link?: string | null, code_link?: string | null, stripe_dashboard_link?: string | null, tos_link?: string | null, data_policy_link?: string | null } | null } | null } | null };
+export type SettingQuery = { __typename?: 'Query', setting?: { __typename?: 'SettingEntityResponse', data?: { __typename?: 'SettingEntity', id?: string | null, attributes?: { __typename?: 'Setting', gtm_id?: string | null, about_link?: string | null, announcement?: string | null, matomo_script_url?: string | null, opencollective_link?: string | null, code_link?: string | null, stripe_dashboard_link?: string | null, tos_link?: string | null, data_policy_link?: string | null } | null } | null } | null };
 
 export type TravelFieldsFragment = { __typename?: 'TravelEntity', id?: string | null, attributes?: { __typename?: 'Travel', meeting?: string | null, meeting_latitude?: number | null, meeting_longitude?: number | null, departureDate?: any | null, departureTime?: string | null, details?: string | null, vehicleName?: string | null, phone_number?: string | null, seats?: number | null, passengers?: { __typename?: 'PassengerRelationResponseCollection', data: Array<{ __typename?: 'PassengerEntity', id?: string | null, attributes?: { __typename?: 'Passenger', name: string, location?: string | null, phone?: string | null, user?: { __typename?: 'UsersPermissionsUserEntityResponse', data?: { __typename?: 'UsersPermissionsUserEntity', id?: string | null, attributes?: { __typename?: 'UsersPermissionsUser', firstName?: string | null, lastName?: string | null, email: string } | null } | null } | null } | null }> } | null } | null };
 

@@ -3060,7 +3058,6 @@ id
       attributes {
         gtm_id
         about_link
-        faq_link
         announcement
         matomo_script_url
         opencollective_link
M frontend/graphql/setting.gql → frontend/graphql/setting.gql 
@@ -5,7 +5,6 @@ id
       attributes {
         gtm_id
         about_link
-        faq_link
         announcement
         matomo_script_url
         opencollective_link
M frontend/locales/en.json → frontend/locales/en.json 
@@ -251,7 +251,7 @@ "travel.creation.meeting": "Meeting place",
   "travel.creation.name": "Name of the car",
   "travel.creation.notes": "Additional information",
   "travel.creation.phone": "Telephone number",
-  "travel.creation.phoneHelper.faq": "/en/faq",
+  "travel.creation.phoneHelper.faq": "https://caroster.io/en/faq",
   "travel.creation.phoneHelper.why": "Why do we ask for a phone number ?",
   "travel.creation.seats": "Number of available seats",
   "travel.creation.submit": "Add",
M frontend/locales/fr.json → frontend/locales/fr.json 
@@ -248,7 +248,7 @@ "travel.creation.meeting": "Lieu de rencontre",
   "travel.creation.name": "Nom de la voiture",
   "travel.creation.notes": "Infos complémentaires",
   "travel.creation.phone": "Numéro de téléphone",
-  "travel.creation.phoneHelper.faq": "/fr/faq",
+  "travel.creation.phoneHelper.faq": "https://caroster.io/fr/faq",
   "travel.creation.phoneHelper.why": "Pourquoi le num. de tél. est-il demandé?",
   "travel.creation.seats": "Nombre de places disponibles",
   "travel.creation.submit": "Ajouter",
M frontend/locales/nl.json → frontend/locales/nl.json 
@@ -248,7 +248,7 @@ "travel.creation.meeting": "Afspraaklocatie",
   "travel.creation.name": "Voertuignaam",
   "travel.creation.notes": "Aanvullende informatie",
   "travel.creation.phone": "Telefoonnummer",
-  "travel.creation.phoneHelper.faq": "/nl/faq",
+  "travel.creation.phoneHelper.faq": "https://caroster.io/en/faq",
   "travel.creation.phoneHelper.why": "Waarom wordt er om een telefoonnummer gevraagd?",
   "travel.creation.seats": "Aantal beschikbare plaatsen",
   "travel.creation.submit": "Toevoegen",
M frontend/locales/pl.json → frontend/locales/pl.json 
@@ -238,7 +238,7 @@ "travel.creation.meeting": "",
     "travel.creation.name": "",
     "travel.creation.notes": "",
     "travel.creation.phone": "",
-    "travel.creation.phoneHelper.faq": "/pl/faq",
+    "travel.creation.phoneHelper.faq": "https://caroster.io/en/faq",
     "travel.creation.phoneHelper.why": "",
     "travel.creation.seats": "",
     "travel.creation.submit": "Dodaj",
M frontend/locales/sv.json → frontend/locales/sv.json 
@@ -215,7 +215,7 @@ "travel.creation.meeting": "",
   "travel.creation.name": "",
   "travel.creation.notes": "",
   "travel.creation.phone": "",
-  "travel.creation.phoneHelper.faq": "",
+  "travel.creation.phoneHelper.faq": "https://caroster.io/en/faq",
   "travel.creation.phoneHelper.why": "",
   "travel.creation.seats": "",
   "travel.creation.submit": "",