{session.name}
@@ -101,10 +84,7 @@ const SessionListItem: React.FC{session.name}
{/* Instead of loading an image each time the select changes, use opacity to transition them */}
-
-
-
-
+
+
+
+
About
- The Ionic Conference is a one-day event happening on{' '} - {displayDate(conferenceDate, 'MMM dd, yyyy')}, featuring talks from - the Ionic team. The conference focuses on building applications with - Ionic Framework, including topics such as app migration to the - latest version, React best practices, Webpack, Sass, and other - technologies commonly used in the Ionic ecosystem. Tickets are - completely sold out, and we're expecting over 1,000 developers — - making this the largest Ionic conference to date! + The Ionic Conference is a one-day event happening on {displayDate(conferenceDate, 'MMM dd, yyyy')}, + featuring talks from the Ionic team. The conference focuses on building applications with Ionic Framework, + including topics such as app migration to the latest version, React best practices, Webpack, Sass, and other + technologies commonly used in the Ionic ecosystem. Tickets are completely sold out, and we're expecting over + 1,000 developers — making this the largest Ionic conference to date!
Details
@@ -118,9 +96,7 @@ const About: React.FC
- 
+
- clicked('Update Picture')}>
- Update Picture
-
- setShowAlert(true)}>
- Change Username
-
- clicked('Change Password')}>
- Change Password
-
+ clicked('Update Picture')}>Update Picture
+ setShowAlert(true)}>Change Username
+ clicked('Change Password')}>Change Password
Support
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 9ef8e794..37aa9ea6 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -1,4 +1,3 @@
-import React, { useState } from 'react';
import {
IonHeader,
IonToolbar,
@@ -13,19 +12,18 @@ import {
IonInput,
useIonRouter,
} from '@ionic/react';
+import React, { useState } from 'react';
+
import './Login.scss';
-import { setIsLoggedIn, setUsername } from '../data/user/user.actions';
import { connect } from '../data/connect';
+import { setIsLoggedIn, setUsername } from '../data/user/user.actions';
interface LoginProps {
setIsLoggedIn: typeof setIsLoggedIn;
setUsername: typeof setUsername;
}
-const Login: React.FC = ({
- setIsLoggedIn,
- setUsername: setUsernameAction,
-}) => {
+const Login: React.FC = ({ setIsLoggedIn, setUsername: setUsernameAction }) => {
const router = useIonRouter();
const [login, setLogin] = useState({ username: '', password: '' });
const [submitted, setSubmitted] = useState(false);
@@ -71,12 +69,8 @@ const Login: React.FC = ({
type="text"
spellCheck={false}
autocapitalize="off"
- errorText={
- submitted && !login.username ? 'Username is required' : ''
- }
- onIonInput={(e) =>
- setLogin({ ...login, username: e.detail.value! })
- }
+ errorText={submitted && !login.username ? 'Username is required' : ''}
+ onIonInput={(e) => setLogin({ ...login, username: e.detail.value! })}
required
/>
@@ -87,12 +81,8 @@ const Login: React.FC = ({
value={login.password}
name="password"
type="password"
- errorText={
- submitted && !login.password ? 'Password is required' : ''
- }
- onIonInput={(e) =>
- setLogin({ ...login, password: e.detail.value! })
- }
+ errorText={submitted && !login.password ? 'Password is required' : ''}
+ onIonInput={(e) => setLogin({ ...login, password: e.detail.value! })}
required
/>
diff --git a/src/pages/MainTabs.tsx b/src/pages/MainTabs.tsx
index e6fd79d5..69864ffe 100644
--- a/src/pages/MainTabs.tsx
+++ b/src/pages/MainTabs.tsx
@@ -1,20 +1,14 @@
+import { IonTabs, IonRouterOutlet, IonTabBar, IonTabButton, IonIcon, IonLabel } from '@ionic/react';
+import { calendar, location, informationCircle, people } from 'ionicons/icons';
import React from 'react';
-import {
- IonTabs,
- IonRouterOutlet,
- IonTabBar,
- IonTabButton,
- IonIcon,
- IonLabel,
-} from '@ionic/react';
import { Route, Navigate } from 'react-router-dom';
-import { calendar, location, informationCircle, people } from 'ionicons/icons';
+
+import About from './About';
+import MapView from './MapView';
import SchedulePage from './SchedulePage';
-import SpeakerList from './SpeakerList';
-import SpeakerDetail from './SpeakerDetail';
import SessionDetail from './SessionDetail';
-import MapView from './MapView';
-import About from './About';
+import SpeakerDetail from './SpeakerDetail';
+import SpeakerList from './SpeakerList';
interface MainTabsProps {}
diff --git a/src/pages/MapView.tsx b/src/pages/MapView.tsx
index 693b1563..fb04b5ac 100644
--- a/src/pages/MapView.tsx
+++ b/src/pages/MapView.tsx
@@ -1,20 +1,14 @@
+import { IonContent, IonHeader, IonPage, IonTitle, IonToolbar, useIonViewDidEnter } from '@ionic/react';
+import L from 'leaflet';
+import markerIconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';
+import markerIconUrl from 'leaflet/dist/images/marker-icon.png';
+import markerShadowUrl from 'leaflet/dist/images/marker-shadow.png';
import React, { useEffect, useRef } from 'react';
-import {
- IonContent,
- IonHeader,
- IonPage,
- IonTitle,
- IonToolbar,
- useIonViewDidEnter,
-} from '@ionic/react';
-import { Location } from '../models/Location';
+
import { connect } from '../data/connect';
import { loadLocations } from '../data/locations/locations.actions';
-import L from 'leaflet';
+import type { Location } from '../models/Location';
import 'leaflet/dist/leaflet.css';
-import markerIconUrl from 'leaflet/dist/images/marker-icon.png';
-import markerIconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';
-import markerShadowUrl from 'leaflet/dist/images/marker-shadow.png';
import './MapView.scss';
// Fix for marker icons in Vite
@@ -31,10 +25,7 @@ interface DispatchProps {
loadLocations: typeof loadLocations;
}
-const MapView: React.FC = ({
- locations,
- loadLocations,
-}) => {
+const MapView: React.FC = ({ locations, loadLocations }) => {
const mapCanvas = useRef(null);
const map = useRef(null);
const markers = useRef([]);
@@ -63,9 +54,7 @@ const MapView: React.FC = ({
// Add markers for all locations
locations.forEach((location: Location) => {
- const marker = L.marker([location.lat, location.lng])
- .addTo(map.current!)
- .bindPopup(`${location.name}`);
+ const marker = L.marker([location.lat, location.lng]).addTo(map.current!).bindPopup(`${location.name}`);
markers.current.push(marker);
});
diff --git a/src/pages/SchedulePage.tsx b/src/pages/SchedulePage.tsx
index 25751c64..2a41e99b 100644
--- a/src/pages/SchedulePage.tsx
+++ b/src/pages/SchedulePage.tsx
@@ -1,5 +1,3 @@
-import React, { useState, useRef } from 'react';
-
import {
IonToolbar,
IonContent,
@@ -20,17 +18,15 @@ import {
getConfig,
} from '@ionic/react';
import { options, search } from 'ionicons/icons';
+import React, { useState, useRef } from 'react';
import SessionList from '../components/SessionList';
import SessionListFilter from '../components/SessionListFilter';
-import './SchedulePage.scss';
-
import ShareSocialFab from '../components/ShareSocialFab';
-
-import * as selectors from '../data/selectors';
import { connect } from '../data/connect';
+import * as selectors from '../data/selectors';
import { setSearchText } from '../data/sessions/sessions.actions';
-import { Schedule } from '../models/Schedule';
+import type { Schedule } from '../models/Schedule';
interface OwnProps {}
@@ -46,19 +42,14 @@ interface DispatchProps {
type SchedulePageProps = OwnProps & StateProps & DispatchProps;
-const SchedulePage: React.FC = ({
- favoritesSchedule,
- schedule,
- setSearchText,
- mode,
-}) => {
+const SchedulePage: React.FC = ({ favoritesSchedule, schedule, setSearchText, mode }) => {
const [segment, setSegment] = useState<'all' | 'favorites'>('all');
const [showSearchbar, setShowSearchbar] = useState(false);
const [showFilterModal, setShowFilterModal] = useState(false);
const ionRefresherRef = useRef(null);
const [showCompleteToast, setShowCompleteToast] = useState(false);
- const pageRef = useRef(null);
+ const [pageElement, setPageElement] = useState(null);
const ios = mode === 'ios';
@@ -70,7 +61,7 @@ const SchedulePage: React.FC = ({
};
return (
-
+
{!showSearchbar && (
@@ -79,10 +70,7 @@ const SchedulePage: React.FC = ({
)}
{ios && (
- setSegment(e.detail.value as any)}
- >
+ setSegment(e.detail.value as any)}>
All
Favorites
@@ -105,11 +93,7 @@ const SchedulePage: React.FC = ({
)}
{!showSearchbar && (
setShowFilterModal(true)}>
- {mode === 'ios' ? (
- 'Filter'
- ) : (
-
)}
@@ -117,10 +101,7 @@ const SchedulePage: React.FC = ({
{!ios && (
- setSegment(e.detail.value as any)}
- >
+ setSegment(e.detail.value as any)}>
All
Favorites
@@ -141,11 +122,7 @@ const SchedulePage: React.FC = ({
-
+
@@ -156,22 +133,14 @@ const SchedulePage: React.FC = ({
onDidDismiss={() => setShowCompleteToast(false)}
/>
- setShowFilterModal(false)}
- presentingElement={pageRef.current!}
+ presentingElement={pageElement ?? undefined}
>
setShowFilterModal(false)} />
diff --git a/src/pages/SessionDetail.tsx b/src/pages/SessionDetail.tsx
index 1ae596c1..2e4cffca 100644
--- a/src/pages/SessionDetail.tsx
+++ b/src/pages/SessionDetail.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import {
IonHeader,
IonToolbar,
@@ -13,13 +12,15 @@ import {
IonItem,
IonLabel,
} from '@ionic/react';
-import { connect } from '../data/connect';
+import { starOutline, star, share, cloudDownload } from 'ionicons/icons';
+import React from 'react';
import { useParams } from 'react-router-dom';
+
+import { connect } from '../data/connect';
import * as selectors from '../data/selectors';
-import { starOutline, star, share, cloudDownload } from 'ionicons/icons';
-import './SessionDetail.scss';
import { addFavorite, removeFavorite } from '../data/sessions/sessions.actions';
-import { Session } from '../models/Schedule';
+import type { Session } from '../models/Schedule';
+import './SessionDetail.scss';
interface OwnProps {
id?: string;
@@ -37,12 +38,7 @@ interface DispatchProps {
type SessionDetailProps = OwnProps & StateProps & DispatchProps;
-const SessionDetail: React.FC = ({
- session,
- addFavorite,
- removeFavorite,
- favoriteSessions,
-}) => {
+const SessionDetail: React.FC = ({ session, addFavorite, removeFavorite, favoriteSessions }) => {
if (!session) {
return = ({
= ({
sessionClick('download video')} button>
Download Video
-
sessionClick('leave feedback')} button>
Leave Feedback
diff --git a/src/pages/Signup.tsx b/src/pages/Signup.tsx
index 23370afa..0932b9ad 100644
--- a/src/pages/Signup.tsx
+++ b/src/pages/Signup.tsx
@@ -1,4 +1,3 @@
-import React, { useState } from 'react';
import {
IonHeader,
IonToolbar,
@@ -13,19 +12,18 @@ import {
IonInput,
useIonRouter,
} from '@ionic/react';
+import React, { useState } from 'react';
+
import './Signup.scss';
-import { setIsLoggedIn, setUsername } from '../data/user/user.actions';
import { connect } from '../data/connect';
+import { setIsLoggedIn, setUsername } from '../data/user/user.actions';
interface SignupProps {
setIsLoggedIn: typeof setIsLoggedIn;
setUsername: typeof setUsername;
}
-const Signup: React.FC = ({
- setIsLoggedIn,
- setUsername: setUsernameAction,
-}) => {
+const Signup: React.FC = ({ setIsLoggedIn, setUsername: setUsernameAction }) => {
const router = useIonRouter();
const [signup, setSignup] = useState({ username: '', password: '' });
const [submitted, setSubmitted] = useState(false);
@@ -65,12 +63,8 @@ const Signup: React.FC = ({
value={signup.username}
name="username"
type="text"
- errorText={
- submitted && !signup.username ? 'Username is required' : ''
- }
- onIonInput={(e) =>
- setSignup({ ...signup, username: e.detail.value! })
- }
+ errorText={submitted && !signup.username ? 'Username is required' : ''}
+ onIonInput={(e) => setSignup({ ...signup, username: e.detail.value! })}
required
/>
@@ -81,12 +75,8 @@ const Signup: React.FC = ({
value={signup.password}
name="password"
type="password"
- errorText={
- submitted && !signup.password ? 'Password is required' : ''
- }
- onIonInput={(e) =>
- setSignup({ ...signup, password: e.detail.value! })
- }
+ errorText={submitted && !signup.password ? 'Password is required' : ''}
+ onIonInput={(e) => setSignup({ ...signup, password: e.detail.value! })}
required
/>
diff --git a/src/pages/SpeakerDetail.tsx b/src/pages/SpeakerDetail.tsx
index 82ef54a6..00b1eaec 100644
--- a/src/pages/SpeakerDetail.tsx
+++ b/src/pages/SpeakerDetail.tsx
@@ -1,9 +1,4 @@
-import React, { useState } from 'react';
-import { useParams } from 'react-router-dom';
-
-import './SpeakerDetail.scss';
-
-import { ActionSheetButton } from '@ionic/core';
+import type { ActionSheetButton } from '@ionic/core';
import {
IonActionSheet,
IonChip,
@@ -26,11 +21,13 @@ import {
shareOutline,
shareSharp,
} from 'ionicons/icons';
+import React, { useState } from 'react';
+import { useParams } from 'react-router-dom';
import { connect } from '../data/connect';
import * as selectors from '../data/selectors';
-
-import { Speaker } from '../models/Speaker';
+import type { Speaker } from '../models/Speaker';
+import './SpeakerDetail.scss';
interface OwnProps {
id?: string;
@@ -46,9 +43,7 @@ interface SpeakerDetailProps extends OwnProps, StateProps, DispatchProps {}
const SpeakerDetail: React.FC = ({ speaker }) => {
const [showActionSheet, setShowActionSheet] = useState(false);
- const [actionSheetButtons, setActionSheetButtons] = useState<
- ActionSheetButton[]
- >([]);
+ const [actionSheetButtons, setActionSheetButtons] = useState([]);
const [actionSheetHeader, setActionSheetHeader] = useState('');
function openSpeakerShare(speaker: Speaker) {
@@ -114,18 +109,10 @@ const SpeakerDetail: React.FC = ({ speaker }) => {
openContact(speaker)}>
-
openSpeakerShare(speaker)}>
-
@@ -141,32 +128,17 @@ const SpeakerDetail: React.FC = ({ speaker }) => {
-
- openExternalUrl(`https://twitter.com/${speaker.twitter}`)
- }
- >
+ openExternalUrl(`https://twitter.com/${speaker.twitter}`)}>
Twitter
-
- openExternalUrl('https://github.com/ionic-team/ionic-framework')
- }
- >
+ openExternalUrl('https://github.com/ionic-team/ionic-framework')}>
GitHub
-
- openExternalUrl('https://instagram.com/ionicframework')
- }
- >
+ openExternalUrl('https://instagram.com/ionicframework')}>
Instagram
diff --git a/src/pages/SpeakerList.tsx b/src/pages/SpeakerList.tsx
index 9e6f3bc9..28676829 100644
--- a/src/pages/SpeakerList.tsx
+++ b/src/pages/SpeakerList.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import {
IonHeader,
IonToolbar,
@@ -11,11 +10,13 @@ import {
IonRow,
IonCol,
} from '@ionic/react';
+import React from 'react';
+
import SpeakerItem from '../components/SpeakerItem';
-import { Speaker } from '../models/Speaker';
-import { Session } from '../models/Schedule';
import { connect } from '../data/connect';
import * as selectors from '../data/selectors';
+import type { Session } from '../models/Schedule';
+import type { Speaker } from '../models/Speaker';
import './SpeakerList.scss';
interface OwnProps {}
@@ -29,10 +30,7 @@ interface DispatchProps {}
interface SpeakerListProps extends OwnProps, StateProps, DispatchProps {}
-const SpeakerList: React.FC = ({
- speakers,
- speakerSessions,
-}) => {
+const SpeakerList: React.FC = ({ speakers, speakerSessions }) => {
return (
@@ -55,11 +53,7 @@ const SpeakerList: React.FC = ({
{speakers.map((speaker) => (
-
))}
diff --git a/src/pages/Support.tsx b/src/pages/Support.tsx
index ac71d6bd..623e4a04 100644
--- a/src/pages/Support.tsx
+++ b/src/pages/Support.tsx
@@ -1,4 +1,3 @@
-import React, { useState } from 'react';
import {
IonHeader,
IonToolbar,
@@ -14,6 +13,7 @@ import {
useIonToast,
useIonViewWillEnter,
} from '@ionic/react';
+import React, { useState } from 'react';
import './Support.scss';
const Support: React.FC = () => {
@@ -67,11 +67,7 @@ const Support: React.FC = () => {
value={supportMessage}
name="supportQuestion"
rows={6}
- errorText={
- submitted && !supportMessage
- ? 'Support message is required'
- : ''
- }
+ errorText={submitted && !supportMessage ? 'Support message is required' : ''}
onIonInput={(e) => setSupportMessage(e.detail.value!)}
required
/>
diff --git a/src/pages/Tutorial.tsx b/src/pages/Tutorial.tsx
index 87278120..c23ab673 100644
--- a/src/pages/Tutorial.tsx
+++ b/src/pages/Tutorial.tsx
@@ -1,4 +1,3 @@
-import React, { useRef, useEffect } from 'react';
import {
IonContent,
IonPage,
@@ -11,10 +10,12 @@ import {
useIonRouter,
} from '@ionic/react';
import { arrowForward } from 'ionicons/icons';
+import React, { useRef } from 'react';
+
+import { connect } from '../data/connect';
import { setMenuEnabled } from '../data/sessions/sessions.actions';
import { setHasSeenTutorial } from '../data/user/user.actions';
import './Tutorial.scss';
-import { connect } from '../data/connect';
interface OwnProps {}
interface DispatchProps {
@@ -24,10 +25,7 @@ interface DispatchProps {
interface TutorialProps extends OwnProps, DispatchProps {}
-const Tutorial: React.FC = ({
- setHasSeenTutorial,
- setMenuEnabled,
-}) => {
+const Tutorial: React.FC = ({ setHasSeenTutorial, setMenuEnabled }) => {
const router = useIonRouter();
const sliderRef = useRef(null);
@@ -63,55 +61,36 @@ const Tutorial: React.FC = ({
- 
+
- 
+
Continue
diff --git a/src/serviceWorker.ts b/src/serviceWorker.ts
index bdab413f..515519a3 100644
--- a/src/serviceWorker.ts
+++ b/src/serviceWorker.ts
@@ -12,12 +12,10 @@
const isLocalhost = Boolean(
window.location.hostname === 'localhost' ||
- // [::1] is the IPv6 localhost address.
- window.location.hostname === '[::1]' ||
- // 127.0.0.1/8 is considered localhost for IPv4.
- window.location.hostname.match(
- /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
- )
+ // [::1] is the IPv6 localhost address.
+ window.location.hostname === '[::1]' ||
+ // 127.0.0.1/8 is considered localhost for IPv4.
+ window.location.hostname.match(/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/),
);
type Config = {
@@ -28,10 +26,7 @@ type Config = {
export function register(config?: Config) {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
// The URL constructor is available in all browsers that support SW.
- const publicUrl = new URL(
- (process as { env: { [key: string]: string } }).env.PUBLIC_URL,
- window.location.href
- );
+ const publicUrl = new URL((process as { env: { [key: string]: string } }).env.PUBLIC_URL, window.location.href);
if (publicUrl.origin !== window.location.origin) {
// Our service worker won't work if PUBLIC_URL is on a different origin
// from what our page is served on. This might happen if a CDN is used to
@@ -51,7 +46,7 @@ export function register(config?: Config) {
navigator.serviceWorker.ready.then(() => {
console.log(
'This web app is being served cache-first by a service ' +
- 'worker. To learn more, visit https://bit.ly/CRA-PWA'
+ 'worker. To learn more, visit https://bit.ly/CRA-PWA',
);
});
} else {
@@ -79,7 +74,7 @@ function registerValidSW(swUrl: string, config?: Config) {
// content until all client tabs are closed.
console.log(
'New content is available and will be used when all ' +
- 'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
+ 'tabs for this page are closed. See https://bit.ly/CRA-PWA.',
);
// Execute callback
@@ -112,10 +107,7 @@ function checkValidServiceWorker(swUrl: string, config?: Config) {
.then((response) => {
// Ensure service worker exists, and that we really are getting a JS file.
const contentType = response.headers.get('content-type');
- if (
- response.status === 404 ||
- (contentType != null && contentType.indexOf('javascript') === -1)
- ) {
+ if (response.status === 404 || (contentType != null && contentType.indexOf('javascript') === -1)) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then((registration) => {
registration.unregister().then(() => {
@@ -128,9 +120,7 @@ function checkValidServiceWorker(swUrl: string, config?: Config) {
}
})
.catch(() => {
- console.log(
- 'No internet connection found. App is running in offline mode.'
- );
+ console.log('No internet connection found. App is running in offline mode.');
});
}
diff --git a/src/util/types.ts b/src/util/types.ts
index 592d86cb..2e2af957 100644
--- a/src/util/types.ts
+++ b/src/util/types.ts
@@ -5,8 +5,6 @@ export interface DispatchObject {
type PromiseResolveValue = T extends Promise ? R : T;
type EffectType any> = ReturnType>;
-type EffectReturnValue any> = PromiseResolveValue<
- EffectType
->;
+type EffectReturnValue any> = PromiseResolveValue>;
export type ActionType any> =
ReturnType extends DispatchObject ? ReturnType : EffectReturnValue;
diff --git a/vite.config.ts b/vite.config.ts
index 68a89113..b847c572 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,15 +1,15 @@
-import react from '@vitejs/plugin-react'
-import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react';
+import { defineConfig } from 'vite';
// https://vitejs.dev/config/
export default defineConfig({
plugins: [react()],
server: {
- port: 3000
+ port: 3000,
},
define: {
'process.env': process.env,
- __HMR_CONFIG_NAME__: JSON.stringify('vite')
+ __HMR_CONFIG_NAME__: JSON.stringify('vite'),
},
css: {
preprocessorOptions: {
@@ -17,5 +17,5 @@ export default defineConfig({
api: 'modern',
},
},
- }
-})
+ },
+});
From 5f4a7383cf1a2e7f8a608d92d2ee1cf140a2ebd7 Mon Sep 17 00:00:00 2001
From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>
Date: Fri, 23 Oct 2026 13:34:49 -0400
Subject: [PATCH 02/10] fix(lint): restore stylesheet imports and their
original order
---
src/App.tsx | 31 ++++++++++++++++---------------
src/pages/About.tsx | 8 ++++----
src/pages/MainTabs.tsx | 14 +++++++-------
src/pages/MapView.tsx | 14 +++++++-------
src/pages/SchedulePage.tsx | 9 +++++++--
src/pages/SessionDetail.tsx | 10 +++++-----
src/pages/SpeakerDetail.tsx | 10 +++++++---
src/pages/Tutorial.tsx | 6 +++---
8 files changed, 56 insertions(+), 46 deletions(-)
diff --git a/src/App.tsx b/src/App.tsx
index 1dcd6612..d005a69b 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,22 +1,10 @@
-import { IonApp, IonRouterOutlet, IonSplitPane, setupIonicReact } from '@ionic/react';
-import { IonReactRouter } from '@ionic/react-router';
+/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
import React, { useEffect } from 'react';
import { Route } from 'react-router-dom';
+import { IonApp, IonRouterOutlet, IonSplitPane, setupIonicReact } from '@ionic/react';
+import { IonReactRouter } from '@ionic/react-router';
-import HomeOrTutorial from './components/HomeOrTutorial';
import Menu from './components/Menu';
-import RedirectToLogin from './components/RedirectToLogin';
-import { AppContextProvider } from './data/AppContext';
-import { connect } from './data/connect';
-import { loadConfData } from './data/sessions/sessions.actions';
-import { setIsLoggedIn, setUsername, loadUserData } from './data/user/user.actions';
-import type { Schedule } from './models/Schedule';
-import Account from './pages/Account';
-import Login from './pages/Login';
-import MainTabs from './pages/MainTabs';
-import Signup from './pages/Signup';
-import Support from './pages/Support';
-import Tutorial from './pages/Tutorial';
/* Core CSS required for Ionic components to work properly */
import '@ionic/react/css/core.css';
@@ -53,6 +41,19 @@ import 'leaflet/dist/leaflet.css';
/* Global styles */
import './App.scss';
+import MainTabs from './pages/MainTabs';
+import { connect } from './data/connect';
+import { AppContextProvider } from './data/AppContext';
+import { loadConfData } from './data/sessions/sessions.actions';
+import { setIsLoggedIn, setUsername, loadUserData } from './data/user/user.actions';
+import Account from './pages/Account';
+import Login from './pages/Login';
+import Signup from './pages/Signup';
+import Support from './pages/Support';
+import Tutorial from './pages/Tutorial';
+import HomeOrTutorial from './components/HomeOrTutorial';
+import type { Schedule } from './models/Schedule';
+import RedirectToLogin from './components/RedirectToLogin';
setupIonicReact();
diff --git a/src/pages/About.tsx b/src/pages/About.tsx
index eb3d0d3c..3e339523 100644
--- a/src/pages/About.tsx
+++ b/src/pages/About.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
+import React, { useState } from 'react';
import {
IonHeader,
IonToolbar,
@@ -16,12 +18,10 @@ import {
IonPopover,
IonText,
} from '@ionic/react';
-import { format, parseISO } from 'date-fns';
+import './About.scss';
import { ellipsisHorizontal, ellipsisVertical } from 'ionicons/icons';
-import React, { useState } from 'react';
-
import AboutPopover from '../components/AboutPopover';
-import './About.scss';
+import { format, parseISO } from 'date-fns';
interface AboutProps {}
diff --git a/src/pages/MainTabs.tsx b/src/pages/MainTabs.tsx
index 69864ffe..ed9846c4 100644
--- a/src/pages/MainTabs.tsx
+++ b/src/pages/MainTabs.tsx
@@ -1,14 +1,14 @@
-import { IonTabs, IonRouterOutlet, IonTabBar, IonTabButton, IonIcon, IonLabel } from '@ionic/react';
-import { calendar, location, informationCircle, people } from 'ionicons/icons';
+/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
import React from 'react';
+import { IonTabs, IonRouterOutlet, IonTabBar, IonTabButton, IonIcon, IonLabel } from '@ionic/react';
import { Route, Navigate } from 'react-router-dom';
-
-import About from './About';
-import MapView from './MapView';
+import { calendar, location, informationCircle, people } from 'ionicons/icons';
import SchedulePage from './SchedulePage';
-import SessionDetail from './SessionDetail';
-import SpeakerDetail from './SpeakerDetail';
import SpeakerList from './SpeakerList';
+import SpeakerDetail from './SpeakerDetail';
+import SessionDetail from './SessionDetail';
+import MapView from './MapView';
+import About from './About';
interface MainTabsProps {}
diff --git a/src/pages/MapView.tsx b/src/pages/MapView.tsx
index fb04b5ac..f0c2c906 100644
--- a/src/pages/MapView.tsx
+++ b/src/pages/MapView.tsx
@@ -1,14 +1,14 @@
-import { IonContent, IonHeader, IonPage, IonTitle, IonToolbar, useIonViewDidEnter } from '@ionic/react';
-import L from 'leaflet';
-import markerIconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';
-import markerIconUrl from 'leaflet/dist/images/marker-icon.png';
-import markerShadowUrl from 'leaflet/dist/images/marker-shadow.png';
+/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
import React, { useEffect, useRef } from 'react';
-
+import { IonContent, IonHeader, IonPage, IonTitle, IonToolbar, useIonViewDidEnter } from '@ionic/react';
+import type { Location } from '../models/Location';
import { connect } from '../data/connect';
import { loadLocations } from '../data/locations/locations.actions';
-import type { Location } from '../models/Location';
+import L from 'leaflet';
import 'leaflet/dist/leaflet.css';
+import markerIconUrl from 'leaflet/dist/images/marker-icon.png';
+import markerIconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';
+import markerShadowUrl from 'leaflet/dist/images/marker-shadow.png';
import './MapView.scss';
// Fix for marker icons in Vite
diff --git a/src/pages/SchedulePage.tsx b/src/pages/SchedulePage.tsx
index 2a41e99b..168aec23 100644
--- a/src/pages/SchedulePage.tsx
+++ b/src/pages/SchedulePage.tsx
@@ -1,3 +1,6 @@
+/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
+import React, { useState, useRef } from 'react';
+
import {
IonToolbar,
IonContent,
@@ -18,13 +21,15 @@ import {
getConfig,
} from '@ionic/react';
import { options, search } from 'ionicons/icons';
-import React, { useState, useRef } from 'react';
import SessionList from '../components/SessionList';
import SessionListFilter from '../components/SessionListFilter';
+import './SchedulePage.scss';
+
import ShareSocialFab from '../components/ShareSocialFab';
-import { connect } from '../data/connect';
+
import * as selectors from '../data/selectors';
+import { connect } from '../data/connect';
import { setSearchText } from '../data/sessions/sessions.actions';
import type { Schedule } from '../models/Schedule';
diff --git a/src/pages/SessionDetail.tsx b/src/pages/SessionDetail.tsx
index 2e4cffca..60442e4d 100644
--- a/src/pages/SessionDetail.tsx
+++ b/src/pages/SessionDetail.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
+import React from 'react';
import {
IonHeader,
IonToolbar,
@@ -12,15 +14,13 @@ import {
IonItem,
IonLabel,
} from '@ionic/react';
-import { starOutline, star, share, cloudDownload } from 'ionicons/icons';
-import React from 'react';
-import { useParams } from 'react-router-dom';
-
import { connect } from '../data/connect';
+import { useParams } from 'react-router-dom';
import * as selectors from '../data/selectors';
+import { starOutline, star, share, cloudDownload } from 'ionicons/icons';
+import './SessionDetail.scss';
import { addFavorite, removeFavorite } from '../data/sessions/sessions.actions';
import type { Session } from '../models/Schedule';
-import './SessionDetail.scss';
interface OwnProps {
id?: string;
diff --git a/src/pages/SpeakerDetail.tsx b/src/pages/SpeakerDetail.tsx
index 00b1eaec..497be2b0 100644
--- a/src/pages/SpeakerDetail.tsx
+++ b/src/pages/SpeakerDetail.tsx
@@ -1,3 +1,9 @@
+/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
+import React, { useState } from 'react';
+import { useParams } from 'react-router-dom';
+
+import './SpeakerDetail.scss';
+
import type { ActionSheetButton } from '@ionic/core';
import {
IonActionSheet,
@@ -21,13 +27,11 @@ import {
shareOutline,
shareSharp,
} from 'ionicons/icons';
-import React, { useState } from 'react';
-import { useParams } from 'react-router-dom';
import { connect } from '../data/connect';
import * as selectors from '../data/selectors';
+
import type { Speaker } from '../models/Speaker';
-import './SpeakerDetail.scss';
interface OwnProps {
id?: string;
diff --git a/src/pages/Tutorial.tsx b/src/pages/Tutorial.tsx
index c23ab673..73dfe135 100644
--- a/src/pages/Tutorial.tsx
+++ b/src/pages/Tutorial.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
+import React, { useRef } from 'react';
import {
IonContent,
IonPage,
@@ -10,12 +12,10 @@ import {
useIonRouter,
} from '@ionic/react';
import { arrowForward } from 'ionicons/icons';
-import React, { useRef } from 'react';
-
-import { connect } from '../data/connect';
import { setMenuEnabled } from '../data/sessions/sessions.actions';
import { setHasSeenTutorial } from '../data/user/user.actions';
import './Tutorial.scss';
+import { connect } from '../data/connect';
interface OwnProps {}
interface DispatchProps {
From 80ddbf8c007df1118f39952241edde084feea642 Mon Sep 17 00:00:00 2001
From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>
Date: Fri, 23 Oct 2026 15:17:27 -0400
Subject: [PATCH 03/10] chore(lint): ignore native projects in prettier
---
.prettierignore | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 .prettierignore
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..08d41d63
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,5 @@
+# Prettier only reads the root .gitignore, not the ones inside the native
+# projects, so ignore them here to skip Capacitor's copied web build and
+# Gradle's build output.
+android/
+ios/
From 9e5c1ef89875df9d43dda386a26b4e006274a0e2 Mon Sep 17 00:00:00 2001
From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>
Date: Wed, 11 Nov 2026 15:22:16 -0500
Subject: [PATCH 04/10] chore(ci): run on node 26
---
.github/workflows/CI.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 317ddfe3..a9ae5431 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -15,10 +15,10 @@ jobs:
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- - name: Use Node.js 24
+ - name: Use Node.js 26
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
- node-version: 24
+ node-version: 26
- name: Install Dependencies
run: npm ci
- name: Lint
@@ -34,7 +34,7 @@ jobs:
# Require status checks to pass before merging ->
# Search for the new version -> Add them to the list ->
# Remove the old version from the list -> Save changes
- node_version: [24]
+ node_version: [26]
os: [windows-latest, macOS-latest]
steps:
From 41fb1da34e939a154fd2b89b508a9a3cd0d72335 Mon Sep 17 00:00:00 2001
From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>
Date: Wed, 11 Nov 2026 15:27:43 -0500
Subject: [PATCH 05/10] chore(ci): name the test jobs by os only
---
.github/workflows/CI.yml | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index a9ae5431..03d2dd1d 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -25,24 +25,18 @@ jobs:
run: npm run lint
test:
- name: Test on node ${{ matrix.node_version }} and ${{ matrix.os }}
+ name: Test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
- # When node version is updated, update the version in the GitHub repository settings (admin access required):
- # Branches -> Edit `main` -> Protect matching branches ->
- # Require status checks to pass before merging ->
- # Search for the new version -> Add them to the list ->
- # Remove the old version from the list -> Save changes
- node_version: [26]
os: [windows-latest, macOS-latest]
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- - name: Use Node.js ${{ matrix.node_version }}
+ - name: Use Node.js 26
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
- node-version: ${{ matrix.node_version }}
+ node-version: 26
- name: Install Dependencies
run: npm ci
- name: Build
From bb9e62e0257698ab45c3418b06917912529a863d Mon Sep 17 00:00:00 2001
From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>
Date: Wed, 11 Nov 2026 15:39:22 -0500
Subject: [PATCH 06/10] chore(ci): read the node version from .nvmrc
---
.github/workflows/CI.yml | 8 ++++----
.github/workflows/capacitor-sync.yml | 4 ++--
.nvmrc | 1 +
3 files changed, 7 insertions(+), 6 deletions(-)
create mode 100644 .nvmrc
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 03d2dd1d..bb32cba2 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -15,10 +15,10 @@ jobs:
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- - name: Use Node.js 26
+ - name: Set up Node.js
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
- node-version: 26
+ node-version-file: .nvmrc
- name: Install Dependencies
run: npm ci
- name: Lint
@@ -33,10 +33,10 @@ jobs:
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- - name: Use Node.js 26
+ - name: Set up Node.js
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
- node-version: 26
+ node-version-file: .nvmrc
- name: Install Dependencies
run: npm ci
- name: Build
diff --git a/.github/workflows/capacitor-sync.yml b/.github/workflows/capacitor-sync.yml
index 345953f1..9c02db74 100644
--- a/.github/workflows/capacitor-sync.yml
+++ b/.github/workflows/capacitor-sync.yml
@@ -26,10 +26,10 @@ jobs:
with:
ref: ${{ github.ref_name }}
token: ${{ secrets.IONITRON_GITHUB_TOKEN }}
- - name: Configure Node
+ - name: Set up Node.js
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
- node-version: 26
+ node-version-file: .nvmrc
- name: Install Dependencies
run: npm ci
- name: Build
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 00000000..6f4247a6
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+26
From 35ae9d3555a25e1c31b0852bd27dfb2e253594fd Mon Sep 17 00:00:00 2001
From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>
Date: Wed, 11 Nov 2026 15:54:06 -0500
Subject: [PATCH 07/10] chore(lint): sort imports instead of turning off import
order for stylesheets
---
src/App.tsx | 25 ++++++++++++-------------
src/pages/About.tsx | 8 ++++----
src/pages/MainTabs.tsx | 14 +++++++-------
src/pages/MapView.tsx | 14 +++++++-------
src/pages/SchedulePage.tsx | 10 +++-------
src/pages/SessionDetail.tsx | 10 +++++-----
src/pages/SpeakerDetail.tsx | 10 +++-------
src/pages/Tutorial.tsx | 6 +++---
8 files changed, 44 insertions(+), 53 deletions(-)
diff --git a/src/App.tsx b/src/App.tsx
index d005a69b..42b18756 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,11 +1,3 @@
-/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
-import React, { useEffect } from 'react';
-import { Route } from 'react-router-dom';
-import { IonApp, IonRouterOutlet, IonSplitPane, setupIonicReact } from '@ionic/react';
-import { IonReactRouter } from '@ionic/react-router';
-
-import Menu from './components/Menu';
-
/* Core CSS required for Ionic components to work properly */
import '@ionic/react/css/core.css';
@@ -41,19 +33,26 @@ import 'leaflet/dist/leaflet.css';
/* Global styles */
import './App.scss';
-import MainTabs from './pages/MainTabs';
-import { connect } from './data/connect';
+
+import { IonApp, IonRouterOutlet, IonSplitPane, setupIonicReact } from '@ionic/react';
+import { IonReactRouter } from '@ionic/react-router';
+import React, { useEffect } from 'react';
+import { Route } from 'react-router-dom';
+
+import HomeOrTutorial from './components/HomeOrTutorial';
+import Menu from './components/Menu';
+import RedirectToLogin from './components/RedirectToLogin';
import { AppContextProvider } from './data/AppContext';
+import { connect } from './data/connect';
import { loadConfData } from './data/sessions/sessions.actions';
import { setIsLoggedIn, setUsername, loadUserData } from './data/user/user.actions';
+import type { Schedule } from './models/Schedule';
import Account from './pages/Account';
import Login from './pages/Login';
+import MainTabs from './pages/MainTabs';
import Signup from './pages/Signup';
import Support from './pages/Support';
import Tutorial from './pages/Tutorial';
-import HomeOrTutorial from './components/HomeOrTutorial';
-import type { Schedule } from './models/Schedule';
-import RedirectToLogin from './components/RedirectToLogin';
setupIonicReact();
diff --git a/src/pages/About.tsx b/src/pages/About.tsx
index 3e339523..eb3d0d3c 100644
--- a/src/pages/About.tsx
+++ b/src/pages/About.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
-import React, { useState } from 'react';
import {
IonHeader,
IonToolbar,
@@ -18,10 +16,12 @@ import {
IonPopover,
IonText,
} from '@ionic/react';
-import './About.scss';
+import { format, parseISO } from 'date-fns';
import { ellipsisHorizontal, ellipsisVertical } from 'ionicons/icons';
+import React, { useState } from 'react';
+
import AboutPopover from '../components/AboutPopover';
-import { format, parseISO } from 'date-fns';
+import './About.scss';
interface AboutProps {}
diff --git a/src/pages/MainTabs.tsx b/src/pages/MainTabs.tsx
index ed9846c4..69864ffe 100644
--- a/src/pages/MainTabs.tsx
+++ b/src/pages/MainTabs.tsx
@@ -1,14 +1,14 @@
-/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
-import React from 'react';
import { IonTabs, IonRouterOutlet, IonTabBar, IonTabButton, IonIcon, IonLabel } from '@ionic/react';
-import { Route, Navigate } from 'react-router-dom';
import { calendar, location, informationCircle, people } from 'ionicons/icons';
+import React from 'react';
+import { Route, Navigate } from 'react-router-dom';
+
+import About from './About';
+import MapView from './MapView';
import SchedulePage from './SchedulePage';
-import SpeakerList from './SpeakerList';
-import SpeakerDetail from './SpeakerDetail';
import SessionDetail from './SessionDetail';
-import MapView from './MapView';
-import About from './About';
+import SpeakerDetail from './SpeakerDetail';
+import SpeakerList from './SpeakerList';
interface MainTabsProps {}
diff --git a/src/pages/MapView.tsx b/src/pages/MapView.tsx
index f0c2c906..fb04b5ac 100644
--- a/src/pages/MapView.tsx
+++ b/src/pages/MapView.tsx
@@ -1,14 +1,14 @@
-/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
-import React, { useEffect, useRef } from 'react';
import { IonContent, IonHeader, IonPage, IonTitle, IonToolbar, useIonViewDidEnter } from '@ionic/react';
-import type { Location } from '../models/Location';
-import { connect } from '../data/connect';
-import { loadLocations } from '../data/locations/locations.actions';
import L from 'leaflet';
-import 'leaflet/dist/leaflet.css';
-import markerIconUrl from 'leaflet/dist/images/marker-icon.png';
import markerIconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png';
+import markerIconUrl from 'leaflet/dist/images/marker-icon.png';
import markerShadowUrl from 'leaflet/dist/images/marker-shadow.png';
+import React, { useEffect, useRef } from 'react';
+
+import { connect } from '../data/connect';
+import { loadLocations } from '../data/locations/locations.actions';
+import type { Location } from '../models/Location';
+import 'leaflet/dist/leaflet.css';
import './MapView.scss';
// Fix for marker icons in Vite
diff --git a/src/pages/SchedulePage.tsx b/src/pages/SchedulePage.tsx
index 168aec23..914e0899 100644
--- a/src/pages/SchedulePage.tsx
+++ b/src/pages/SchedulePage.tsx
@@ -1,6 +1,3 @@
-/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
-import React, { useState, useRef } from 'react';
-
import {
IonToolbar,
IonContent,
@@ -21,17 +18,16 @@ import {
getConfig,
} from '@ionic/react';
import { options, search } from 'ionicons/icons';
+import React, { useState, useRef } from 'react';
import SessionList from '../components/SessionList';
import SessionListFilter from '../components/SessionListFilter';
-import './SchedulePage.scss';
-
import ShareSocialFab from '../components/ShareSocialFab';
-
-import * as selectors from '../data/selectors';
import { connect } from '../data/connect';
+import * as selectors from '../data/selectors';
import { setSearchText } from '../data/sessions/sessions.actions';
import type { Schedule } from '../models/Schedule';
+import './SchedulePage.scss';
interface OwnProps {}
diff --git a/src/pages/SessionDetail.tsx b/src/pages/SessionDetail.tsx
index 60442e4d..2e4cffca 100644
--- a/src/pages/SessionDetail.tsx
+++ b/src/pages/SessionDetail.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
-import React from 'react';
import {
IonHeader,
IonToolbar,
@@ -14,13 +12,15 @@ import {
IonItem,
IonLabel,
} from '@ionic/react';
-import { connect } from '../data/connect';
+import { starOutline, star, share, cloudDownload } from 'ionicons/icons';
+import React from 'react';
import { useParams } from 'react-router-dom';
+
+import { connect } from '../data/connect';
import * as selectors from '../data/selectors';
-import { starOutline, star, share, cloudDownload } from 'ionicons/icons';
-import './SessionDetail.scss';
import { addFavorite, removeFavorite } from '../data/sessions/sessions.actions';
import type { Session } from '../models/Schedule';
+import './SessionDetail.scss';
interface OwnProps {
id?: string;
diff --git a/src/pages/SpeakerDetail.tsx b/src/pages/SpeakerDetail.tsx
index 497be2b0..00b1eaec 100644
--- a/src/pages/SpeakerDetail.tsx
+++ b/src/pages/SpeakerDetail.tsx
@@ -1,9 +1,3 @@
-/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
-import React, { useState } from 'react';
-import { useParams } from 'react-router-dom';
-
-import './SpeakerDetail.scss';
-
import type { ActionSheetButton } from '@ionic/core';
import {
IonActionSheet,
@@ -27,11 +21,13 @@ import {
shareOutline,
shareSharp,
} from 'ionicons/icons';
+import React, { useState } from 'react';
+import { useParams } from 'react-router-dom';
import { connect } from '../data/connect';
import * as selectors from '../data/selectors';
-
import type { Speaker } from '../models/Speaker';
+import './SpeakerDetail.scss';
interface OwnProps {
id?: string;
diff --git a/src/pages/Tutorial.tsx b/src/pages/Tutorial.tsx
index 73dfe135..c23ab673 100644
--- a/src/pages/Tutorial.tsx
+++ b/src/pages/Tutorial.tsx
@@ -1,5 +1,3 @@
-/* eslint-disable import-x/order -- stylesheet imports must keep their original order */
-import React, { useRef } from 'react';
import {
IonContent,
IonPage,
@@ -12,10 +10,12 @@ import {
useIonRouter,
} from '@ionic/react';
import { arrowForward } from 'ionicons/icons';
+import React, { useRef } from 'react';
+
+import { connect } from '../data/connect';
import { setMenuEnabled } from '../data/sessions/sessions.actions';
import { setHasSeenTutorial } from '../data/user/user.actions';
import './Tutorial.scss';
-import { connect } from '../data/connect';
interface OwnProps {}
interface DispatchProps {
From ff629e5c627f992b794534acc61d79c8a68cba7c Mon Sep 17 00:00:00 2001
From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>
Date: Wed, 11 Nov 2026 16:05:47 -0500
Subject: [PATCH 08/10] chore(ci): cancel outdated runs when a pull request is
updated
---
.github/workflows/CI.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index bb32cba2..873850c8 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -6,6 +6,11 @@ name: Install Dependencies, Lint and Build
on: [pull_request]
+# Cancel a pull request's in-progress run when a newer commit is pushed.
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
jobs:
lint:
name: Lint
From a247c387d4420aa3207f38ad9d41bab9cbfb064c Mon Sep 17 00:00:00 2001
From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>
Date: Wed, 11 Nov 2026 16:41:15 -0500
Subject: [PATCH 09/10] chore(lint): turn react-refresh back on and split the
app context from its provider
---
eslint.config.mjs | 9 +++++----
src/App.tsx | 2 +-
src/data/AppContext.ts | 15 +++++++++++++++
.../{AppContext.tsx => AppContextProvider.tsx} | 14 ++------------
4 files changed, 23 insertions(+), 17 deletions(-)
create mode 100644 src/data/AppContext.ts
rename src/data/{AppContext.tsx => AppContextProvider.tsx} (57%)
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 05bc2bda..7667dedc 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -19,10 +19,11 @@ export default defineConfig([
rules: {
// Ionic's base level; `recommended` makes it an error, which is meant for libraries.
'@typescript-eslint/explicit-module-boundary-types': 'warn',
- // Every page exports both the component and a `connect()`-wrapped default,
- // which fast refresh can't follow. Revisit if the custom connect HOC in
- // data/connect.tsx is replaced with hooks.
- 'react-refresh/only-export-components': 'off',
+ // Pages export a component wrapped in the custom `connect()` HOC from data/connect.tsx.
+ 'react-refresh/only-export-components': [
+ 'error',
+ { allowConstantExport: true, allowCompoundComponents: true, extraHOCs: ['connect'] },
+ ],
// `connect()` and several page props use `{}` as an empty-props generic.
'@typescript-eslint/no-empty-object-type': 'off',
// The demo uses `cond && fn()` and ternaries for side effects throughout.
diff --git a/src/App.tsx b/src/App.tsx
index 42b18756..08afce2c 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -42,7 +42,7 @@ import { Route } from 'react-router-dom';
import HomeOrTutorial from './components/HomeOrTutorial';
import Menu from './components/Menu';
import RedirectToLogin from './components/RedirectToLogin';
-import { AppContextProvider } from './data/AppContext';
+import { AppContextProvider } from './data/AppContextProvider';
import { connect } from './data/connect';
import { loadConfData } from './data/sessions/sessions.actions';
import { setIsLoggedIn, setUsername, loadUserData } from './data/user/user.actions';
diff --git a/src/data/AppContext.ts b/src/data/AppContext.ts
new file mode 100644
index 00000000..3cb44de1
--- /dev/null
+++ b/src/data/AppContext.ts
@@ -0,0 +1,15 @@
+import type React from 'react';
+import { createContext } from 'react';
+
+import type { AppState } from './state';
+import { initialState } from './state';
+
+export interface AppContextState {
+ state: AppState;
+ dispatch: React.Dispatch;
+}
+
+export const AppContext = createContext({
+ state: initialState,
+ dispatch: () => undefined,
+});
diff --git a/src/data/AppContext.tsx b/src/data/AppContextProvider.tsx
similarity index 57%
rename from src/data/AppContext.tsx
rename to src/data/AppContextProvider.tsx
index fe733bb9..edf56c5c 100644
--- a/src/data/AppContext.tsx
+++ b/src/data/AppContextProvider.tsx
@@ -1,19 +1,9 @@
import type { PropsWithChildren } from 'react';
-import React, { createContext, useReducer } from 'react';
+import React, { useReducer } from 'react';
-import type { AppState } from './state';
+import { AppContext } from './AppContext';
import { initialState, reducers } from './state';
-export interface AppContextState {
- state: AppState;
- dispatch: React.Dispatch;
-}
-
-export const AppContext = createContext({
- state: initialState,
- dispatch: () => undefined,
-});
-
export const AppContextProvider: React.FC = ({ children }) => {
const [store, dispatch] = useReducer(reducers, initialState);
From 62166b8dd46086994d4abd4f19af1ae2b4d9d34f Mon Sep 17 00:00:00 2001
From: Brandy Smith <6577830+brandyscarney@users.noreply.github.com>
Date: Wed, 11 Nov 2026 16:41:58 -0500
Subject: [PATCH 10/10] chore: make the package an es module like the react
tutorial app
---
eslint.config.mjs => eslint.config.js | 0
package.json | 1 +
2 files changed, 1 insertion(+)
rename eslint.config.mjs => eslint.config.js (100%)
diff --git a/eslint.config.mjs b/eslint.config.js
similarity index 100%
rename from eslint.config.mjs
rename to eslint.config.js
diff --git a/package.json b/package.json
index 8a7b4332..909354f0 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
"author": "Ionic Team ",
"license": "MIT",
"private": true,
+ "type": "module",
"dependencies": {
"@capacitor/android": "^8.0.0",
"@capacitor/core": "^8.0.0",
+
{username}
Session not found
;
}
@@ -82,10 +78,7 @@ const SessionDetail: React.FC{session.name}
{session.tracks.map((track) => ( - + {track} ))} @@ -108,12 +101,7 @@ const SessionDetail: React.FC-
- 
+
+
Welcome to ICA
- The ionic conference app is a practical preview of the - ionic framework in action, and a demonstration of proper code - use. + The ionic conference app is a practical preview of the ionic framework in action, and a + demonstration of proper code use.
- 
+
+
What is Ionic?
- Ionic Framework is an open source SDK that enables - developers to build high quality mobile apps with web - technologies like HTML, CSS, and JavaScript. + Ionic Framework is an open source SDK that enables developers to build high quality mobile apps + with web technologies like HTML, CSS, and JavaScript.
+
What is Ionic Appflow?
- Ionic Appflow is a powerful set of services and features - built on top of Ionic Framework that brings a totally new level of - app development agility to mobile dev teams. + Ionic Appflow is a powerful set of services and features built on top of Ionic Framework that + brings a totally new level of app development agility to mobile dev teams.
+