From 773957672d8859244b95102dee31e9e3a7991780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1rbara=20Chaves?= <barbara.chaves@vizzuality.com>
Date: Mon, 2 Dec 2024 20:24:00 +0100
Subject: [PATCH 1/3] Add content and style changes

---
 client/public/images/map/story-marker-lg.png  | Bin 0 -> 6576 bytes
 client/public/images/map/story-marker.png     | Bin 2095 -> 5864 bytes
 client/src/components/chart/index.tsx         |  10 ++-
 .../components/map/layers/marker/index.tsx    |   2 +-
 client/src/components/ui/carousel/index.tsx   |  24 ++----
 client/src/components/ui/dialog.tsx           |   6 +-
 client/src/components/ui/rich-text.tsx        |   7 +-
 .../containers/globe/dashboard/numbers.tsx    |   4 +-
 client/src/containers/globe/index.tsx         |   6 +-
 .../src/containers/home/satellite-button.tsx  |   2 +-
 client/src/containers/map/index.tsx           |   7 +-
 .../map/markers/globe-markers/index.tsx       |  46 +++++++++-
 .../steps/layouts/components/map-content.tsx  |   6 +-
 .../story/steps/layouts/map-step.tsx          |  77 ++++++++++++++++-
 .../story/steps/layouts/outro-step.tsx        |  80 ++++++++++--------
 15 files changed, 200 insertions(+), 77 deletions(-)
 create mode 100644 client/public/images/map/story-marker-lg.png

diff --git a/client/public/images/map/story-marker-lg.png b/client/public/images/map/story-marker-lg.png
new file mode 100644
index 0000000000000000000000000000000000000000..c15a3e1487f5c48f5047e7e8a58ec7e08cdac5ff
GIT binary patch
literal 6576
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

literal 0
HcmV?d00001

diff --git a/client/public/images/map/story-marker.png b/client/public/images/map/story-marker.png
index 0f42f2438412ac5deec6c498a7a5246b4b593f6a..77015ebe532c4abed30f9fa14eadf4b6add24fe9 100644
GIT binary patch
literal 5864
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

delta 2088
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
S;w44^0000<MNUMnLSTZeq2sv#

diff --git a/client/src/components/chart/index.tsx b/client/src/components/chart/index.tsx
index ff44b8f..470a1c4 100644
--- a/client/src/components/chart/index.tsx
+++ b/client/src/components/chart/index.tsx
@@ -64,9 +64,15 @@ const ChartJs = ({ widget, ...props }: ChartJsProps) => {
   };
 
   return (
-    <div {...props}>
+    <div className="w-full">
       {!chartTypes.includes(chartType) || !data || !(data as ChartData).datasets ? null : (
-        <Chart ref={chartRef} type={chartType} options={OPTIONS} data={dataWithDefaults} />
+        <Chart
+          {...props}
+          ref={chartRef}
+          type={chartType}
+          options={OPTIONS}
+          data={dataWithDefaults}
+        />
       )}
     </div>
   );
diff --git a/client/src/components/map/layers/marker/index.tsx b/client/src/components/map/layers/marker/index.tsx
index 0f84d10..778bc01 100644
--- a/client/src/components/map/layers/marker/index.tsx
+++ b/client/src/components/map/layers/marker/index.tsx
@@ -34,7 +34,7 @@ const Marker = ({ markers, handleClick, handleClose }: MarkerProps) => {
       >
         <div
           className={cn({
-            'absolute left-1/2 top-1/2 flex h-3 w-3 -translate-x-1/2 -translate-y-1/2 rotate-45 items-center justify-center border-[1.5px] border-[#FFE094] transition-all':
+            'absolute left-1/2 top-1/2 flex h-4 w-4 -translate-x-1/2 -translate-y-1/2 rotate-45 items-center justify-center border-[1.5px] border-[#FFE094] transition-all':
               true,
             'bg-background scale-[1.25] border-gray-200': true,
           })}
diff --git a/client/src/components/ui/carousel/index.tsx b/client/src/components/ui/carousel/index.tsx
index 365f8f3..5815763 100644
--- a/client/src/components/ui/carousel/index.tsx
+++ b/client/src/components/ui/carousel/index.tsx
@@ -4,7 +4,6 @@ import React, {
   PropsWithChildren,
   useCallback,
   useEffect,
-  useRef,
   useState,
 } from 'react';
 
@@ -149,30 +148,18 @@ type CarouselMediaProps = {
 };
 
 export const CarouselMedia = ({ media, isCurrentMedia }: CarouselMediaProps) => {
-  const videoRef = useRef<HTMLVideoElement>(null);
   const mediaSrc = getImageSrc(media?.url);
 
-  useEffect(() => {
-    if (!isCurrentMedia && videoRef.current) {
-      videoRef.current?.pause();
-    } else if (isCurrentMedia && videoRef.current) {
-      videoRef.current?.play();
-    }
-  }, [isCurrentMedia]);
-
   if (media?.type === 'video') {
     return (
       <video
-        ref={videoRef}
         width="100%"
         height="100%"
         src={mediaSrc}
-        muted={!isCurrentMedia}
         loop
-        controls={isCurrentMedia}
-        autoPlay={isCurrentMedia}
+        controls
         className={cn(
-          'h-full max-h-[calc(100vh-152px)] w-full',
+          'h-full max-h-[calc(100vh-152px)] w-full bg-black',
           isCurrentMedia ? 'object-contain' : 'object-cover'
         )}
       >
@@ -228,15 +215,14 @@ const EmblaCarousel: React.FC<PropType> = ({ options, medias, selected }) => {
       <div className="embla__viewport w-full" ref={emblaRef}>
         <div
           className={cn(
-            'embla__container items-center',
-            medias?.length > 1 ? '-ml-4 sm:-ml-6' : ''
+            'embla__container -ml-4 items-center sm:-ml-10',
+            medias.length === 1 && ' justify-center'
           )}
         >
           {medias?.map((media, index) => (
             <div
               className={cn(
-                'embla__slide',
-                medias?.length > 1 ? 'flex-[0_0_80%] pl-4 sm:pl-6' : 'flex-1',
+                'embla__slide flex-[0_0_60%] pl-4 sm:pl-10',
                 index === currSlider ? 'h-[80vh]' : 'h-[40vh]'
               )}
               key={index}
diff --git a/client/src/components/ui/dialog.tsx b/client/src/components/ui/dialog.tsx
index 5294cbf..d2e61ec 100644
--- a/client/src/components/ui/dialog.tsx
+++ b/client/src/components/ui/dialog.tsx
@@ -23,7 +23,7 @@ const DialogOverlay = React.forwardRef<
   <DialogPrimitive.Overlay
     ref={ref}
     className={cn(
-      'bg-background/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 backdrop-blur-sm',
+      'bg-background/40 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 backdrop-blur-[2px]',
       className
     )}
     {...props}
@@ -46,8 +46,8 @@ const DialogContent = React.forwardRef<
       {...props}
     >
       {children}
-      <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-8 rounded-full bg-white p-1 opacity-70 backdrop-blur-lg transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none sm:p-1">
-        <X className="h-6 w-6" />
+      <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-8 flex w-14 justify-center rounded-full border border-gray-800 bg-gray-900 p-1 opacity-70 backdrop-blur-lg transition-opacity  hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none sm:p-1">
+        <X className="h-6 w-6 text-white" />
         <span className="sr-only">Close</span>
       </DialogPrimitive.Close>
     </DialogPrimitive.Content>
diff --git a/client/src/components/ui/rich-text.tsx b/client/src/components/ui/rich-text.tsx
index 6fff444..0946fce 100644
--- a/client/src/components/ui/rich-text.tsx
+++ b/client/src/components/ui/rich-text.tsx
@@ -28,6 +28,11 @@ const RichText = ({ children, className }: RichTextProps) => {
             {props.children}
           </ol>
         ),
+        li: ({ node, ...props }) => (
+          <li {...props} className="ml-4 list-disc">
+            {props.children}
+          </li>
+        ),
         img: ({ node, ...props }) => (
           <Image
             {...props}
@@ -42,7 +47,7 @@ const RichText = ({ children, className }: RichTextProps) => {
         ),
         video: ({ node, ...props }) => {
           return (
-            <video {...props} controls className="h-auto w-full">
+            <video {...props} controls className="h-auto min-h-[418px] w-full">
               <source src={props.src} />
             </video>
           );
diff --git a/client/src/containers/globe/dashboard/numbers.tsx b/client/src/containers/globe/dashboard/numbers.tsx
index 14757c5..e64c5b7 100644
--- a/client/src/containers/globe/dashboard/numbers.tsx
+++ b/client/src/containers/globe/dashboard/numbers.tsx
@@ -1,7 +1,7 @@
 const numbers = [
-  { stat: 'Supported countries', number: 53 },
+  { stat: 'Supported countries', number: 69 },
   { stat: 'Organizations Involved', number: 41 },
-  { stat: 'IFI projects', number: 50 },
+  { stat: 'IFI projects', number: 81 },
 ];
 
 const DashboardNumbers = () => {
diff --git a/client/src/containers/globe/index.tsx b/client/src/containers/globe/index.tsx
index 76aca65..dc236c5 100644
--- a/client/src/containers/globe/index.tsx
+++ b/client/src/containers/globe/index.tsx
@@ -44,7 +44,7 @@ export default function Home() {
   const { removeStep } = useSyncStep();
 
   const { data: storiesData } = useStories();
-  const storiesLength = storiesData?.data?.length;
+  const storiesLength = storiesData?.data?.length || 0;
   const { default: map } = useMap();
 
   const isMobile = useIsMobile();
@@ -98,7 +98,9 @@ export default function Home() {
               <Filters filtersActive={filtersActive} />
             </div>
             <div className="font-open-sans flex justify-between text-sm font-semibold">
-              <p className="pl-1 text-gray-800">{!!storiesLength && `${storiesLength} stories`}</p>
+              <p className="pl-1 text-gray-800">
+                {`${storiesLength} featured ${storiesLength === 1 ? 'story' : 'stories'}`}
+              </p>
               <Button
                 variant="link"
                 className={cn(
diff --git a/client/src/containers/home/satellite-button.tsx b/client/src/containers/home/satellite-button.tsx
index 940c0f4..6380b00 100644
--- a/client/src/containers/home/satellite-button.tsx
+++ b/client/src/containers/home/satellite-button.tsx
@@ -16,7 +16,7 @@ const SatelliteButton = ({ handleSelectMarker, satellite, className }: Satellite
   return (
     <button
       className={cn(
-        'pointer-events-auto absolute z-50 flex cursor-pointer items-center justify-center',
+        'pointer-events-auto absolute z-50 flex cursor-pointer items-center justify-center transition-all duration-300 hover:scale-110',
         className
       )}
       onClick={() => handleSelectMarker(satellite.id)}
diff --git a/client/src/containers/map/index.tsx b/client/src/containers/map/index.tsx
index 11147e3..c22b300 100644
--- a/client/src/containers/map/index.tsx
+++ b/client/src/containers/map/index.tsx
@@ -1,19 +1,18 @@
 'use client';
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { MapLayerMouseEvent, useMap } from 'react-map-gl';
 
 import dynamic from 'next/dynamic';
-import { usePathname, useRouter } from 'next/navigation';
+import { usePathname } from 'next/navigation';
 
-import { useMotionValueEvent, useScroll } from 'framer-motion';
 import { useAtomValue, useSetAtom } from 'jotai';
 import { LngLatBoundsLike } from 'mapbox-gl';
 
 import { cn } from '@/lib/classnames';
 
-import { bboxAtom, layersInteractiveIdsAtom, mapScrollAtom, tmpBboxAtom } from '@/store/map';
+import { bboxAtom, layersInteractiveIdsAtom, tmpBboxAtom } from '@/store/map';
 
 import { Bbox } from '@/types/map';
 
diff --git a/client/src/containers/map/markers/globe-markers/index.tsx b/client/src/containers/map/markers/globe-markers/index.tsx
index 6584bc3..350931f 100644
--- a/client/src/containers/map/markers/globe-markers/index.tsx
+++ b/client/src/containers/map/markers/globe-markers/index.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import { Layer, Source } from 'react-map-gl';
 
@@ -44,12 +44,38 @@ const GlobeMarkers = () => {
     url: `${process.env.NEXT_PUBLIC_BASE_PATH}/images/map/story-marker.png`,
   });
 
+  useMapImage({
+    name: 'story-marker-lg',
+    url: `${process.env.NEXT_PUBLIC_BASE_PATH}/images/map/story-marker-lg.png`,
+  });
+
   const pathname = usePathname();
   const visibility = useMemo(
     () => (!pathname.includes('stories') ? 'visible' : 'none'),
     [pathname]
   );
 
+  const [size, setSize] = useState(1);
+
+  const [opacity, setOpacity] = useState(1);
+
+  // Animate the size and opacity of the markers
+  useEffect(() => {
+    const startTime = performance.now();
+    const velocity = 3000;
+    const minSize = 0.75;
+
+    // Set the size interpolating from 0.75 to 1 in 1 second and back
+    const interval = setInterval(() => {
+      const progress = ((performance.now() - startTime) % velocity) / velocity;
+      const size = Math.abs(Math.sin(progress * Math.PI)) * (1 - minSize) + minSize;
+      setOpacity(Math.abs(Math.sin(progress * Math.PI)));
+      setSize(size);
+    }, 100);
+
+    return () => clearInterval(interval);
+  }, []);
+
   return (
     <Source id="story-markers" type="geojson" data={FeatureCollection}>
       <Layer
@@ -81,17 +107,35 @@ const GlobeMarkers = () => {
         }}
       />
 
+      <Layer
+        id="story-markers-unclustered-lg"
+        type="symbol"
+        filter={['!', ['has', 'point_count']]}
+        paint={{
+          'icon-color': '#FFE094',
+        }}
+        layout={{
+          'icon-image': 'story-marker-lg',
+          'icon-ignore-placement': true,
+          'icon-allow-overlap': true,
+          'icon-size': 0.75,
+          visibility,
+        }}
+      />
       <Layer
         id="story-markers-unclustered"
         type="symbol"
         filter={['!', ['has', 'point_count']]}
         paint={{
           'icon-color': '#FFE094',
+          'icon-opacity': opacity,
         }}
         layout={{
           'icon-image': 'story-marker',
           'icon-ignore-placement': true,
           'icon-allow-overlap': true,
+          'icon-size': size,
+          'icon-offset': [-opacity, opacity],
           visibility,
         }}
       />
diff --git a/client/src/containers/story/steps/layouts/components/map-content.tsx b/client/src/containers/story/steps/layouts/components/map-content.tsx
index 47c9efa..d471789 100644
--- a/client/src/containers/story/steps/layouts/components/map-content.tsx
+++ b/client/src/containers/story/steps/layouts/components/map-content.tsx
@@ -17,11 +17,11 @@ const MapContent = ({ showContent, title, titlePlaceholder, children }: MapConte
     <Collapsible
       defaultOpen
       className={cn(
-        'group pointer-events-auto w-full overflow-hidden rounded border-gray-800 p-2 transition-all duration-300 ease-in-out sm:border sm:bg-[#335e6f]/80 sm:backdrop-blur',
+        'group pointer-events-auto w-full overflow-hidden rounded border-gray-800 p-2 transition-all duration-300 ease-in-out sm:border sm:bg-[rgba(51,94,111,0.8)] sm:backdrop-blur',
         showContent ? 'opacity-100' : 'sm:opacity-0'
       )}
     >
-      <CollapsibleTrigger className="group hidden w-full justify-between gap-2 px-4 data-[state=open]:pt-2 sm:flex">
+      <CollapsibleTrigger className="group pointer-events-none flex w-full justify-between gap-2 px-4 data-[state=open]:pt-2 sm:pointer-events-auto">
         <h2 className="font-notes group w-[calc(100%-32px)] flex-1 text-start text-xl font-bold ">
           {title ? (
             title
@@ -31,7 +31,7 @@ const MapContent = ({ showContent, title, titlePlaceholder, children }: MapConte
             </span>
           )}
         </h2>
-        <ChevronDownIcon className="h-6 w-6 shrink-0 group-data-[state=closed]:rotate-180" />
+        <ChevronDownIcon className="hidden h-6 w-6 shrink-0 group-data-[state=closed]:rotate-180 sm:inline-block" />
       </CollapsibleTrigger>
       <CollapsibleContent>
         <div
diff --git a/client/src/containers/story/steps/layouts/map-step.tsx b/client/src/containers/story/steps/layouts/map-step.tsx
index 8192326..76c67d9 100644
--- a/client/src/containers/story/steps/layouts/map-step.tsx
+++ b/client/src/containers/story/steps/layouts/map-step.tsx
@@ -55,7 +55,9 @@ const MapStepLayout = ({ step, showContent, storySummary }: MapStepLayoutProps)
         <div className="absolute left-0 top-[80vh] z-10 w-full -translate-y-full px-4 sm:fixed sm:bottom-8 sm:left-14 sm:top-auto sm:w-fit sm:translate-y-0 sm:px-0">
           <MapLegends className="" />
         </div>
-        <div className="bg-background/80 flex flex-col items-end justify-end rounded-2xl pb-4 backdrop-blur sm:min-h-full sm:w-[468px] sm:space-y-6 sm:rounded-none sm:bg-[#335e6f]/0 sm:pb-8 sm:backdrop-blur-0">
+
+        {/* Desktop */}
+        <div className="hidden min-h-full w-[468px] flex-col items-end justify-end space-y-6 rounded-none pb-8 sm:flex">
           {!!card && (
             <MapContent
               showContent={showContent}
@@ -68,7 +70,78 @@ const MapStepLayout = ({ step, showContent, storySummary }: MapStepLayoutProps)
           {!!widget?.id && (
             <MapContent showContent={showContent} title={widget.title}>
               <div className="mt-2 space-y-2">
-                <Chart widget={widget as WidgetWidgetComponent} />
+                <div className="mx-auto w-fit">
+                  <Chart widget={widget as WidgetWidgetComponent} />
+                </div>
+                {(widget as any)?.legend && <RichText>{(widget as any).legend}</RichText>}
+              </div>
+            </MapContent>
+          )}
+          {!!storySummary?.length && (
+            <div className="pointer-events-auto flex w-full max-w-full flex-wrap justify-between gap-4 rounded border-gray-800 px-6 py-4 sm:border sm:bg-[#335e6f]/80 sm:backdrop-blur">
+              {storySummary?.map((item) => (
+                <div className="space-y-1" key={item.title}>
+                  <div
+                    key={`${item.title}-title`}
+                    className="text-enlight-yellow-400 flex items-center gap-2"
+                  >
+                    <h2 className="font-bold uppercase sm:text-sm">{item.title}</h2>
+                  </div>
+                  <div key={`${item.title}-content`} className="space-y-2">
+                    {item.content?.map((c) => {
+                      return (
+                        <div key={`${c.id}-${c.attributes?.name}`} className="flex gap-2">
+                          <>
+                            {c.attributes?.link ? (
+                              <a
+                                className="font-open-sans block w-max leading-none hover:underline"
+                                href={c.attributes.link}
+                                target="_blank"
+                                rel="noopener noreferrer"
+                              >
+                                {c.attributes?.name}
+                              </a>
+                            ) : (
+                              <p className="font-open-sans leading-tight">{c.attributes?.name}</p>
+                            )}
+                            {c.attributes?.description && (
+                              <Tooltip>
+                                <TooltipTrigger>
+                                  <InfoIcon className="h-4 w-4" />
+                                </TooltipTrigger>
+                                <TooltipContent className="max-w-md">
+                                  {c.attributes?.description}
+                                </TooltipContent>
+                              </Tooltip>
+                            )}
+                          </>
+                        </div>
+                      );
+                    })}
+                  </div>
+                </div>
+              ))}
+            </div>
+          )}
+        </div>
+
+        {/* Mobile */}
+        <div className="bg-background/80 flex flex-col items-end justify-end rounded-2xl pb-4 backdrop-blur sm:hidden">
+          {!!card && (
+            <MapContent
+              showContent={showContent}
+              title={card.title}
+              titlePlaceholder={card.content}
+            >
+              <RichText>{card.content}</RichText>
+            </MapContent>
+          )}
+          {!!widget?.id && (
+            <MapContent showContent={showContent} title={widget.title}>
+              <div className="mt-2 space-y-2">
+                <div className="mx-auto w-fit">
+                  <Chart widget={widget as WidgetWidgetComponent} />
+                </div>
                 {(widget as any)?.legend && <RichText>{(widget as any).legend}</RichText>}
               </div>
             </MapContent>
diff --git a/client/src/containers/story/steps/layouts/outro-step.tsx b/client/src/containers/story/steps/layouts/outro-step.tsx
index d2928d0..846b69c 100644
--- a/client/src/containers/story/steps/layouts/outro-step.tsx
+++ b/client/src/containers/story/steps/layouts/outro-step.tsx
@@ -14,6 +14,7 @@ import { StepLayoutOutroStepComponent } from '@/types/generated/strapi.schemas';
 
 import { useIsMobile } from '@/hooks/screen-size';
 
+import RichText from '@/components/ui/rich-text';
 import ScrollExplanation from '@/components/ui/scroll-explanation';
 
 type Disclaimer = {
@@ -76,7 +77,7 @@ const OutroStepLayout = ({ step, showContent, disclaimer }: MediaStepLayoutProps
   const isVideo = mediaType?.includes('video');
   const isImage = mediaType?.includes('image');
 
-  const scaleContent = useTransform(scrollYProgress, [0.5, 0.7], ['1', '0.75']);
+  const scrollOpacity = useTransform(scrollYProgress, [0.5, 0.8], [1, 0.1]);
 
   const categoryDisclaimer = disclaimer as Disclaimer[];
 
@@ -100,39 +101,46 @@ const OutroStepLayout = ({ step, showContent, disclaimer }: MediaStepLayoutProps
         </motion.div>
 
         <div className="pointer-events-auto flex w-full flex-1 flex-col items-center justify-between sm:p-10">
-          <div className="flex w-full flex-1 flex-col justify-between sm:gap-12 lg:flex-row">
-            <motion.div
-              initial={{ opacity: 0, x: '-300%' }}
-              animate={{ opacity: 1, x: 0 }}
-              exit={{ opacity: 0 }}
-              transition={{ duration: 1.5 }}
-              style={{ scale: scaleContent }}
-              className="relative z-50 flex w-full flex-1 items-center justify-center sm:mt-10"
-            >
-              {isVideo && (
-                <video
-                  width="100%"
-                  height="100%"
-                  src={mediaSrc}
-                  ref={videoRef}
-                  muted
-                  loop
-                  autoPlay={true}
-                  controls
-                >
-                  <source src={mediaSrc} type={mediaMime} />
-                </video>
-              )}
-              {isImage && (
-                <Image
-                  className="aspect-video w-full object-cover"
-                  src={mediaSrc}
-                  width={534}
-                  height={330}
-                  alt="story conclusion image"
-                />
-              )}
-            </motion.div>
+          <div
+            className={cn(
+              'flex flex-1 flex-col justify-between sm:gap-12 lg:flex-row',
+              !!mediaSrc && 'w-full'
+            )}
+          >
+            {mediaSrc && (
+              <motion.div
+                initial={{ opacity: 0, x: '-300%' }}
+                animate={{ opacity: 1, x: 0 }}
+                exit={{ opacity: 0 }}
+                transition={{ duration: 1.5 }}
+                style={{ opacity: scrollOpacity }}
+                className="relative z-50 flex w-full flex-1 items-center justify-center sm:mt-10"
+              >
+                {isVideo && (
+                  <video
+                    width="100%"
+                    height="100%"
+                    src={mediaSrc}
+                    ref={videoRef}
+                    muted
+                    loop
+                    autoPlay={true}
+                    controls
+                  >
+                    <source src={mediaSrc} type={mediaMime} />
+                  </video>
+                )}
+                {isImage && (
+                  <Image
+                    className="aspect-video w-full object-cover"
+                    src={mediaSrc}
+                    width={534}
+                    height={330}
+                    alt="story conclusion image"
+                  />
+                )}
+              </motion.div>
+            )}
 
             <motion.div
               className="flex w-full max-w-5xl flex-1 items-center justify-center space-y-16"
@@ -140,13 +148,13 @@ const OutroStepLayout = ({ step, showContent, disclaimer }: MediaStepLayoutProps
               animate={{ opacity: 1, x: 0 }}
               exit={{ opacity: 0 }}
               transition={{ duration: 1.5 }}
-              style={{ scale: scaleContent }}
+              style={{ opacity: scrollOpacity }}
             >
               <div className="max-w-lg space-y-4 p-4 sm:p-10">
                 <h3 className="text-enlight-yellow-500 text-2xl font-bold tracking-wider">
                   {title}
                 </h3>
-                <p>{content}</p>
+                <RichText className="text-white">{content}</RichText>
               </div>
             </motion.div>
           </div>

From e33f7704c5b9326032ded60851fc9640fc0af878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1rbara=20Chaves?= <barbara.chaves@vizzuality.com>
Date: Tue, 3 Dec 2024 11:03:03 +0100
Subject: [PATCH 2/3] Change globe marker size

---
 client/public/images/map/story-marker-lg.png  | Bin 6576 -> 4411 bytes
 client/public/images/map/story-marker-sm.png  | Bin 0 -> 4262 bytes
 client/public/images/map/story-marker.png     | Bin 5864 -> 0 bytes
 .../map/markers/globe-markers/index.tsx       |  18 ++++++++++--------
 4 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 client/public/images/map/story-marker-sm.png
 delete mode 100644 client/public/images/map/story-marker.png

diff --git a/client/public/images/map/story-marker-lg.png b/client/public/images/map/story-marker-lg.png
index c15a3e1487f5c48f5047e7e8a58ec7e08cdac5ff..62227aae1a3236c1b0ce1a7e7ad14e29655263e6 100644
GIT binary patch
literal 4411
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
Ba6bS5

literal 6576
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

diff --git a/client/public/images/map/story-marker-sm.png b/client/public/images/map/story-marker-sm.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cdb3535fa5c93281a4698f7f2092fa9c8db0841
GIT binary patch
literal 4262
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
IM6N<$f>@6QiU0rr

literal 0
HcmV?d00001

diff --git a/client/public/images/map/story-marker.png b/client/public/images/map/story-marker.png
deleted file mode 100644
index 77015ebe532c4abed30f9fa14eadf4b6add24fe9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5864
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

diff --git a/client/src/containers/map/markers/globe-markers/index.tsx b/client/src/containers/map/markers/globe-markers/index.tsx
index 350931f..7e7da8d 100644
--- a/client/src/containers/map/markers/globe-markers/index.tsx
+++ b/client/src/containers/map/markers/globe-markers/index.tsx
@@ -41,7 +41,7 @@ const GlobeMarkers = () => {
 
   useMapImage({
     name: 'story-marker',
-    url: `${process.env.NEXT_PUBLIC_BASE_PATH}/images/map/story-marker.png`,
+    url: `${process.env.NEXT_PUBLIC_BASE_PATH}/images/map/story-marker-sm.png`,
   });
 
   useMapImage({
@@ -65,11 +65,13 @@ const GlobeMarkers = () => {
     const velocity = 3000;
     const minSize = 0.75;
 
-    // Set the size interpolating from 0.75 to 1 in 1 second and back
     const interval = setInterval(() => {
       const progress = ((performance.now() - startTime) % velocity) / velocity;
-      const size = Math.abs(Math.sin(progress * Math.PI)) * (1 - minSize) + minSize;
-      setOpacity(Math.abs(Math.sin(progress * Math.PI)));
+      const x = Math.abs(Math.sin(progress * Math.PI));
+      // Set the opacity interpolating from 0 to 1 and back
+      setOpacity(x);
+      const size = x * (1 - minSize) + minSize;
+      // Set the size interpolating from 0.75 to 1 and back
       setSize(size);
     }, 100);
 
@@ -118,7 +120,7 @@ const GlobeMarkers = () => {
           'icon-image': 'story-marker-lg',
           'icon-ignore-placement': true,
           'icon-allow-overlap': true,
-          'icon-size': 0.75,
+          'icon-size': size,
           visibility,
         }}
       />
@@ -128,14 +130,14 @@ const GlobeMarkers = () => {
         filter={['!', ['has', 'point_count']]}
         paint={{
           'icon-color': '#FFE094',
-          'icon-opacity': opacity,
+          'icon-opacity': 1 - opacity,
         }}
         layout={{
           'icon-image': 'story-marker',
           'icon-ignore-placement': true,
           'icon-allow-overlap': true,
-          'icon-size': size,
-          'icon-offset': [-opacity, opacity],
+          'icon-size': 1,
+          'icon-offset': [0.75, 1.75],
           visibility,
         }}
       />

From e5e104f33ae0d0717f3429a485c5639fd6f6fce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1rbara=20Chaves?= <barbara.chaves@vizzuality.com>
Date: Tue, 3 Dec 2024 12:56:27 +0100
Subject: [PATCH 3/3] Update globe-markers animation !

---
 client/src/containers/map/index.tsx                 |  8 ++++++--
 .../containers/map/markers/globe-markers/index.tsx  | 13 +++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/client/src/containers/map/index.tsx b/client/src/containers/map/index.tsx
index c22b300..62a2072 100644
--- a/client/src/containers/map/index.tsx
+++ b/client/src/containers/map/index.tsx
@@ -147,8 +147,12 @@ export default function MapContainer() {
         )}
       >
         <LayerManager />
-        <GlobeMarkers />
-        <SelectedStoriesMarker markers={markers} onCloseMarker={() => setMarkers([])} />
+        {!isStoriesPage && (
+          <>
+            <GlobeMarkers />
+            <SelectedStoriesMarker markers={markers} onCloseMarker={() => setMarkers([])} />
+          </>
+        )}
         {isStoriesPage && <StoryMarkers />}
       </Map>
     </div>
diff --git a/client/src/containers/map/markers/globe-markers/index.tsx b/client/src/containers/map/markers/globe-markers/index.tsx
index 7e7da8d..0d226ca 100644
--- a/client/src/containers/map/markers/globe-markers/index.tsx
+++ b/client/src/containers/map/markers/globe-markers/index.tsx
@@ -61,11 +61,12 @@ const GlobeMarkers = () => {
 
   // Animate the size and opacity of the markers
   useEffect(() => {
+    if (typeof window === 'undefined') return;
     const startTime = performance.now();
     const velocity = 3000;
     const minSize = 0.75;
 
-    const interval = setInterval(() => {
+    const animate = () => {
       const progress = ((performance.now() - startTime) % velocity) / velocity;
       const x = Math.abs(Math.sin(progress * Math.PI));
       // Set the opacity interpolating from 0 to 1 and back
@@ -73,12 +74,16 @@ const GlobeMarkers = () => {
       const size = x * (1 - minSize) + minSize;
       // Set the size interpolating from 0.75 to 1 and back
       setSize(size);
-    }, 100);
+      requestAnimationFrame(animate);
+    };
 
-    return () => clearInterval(interval);
+    // https://developer.mozilla.org/en-US/docs/Web/API/Window/requestAnimationFrame
+    const frame = requestAnimationFrame(animate);
+
+    return () => cancelAnimationFrame(frame);
   }, []);
 
-  return (
+  return pathname.includes('stories') ? null : (
     <Source id="story-markers" type="geojson" data={FeatureCollection}>
       <Layer
         id="story-markers-cluster"