From 1a75c748eab389beb2d3e1d994f16c29d3f803c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Geonizeli?= <joao.geonizeli@gmail.com>
Date: Tue, 31 Aug 2021 00:22:54 -0300
Subject: [PATCH] add loading spinner on PoolListing

---
 .../src/components/Navbar/Navbar.tsx          | 18 ++------
 .../src/components/Spinner/Spinner.tsx        | 21 +++++++++
 .../src/components/Spinner/index.ts           |  1 +
 app/javascript/src/components/index.ts        |  1 +
 app/javascript/src/constants/Pools.ts         |  2 +
 app/javascript/src/pages/Home/PoolListing.tsx | 46 ++++++++++---------
 app/javascript/src/utils/notEmpty.ts          |  3 ++
 7 files changed, 55 insertions(+), 37 deletions(-)
 create mode 100644 app/javascript/src/components/Spinner/Spinner.tsx
 create mode 100644 app/javascript/src/components/Spinner/index.ts
 create mode 100644 app/javascript/src/utils/notEmpty.ts

diff --git a/app/javascript/src/components/Navbar/Navbar.tsx b/app/javascript/src/components/Navbar/Navbar.tsx
index c367b4d..16f8f1e 100644
--- a/app/javascript/src/components/Navbar/Navbar.tsx
+++ b/app/javascript/src/components/Navbar/Navbar.tsx
@@ -1,4 +1,5 @@
 import * as React from "react";
+import { MenuIcon } from "@heroicons/react/outline";
 
 import XStakeLogo from "../../assets/images/logo.png";
 import { useApp } from "../../contexts/AppProvider";
@@ -23,23 +24,10 @@ export const Navbar = () => {
   return (
     <nav className="w-full h-16 flex bg-white shadow items-center px-4 space-x-2 z-50">
       <button
-        className="w-12 md:w-10 h-12 md:h-10 xl:hidden fixed md:relative bottom-8 md:bottom-auto right-8 md:right-auto bg-white rounded-full p-3 md:p-0 shadow md:shadow-none"
+        className="w-12 mr-2 md:w-10 h-12 md:h-10 xl:hidden fixed md:relative bottom-8 md:bottom-auto right-8 md:right-auto bg-white rounded-full p-3 md:p-0 shadow md:shadow-none"
         onClick={() => handleExpandSideNav()}
       >
-        <svg
-          xmlns="http://www.w3.org/2000/svg"
-          className="h-full w-full"
-          fill="none"
-          viewBox="0 0 24 24"
-          stroke="currentColor"
-        >
-          <path
-            strokeLinecap="round"
-            strokeLinejoin="round"
-            strokeWidth={2}
-            d="M4 6h16M4 12h16M4 18h16"
-          />
-        </svg>
+        <MenuIcon />
       </button>
       <img
         src={XStakeLogo}
diff --git a/app/javascript/src/components/Spinner/Spinner.tsx b/app/javascript/src/components/Spinner/Spinner.tsx
new file mode 100644
index 0000000..a2b589e
--- /dev/null
+++ b/app/javascript/src/components/Spinner/Spinner.tsx
@@ -0,0 +1,21 @@
+import type { FC } from "react";
+import React from "react";
+import cs from "classnames";
+
+type Props = {
+  sizeClasses?: string;
+};
+
+export const Spinner: FC<Props> = ({ sizeClasses }) => {
+  return (
+    <div className="absolute right-1/2 bottom-1/2  transform translate-x-1/2 translate-y-1/2 ">
+      <div
+        style={{ borderTopColor: "transparent" }}
+        className={cs(
+          "border-solid animate-spin  rounded-full border-gray-300 border-8",
+          sizeClasses ?? "h-20 w-20"
+        )}
+      />
+    </div>
+  );
+};
diff --git a/app/javascript/src/components/Spinner/index.ts b/app/javascript/src/components/Spinner/index.ts
new file mode 100644
index 0000000..2f83b96
--- /dev/null
+++ b/app/javascript/src/components/Spinner/index.ts
@@ -0,0 +1 @@
+export * from "./Spinner";
diff --git a/app/javascript/src/components/index.ts b/app/javascript/src/components/index.ts
index 882dd77..90b1af0 100644
--- a/app/javascript/src/components/index.ts
+++ b/app/javascript/src/components/index.ts
@@ -3,3 +3,4 @@ export * from "./SideNav";
 export * from "./Modal";
 export * from "./Input";
 export * from "./Button";
+export * from "./Spinner";
diff --git a/app/javascript/src/constants/Pools.ts b/app/javascript/src/constants/Pools.ts
index 6074bed..4f4fa12 100644
--- a/app/javascript/src/constants/Pools.ts
+++ b/app/javascript/src/constants/Pools.ts
@@ -2635,3 +2635,5 @@ export const pools: PoolConfig[] = [
     isFinished: true,
   },
 ];
+
+export const unfinishedPools = pools.filter((pool) => !pool.isFinished);
diff --git a/app/javascript/src/pages/Home/PoolListing.tsx b/app/javascript/src/pages/Home/PoolListing.tsx
index d003830..200b390 100644
--- a/app/javascript/src/pages/Home/PoolListing.tsx
+++ b/app/javascript/src/pages/Home/PoolListing.tsx
@@ -3,17 +3,20 @@ import React, { useEffect, useState } from "react";
 import { useLazyLoadQuery } from "react-relay";
 import { ethers } from "ethers";
 
-import { pools } from "../../constants/Pools";
+import { unfinishedPools } from "../../constants/Pools";
 import { useBsc } from "../../contexts/BscProvider";
 import type { PoolConfig } from "../../types";
 import { Pool } from "./Pool";
 import sousChef from "../../abi/sousChef.json";
 import { getEndBlock } from "../../utils/getEndBlock";
 import type { PoolListingQuery } from "./__generated__/PoolListingQuery.graphql";
+import { notEmpty } from "../../utils/notEmpty";
+import { Spinner } from "../../components";
 
 export const PoolListing = () => {
   const { provider } = useBsc();
   const [validPools, setValidPools] = useState<PoolConfig[]>([]);
+  const [isLoadingPools, setIsLoadingPools] = useState(true);
 
   const { currentUser } = useLazyLoadQuery<PoolListingQuery>(
     graphql`
@@ -42,35 +45,34 @@ export const PoolListing = () => {
         );
       };
 
-      const valids: PoolConfig[] = [];
-
-      pools.forEach(async (pool) => {
-        if (pool.sousId === 0) {
-          valids.push(pool);
-          setValidPools([...valids]);
-
-          return;
-        }
-
-        try {
-          const chef = getChef(pool);
-          const endBlock = await getEndBlock(chef);
-
-          if (endBlock >= blockNumber) {
-            valids.push(pool);
-            setValidPools([...valids]);
+      await Promise.all(
+        unfinishedPools.map(async (pool) => {
+          if (pool.sousId === 0) {
+            return pool;
           }
-        } catch (e) {
-          console.error(e);
-        }
+
+          try {
+            const chef = getChef(pool);
+            const endBlock = await getEndBlock(chef);
+
+            if (endBlock >= blockNumber) {
+              return pool;
+            }
+          } catch (e) {
+            console.error(e);
+          }
+        })
+      ).then((pools) => {
+        setIsLoadingPools(false);
+        setValidPools(pools.filter(notEmpty));
       });
     })();
   }, [provider]);
 
   return (
     <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 place-items-center w-full gap-8 py-4 -mt-16 overflow-x-hidden">
+      {isLoadingPools && <Spinner />}
       {validPools
-        .filter((pool) => !pool.isFinished)
         .sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0))
         .map((pool) => (
           <Pool key={pool.sousId} pool={pool} balance={balance} />
diff --git a/app/javascript/src/utils/notEmpty.ts b/app/javascript/src/utils/notEmpty.ts
new file mode 100644
index 0000000..3b5bacf
--- /dev/null
+++ b/app/javascript/src/utils/notEmpty.ts
@@ -0,0 +1,3 @@
+// Use a type predicate function to avoid opting out of strict type checking: https://www.typescriptlang.org/docs/handbook/2/narrowing.html#using-type-predicates
+export const notEmpty = <T>(value: T | null | undefined): value is T =>
+  value !== null && value !== undefined;