update url

parlemonde · Apr 10, 2024 · edc651b · edc651b
1 parent 0a6e0dc
commit edc651b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/src/components/activities/StepsNavigation.tsx b/src/components/activities/StepsNavigation.tsx
@@ -10,7 +10,7 @@ interface StepsNavigationProps {
 const StepsNavigation: React.FC<StepsNavigationProps> = ({ currentStep, errorSteps }) => (
   <Steps
     steps={['Contenu', 'Forme', 'Prévisualiser']}
-    urls={['/admin/newportal/contenulibre', '/admin/newportal/contenulibre/2', '/admin/newportal/contenulibre/3']}
+    urls={['/admin/newportal/contenulibre/1?edit', '/admin/newportal/contenulibre/2', '/admin/newportal/contenulibre/3']}
     activeStep={currentStep}
     errorSteps={errorSteps}
   />

diff --git a/src/pages/admin/newportal/contenulibre/1.tsx b/src/pages/admin/newportal/contenulibre/1.tsx
@@ -15,9 +15,9 @@ const ContenuLibreStep1: React.FC = () => {
 
   useEffect(() => {
     if (activity === null && !('activity-id' in router.query) && !sessionStorage.getItem('activity')) {
-      router.push('/admin/newportal/contenulibre');
+      router.push('/admin/newportal/contenulibre/1');
     } else if (activity && !isFreeContent(activity)) {
-      router.push('/admin/newportal/contenulibre');
+      router.push('/admin/newportal/contenulibre/1');
     }
   }, [activity, router]);
 

diff --git a/src/pages/admin/newportal/contenulibre/2.tsx b/src/pages/admin/newportal/contenulibre/2.tsx
@@ -33,7 +33,7 @@ const ContenuLibre = () => {
 
   React.useEffect(() => {
     if (!activity || !isFreeContent(activity)) {
-      router.push('/admin/newportal/contenulibre');
+      router.push('/admin/newportal/contenulibre/1');
     }
   }, [activity, router]);
 
@@ -152,7 +152,7 @@ const ContenuLibre = () => {
           <h2 style={{ margin: '1rem 0 0.5rem 0' }}>Aperçu de votre publication</h2>
           <p className="text">Voilà à quoi ressemblera votre publication dans le fil d&apos;activité</p>
           <ActivityCard activity={activity} user={user} noButtons />
-          <StepsButton prev="/admin/newportal/contenulibre" next={onNext} />
+          <StepsButton prev="/admin/newportal/contenulibre/1" next={onNext} />
         </div>
       </div>
 

diff --git a/src/pages/admin/newportal/contenulibre/3.tsx b/src/pages/admin/newportal/contenulibre/3.tsx
@@ -41,11 +41,11 @@ const ContenuLibre = () => {
 
   React.useEffect(() => {
     if (!activity) {
-      router.push('/admin/newportal/contenulibre');
+      router.push('/admin/newportal/contenulibre/1');
       return;
     }
     if (!isFreeContent(activity)) {
-      router.push('/admin/newportal/contenulibre');
+      router.push('/admin/newportal/contenulibre/1');
     }
   }, [activity, router]);
 
@@ -100,7 +100,7 @@ const ContenuLibre = () => {
           <div className={classNames('preview-block', { 'preview-block--warning': errorSteps.includes(0) })}>
             <EditButton
               onClick={() => {
-                router.push('/admin/newportal/contenulibre');
+                router.push('/admin/newportal/contenulibre/1');
               }}
               status={errorSteps.includes(0) ? 'warning' : 'success'}
               style={{ position: 'absolute', top: '0.5rem', right: '0.5rem' }}

diff --git a/src/pages/admin/newportal/create/index.tsx b/src/pages/admin/newportal/create/index.tsx
@@ -29,12 +29,12 @@ const Creer = () => {
   const handleNewActivity = () => {
     const success = createNewActivity(ActivityType.CONTENU_LIBRE, selectedPhase);
     if (success) {
-      router.push('/admin/newportal/contenulibre');
+      router.push('/admin/newportal/contenulibre/1');
     }
   };
 
   const links: Link[] = [
-    { name: 'Créer du contenu libre', link: '/admin/newportal/contenulibre', action: handleNewActivity },
+    { name: 'Créer du contenu libre', link: '/admin/newportal/contenulibre/1', action: handleNewActivity },
     { name: 'Créer une activité H5P', link: 'https://' },
     { name: 'Paramétrer l’hymne', link: 'https://' },
     { name: 'Mixer l’hymne', link: 'https://' },

diff --git a/src/styles/globals.scss b/src/styles/globals.scss
@@ -78,11 +78,7 @@ body {
     }
     .container-admin-portal {
       padding: 0 50px !important;
-<<<<<<< HEAD
       min-height: 100vh;
-=======
-      height: 100%;
->>>>>>> e94d2bec (fix errors)
       @media screen and (min-width: 1600px) {
         padding: 0 15% !important;
       }