From c6bcf23af1e0fa3c77076a1190cf2df7603f2aef Mon Sep 17 00:00:00 2001
From: Brandon Egger <brandonegger64@gmail.com>
Date: Tue, 11 Apr 2023 01:47:25 -0500
Subject: [PATCH] add proper backwards animations

---
 src/components/Survey.tsx      | 13 +++++++----
 src/pages/resources/survey.tsx | 42 +++++++++++++++++-----------------
 tailwind.config.cjs            |  7 +++++-
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/components/Survey.tsx b/src/components/Survey.tsx
index c9f7a32..3543983 100644
--- a/src/components/Survey.tsx
+++ b/src/components/Survey.tsx
@@ -72,7 +72,7 @@ const QuestionPage = ({isLastPage, page, question, updatePage, formData, updateF
 
         if (dontCare) {
             return (
-                <button disabled type="button" onClick={handleToggle} className={"mx-auto w-64 py-2 shadow rounded-lg border border-neutral-400 " + (selected ? "bg-amber-200" : "bg-white")}>
+                <button disabled type="button" onClick={handleToggle} className={"line-through mx-auto w-64 py-2 shadow rounded-lg border border-neutral-400 " + (selected ? "bg-amber-200" : "bg-white")}>
                     {option.label}
                 </button>
             )
@@ -162,12 +162,16 @@ const QuestionPage = ({isLastPage, page, question, updatePage, formData, updateF
     )
 }
 
-const PageTransition = ({lastPage, currentPage}: {
+/**
+ * Wrapper for last and current page to enable the transition animation
+ */
+const PageTransition = ({backwards, lastPage, currentPage}: {
+    backwards: boolean,
     lastPage: JSX.Element | null,
     currentPage: JSX.Element,
 }) => {
     return (
-        <div className={"h-[450px] w-[200%] flex flex-row-reverse translate-x-[-50%] animate-slide_survey_page"}>    
+        <div className={"h-[500px] w-[200%] flex " + (backwards ? "flex-row animate-slide_survey_page_backwards" : "flex-row-reverse translate-x-[-50%] animate-slide_survey_page")}>    
             <div className="relative w-1/2 h-full grid place-items-center">
                 {currentPage}
             </div>
@@ -242,6 +246,7 @@ const GuidedSurvey = ({questions}: {
 
     const lastPage = <SurveyPage pageNumber={previousPage} />;
     const currentPage = <SurveyPage pageNumber={page} />;
+    const backwards = (previousPage ?? -1) >= page;
 
     return (
         <div>
@@ -249,7 +254,7 @@ const GuidedSurvey = ({questions}: {
                 <h1 className="text-gray-300 font-bold">Search</h1>
             </div>
 
-            <PageTransition key={page} lastPage={lastPage} currentPage={currentPage}/>
+            <PageTransition backwards={backwards} key={page} lastPage={lastPage} currentPage={currentPage}/>
 
             {/** Hidden html */}
             <form action="/resources" id='survey-form' className="hidden">
diff --git a/src/pages/resources/survey.tsx b/src/pages/resources/survey.tsx
index 19ae224..6cb0121 100644
--- a/src/pages/resources/survey.tsx
+++ b/src/pages/resources/survey.tsx
@@ -47,26 +47,6 @@ const questions: Question<QuestionTypes>[] = [
             }
         ]
     },
-    {
-        for: "skill_levels",
-        header: "Skill Level",
-        question: "What skill level(s) should the resource have?",
-        optional: true,
-        options: [
-            {
-                label: "Beginner",
-                value: "BEGINNER",
-            },
-            {
-                label: "Intermediate",
-                value: "INTERMEDIATE",
-            },
-            {
-                label: "Advanced",
-                value: "ADVANCED",
-            }
-        ]
-    },
     {
         for: "skills",
         header: "Skills Practiced",
@@ -98,7 +78,27 @@ const questions: Question<QuestionTypes>[] = [
                 value: "ENVIRONMENT",
             },
         ]
-    }
+    },
+    {
+        for: "skill_levels",
+        header: "Skill Level",
+        question: "What skill level(s) should the resource have?",
+        optional: true,
+        options: [
+            {
+                label: "Beginner",
+                value: "BEGINNER",
+            },
+            {
+                label: "Intermediate",
+                value: "INTERMEDIATE",
+            },
+            {
+                label: "Advanced",
+                value: "ADVANCED",
+            }
+        ]
+    },
 ]
 
 const ChoiceQuestion = ({question, formData, updateFormData}: {question: Question<QuestionTypes>, formData: Record<string, QuestionTypes[]>, updateFormData: Dispatch<SetStateAction<Record<string, QuestionTypes[]>>>}) => {    
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index 94d5bd3..dc1fe14 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -11,11 +11,16 @@ const config = {
         slide_left_full: {
           '0%': { transform: 'translate(0%)' },
           '100%': { transform: 'translate(-50%)' },
+        },
+        slide_right_full: {
+          '0%': { transform: 'translate(-50%)' },
+          '100%': { transform: 'translate(0%)' },
         }
       },
       animation: {
         expand_in_out: 'expand_in_out 2s ease-in-out infinite',
-        slide_survey_page: 'slide_left_full 1s ease-in-out',
+        slide_survey_page: 'slide_left_full 0.5s ease-in-out',
+        slide_survey_page_backwards: 'slide_right_full 0.5s ease-in-out'
       },
     },
   },