ionic-team · AGS1130 · Dec 28, 2019
diff --git 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
 }
diff --git a/public/index.html b/public/index.html
@@ -24,6 +24,6 @@
   <body>
     <div id="root"></div>
     <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAmAwkv8-x2I--ne-NtA3C_4E_-xLCsFJs" async defer></script>
-  </body>  
+  </body>
 
 </html>
diff --git a/src/components/Map.tsx b/src/components/Map.tsx
@@ -33,13 +33,13 @@ const Map: React.FC<MapProps> = ({ mapCenter, locations }) => {
         let infoWindow = new google.maps.InfoWindow({
           content: `<h5>${markerData.name}</h5>`
         });
-  
+
         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
@@ -14,7 +14,7 @@ interface SessionListItemProps {
 
 const SessionListItem: React.FC<SessionListItemProps> = ({ isFavorite, onAddFavorite, onRemoveFavorite, onShowAlert, session, listType }) => {
   const ionItemSlidingRef = useRef<HTMLIonItemSlidingElement>(null)
-  
+
   const dismissAlert = () => {
     ionItemSlidingRef.current && ionItemSlidingRef.current.close();
   }

diff --git 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(
     <>
       <IonLoading

diff --git a/src/data/sessions/sessions.actions.ts b/src/data/sessions/sessions.actions.ts
@@ -30,13 +30,13 @@ export const removeFavorite = (sessionId: number) => ({
 } 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
@@ -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
@@ -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;
-  }  
+  }
 }
diff --git a/src/pages/About.tsx b/src/pages/About.tsx
@@ -72,7 +72,7 @@ const About: React.FC<AboutProps> = () => {
         event={popoverEvent}
         onDidDismiss={() => setShowPopover(false)}
       >
-        <AboutPopover dismiss={() => setShowPopover(false)} /> 
+        <AboutPopover dismiss={() => setShowPopover(false)} />
       </IonPopover>
     </IonPage>
   );

diff --git a/src/pages/Account.scss b/src/pages/Account.scss
@@ -2,5 +2,5 @@
   img {
     max-width: 140px;
     border-radius: 50%;
-  }  
+  }
 }
diff --git 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;
   }
-  
+
 }
diff --git a/src/pages/MainTabs.tsx b/src/pages/MainTabs.tsx
@@ -17,9 +17,9 @@ const MainTabs: React.FC<MainTabsProps> = () => {
     <IonTabs>
       <IonRouterOutlet>
         <Redirect exact path="/tabs" to="/tabs/schedule" />
-        {/* 
+        {/*
           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.
         */}
         <Route path="/tabs/schedule" render={() => <SchedulePage />} exact={true} />
         <Route path="/tabs/speakers" render={() => <SpeakerList />} exact={true} />

diff --git 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;
   }
-  
+
 }
diff --git a/src/pages/SessionDetail.tsx b/src/pages/SessionDetail.tsx
@@ -30,12 +30,12 @@ const SessionDetail: React.FC<SessionDetailProps> = ({ 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
@@ -18,7 +18,7 @@ interface DispatchProps {};
 interface SpeakerDetailProps extends OwnProps, StateProps, DispatchProps {};
 
 const SpeakerDetail: React.FC<SpeakerDetailProps> = ({ speaker }) => {
-  
+
   if (!speaker) {
     return <div>Speaker not found</div>
   }

diff --git 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;
-  }  
+  }
 }
diff --git a/src/pages/Support.tsx b/src/pages/Support.tsx
@@ -66,9 +66,9 @@ const Support: React.FC<SupportProps> = () => {
             </IonCol>
           </IonRow>
         </form>
-       
+
       </IonContent>
-     
+
       <IonToast
         isOpen={showToast}
         duration={3000}

diff --git a/src/pages/Tutorial.scss b/src/pages/Tutorial.scss
@@ -4,35 +4,35 @@
     --background: transparent;
     --border-color: transparent;
   }
-  
+
   .swiper-slide {
     display: block;
   }
-  
+
   .slide-title {
     margin-top: 2.8rem;
   }
-  
+
   .slide-image {
     max-height: 50%;
     max-width: 60%;
     margin: 36px 0;
     pointer-events: none;
   }
-  
+
   b {
     font-weight: 500;
   }
-  
+
   p {
     padding: 0 40px;
     font-size: 14px;
     line-height: 1.5;
     color: var(--ion-color-step-600, #60646b);
-  
+
     b {
       color: var(--ion-text-color, #000000);
     }
   }
-  
+
 }
diff --git a/src/pages/Tutorial.tsx b/src/pages/Tutorial.tsx
@@ -17,13 +17,13 @@ interface TutorialProps extends OwnProps, DispatchProps { };
 const Tutorial: React.FC<TutorialProps> = ({ history, setHasSeenTutorial }) => {
   const [showSkip, setShowSkip] = useState(true);
   const slideRef = useRef<HTMLIonSlidesElement>(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));
   };
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,6 @@ @@
       <body>
         <div id="root"></div>
         <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAmAwkv8-x2I--ne-NtA3C_4E_-xLCsFJs" async defer></script>
-      </body>
+      </body>
     </html>