Merge pull request #488 from EscolaLMS/SPRAW-118

SPRAW-119 && SPRAW-118 && SPRAW-117
EscolaLMS · Apr 26, 2024 · 6ac9427 · 6ac9427
2 parents 6fa6a73 + f5ee7a3
commit 6ac9427
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/src/components/Courses/SingleCoursesTwo/CoursesDetailsSidebar/index.tsx b/src/components/Courses/SingleCoursesTwo/CoursesDetailsSidebar/index.tsx
@@ -64,7 +64,7 @@ const CoursesDetailsSidebar: React.FC<Props> = ({
   course,
   onRequestAccess,
 }) => {
-  const { user, courseAccess, settings } = useContext(EscolaLMSContext);
+  const { user, courseAccess } = useContext(EscolaLMSContext);
   const { t } = useTranslation();
   const { id } = useParams<{ id: string }>();
   const { progress } = useCourseProgress(Number(id));
@@ -123,7 +123,7 @@ const CoursesDetailsSidebar: React.FC<Props> = ({
         ) : (
           <ContentLoader />
         )}
-        <Text>{settings?.value?.mobile?.infotext}</Text>
+        {/* <Text>{settings?.value?.mobile?.infotext}</Text> */}
         <div className="pricing-card-features">
           {course.duration && (
             <IconText
@@ -165,7 +165,7 @@ const CoursesDetailsSidebar: React.FC<Props> = ({
               }
             />
           )}
-          {course.users_count ? (
+          {/* {course.users_count ? (
             <IconText
               text={
                 <IconTextWrapper>
@@ -176,7 +176,7 @@ const CoursesDetailsSidebar: React.FC<Props> = ({
             />
           ) : (
             ""
-          )}
+          )} */}
         </div>
         {!user.value ? (
           <></>

diff --git a/src/components/_App/Footer/index.tsx b/src/components/_App/Footer/index.tsx
@@ -5,7 +5,8 @@ import { EscolaLMSContext } from "@escolalms/sdk/lib/react";
 import { isMobile } from "react-device-detect";
 import { useTranslation } from "react-i18next";
 import { PageListItem, PaginatedMetaList } from "@escolalms/sdk/lib/types/api";
-import { Link } from "@escolalms/components/lib/components/atoms/Link/Link";
+import { Link as LmsLink } from "@escolalms/components/lib/components/atoms/Link/Link";
+import { Link } from "react-router-dom";
 import Container from "@/components/Common/Container";
 import routeRoutes from "@/components/Routes/routes";
 import { WellmsLogo } from "@/icons/index";
@@ -184,42 +185,42 @@ const Footer = () => {
               {footerFromApi.map((link: LinkObject) => {
                 return (
                   !!link.link && (
-                    <Link
+                    <LmsLink
                       key={link.link.toString()}
                       className="single-link"
                       href={link.link}
                     >
                       {typeof link.label === "object" && (
                         <Text size="14">{link.label[i18n.language]}</Text>
                       )}
-                    </Link>
+                    </LmsLink>
                   )
                 );
               })}
             </>
           ) : (
             <>
-              <Link className="single-link" href={routeRoutes.home}>
+              <Link className="single-link" to={routeRoutes.home}>
                 <Text size="16">{t<string>("Footer.HomePage")}</Text>
               </Link>
-              <Link className="single-link" href={routeRoutes.courses}>
+              <Link className="single-link" to={routeRoutes.courses}>
                 <Text size="16">{t<string>("Footer.Courses")}</Text>
               </Link>
               {user.value ? (
-                <Link className="single-link" href={routeRoutes.myProfile}>
+                <Link className="single-link" to={routeRoutes.myProfile}>
                   <Text size="16">{t<string>("Footer.UserProfile")}</Text>
                 </Link>
               ) : (
                 <>
-                  <Link className="single-link" href={routeRoutes.login}>
+                  <Link className="single-link" to={routeRoutes.login}>
                     <Text size="16">{t<string>("Header.Login")}</Text>
                   </Link>
-                  <Link className="single-link" href={routeRoutes.register}>
+                  <Link className="single-link" to={routeRoutes.register}>
                     <Text size="16">{t<string>("Header.Register")}</Text>
                   </Link>
                 </>
               )}
-              <Link className="single-link" href={routeRoutes.cart}>
+              <Link className="single-link" to={routeRoutes.cart}>
                 <Text size="16">{t<string>("Footer.Cart")}</Text>
               </Link>
             </>
@@ -232,13 +233,13 @@ const Footer = () => {
           {chunkArray(pages.list, 4).map((chunk: PageListItem[]) => (
             <div className="chunk-pages" key={chunk.toString()}>
               {chunk.map((page: PageListItem) => (
-                <Link
+                <LmsLink
                   key={page.id}
                   className="single-link"
                   href={`/#/${page.slug}`}
                 >
                   <Text size="14">{page.title}</Text>
-                </Link>
+                </LmsLink>
               ))}
             </div>
           ))}
@@ -252,9 +253,9 @@ const Footer = () => {
 
         <div className="copyrights">
           <Text size="14">{t<string>("Footer.PoweredBy")}</Text>
-          <Link href="https://www.wellms.io">
+          <LmsLink href="https://www.wellms.io">
             <WellmsLogo />
-          </Link>
+          </LmsLink>
         </div>
       </Container>
       <GoTop />