ic/tare-mobile conflict pr/242

[isabellachou]

Summary

Closes #242

Changes

• Removed the old yarn.lock
• Then re-installed yarn

[vercel]

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
toriis	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	May 2, 2025 3:00am

[isabellachou]

Summary

Closes #242

Changes

• change the import to import Link from 'next/link'
• remove everything under <Link ... > in line 20 except for className={navStyle} and to={dataKey.path}
• change to={dataKey.path} to href={'#' + dataKey.path}
• add onNavigate for smooth scrolling to sections in the homepage
• URL stays at 'home'

[kennykos]

This looks great!

We need to merge lg/tare-page into this branch before merge this into main.

[lizageorge]

Unfortunately, I think there are more conflicts with the new Next versions. When I go to an investments tare page (like Investments > click on a company card, like this), I get the following error:

I get this error even when I pull the link on an Incognito tab, but not on the live Toriis site (thankfully 😭)

[kennykos]

Running yarn add apexcharts fixed the issue for me. A quick git diff shows

diff --git a/package.json b/package.json
index 3964dfb..c2e5bad 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "@trpc/react-query": "^10.9.0",
     "@trpc/server": "^10.9.0",
     "@vercel/analytics": "^1.0.0",
-    "apexcharts": "^3.37.1",
+    "apexcharts": "^4.7.0",
     "clsx": "^1.2.1",
     "contentful": "^9.3.5",
     "flowbite": "^1.6.4",
diff --git a/yarn.lock b/yarn.lock
index be34e51..39fbb26 100644
--- a/yarn.lock
+++ b/yarn.lock

so it looks like all that was needed was an ApexCharts update :). @lizageorge, @isabellachou let me know if this works for you, and then @isabellachou can commit the change!