Rework loading followers and pagination a bit. Closes #2835

web/components/ui/followers/FollowerCollection/FollowerCollection.module.scss

@@ -3,9 +3,20 @@
 .followers {
   width: 100%;
   padding: 5px;
+  min-height: 20vh;
 
+  .followerRow {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+  }
+  @media (max-width: 900px) {
+    .followerRow {
+      grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+  }
   @include screen(mobile) {
     .followerRow {
+      display: block;
       justify-content: center;
     }
   }

web/components/ui/followers/FollowerCollection/FollowerCollection.tsx

@@ -1,5 +1,5 @@
 import { FC, useEffect, useState } from 'react';
-import { Col, Pagination, Row, Skeleton } from 'antd';
+import { Pagination, Spin } from 'antd';
 import { ErrorBoundary } from 'react-error-boundary';
 import { Follower } from '../../../../interfaces/follower';
 import { SingleFollower } from '../SingleFollower/SingleFollower';
@@ -23,8 +23,10 @@ export const FollowerCollection: FC<FollowerCollectionProps> = ({ name, onFollow
 
   const getFollowers = async () => {
     try {
+      setLoading(true);
+
       const response = await fetch(
-        `${ENDPOINT}?offset=${page * ITEMS_PER_PAGE}&limit=${ITEMS_PER_PAGE}`,
+        `${ENDPOINT}?offset=${(page - 1) * ITEMS_PER_PAGE}&limit=${ITEMS_PER_PAGE}`,
       );
 
       const data = await response.json();
@@ -60,13 +62,7 @@ export const FollowerCollection: FC<FollowerCollectionProps> = ({ name, onFollow
     </div>
   );
 
-  const loadingSkeleton = <Skeleton active paragraph={{ rows: 3 }} />;
+  if (!followers?.length && !loading) {
-
-  if (loading) {
-    return loadingSkeleton;
-  }
-
-  if (!followers?.length) {
     return noFollowers;
   }
 
@@ -81,14 +77,13 @@ export const FollowerCollection: FC<FollowerCollectionProps> = ({ name, onFollow
         />
       )}
     >
+      <Spin spinning={loading} size="large">
         <div className={styles.followers} id="followers-collection">
-        <Row wrap gutter={[10, 10]} className={styles.followerRow}>
+          <div className={styles.followerRow}>
             {followers.map(follower => (
-            <Col key={follower.link}>
               <SingleFollower key={follower.link} follower={follower} />
-            </Col>
             ))}
-        </Row>
+          </div>
 
           <Pagination
             className={styles.pagination}
@@ -103,6 +98,7 @@ export const FollowerCollection: FC<FollowerCollectionProps> = ({ name, onFollow
             hideOnSinglePage
           />
         </div>
+      </Spin>
     </ErrorBoundary>
   );
 };

web/components/ui/followers/SingleFollower/SingleFollower.module.scss

@@ -7,9 +7,8 @@
   padding: 10px 10px;
   border-radius: 15px;
   height: 75px;
-  width: 250px;
   font-size: 0.8rem;
-
+  margin: 5px;
   color: var(--theme-color-components-text-on-light);
 
   .name {

web/components/ui/followers/SingleFollower/SingleFollower.tsx

@@ -12,7 +12,7 @@ export const SingleFollower: FC<SingleFollowerProps> = ({ follower }) => (
   <div className={cn([styles.follower, 'followers-follower'])}>
     <a href={follower.link} target="_blank" rel="noreferrer">
       <Row wrap={false}>
-        <Col span={6}>
+        <Col span={4}>
           <Avatar
             src={follower.image}
             alt="Avatar"