Merge pull request #2151 from quran/revert-2144-add-post-ramadan-lear…

…ning-plans Revert "Add post-Ramadan learning plan button"
quran · May 7, 2024 · 7a22db1 · 7a22db1
2 parents 78e6c86 + 0e24c0a
commit 7a22db1
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 28 deletions.
diff --git a/src/components/Banner/Banner.tsx b/src/components/Banner/Banner.tsx
@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 
 import styles from './Banner.module.scss';
 
-// import MoonIllustrationSVG from '@/public/images/moon-illustration.svg';
+import MoonIllustrationSVG from '@/public/images/moon-illustration.svg';
 import { selectIsBannerVisible } from '@/redux/slices/banner';
 
 type BannerProps = {
@@ -21,6 +21,9 @@ const Banner = ({ text, ctaButton }: BannerProps) => {
       })}
     >
       <div className={styles.description}>
+        <div className={styles.illustrationContainer}>
+          <MoonIllustrationSVG />
+        </div>
         <div className={styles.text}>{text}</div>
       </div>
       {ctaButton && <div className={styles.ctaContainer}>{ctaButton}</div>}

diff --git a/src/components/Course/Buttons/NavbarButton/index.tsx b/src/components/Course/Buttons/NavbarButton/index.tsx
@@ -9,7 +9,7 @@ import Button, { ButtonSize, ButtonType } from '@/dls/Button/Button';
 import { logButtonClick } from '@/utils/eventLogger';
 import { getCourseNavigationUrl } from '@/utils/navigation';
 
-const LEARNING_PLAN_SLUG = 'avoiding-the-post-ramadan-slump';
+const LEARNING_PLAN_SLUG = 'preparing-our-hearts-for-ramadan';
 
 const NavbarButton = () => {
   const { t } = useTranslation('common');

diff --git a/src/components/Navbar/Navbar.module.scss b/src/components/Navbar/Navbar.module.scss
@@ -19,9 +19,4 @@
 .hiddenNav {
   // https://ptgamr.github.io/2014-09-13-translate3d-vs-translate-performance/
   transform: translate3d(0, calc(-1 * var(--navbar-container-height)), 0);
-
-  // TODO: remove this when banner is removed
-  @include breakpoints.smallerThanTablet {
-    transform: translate3d(0, calc(-1 * (var(--navbar-container-height) + var(--banner-height))), 0);
-  }
 }
diff --git a/src/components/Navbar/Navbar.tsx b/src/components/Navbar/Navbar.tsx
@@ -1,19 +1,15 @@
 import React from 'react';
 
 import classNames from 'classnames';
-import useTranslation from 'next-translate/useTranslation';
 import { useSelector, shallowEqual } from 'react-redux';
 
 import styles from './Navbar.module.scss';
 import NavbarBody from './NavbarBody';
 
-import Banner from '@/components/Banner/Banner';
-import LearningPlanButton from '@/components/Course/Buttons/NavbarButton';
 import { useOnboarding } from '@/components/Onboarding/OnboardingProvider';
 import { selectNavbar } from '@/redux/slices/navbar';
 
 const Navbar = () => {
-  const { t } = useTranslation('common');
   const { isActive } = useOnboarding();
   const { isVisible: isNavbarVisible } = useSelector(selectNavbar, shallowEqual);
   const showNavbar = isNavbarVisible || isActive;
@@ -22,7 +18,6 @@ const Navbar = () => {
     <>
       <div className={styles.emptySpacePlaceholder} />
       <nav className={classNames(styles.container, { [styles.hiddenNav]: !showNavbar })}>
-        <Banner text={t('prepare-hearts.title')} ctaButton={<LearningPlanButton />} />
         <NavbarBody />
       </nav>
     </>

diff --git a/src/components/PageContainer/PageContainer.module.scss b/src/components/PageContainer/PageContainer.module.scss
@@ -10,10 +10,6 @@
   margin-inline-start: auto;
   margin-inline-end: auto;
 
-  @include breakpoints.smallerThanTablet {
-    margin-block-start: var(--spacing-mega);
-  }
-
   --flow-side-spacing: var(--spacing-small);
   padding-inline-start: var(--flow-side-spacing);
   padding-inline-end: var(--flow-side-spacing);

diff --git a/src/components/QuranReader/SidebarNavigation/SidebarNavigation.module.scss b/src/components/QuranReader/SidebarNavigation/SidebarNavigation.module.scss
@@ -138,12 +138,6 @@
 
 .spaceOnTop {
   padding-block-start: calc(3.5 * var(--spacing-mega));
-  @include breakpoints.smallerThanTablet {
-    padding-block-start: calc(4.5 * var(--spacing-mega));
-  }
-  @include breakpoints.tablet {
-    padding-block-start: calc(3.5 * var(--spacing-mega));
-  }
 }
 
 .chapterNumber {

diff --git a/src/pages/index.module.scss b/src/pages/index.module.scss
@@ -4,12 +4,6 @@
 $list-max-width: 80rem;
 
 .pageContainer {
-  @include breakpoints.smallerThanTablet {
-    padding-block-start: var(--banner-height);
-  }
-  @include breakpoints.tablet {
-    padding-block-start: var(--spacing-small);
-  }
   padding-block-end: var(--spacing-small);
   padding-inline-start: 0;
   padding-inline-end: 0;