refactor 🧪

src/components/Button.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { formatClasses as cx } from '../helpers/format';
+import { formatClasses as cx } from '../helpers';
 import Icon, { icons } from './Icon';
 
 type ButtonProps = {

src/helpers/analytics.spec.ts → src/helpers/__tests__/analytics.spec.ts

@@ -1,4 +1,4 @@
-import { analyticsEvent } from '.';
+import { analyticsEvent } from '../analytics';
 
 window.gtag = jest.fn();
 window.ga = jest.fn();

src/helpers/data/distance.spec.ts → src/helpers/__tests__/calculate-distances.spec.ts

@@ -1,4 +1,4 @@
-import { getDistance } from './calculate-distances';
+import { getDistance } from '../calculate-distances';
 import { settings } from '../settings';
 import type { Meeting } from '../../types';
 

src/helpers/format/format-address.spec.ts → src/helpers/__tests__/format-address.spec.ts

@@ -1,4 +1,4 @@
-import { formatAddress } from './format-address';
+import { formatAddress } from '../format-address';
 
 describe('formatAddress', () => {
   it('returns first part of address if length > 3', () => {

src/helpers/format/format-array.spec.ts → src/helpers/__tests__/format-array.spec.ts

@@ -1,4 +1,4 @@
-import { formatArray } from './format-array';
+import { formatArray } from '../format-array';
 
 describe('formatArray', () => {
   it.each`

src/helpers/format/format-classes.spec.ts → src/helpers/__tests__/format-classes.spec.ts

@@ -1,4 +1,4 @@
-import { formatClasses } from './format-classes';
+import { formatClasses } from '../format-classes';
 
 describe('formatClasses', () => {
   it.each`

src/helpers/format/format-conference-provider.spec.ts → src/helpers/__tests__/format-conference-provider.spec.ts

@@ -1,5 +1,5 @@
 import { settings } from '../settings';
-import { formatConferenceProvider } from './format-conference-provider';
+import { formatConferenceProvider } from '../format-conference-provider';
 
 describe('formatConferenceProvider', () => {
   it.each(['foo', 'https://', 'https://foo.com'])(

src/helpers/format/format-directions-url.spec.ts → src/helpers/__tests__/format-directions-url.spec.ts

@@ -1,4 +1,4 @@
-import { formatDirectionsUrl } from './format-directions-url';
+import { formatDirectionsUrl } from '../format-directions-url';
 
 describe('formatDirectionsUrl', () => {
   const { formatted_address, latitude, longitude } = {

src/helpers/format/format-feedback-email.spec.ts → src/helpers/__tests__/format-feedback-email.spec.ts

@@ -1,9 +1,9 @@
 import { settings } from '../settings';
 import { getQueryString } from '../query-string';
-import { formatFeedbackEmail } from '.';
+import { formatFeedbackEmail } from '../format-feedback-email';
 import { Meeting } from '../../types';
 
-jest.mock('./format-url', () => ({
+jest.mock('../format-url', () => ({
   formatUrl: jest.fn().mockReturnValue('https://foo.com'),
 }));
 

src/helpers/format/format-ics.spec.ts → src/helpers/__tests__/format-ics.spec.ts

@@ -1,6 +1,6 @@
 import { DateTime } from 'luxon';
 
-import { formatIcs } from '.';
+import { formatIcs } from '../format-ics';
 import { Meeting } from '../../types';
 
 //TODO: Only requiring the parts needed for this test, should

src/helpers/format/format-slug.spec.ts → src/helpers/__tests__/format-slug.spec.ts

@@ -1,4 +1,4 @@
-import { formatSlug } from '.';
+import { formatSlug } from '../format-slug';
 
 describe('formatSlug', () => {
   it('removes accents', () => {

src/helpers/format/format-string.spec.ts → src/helpers/__tests__/format-string.spec.ts

@@ -1,4 +1,4 @@
-import { formatString } from '.';
+import { formatString } from '../format-string';
 
 describe('formatString', () => {
   it('works with mixed params', () => {

src/helpers/format/format-url.spec.ts → src/helpers/__tests__/format-url.spec.ts

@@ -1,4 +1,4 @@
-import { formatUrl } from '.';
+import { formatUrl } from '../format-url';
 
 describe('formatUrl', () => {
   it('works with no params', () => {

src/helpers/data/load-meeting-data.spec.ts → src/helpers/__tests__/load-meeting-data.spec.ts

@@ -1,5 +1,5 @@
 import type { JSONData } from '../../types';
-import { flattenDays, loadMeetingData } from './load-meeting-data';
+import { flattenDays, loadMeetingData } from '../load-meeting-data';
 
 describe('loadMeetingData', () => {
   it('loads data correctly', () => {

src/helpers/query-string.spec.ts → src/helpers/__tests__/query-string.spec.ts

@@ -1,13 +1,13 @@
-import { getQueryString, setQueryString } from './query-string';
+import { getQueryString, setQueryString } from '../query-string';
 import { stringify } from 'querystring';
-import { settings } from './settings';
-import { formatUrl } from './format';
+import { settings } from '../settings';
+import { formatUrl } from '../format-url';
 
-jest.mock('./settings', () => ({
+jest.mock('../settings', () => ({
   settings: { filters: [], params: [] },
 }));
 
-jest.mock('./format', () => ({
+jest.mock('../format-url', () => ({
   formatUrl: jest.fn().mockReturnValue('foo'),
 }));
 

src/helpers/data/translate-google-sheet.spec.ts → src/helpers/__tests__/translate-google-sheet.spec.ts

@@ -2,7 +2,7 @@ import { JSONData } from '../../types';
 import {
   GoogleSheetData,
   translateGoogleSheet,
-} from './translate-google-sheet';
+} from '../translate-google-sheet';
 
 describe('translateGoogleSheet', () => {
   const sheetId = 'abc123';

src/helpers/__tests__/user-agent.spec.ts

@@ -0,0 +1,24 @@
+import { iOS } from '../user-agent';
+
+let platformGetter: jest.SpyInstance<string, []>;
+let userAgentGetter: jest.SpyInstance<string, []>;
+
+describe('iOS', () => {
+  beforeEach(() => {
+    platformGetter = jest.spyOn(window.navigator, 'platform', 'get');
+    userAgentGetter = jest.spyOn(window.navigator, 'userAgent', 'get');
+  });
+
+  it('detects iOS', () => {
+    platformGetter.mockReturnValue('iPhone');
+    const isIOS = iOS();
+    expect(isIOS).toBe(true);
+  });
+
+  it('detects Mac', () => {
+    platformGetter.mockReturnValue('MacIntel');
+    userAgentGetter.mockReturnValue('Mac');
+    const isIOS = iOS();
+    expect(isIOS).toBe(false);
+  });
+});

src/helpers/data/calculate-distances.ts → src/helpers/calculate-distances.ts

@@ -1,7 +1,7 @@
-import type { Index, Meeting, State } from '../../types';
-import { settings, strings } from '../settings';
+import type { Index, Meeting, State } from '../types';
+import { settings, strings } from './settings';
 import { flattenAndSortIndexes } from './flatten-and-sort-indexes';
-import { formatString as i18n } from '../format';
+import { formatString as i18n } from './format-string';
 
 //calculate distances
 export function calculateDistances(

src/helpers/data/filter-meeting-data.ts → src/helpers/filter-meeting-data.ts

@@ -1,7 +1,7 @@
 import { DateTime } from 'luxon';
 
-import type { State } from '../../types';
-import { settings } from '../settings';
+import type { State } from '../types';
+import { settings } from './settings';
 import { getIndexByKey } from './get-index-by-key';
 import { calculateDistances } from './calculate-distances';
 

src/helpers/data/flatten-and-sort-indexes.ts → src/helpers/flatten-and-sort-indexes.ts

@@ -1,4 +1,4 @@
-import type { Index } from '../../types';
+import type { Index } from '../types';
 
 //recursive function to make sorted array from object index
 export function flattenAndSortIndexes(

src/helpers/format/format-conference-provider.ts → src/helpers/format-conference-provider.ts

@@ -1,4 +1,4 @@
-import { settings } from '../settings';
+import { settings } from './settings';
 
 //get name of provider from url
 export function formatConferenceProvider(url: string) {

src/helpers/format/format-directions-url.ts → src/helpers/format-directions-url.ts

@@ -1,5 +1,5 @@
-import type { Meeting } from '../../types';
-import { iOS } from '../user-agent';
+import type { Meeting } from '../types';
+import { iOS } from './user-agent';
 
 //create a link for directions
 export function formatDirectionsUrl({

src/helpers/format/format-feedback-email.ts → src/helpers/format-feedback-email.ts

@@ -1,6 +1,6 @@
-import { Meeting } from '../../types';
-import { getQueryString } from '../query-string';
-import { strings } from '../settings';
+import { Meeting } from '../types';
+import { getQueryString } from './query-string';
+import { strings } from './settings';
 import { formatArray } from './format-array';
 import { formatString as i18n } from './format-string';
 import { formatUrl } from './format-url';

src/helpers/format/format-ics.ts → src/helpers/format-ics.ts

@@ -1,7 +1,7 @@
 import { DateTime } from 'luxon';
 
-import { Meeting } from '../../types';
-import { iOS } from '../user-agent';
+import { Meeting } from '../types';
+import { iOS } from './user-agent';
 
 //format ICS file for add to calendar
 export function formatIcs(meeting: Meeting) {

src/helpers/format/format-url.ts → src/helpers/format-url.ts

@@ -1,4 +1,4 @@
-import { settings } from '../settings';
+import { settings } from './settings';
 
 //format an internal link with correct query params
 export function formatUrl(input: Partial<TSMLReactConfig['defaults']>) {

src/helpers/data/get-index-by-key.ts → src/helpers/get-index-by-key.ts

@@ -1,4 +1,4 @@
-import type { Index } from '../../types';
+import type { Index } from '../types';
 
 //find an index by key
 export function getIndexByKey(

src/helpers/index.ts

@@ -1,5 +1,20 @@
 export * from './analytics';
-export * from './data';
-export * from './format';
+export * from './calculate-distances';
+export * from './filter-meeting-data';
+export * from './flatten-and-sort-indexes';
+export * from './format-address';
+export * from './format-array';
+export * from './format-classes';
+export * from './format-conference-provider';
+export * from './format-directions-url';
+export * from './format-feedback-email';
+export * from './format-ics';
+export * from './format-slug';
+export * from './format-string';
+export * from './format-url';
+export * from './get-index-by-key';
+export * from './load-meeting-data';
 export * from './query-string';
 export * from './settings';
+export * from './translate-google-sheet';
+export * from './user-agent';

src/helpers/data/load-meeting-data.ts → src/helpers/load-meeting-data.ts

@@ -1,14 +1,10 @@
 import { DateTime } from 'luxon';
-import type {
-  JSONData,
-  JSONDataFlat,
-  State,
-  Meeting,
-  Index,
-} from '../../types';
-
-import { formatAddress, formatConferenceProvider, formatSlug } from '../format';
-import { settings, strings } from '../settings';
+import type { JSONData, JSONDataFlat, State, Meeting, Index } from '../types';
+
+import { formatAddress } from './format-address';
+import { formatConferenceProvider } from './format-conference-provider';
+import { formatSlug } from './format-slug';
+import { settings, strings } from './settings';
 import { flattenAndSortIndexes } from './flatten-and-sort-indexes';
 
 //set up meeting data; this is only run once when the app loads

src/helpers/query-string.ts

@@ -1,5 +1,5 @@
 import { settings } from './settings';
-import { formatUrl } from './format';
+import { formatUrl } from './format-url';
 import type { State } from '../types';
 
 //load input values from query string

src/helpers/data/translate-google-sheet.ts → src/helpers/translate-google-sheet.ts

@@ -1,9 +1,9 @@
 import { DateTime } from 'luxon';
 
-import type { JSONData } from '../../types';
-import { formatSlug } from '../format';
-import { en, es, fr, ja, sv } from '../../i18n';
-import { settings } from '../../helpers';
+import type { JSONData } from '../types';
+import { formatSlug } from './format-slug';
+import { en, es, fr, ja, sv } from '../i18n';
+import { settings } from './settings';
 
 export type GoogleSheetData = {
   values: string[][];