fixed conflicts

src/components/widgets/Hero.astro

@@ -6,6 +6,7 @@ import type { CallToAction } from '~/types';
 export interface Props {
   id?: string;
   title?: string;
+  title2?: string;
   subtitle?: string;
   tagline?: string;
   content?: string;
@@ -16,6 +17,7 @@ export interface Props {
 const {
   id,
   title = await Astro.slots.render('title'),
+  title2 = await Astro.slots.render('title2'),
   subtitle = await Astro.slots.render('subtitle'),
   tagline,
   content = await Astro.slots.render('content'),
@@ -46,6 +48,14 @@ const {
             />
           )
         }
+        {
+          title2 && (
+            <h3
+              class="text-5xl md:text-4xl font-bold leading-tighter tracking-tighter mb-4 font-heading dark:text-gray-200"
+              set:html={title2}
+            />
+          )
+        }
         <div class="max-w-3xl mx-auto">
           {subtitle && <p class="text-xl text-muted mb-6 dark:text-slate-300" set:html={subtitle} />}
           {

src/navigation.js

@@ -8,7 +8,7 @@ export const headerData = {
     },
     { 
       text: 'Farming',
-      href: getPermalink('/nodes'),
+      href: getPermalink('/farming'),
     },
     {
       text: 'Ecosystem',
@@ -29,35 +29,28 @@ export const headerData = {
 export const footerData = {
   links: [
     {
-      title: 'Technology',
+      title: 'Project Overview',
       links: [
-        { text: 'Zero-OS', href: 'technology#zeroos' },
+        { text: 'Home', href: '/' },
-        { text: 'Mycelium Network', href: 'technology#mycelium' },
+        { text: 'Technology', href: 'technology' },
-        { text: 'Quantum Safe File Storage', href: 'technology#qsfs' },
+        { text: 'About', href: 'about' },
-        { text: 'TFChain', href: 'technology#tfchain' },
       ],
     },
     {
-      title: 'Nodes',
+      title: 'Join the Cloud',
       links: [
-        { text: 'Silver', href: '/nodes' },
+        { text: 'Farming', href: 'farming' },
-        { text: 'Platinum', href: '/nodes' },
+        { text: 'Ecosystem', href: 'ecosystem' },
-        { text: 'AI', href: '/nodes' },
+        { text: 'DIY Nodes', href: 'https://manual.grid.tf/documentation/farmers/3node_building/3node_building.html' },
+
       ],
     },
     {
-      title: 'About',
+      title: 'Communication',
       links: [
-        { text: 'The Project', href: '/about' },
+        { text: 'Contact Us', href: 'mailto:info@threefold.io' },
-        { text: 'ThreeFold', href: 'https://threefold.io' },
-      ],
-    },
-    {
-      title: 'Contact',
-      links: [
-        { text: 'Let\'s Connect', href: '/contact' },
-        { text: 'Reach Support', href: 'https://threefoldfaq.crisp.help/en/' },
         { text: 'ThreeFold Chat', href: 'https://t.me/threefold' },
+        { text: 'ThreeFold Support', href: 'https://threefoldfaq.crisp.help/en/' },
       ],
     },
   ],

src/pages/about.astro

@@ -17,6 +17,7 @@ const metadata = {
   <!-- Hero Widget ******************* -->
 
   <Hero
+    id="about"
     tagline="About"
     image={{
       src: '~/assets/images/threefold_cooperative.png',
@@ -36,7 +37,7 @@ const metadata = {
   <!-- Steps Widget ****************** -->
 
   <Steps
-    id="resume"
+    id="values"
     title="Our Values"
     items={[
       {
@@ -106,7 +107,7 @@ const metadata = {
   <!-- Content Widget **************** -->
 
   <Content
-    id="about"
+    id="mission"
     columns={3}
     items={[
       {
@@ -144,7 +145,7 @@ const metadata = {
 
   <Content
     isReversed
-    id="about"
+    id="vision"
     columns={3}
     items={[
       {
@@ -187,6 +188,7 @@ const metadata = {
   <!-- Steps2 Widget ****************** -->
 
   <Steps2
+    id="achievements"
     title="Achievements"
     subtitle="INCA is the continuation of the ThreeFold Grid. We are now entering our 4th phase and we are ready for a major expansion. Build with us the largest decentralized cloud on the planet."
     isReversed={true}

src/pages/ecosystem.astro

@@ -25,19 +25,17 @@ const metadata = {
         target: '_blank',
         icon: 'tabler:brand-minecraft',
       },
-      { text: 'Learn more', href: '#features' },
+      { text: 'Learn more', href: '#partners' },
     ]}
   >
     <Fragment slot="title">
-      <span class="text-accent dark:text-white highlight"> Project INCA<br></span> ecosystem<br><br>
+      <span class="text-accent dark:text-white highlight"> Project INCA<br></span> Ecosystem<br><br>
     </Fragment>
 
     <Fragment slot="subtitle">
       <span class="hidden sm:inline">
-        <span class="font-semibold">Project INCA</span> is an open-source DePIN cloud that allows <br>anyone anywhere to become a cloud service provider.<br></span
+        <span class="font-semibold">Project INCA</span> is proud of its many partnerships<br> providing a thriving ecosystem of like-minded individuals <br>and innovative products and services<br></span
       >
-      <span class="block mb-1 sm:hidden font-bold text-blue-600">INCA, DePIN Cloud</span>
-      <i>Earn <span class="font-semibold">INCA</span> rewards by providing <span class="font-semibold">IN</span>ternet <span class="font-semibold">CA</span>pacity to the world!</i>
     </Fragment>
   </Hero>
 

src/pages/farming.astro

@@ -11,7 +11,7 @@ import InternetCapacity from './internetcapacity.astro';
 import NodeSteps from './steps_node_buy.astro'
 
 const metadata = {
-  title: 'Nodes',
+  title: 'Farming',
 };
 ---
 
@@ -28,11 +28,11 @@ const metadata = {
         target: '_blank',
         icon: 'tabler:brand-minecraft',
       },
-      { text: 'Learn more', href: '#features' },
+      { text: 'Learn more', href: '#nodesspecs' },
     ]}
   >
     <Fragment slot="title">
-      become an<br>
+      Become an<br>
       <InternetCapacity/>
       <br>Provider<br>
     </Fragment>
@@ -52,6 +52,7 @@ const metadata = {
   <!-- Pricing Widget ******************* -->
 
   <Prices
+    id="nodesspecs"
     title="Building the <br>Unbreakable Internet<br> One Node at a Time"
     subtitle="The Unbreakable Internet"
     prices={[
@@ -61,9 +62,6 @@ const metadata = {
         price: 499,
         period: 'per node',
         items: [
-          {
-            description: 'Suited for Content Delivery + Name',
-          },
           {
             description: '32 GB of Memory',
           },
@@ -89,9 +87,6 @@ const metadata = {
         price: 1999,
         period: 'per node',
         items: [
-          {
-            description: 'Suited for Hero AI assistant workloads',
-          },
           {
             description: '64 GB of Memory',
           },
@@ -119,9 +114,6 @@ const metadata = {
         price: 3999,
         period: 'per node',
         items: [
-          {
-            description: 'Suited for state-of-the-art AI with ease',
-          },
           {
             description: '64 GB of Memory',
           },
@@ -152,6 +144,7 @@ const metadata = {
   <NodeSteps/>
 
   <Features3
+    id="nodestech"
     title="Nodes Leading at the Edge"
     subtitle="Discover how our nodes provide a groundbreaking, reliable and robust technology"
     columns={2}
@@ -235,7 +228,8 @@ const metadata = {
   <!-- FAQs Widget ******************* -->
 
   <FAQs
-    title="Nodes FAQs"
+    id="farmingfaq"
+    title="Farming FAQs"
     subtitle="Choosing the right node for you is a crucial step, <br>and we're here to answer your questions. "
     columns={1}
     items={[
@@ -270,12 +264,12 @@ const metadata = {
   <!-- CallToAction Widget *********** -->
 
   <CallToAction
-    title="Do you want to build your own<br> INCA Farming Node?"
+    title="Do you want to build your own<br> INCA Farming Nodes?"
-    subtitle="Are you a do it yourself person. <br> All our work is opensource, you can build your own node."
+    subtitle="Are you a do-it-yourself person and like to get things done? <br> All our work is open-source and you can build your own nodes!"
     actions={[
       {
         variant: 'primary',
-        text: 'Build Now',
+        text: 'Build DIY Nodes',
         href: 'https://manual.grid.tf/documentation/farmers/3node_building/3node_building.html',
       },
     ]}

src/pages/index.astro

@@ -36,7 +36,7 @@ const metadata = {
         target: '_blank',
         icon: 'tabler:brand-minecraft',
       },
-      { text: 'Learn more', href: '#about' },
+      { text: 'Learn more', href: '#purpose' },
     ]}
     
   >
@@ -72,7 +72,7 @@ const metadata = {
    <Purpose/>
 
   <Content
-    id="about"
+    id="pioneers"
     image={{
       src: '~/assets/images/pioneers2.jpg',
       alt: '',

src/pages/partners.astro

@@ -9,6 +9,7 @@ import Features2 from '~/components/widgets/Features2.astro';
   <!-- Features3 Widget ************** -->
 
   <Features2
+    id="partners"
     title="BE THE CLOUD."
     subtitle="INCA is a community-driven, <br> open-source and decentralized cloud by everyone for everyone."
     tagline="ECOSYSTEM"
@@ -16,52 +17,52 @@ import Features2 from '~/components/widgets/Features2.astro';
       {
         title: 'Holochain',
         description: "Holochain is a more peer2peer alternative to the blockchain, giving developers a framework for creating decentralized applications (dApps). Holochain’s method avoids keeping a global consensus, using an agent system in which each agent keeping a private fork.",
-        icon: 'flat-color-icons:template',
+        icon: 'tabler:server',
       },
       {
         title: 'Earth Wallet',
         description:
           "A cutting-edge digital wallet solution designed to empower users with secure, decentralized control over their digital assets. With a focus on accessibility, security, and sustainability, Earth Wallet offers a seamless and user-friendly interface for managing various cryptocurrencies and digital tokens.",
-        icon: 'flat-color-icons:gallery',
+        icon: 'tabler:wallet',
       },
       {
         title: 'Digital Free Zone',
         description:
           'The OurWorld Digital FreeZone, established in Zanzibar, is a groundbreaking partnership between ThreeFold and the government of Tanzania. This initiative aims to create a free sovereign digital and economic area, fostering innovation, growth, and prosperity within the region.',
-        icon: 'flat-color-icons:approval',
+        icon: 'tabler:map',
       },
       {
         title: 'Tanzania Sovereign Internet',
         description:
           "ThreeFold is proud to announce its partnership with the government of Tanzania to establish a sovereign internet, a groundbreaking initiative poised to revolutionize Tanzania's startup ecosystem fostering digital freedom.",
-        icon: 'flat-color-icons:document',
+        icon: 'tabler:flag',
       },
       {
         title: 'Elestio',
         description:
           'Elestio is an innovative platform dedicated to providing cutting-edge decentralized applications (dApps) and services to users worldwide, with a focus on accessibility, security, and user empowerment.',
-        icon: 'flat-color-icons:advertising',
+        icon: 'tabler:device-desktop-code',
       },
       {
         title: 'Vverse',
         description: 'Vverse is an innovative platform that aims to create a virtual universe where users can explore, interact, and create in immersive virtual environments. It leverages cutting-edge technologies such as virtual reality (VR), augmented reality (AR), and blockchain.',
-        icon: 'flat-color-icons:currency-exchange',
+        icon: 'tabler:stack-backward',
       },
       {
         title: 'Helium',
         description: 'Helium is a decentralized wireless network that enables low-power, long-range connectivity for Internet of Things (IoT) devices. By leveraging blockchain technology and a network of hotspots, Helium provides a cost-effective and scalable solution for IoT device connectivity.',
-        icon: 'flat-color-icons:voice-presentation',
+        icon: 'tabler:wifi',
       },
       {
         title: 'Sikana',
         description:
           'Sikana, a platform dedicated to providing education for all, has delivered over 400 million lessons through free educational videos. This partnership will empower communities worldwide with knowledge and skills, irrespective of their financial or geographical limitations. ',
-        icon: 'flat-color-icons:business-contact',
+        icon: 'tabler:chalkboard',
       },
       {
         title: 'ThreeFold',
         description: "The backbone and first phases of the INCA project, ThreeFold’s self-healing autonomous system empowers anyone to become a cloud service provider allowing people and organizations to buy, sell and use cloud resources autonomously and securely.",
-        icon: 'flat-color-icons:database',
+        icon: 'tabler:cloud-computing',
       },
     ]}
   >

src/pages/purpose.astro

@@ -3,7 +3,7 @@ import Features from '~/components/widgets/Features.astro';
 ---
 
 <Features
-id="features"
+id="purpose"
 tagline="PURPOSE"
 title="Layer 0 for DePIN"
 subtitle="Project INCA aims to be a Layer 0 for the DePIN community. DePIN projects can run on our decentralized cloud infrastructure, gaining access to a sovereign, decentralized, and reliable storage, network, and compute layer."

src/pages/steps_node_buy.astro

@@ -2,6 +2,7 @@
 import Steps from '~/components/widgets/Steps.astro';
 ---
 <Steps
+id="steps"
 title="Get a node <br> up and running<br>in no time to earn rewards..."
 items={[
   {