From 1b496b5344b2cff478b71f60b3c8b8982dee711d Mon Sep 17 00:00:00 2001 From: Alexandru Iordache Date: Fri, 28 Nov 2025 12:13:49 +0200 Subject: [PATCH 001/127] first changes --- app/[...all]/page.tsx | 2 +- components/pages/{Feed.tsx => Home.tsx} | 16 ++++++++-------- components/pages/Tabs.tsx | 22 +++++++++++----------- 3 files changed, 20 insertions(+), 20 deletions(-) rename components/pages/{Feed.tsx => Home.tsx} (91%) diff --git a/app/[...all]/page.tsx b/app/[...all]/page.tsx index defd15bd..c061f7ec 100644 --- a/app/[...all]/page.tsx +++ b/app/[...all]/page.tsx @@ -7,7 +7,7 @@ const App = dynamic(() => import('../../components/AppShell'), { export async function generateStaticParams() { return [ - { all: ['feed'] }, + { all: ['home'] }, { all: ['lists'] }, ...lists.map(list => ({ all: ['lists', list.id] })), { all: ['settings'] }, diff --git a/components/pages/Feed.tsx b/components/pages/Home.tsx similarity index 91% rename from components/pages/Feed.tsx rename to components/pages/Home.tsx index 0f130c32..812c8784 100644 --- a/components/pages/Feed.tsx +++ b/components/pages/Home.tsx @@ -18,7 +18,7 @@ import { notificationsOutline } from 'ionicons/icons'; import { selectHomeItems } from '../../store/selectors'; import Store from '../../store'; -type FeedCardProps = { +type HomeCardProps = { title: string; type: string; text: string; @@ -27,14 +27,14 @@ type FeedCardProps = { image: string; }; -const FeedCard = ({ +const HomeCard = ({ title, type, text, author, authorAvatar, image, -}: FeedCardProps) => ( +}: HomeCardProps) => (
); -const Feed = () => { +const Home = () => { const homeItems = Store.useState(selectHomeItems); const [showNotifications, setShowNotifications] = useState(false); @@ -79,7 +79,7 @@ const Feed = () => { - Feed + Home @@ -93,7 +93,7 @@ const Feed = () => { - Feed + Home { onDidDismiss={() => setShowNotifications(false)} /> {homeItems.map((i, index) => ( - + ))} ); }; -export default Feed; +export default Home; diff --git a/components/pages/Tabs.tsx b/components/pages/Tabs.tsx index 4e3cae3d..1e8e43ec 100644 --- a/components/pages/Tabs.tsx +++ b/components/pages/Tabs.tsx @@ -7,9 +7,9 @@ import { IonIcon, IonLabel, } from '@ionic/react'; -import { cog, flash, list } from 'ionicons/icons'; +import { home, pulse, trendingUp } from 'ionicons/icons'; -import Home from './Feed'; +import Home from './Home'; import Lists from './Lists'; import ListDetail from './ListDetail'; import Settings from './Settings'; @@ -19,7 +19,7 @@ const Tabs = () => { - } exact={true} /> + } exact={true} /> } exact={true} /> { exact={true} /> } exact={true} /> - } exact={true} /> + }/> - - - Feed + + + Home - - Lists + + Flows - - Settings + + My Progress From 6764a2c0b24cd087550c2fb49a40db5db1e38b49 Mon Sep 17 00:00:00 2001 From: Alexandru Iordache Date: Sat, 29 Nov 2025 19:17:49 +0200 Subject: [PATCH 002/127] before updating to latest capacitor --- app/[...all]/page.tsx | 11 +- app/layout.tsx | 2 +- components/pages/FlowDetail.tsx | 58 +++++++++ components/pages/{Lists.tsx => Flows.tsx} | 38 ++++-- components/pages/ListDetail.tsx | 73 ----------- components/pages/Practice.tsx | 64 +++++++++ components/pages/Tabs.tsx | 18 ++- data/index.ts | 152 ++++++++++++++++++++++ store/actions.ts | 32 +++++ store/index.ts | 3 + 10 files changed, 358 insertions(+), 93 deletions(-) create mode 100644 components/pages/FlowDetail.tsx rename components/pages/{Lists.tsx => Flows.tsx} (61%) delete mode 100644 components/pages/ListDetail.tsx create mode 100644 components/pages/Practice.tsx create mode 100644 data/index.ts diff --git a/app/[...all]/page.tsx b/app/[...all]/page.tsx index c061f7ec..de6ad5aa 100644 --- a/app/[...all]/page.tsx +++ b/app/[...all]/page.tsx @@ -1,5 +1,5 @@ import dynamic from 'next/dynamic'; -import { lists } from '../../mock'; +import { flows} from '../../data'; const App = dynamic(() => import('../../components/AppShell'), { ssr: false, @@ -8,8 +8,13 @@ const App = dynamic(() => import('../../components/AppShell'), { export async function generateStaticParams() { return [ { all: ['home'] }, - { all: ['lists'] }, - ...lists.map(list => ({ all: ['lists', list.id] })), + { all: ['flows'] }, + ...flows.map(flow => ({ all: ['flows', flow.id] })), + ...flows.flatMap(flow => + flow.practices.map(practice => ({ + all: ['flows', flow.id, practice.id] + })) + ), { all: ['settings'] }, ]; } diff --git a/app/layout.tsx b/app/layout.tsx index 37398e26..36aaf614 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -38,7 +38,7 @@ export default function RootLayout({ children: React.ReactNode; }>) { return ( - + {children}