code4recovery · joshreisner · Oct 6, 2024 · Sep 25, 2024 · Sep 25, 2024 · Sep 25, 2024
diff --git a/public/app.js b/public/app.js
diff --git a/public/tests/aasanjose-gsheet.html b/public/tests/aasanjose-gsheet.html
@@ -22,16 +22,11 @@
   <body>
     <div
       id="tsml-ui"
-      data-src="https://docs.google.com/spreadsheets/d/12Ga8uwMG4WJ8pZ_SEU7vNETp_aQZ-2yNVsYDFqIwHyE/edit#gid=0"
+      data-src="https://docs.google.com/spreadsheets/d/17hg4oj-V_tnRJn5zrRbAAtlEsDM9pN_KeQBUu7QLfy4/edit?gid=0#gid=0"
       data-mapbox="pk.eyJ1Ijoiam9zaHJlaXNuZXIiLCJhIjoiY2tvYXA0YnZxMGRldDJxbzdta25uNGphdiJ9.eay-UKgIT99ALmdw08xBPw"
       data-google="AIzaSyCS9M8Dqk5cMFqA7xvUrQEzT1u5IvcbT7c"
       data-timezone="America/Los_Angeles"
     ></div>
     <script src="/app.js" async></script>
-    <script>
-      var tsml_react_config = {
-        feedback_emails: ['[email protected]'],
-      };
-    </script>
   </body>
 </html>
diff --git a/src/components/Meeting.tsx b/src/components/Meeting.tsx
@@ -5,7 +5,6 @@ import { Link as RouterLink } from 'react-router-dom';
 
 import {
   formatDirectionsUrl,
-  formatFeedbackEmail,
   formatIcs,
   formatString as i18n,
   formatUrl,
@@ -28,12 +27,10 @@ import Map from './Map';
 import type { Meeting as MeetingType, State } from '../types';
 
 export default function Meeting({
-  feedback_emails = [],
   mapbox,
   setState,
   state,
 }: {
-  feedback_emails?: string[];
   mapbox?: string;
   setState: Dispatch<SetStateAction<State>>;
   state: State;
@@ -116,16 +113,6 @@ export default function Meeting({
     document.title = meeting.name;
   }
 
-  // feedback URL link
-  if (!meeting.feedback_url && feedback_emails.length) {
-    meeting.feedback_url = formatFeedbackEmail(
-      settings.feedback_emails,
-      meeting,
-      settings,
-      strings
-    );
-  }
-
   const contactButtons: {
     href: string;
     icon: keyof typeof icons;
@@ -428,18 +415,51 @@ export default function Meeting({
                   {formatWeekdays(groupWeekdays, meeting.slug, state, setState)}
                 </div>
               )}
-            {meeting.updated && (
-              <div>{i18n(strings.updated, { updated: meeting.updated })}</div>
+            {(meeting.updated || meeting.feedback_url || meeting.entity) && (
+              <div>
+                {meeting.entity && (
+                  <>
+                    <small>{strings.provided_by}</small>
+                    <header>
+                      <h2>{meeting.entity}</h2>
+                      {meeting.entity_location && (
+                        <p>{meeting.entity_location}</p>
+                      )}
+                    </header>
+                    {meeting.entity_phone && (
+                      <Button
+                        href={`tel:${meeting.entity_phone}`}
+                        text={meeting.entity_phone}
+                        icon="phone"
+                      />
+                    )}
+                    {meeting.entity_url && (
+                      <Button
+                        href={meeting.entity_url}
+                        text={new URL(meeting.entity_url).host.replace(
+                          'www.',
+                          ''
+                        )}
+                        icon="link"
+                      />
+                    )}
+                  </>
+                )}
+
+                {meeting.feedback_url && (
+                  <Button
+                    href={meeting.feedback_url}
+                    icon="edit"
+                    text={strings.feedback}
+                  />
+                )}
+
+                {meeting.updated && (
+                  <p>{i18n(strings.updated, { updated: meeting.updated })}</p>
+                )}
+              </div>
             )}
           </div>
-
-          {meeting.feedback_url && (
-            <Button
-              href={meeting.feedback_url}
-              icon="edit"
-              text={strings.feedback}
-            />
-          )}
         </div>
         <div
           css={

diff --git a/src/components/TsmlUI.tsx b/src/components/TsmlUI.tsx
@@ -252,12 +252,7 @@ export default function TsmlUI({
       {!state.ready ? (
         <Loading />
       ) : state.input.meeting && state.input.meeting in state.meetings ? (
-        <Meeting
-          feedback_emails={settings.feedback_emails}
-          mapbox={mapbox}
-          setState={setState}
-          state={state}
-        />
+        <Meeting mapbox={mapbox} setState={setState} state={state} />
       ) : (
         <>
           {settings.show.title && <Title state={state} />}

diff --git a/src/helpers/format-feedback-email.ts b/src/helpers/format-feedback-email.ts
@@ -1,17 +1,22 @@
-import { Meeting } from '../types';
-
 import { formatArray } from './format-array';
 import { formatString as i18n } from './format-string';
 import { formatUrl } from './format-url';
 import { getQueryString } from './query-string';
 
 // send back a mailto link to a feedback email
-export function formatFeedbackEmail(
-  feedback_emails: TSMLReactConfig['feedback_emails'],
-  meeting: Meeting,
-  settings: TSMLReactConfig,
-  strings: Translation
-) {
+export function formatFeedbackEmail({
+  feedback_emails,
+  edit_url,
+  name,
+  settings,
+  strings,
+}: {
+  feedback_emails: string[];
+  edit_url?: string;
+  name?: string;
+  settings: TSMLReactConfig;
+  strings: Translation;
+}) {
   // remove extra query params from meeting URL
   const input = getQueryString(settings);
   const meetingUrl = formatUrl({ meeting: input.meeting }, settings);
@@ -24,13 +29,13 @@ export function formatFeedbackEmail(
     '-----',
     i18n(strings.email_public_url, { url: meetingUrl }),
   ];
-  if (meeting.edit_url) {
-    lines.push(i18n(strings.email_edit_url, { url: meeting.edit_url }));
+  if (edit_url) {
+    lines.push(i18n(strings.email_edit_url, { url: edit_url }));
   }
 
   // build mailto link
   return `mailto:${formatArray(feedback_emails).join()}?${new URLSearchParams({
-    subject: i18n(strings.email_subject, { name: meeting.name }),
+    subject: i18n(strings.email_subject, { name }),
     body: lines.join('\n'),
   })
     .toString()

diff --git a/src/helpers/load-meeting-data.ts b/src/helpers/load-meeting-data.ts
@@ -3,6 +3,7 @@ import { DateTime, WeekdayNumbers } from 'luxon';
 import { flattenAndSortIndexes } from './flatten-and-sort-indexes';
 import { formatAddress } from './format-address';
 import { formatConferenceProvider } from './format-conference-provider';
+import { formatFeedbackEmail } from './format-feedback-email';
 import { formatSlug } from './format-slug';
 
 import type { JSONData, JSONDataFlat, State, Meeting, Index } from '../types';
@@ -42,7 +43,10 @@ export function loadMeetingData(
       district,
       edit_url,
       email,
-      feedback_url,
+      entity,
+      entity_location,
+      entity_phone,
+      entity_url,
       group,
       group_notes,
       location,
@@ -72,6 +76,7 @@ export function loadMeetingData(
       conference_phone,
       conference_phone_notes,
       conference_url_notes,
+      feedback_url,
       formatted_address,
       regions,
     } = meeting;
@@ -398,6 +403,23 @@ export function loadMeetingData(
       .join('\t')
       .toLowerCase();
 
+    const feedback_emails = meeting.feedback_emails
+      ? meeting.feedback_emails
+          .split(',')
+          .map(e => e.trim())
+          .filter(e => e)
+      : settings.feedback_emails;
+
+    if (!feedback_url && feedback_emails.length) {
+      feedback_url = formatFeedbackEmail({
+        feedback_emails,
+        name,
+        edit_url,
+        settings,
+        strings,
+      });
+    }
+
     meetings[slug] = {
       address,
       approximate,
@@ -418,6 +440,10 @@ export function loadMeetingData(
       district,
       edit_url,
       email,
+      entity,
+      entity_location,
+      entity_phone,
+      entity_url,
       end,
       feedback_url,
       formatted_address,

diff --git a/src/i18n/en.ts b/src/i18n/en.ts
@@ -49,6 +49,7 @@ export const en: Translation = {
   not_found: 'Meeting not found.',
   night: 'Night',
   phone: 'Phone',
+  provided_by: 'This listing is provided by:',
   region: 'Region',
   region_any: 'Anywhere',
   remove: 'Remove %filter%',

diff --git a/src/i18n/es.ts b/src/i18n/es.ts
@@ -49,6 +49,7 @@ export const es: Translation = {
   not_found: 'Reunión no encontrada.',
   night: 'Noche',
   phone: 'Teléfono',
+  provided_by: 'Este listado es proporcionado por:',
   region: 'Región',
   region_any: 'Todos lados',
   remove: 'Quitar %filter%',

diff --git a/src/i18n/fr.ts b/src/i18n/fr.ts
@@ -49,6 +49,7 @@ export const fr: Translation = {
   not_found: 'Réunion introuvable.',
   night: 'Nuit',
   phone: 'Téléphone',
+  provided_by: 'Cette liste est fournie par :',
   region: 'Région',
   region_any: 'Partout',
   remove: 'Supprimer %filter%',

diff --git a/src/i18n/ja.ts b/src/i18n/ja.ts
@@ -49,6 +49,7 @@ export const ja: Translation = {
   },
   night: '夜',
   phone: '電話',
+  provided_by: 'このリストは以下によって提供されています:',
   region: '区域',
   region_any: '区域指定無し',
   remove: '%filter% を削除',

diff --git a/src/i18n/nl.ts b/src/i18n/nl.ts
@@ -1,6 +1,6 @@
 import { getTypesForLanguage } from '@code4recovery/spec';
 
-export const nl = {
+export const nl: Translation = {
   add_to_calendar: 'Toevoegen aan agenda',
   address: 'Addres',
   appointment: 'Afspraak',
@@ -50,6 +50,7 @@ export const nl = {
   not_found: 'Meeting niet gevonden.',
   night: 'Nacht',
   phone: 'Telefoon',
+  provided_by: 'Deze lijst wordt aangeboden door:',
   region: 'Plaats',
   region_any: 'Overal',
   remove: 'Verwijder %filter%',

diff --git a/src/i18n/pt.ts b/src/i18n/pt.ts
@@ -1,6 +1,6 @@
 import { getTypesForLanguage } from '@code4recovery/spec';
 
-export const pt = {
+export const pt: Translation = {
   add_to_calendar: 'Adicionar ao calendário',
   address: 'Endereço / Plataforma',
   appointment: 'Marcação',
@@ -50,6 +50,7 @@ export const pt = {
   not_found: 'Reunião não encontrada.',
   night: 'Noite',
   phone: 'Telefone',
+  provided_by: 'Este anúncio é fornecido por:',
   region: 'Região',
   region_any: 'Qualquer Local',
   remove: 'Remover %filter%',

diff --git a/src/i18n/sk.ts b/src/i18n/sk.ts
@@ -50,6 +50,7 @@ export const sk: Translation = {
   not_found: 'Stretnutia sa nenašli.',
   night: 'Noc',
   phone: 'Telefón',
+  provided_by: 'Tento zoznam poskytuje:',
   region: 'Kraj',
   region_any: 'Kdekoľvek',
   remove: 'Zmazať %filter%',

diff --git a/src/i18n/sv.ts b/src/i18n/sv.ts
@@ -49,6 +49,7 @@ export const sv: Translation = {
   not_found: 'Hittade inte mötet.',
   night: 'Natt',
   phone: 'Telefon',
+  provided_by: 'Denna lista tillhandahålls av:',
   region: 'Region',
   region_any: 'Överallt',
   remove: 'Ta bort %filter%',

diff --git a/src/styles/meeting.ts b/src/styles/meeting.ts
@@ -52,6 +52,12 @@ export const meetingColumnsCss = css`
     }
   }
 
+  header {
+    text-align: center;
+    display: grid;
+    gap: ${size.gutter / 2}px;
+  }
+
   h3 {
     font-size: var(--font-size);
     font-weight: 500;

diff --git a/src/types/JSONData.ts b/src/types/JSONData.ts
@@ -22,6 +22,11 @@ export type JSONData = {
   edit_url?: string;
   email?: string;
   end_time?: string;
+  entity?: string;
+  entity_location?: string;
+  entity_phone?: string;
+  entity_url?: string;
+  feedback_emails?: string;
   feedback_url?: string;
   formatted_address?: string;
   group?: string;

diff --git a/src/types/Meeting.ts b/src/types/Meeting.ts
@@ -22,6 +22,11 @@ export interface Meeting {
   edit_url?: string;
   email?: string;
   end?: DateTime;
+  entity?: string;
+  entity_location?: string;
+  entity_phone?: string;
+  entity_url?: string;
+  feedback_emails?: string[];
   feedback_url?: string;
   formatted_address: string;
   group?: string;

diff --git a/src/types/Translation.ts b/src/types/Translation.ts
@@ -47,6 +47,7 @@ export interface Translation {
   };
   night: string;
   phone: string;
+  provided_by: string;
   region: string;
   region_any: string;
   remove: string;