Merge pull request #218 from threefoldfoundation/development

merge development

content/header/index.md

@@ -55,7 +55,7 @@ extra:
 
 {% end %}
 
-- More Info
+- MoreInfo
 
 {% row(style="wide") %}
 

static/js/custom.js

@@ -55,6 +55,17 @@ function showMenu(menuName) {
     var menuBtnId = menuName + (isMobile ? '-mobile-menu' : '-menu');
     var menuElement = document.getElementById(menuId)
     menuElement.className = menuElement.className.replace(" hidden", "");
+    let children = document.querySelectorAll('.nav_menu')
+    for (let i = 0; i < children.length; i++) {
+        if (menuElement !== children[i]) {
+            let btnId = `${children[i].id}-btn`;
+            let btn = document.getElementById(btnId);
+            if (btn && !children[i].classList.contains('hidden')) {
+                children[i].classList.add('hidden')
+                btn.lastElementChild.classList.replace("rotate-0", "-rotate-90")
+            }
+        }
+    }
     setTimeout(function () {
         menuElement.className = menuElement.className.replace("duration-200 ease-in opacity-0 -translate-y-1", "duration-150 ease-out opacity-1 -translate-y-0");
     }, 10);

templates/partials/header.html

@@ -126,7 +126,7 @@
     {% set menu_id = header_label ~ "-menu" | slugify %}
 
 <nav>
-    <div id="{{menu_id}}" class="mt-16 sm:mt-0 md:mt-0 lg:mt-0 xl:mt-0 2xl:mt-0 z-30 absolute inset-x-0 transform shadow-lg lg:backdrop-blur xl:backdrop-blur transition duration-200 ease-in opacity-0 -translate-y-1 hidden">
+    <div id="{{menu_id}}" class="nav_menu mt-16 sm:mt-0 md:mt-0 lg:mt-0 xl:mt-0 2xl:mt-0 z-30 absolute inset-x-0 transform shadow-lg lg:backdrop-blur xl:backdrop-blur transition duration-200 ease-in opacity-0 -translate-y-1 hidden">
         <div class="bg-white lg:bg-semi-white md:bg-semi-white xl:bg-semi-white">
             <div id="menu" class="mx-8 lg:mx-10 xl:mx-10 px-6 sm:p-6 md:p-8">
                 {{header_menu | safe }}

templates/shortcodes/cloud_stats.html

@@ -1,9 +1,9 @@
-{% set data = load_data(url="https://explorer.threefold.io/api/stats", required=false, format="json") %}
+{% set data = load_data(url="https://gridproxy.grid.tf/stats?status=up", required=false, format="json") %}
 {% if data %}
-  {% set capacity = data.hru + data.sru / 1000 %}
+  {% set capacity = (data.totalHru + data.totalSru) / 1024 / 1024 / 1024 / 1024 / 1024 %}
-  {% set nodes = data.onlinenodes %}
+  {% set nodes = data.nodes %}
   {% set countries = data.countries %}
-  {% set cores = data.cru %}
+  {% set cores = data.totalCru %}
 {% endif %}
 
 {% if data %}
@@ -85,7 +85,7 @@
                     text-black
                     mb-4
                   ">
-                {{ capacity / 1000000 | round(precision=2) }}PB
+                {{ capacity | round(precision=2) }}PB
               </dd>
             </div>
             <div class="

templates/shortcodes/grid_stats.html

@@ -1,10 +1,10 @@
 {% set styles = "background-image: url('images/V3.png');" %}
-{% set data = load_data(url="https://explorer.threefold.io/api/stats", required=false, format="json") %}
+{% set data = load_data(url="https://gridproxy.grid.tf/stats?status=up", required=false, format="json") %}
 {% if data %}
-  {% set capacity = data.hru + data.sru / 1000 %}
+{% set capacity = (data.totalHru + data.totalSru) / 1024 / 1024 / 1024 / 1024 / 1024 %}
-  {% set nodes = data.onlinenodes %}
+{% set nodes = data.nodes %}
   {% set countries = data.countries %}
-  {% set cores = data.cru %}
+  {% set cores = data.totalCru %}
 {% endif %}
 
 {% if data %}
@@ -20,7 +20,7 @@
             <div class="flex flex-col border border-gray-50 shadow-lg bg-white py-8 my-4">
                     <img class="mx-auto p-4" src="images/V3-08.png" width="150" alt="">
                 <div class="leading-none font-extrabold text-3xl">
-                    {{ capacity /400000 | round(precision=2) }} PB
+                    {{ capacity | round(precision=2) }}PB
                     <span class="block text-lg mt-4 font-normal capitalize">capacity</span>
                 </div>
             </div>