diff --git a/.vscode/settings.json b/.vscode/settings.json index 3662b370..fc943817 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,4 @@ { - "typescript.tsdk": "node_modules/typescript/lib" + "typescript.tsdk": "node_modules/typescript/lib", + "files.trimTrailingWhitespace": true } \ No newline at end of file diff --git a/public/index.html b/public/index.html index 0fa45402..d21274d6 100644 --- a/public/index.html +++ b/public/index.html @@ -24,6 +24,6 @@
- + diff --git a/src/components/Map.tsx b/src/components/Map.tsx index f7e2c60a..e01235c4 100644 --- a/src/components/Map.tsx +++ b/src/components/Map.tsx @@ -33,13 +33,13 @@ const Map: React.FC = ({ mapCenter, locations }) => { let infoWindow = new google.maps.InfoWindow({ content: `
${markerData.name}
` }); - + let marker = new google.maps.Marker({ position: new google.maps.LatLng(markerData.lat, markerData.lng), map: map.current!, title: markerData.name }); - + marker.addListener('click', () => { infoWindow.open(map.current!, marker); }); diff --git a/src/components/SessionListItem.tsx b/src/components/SessionListItem.tsx index 0dc0b18f..80219838 100644 --- a/src/components/SessionListItem.tsx +++ b/src/components/SessionListItem.tsx @@ -14,7 +14,7 @@ interface SessionListItemProps { const SessionListItem: React.FC = ({ isFavorite, onAddFavorite, onRemoveFavorite, onShowAlert, session, listType }) => { const ionItemSlidingRef = useRef(null) - + const dismissAlert = () => { ionItemSlidingRef.current && ionItemSlidingRef.current.close(); } diff --git a/src/components/ShareSocialFab.tsx b/src/components/ShareSocialFab.tsx index 1161d864..94566fc4 100644 --- a/src/components/ShareSocialFab.tsx +++ b/src/components/ShareSocialFab.tsx @@ -6,11 +6,11 @@ const ShareSocialFab: React.FC = () => { const [loadingMessage, setLoadingMessage] = useState('') const [showLoading, setShowLoading] = useState(false); - const openSocial = (network: string) => { + const openSocial = (network: string) => { setLoadingMessage(`Posting to ${network}`); setShowLoading(true); }; - + return( <> ({ } as const); export const updateFilteredTracks = (filteredTracks: string[]) => ({ - type: 'update-filtered-tracks', - filteredTracks + type: 'update-filtered-tracks', + filteredTracks } as const); -export const setSearchText = (searchText?: string) => ({ - type: 'set-search-text', - searchText +export const setSearchText = (searchText?: string) => ({ + type: 'set-search-text', + searchText } as const); export type SessionsActions = diff --git a/src/data/user/user.actions.ts b/src/data/user/user.actions.ts index 81d79006..a9724c08 100644 --- a/src/data/user/user.actions.ts +++ b/src/data/user/user.actions.ts @@ -47,7 +47,7 @@ export const setHasSeenTutorial = (hasSeenTutorial: boolean) => async (dispatch: type: 'set-has-seen-tutorial', hasSeenTutorial } as const); -} +} export const setDarkMode = (darkMode: boolean) => ({ type: 'set-dark-mode', diff --git a/src/pages/About.scss b/src/pages/About.scss index b657cbe6..774075c9 100644 --- a/src/pages/About.scss +++ b/src/pages/About.scss @@ -6,21 +6,21 @@ height: 30%; text-align: center; } - + .about-header img { max-height: 100%; } - + .about-info p { color: var(--ion-color-dark); text-align: left; } - + .about-info ion-icon { margin-inline-end: 32px; } - + .ios .about-info { text-align: center; - } + } } \ No newline at end of file diff --git a/src/pages/About.tsx b/src/pages/About.tsx index bdcd9d04..bcb0b5d8 100644 --- a/src/pages/About.tsx +++ b/src/pages/About.tsx @@ -72,7 +72,7 @@ const About: React.FC = () => { event={popoverEvent} onDidDismiss={() => setShowPopover(false)} > - setShowPopover(false)} /> + setShowPopover(false)} /> ); diff --git a/src/pages/Account.scss b/src/pages/Account.scss index e3c27619..c9db400c 100644 --- a/src/pages/Account.scss +++ b/src/pages/Account.scss @@ -2,5 +2,5 @@ img { max-width: 140px; border-radius: 50%; - } + } } \ No newline at end of file diff --git a/src/pages/Login.scss b/src/pages/Login.scss index 4e58500d..c88beeec 100644 --- a/src/pages/Login.scss +++ b/src/pages/Login.scss @@ -4,13 +4,13 @@ min-height: 200px; text-align: center; } - + .login-logo img { max-width: 150px; } - + .list { margin-bottom: 0; } - + } \ No newline at end of file diff --git a/src/pages/MainTabs.tsx b/src/pages/MainTabs.tsx index 1e576eba..5c7cb157 100644 --- a/src/pages/MainTabs.tsx +++ b/src/pages/MainTabs.tsx @@ -17,9 +17,9 @@ const MainTabs: React.FC = () => { - {/* + {/* Using the render method prop cuts down the number of renders your components will have due to route changes. - Use the component prop when your component depends on the RouterComponentProps passed in automatically. + Use the component prop when your component depends on the RouterComponentProps passed in automatically. */} } exact={true} /> } exact={true} /> diff --git a/src/pages/MapView.scss b/src/pages/MapView.scss index 4dc8071a..6e658ff7 100644 --- a/src/pages/MapView.scss +++ b/src/pages/MapView.scss @@ -1,18 +1,18 @@ #map-view { .map-canvas { position: absolute; - + height: 100%; width: 100%; - + background-color: transparent; - + opacity: 0; transition: opacity 250ms ease-in; } - + .show-map { opacity: 1; } - + } \ No newline at end of file diff --git a/src/pages/SessionDetail.tsx b/src/pages/SessionDetail.tsx index c91b03b6..924a3cdf 100644 --- a/src/pages/SessionDetail.tsx +++ b/src/pages/SessionDetail.tsx @@ -30,12 +30,12 @@ const SessionDetail: React.FC = ({ session, addFavorite, rem } const isFavorite = favoriteSessions.indexOf(session.id) > -1; - - const toggleFavorite = () => { + + const toggleFavorite = () => { isFavorite ? removeFavorite(session.id) : addFavorite(session.id); }; const shareSession = () => { }; - const sessionClick = (text: string) => { + const sessionClick = (text: string) => { console.log(`Clicked ${text}`); }; diff --git a/src/pages/SpeakerDetail.tsx b/src/pages/SpeakerDetail.tsx index a9e7eb72..076e1dac 100644 --- a/src/pages/SpeakerDetail.tsx +++ b/src/pages/SpeakerDetail.tsx @@ -18,7 +18,7 @@ interface DispatchProps {}; interface SpeakerDetailProps extends OwnProps, StateProps, DispatchProps {}; const SpeakerDetail: React.FC = ({ speaker }) => { - + if (!speaker) { return
Speaker not found
} diff --git a/src/pages/SpeakerList.scss b/src/pages/SpeakerList.scss index 12fcf270..c83cd1a2 100644 --- a/src/pages/SpeakerList.scss +++ b/src/pages/SpeakerList.scss @@ -20,5 +20,5 @@ .speaker-card ion-card-content { flex: 1 1 auto; padding: 0; - } + } } \ No newline at end of file diff --git a/src/pages/Support.tsx b/src/pages/Support.tsx index 3e77bc57..34fdebc9 100644 --- a/src/pages/Support.tsx +++ b/src/pages/Support.tsx @@ -66,9 +66,9 @@ const Support: React.FC = () => { - + - + = ({ history, setHasSeenTutorial }) => { const [showSkip, setShowSkip] = useState(true); const slideRef = useRef(null); - - const startApp = async () => { + + const startApp = async () => { await setHasSeenTutorial(true); history.push('/tabs/schedule', { direction: 'none' }); }; - const handleSlideChangeStart = () => { + const handleSlideChangeStart = () => { slideRef.current!.isEnd().then(isEnd => setShowSkip(!isEnd)); };