Merge pull request 'added mailing list in footer' (#102) from development_added_mailing_list into development

Reviewed-on: tfgrid/www_projectinca#102

src/layouts/Layout.astro

@@ -37,22 +37,39 @@ const { language, textDirection } = I18N;
     <Analytics />
 
     <!-- Comment the line below to disable View Transitions -->
-    <ViewTransitions fallback="swap" />
+
-    
+    <script type="text/javascript">
-    <script type="text/javascript">window.$crisp=[];window.CRISP_WEBSITE_ID="1a5a5241-91cb-4a41-8323-5ba5ec574da0";(function(){d=document;s=d.createElement("script");s.src="https://client.crisp.chat/l.js";s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})();</script>
+      window.$crisp = [];
-    
+      window.CRISP_WEBSITE_ID = '1a5a5241-91cb-4a41-8323-5ba5ec574da0';
+      (function () {
+        d = document;
+        s = d.createElement('script');
+        s.src = 'https://client.crisp.chat/l.js';
+        s.async = 1;
+        d.getElementsByTagName('head')[0].appendChild(s);
+      })();
+    </script>
+
     <!-- MailerLite Universal -->
-      <script is:inline>
+    <script is:inline>
       (function (m, a, i, l, e, r) {
-        m['MailerLiteObject'] = e; function f() {
+        m['MailerLiteObject'] = e;
-          var c = { a: arguments, q: [] }; var r = this.push(c); return "number" != typeof r ? r : f.bind(c.q);
+        function f() {
+          var c = { a: arguments, q: [] };
+          var r = this.push(c);
+          return 'number' != typeof r ? r : f.bind(c.q);
         }
-        f.q = f.q || []; m[e] = m[e] || f.bind(f.q); m[e].q = m[e].q || f.q; r = a.createElement(i);
+        f.q = f.q || [];
-        var _ = a.getElementsByTagName(i)[0]; r.async = 1; r.src = l + '?v' + (~~(new Date().getTime() / 1000000));
+        m[e] = m[e] || f.bind(f.q);
+        m[e].q = m[e].q || f.q;
+        r = a.createElement(i);
+        var _ = a.getElementsByTagName(i)[0];
+        r.async = 1;
+        r.src = l + '?v' + ~~(new Date().getTime() / 1000000);
         _.parentNode.insertBefore(r, _);
       })(window, document, 'script', 'https://static.mailerlite.com/js/universal.js', 'ml');
       var ml_account = ml('accounts', '1778010', 'x2d3d9f8n1', 'load');
-      </script>
+    </script>
     <!-- End MailerLite Universal -->
   </head>
 

src/navigation.js

@@ -31,7 +31,6 @@ export const footerData = {
     {
       title: 'Project Overview',
       links: [
-        { text: 'Home', href: '/' },
         { text: 'Technology', href: '/technology' },
         { text: 'Builders', href: '/builders' },
         { text: 'About', href: '/about' },
@@ -48,11 +47,10 @@ export const footerData = {
     {
       title: 'Communication',
       links: [
-        { text: 'Join the Mailing List', href: 'javascript:ml_account("webforms", "3562741", "n7q9l7", "show")' },
         { text: 'Contact Us', href: '/contact' },
-        { text: 'ThreeFold Chat', href: 'https://t.me/threefold' },
+        { text: 'Mailing List', href: 'javascript:ml_account("webforms", "3562741", "n7q9l7", "show")' },
-        { text: 'INCA Blog', href: '/blog' },
+        { text: 'Blog', href: '/blog' },
-        
+
       ],
     },
   ],

src/pages/farming.astro

@@ -43,13 +43,13 @@ const metadata = {
         period: 'per node',
         items: [
           {
-            description: '32 GB of Memory',
+            description: '16 GB of Memory',
           },
           {
-            description: '2,000 GB of SSD',
+            description: '1,000 GB of SSD',
           },
           {
-            description: '8 Logical CPU Cores',
+            description: '4 Logical CPU Cores',
           },
           {
             description: 'Up to 1,500 INCA/month for utilization.',

src/pages/index.astro

@@ -51,8 +51,8 @@ const metadata = {
     </Fragment>
 
     <Fragment slot="subtitle">
-      <span class="hidden sm:inline">
+      <span>
-        <br>We are a community-driven and open-source project<br> that built a self-healing and autonomous cloud engine<br> allowing <span class="font-semibold">anyone</span> to become a <span class="font-semibold">cloud service provider</span>!<br>
+        <br>Ideal for <b>DePIN</b> and <b>Web 2/3</b> projects, <br>our platform serves as a decentralized infrastructure base layer, <br>designed to be hosted by everyone, for everyone.<br>
       </span>
       <br>Earn rewards by providing <span class="font-semibold">Internet Capacity</span> to the world!</i>
 

src/pages/privacy.md

@@ -3,7 +3,15 @@ title: 'Privacy Policy'
 layout: '~/layouts/MarkdownLayout.astro'
 ---
 
-*This privacy policy will explain how ThreeFold Movement ("companies", "we", or "us") uses the personal data we collect from you when you use our websites, including the Project INCA website.*
+This privacy policy will explain how INCA, doing business as INCA or, as the case may be “ThreeFold”  or ThreeFold DMCC (“INCA“, “we”, “us”, or “our”), concerning your access to and use of any of the following INCA related websites: The project INCA website or ThreeFold  websites/wikis/forums, including without limitation any sites such as https://internetcapacity.org,  https://threefold.io, https://threefold.me, https://grid.tf, https://threefold.tech, https://freeflownation.org, https://3bot.org, https://incubaid.com or https://consciousinternet.org or any other website as used/promoted by the ThreeFold Foundation or any other site as originating from our open-source git repositories on https://github.com/threefoldfoundation, https://github.com/threefoldtech and https://git.ourworld.tf/tfgrid,  as well as any other media form, media channel, forum, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the “Site”).
+
+We use the personal data we collect from you when you use our websites, including the Project INCA website.
+
+<p style="text-align: center"><b>ThreeFold DMCC</b><br>
+Unit No: BA1120 DMCC Business Centre, Level No 1,<br>
+Jewellery & Gemplex 3,<br>
+Dubai, <br>
+United Arab Emirates</p>
 
 ### What data do we collect? 
 
@@ -112,4 +120,8 @@ We keep our privacy policy under regular review and places any updates on this w
 
 If you have any questions about our privacy policy, the data we hold on you, or you would like to exercise one of your data protection rights, please do not hesitate to contact us. 
 
-Email us at: dataprivacy@threefold.io
+<p style="text-align: center"><b>ThreeFold DMCC</b><br>
+Unit No: BA1120 DMCC Business Centre, Level No 1,<br>
+Jewellery & Gemplex 3,<br>
+Dubai, <br>
+United Arab Emirates<br>dataprivacy@threefold.io</p>

src/pages/terms.md

@@ -3,9 +3,7 @@ title: 'Terms and Conditions'
 layout: '~/layouts/MarkdownLayout.astro'
 ---
 
-These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity (“you”) and ThreeFold, doing business as ThreeFold (“ThreeFold“, “we”, “us”, or “our”), concerning your access to and use of the threefold related websites:
+These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity (“you”) and INCA, doing business as INCA or, as the case may be “ThreeFold”  or ThreeFold DMCC (“INCA“, “we”, “us”, or “our”), concerning your access to and use of any of the following INCA related websites: The project INCA website or ThreeFold  websites/wikis/forums, including without limitation any sites such as www.https://internetcapacity.org,  https://threefold.io, https://threefold.me, https://grid.tf, https://threefold.tech, https://freeflownation.org, https://3bot.org, https://incubaid.com or https://consciousinternet.org or any other website as used/promoted by the ThreeFold Foundation or any other site as originating from our open-source git repositories on https://github.com/threefoldfoundation, https://github.com/threefoldtech and https://git.ourworld.tf/tfgrid, as well as any other media form, media channel, forum, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the “Site”).
-
-The project INCA website, websites/wikis/forums ending with threefold.io, threefold.me, grid.tf, threefold.tech, TFT.com, freeflownation.org, 3bot.org, incubaid.com or consciousinternet.org or any other website as used/promoted by the ThreeFold Foundation or any other site as originating from our open-source git repository on https://github.com/threefoldfoundation, as well as any other media form, media channel, forum, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the “Site”).
 
 You agree that by accessing the Site, you have read, understood, and agreed to be bound by all of these Terms of Use. 
 
@@ -149,6 +147,8 @@ These Terms of Use and any policies or operating rules posted by us on the Site
 
 In order to resolve a complaint regarding the Site or to receive further information regarding use of the Site, please contact us at:
 
-- ThreeFold FCZ
+<p style="text-align: center"><b>ThreeFold DMCC</b><br>
-- BA1120 DMCC BUSINESS CENTRE, LEVEL NO 1, JEWELLERY & GEMPLEX 3, DUBAI, UNITED EMIRATES ARAB
+Unit No: BA1120 DMCC Business Centre, Level No 1,<br>
-- info@threefold.io
+Jewellery & Gemplex 3,<br>
+Dubai, <br>
+United Arab Emirates<br>info@threefold.io</p>