Merge pull request #519 from EscolaLMS/feature/REK-65

fixed loader
EscolaLMS · Nov 29, 2024 · a12141b · a12141b
2 parents cb39143 + 21cd347
commit a12141b
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "@capacitor/ios": "^5.7.3",
     "@capacitor/local-notifications": "^5.0.7",
     "@capacitor/status-bar": "^5.0.7",
-    "@escolalms/components": "^0.0.157",
+    "@escolalms/components": "^0.0.158",
     "@escolalms/h5p-react": "^0.2.19",
     "@escolalms/sdk": "^0.6.2",
     "@escolalms/ts-models": "^0.0.35",

diff --git a/src/components/Consultations/List/ConsultationsContainer/Items/index.tsx b/src/components/Consultations/List/ConsultationsContainer/Items/index.tsx
@@ -30,7 +30,7 @@ const ConsultationsContainerItems: React.FC<Props> = ({
         }}
       >
         {!loading &&
-          consultations?.data.map((consultation) => (
+          consultations?.data?.map((consultation) => (
             <Col md={6} lg={4} xl={3} key={consultation.id}>
               <ConsultationsContainerItem consultation={consultation} />
             </Col>
@@ -46,6 +46,7 @@ const ConsultationsContainerItems: React.FC<Props> = ({
             onPage={(i) => handlePageChange(i)}
           />
         )}
+      <br />
     </>
   );
 };

diff --git a/src/components/Profile/ProfileTutorConsultations/index.tsx b/src/components/Profile/ProfileTutorConsultations/index.tsx
@@ -6,7 +6,7 @@ import { ConsultationStatus } from "../../../pages/user/my-consultations";
 import { EscolaLMSContext } from "@escolalms/sdk/lib/react/context";
 import { Text } from "@escolalms/components/lib/components/atoms/Typography/Text";
 import ConsultationTutorCard from "@/components/Consultations/ConsultationTutorCard";
-import ContentLoader from "@/components/_App/ContentLoader";
+import { CourseCardSkeleton } from "@/components/Skeletons/CourseCard";
 
 interface ProfileTutorConsultationsProps {
   type: ConsultationStatus;
@@ -35,25 +35,37 @@ const ProfileTutorConsultations = ({
 
   return (
     <>
-      {tutorConsultations.loading ? (
-        <ContentLoader />
-      ) : consultationsData.length === 0 ? (
-        <Text style={{ paddingLeft: isMobile ? 20 : 40 }}>
-          {t<string>("MyProfilePage.OrdersEmpty")}
-        </Text>
-      ) : (
-        <Row
-          style={{
-            gap: "30px 0",
-          }}
-        >
-          {consultationsData.map((consultation) => (
-            <Col key={consultation.consultation_term_id} xs={12} md={6} lg={3}>
-              <ConsultationTutorCard consultation={consultation} />
+      <Row
+        style={{
+          gap: "30px 0",
+        }}
+      >
+        {tutorConsultations.loading ? (
+          Array.from({ length: 8 }).map((_, index) => (
+            <Col md={3} key={`skeleton-card-${index}`}>
+              <CourseCardSkeleton />
             </Col>
-          ))}
-        </Row>
-      )}
+          ))
+        ) : consultationsData.length === 0 ? (
+          <Text style={{ paddingLeft: isMobile ? 20 : 40 }}>
+            {t<string>("MyProfilePage.OrdersEmpty")}
+          </Text>
+        ) : (
+          <>
+            {" "}
+            {consultationsData.map((consultation) => (
+              <Col
+                key={consultation.consultation_term_id}
+                xs={12}
+                md={6}
+                lg={3}
+              >
+                <ConsultationTutorCard consultation={consultation} />
+              </Col>
+            ))}
+          </>
+        )}
+      </Row>
     </>
   );
 };

diff --git a/src/pages/user/MyProfile/index.tsx b/src/pages/user/MyProfile/index.tsx
@@ -20,7 +20,8 @@ export const Content = styled.section`
   .courses-wrapper {
     padding-top: 100px;
 
-    min-height: fit-content;
+    min-height: calc(100vh - 500px);
+    height: fit-content;
     @media (max-width: 991px) {
       margin-top: 0;
       min-height: fit-content;