Merge branch 'piyushgarg-dev:main' into fix/readme

piyushgarg-dev · Oct 7, 2023 · bba7953 · bba7953
2 parents 4a2f883 + 1c67840
commit bba7953
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/components/Dashboard/DashboardSidebar/index.tsx b/components/Dashboard/DashboardSidebar/index.tsx
@@ -97,6 +97,7 @@ const DashboardSidebar: React.FC = () => {
                       />
                     </div>
                   ) : (
+
                     <p className="relative flex h-10 w-10 items-center justify-center rounded-full bg-violet-700 font-semibold text-white">
                       {user?.firstName.charAt(0)}
                       {user?.lastName?.charAt(0)}

diff --git a/components/Dashboard/FormPreview.tsx b/components/Dashboard/FormPreview.tsx
@@ -21,11 +21,11 @@ const FormPreview: React.FC<FormPreviewProps> = (props) => {
         'mb-10': isMobile,
       })}
     >
-      <div className="mb-4 flex justify-center rounded-lg bg-gray-300 p-1">
+      <div className="mb-4 flex justify-center rounded-lg bg-gray-300 dark:bg-gray-700 p-1">
         <button
           className={cn(
             'offset_ring rounded-md p-1.5 transition-all',
-            isMobile && 'bg-gray-100'
+            isMobile && 'bg-gray-100 dark:bg-gray-500'
           )}
           onClick={() => setIsMobile(true)}
         >
@@ -34,7 +34,7 @@ const FormPreview: React.FC<FormPreviewProps> = (props) => {
         <button
           className={cn(
             'offset_ring rounded-md p-1.5 transition-all',
-            !isMobile && 'bg-gray-100'
+            !isMobile && 'bg-gray-100 dark:bg-gray-500'
           )}
           onClick={() => setIsMobile(false)}
         >

diff --git a/components/Dashboard/ReviewForm.tsx b/components/Dashboard/ReviewForm.tsx
@@ -75,12 +75,12 @@ const ReviewForm: React.FC<ReviewFormProps> = (props) => {
         {/* Design  */}
         {currentStepId === 'WELCOME_PAGE' && (
           <div className="relative w-full max-w-lg rounded-xl bg-white p-6 pt-4 shadow-lg">
-            <div className="absolute -top-3.5 right-3 flex items-center gap-2 rounded-full border bg-white px-4 py-1 text-sm">
+            <div className="absolute -top-3.5 right-3 flex dark:text-black items-center gap-2 rounded-full border bg-white px-4 py-1 text-sm">
               <HeartFilledIcon className="h-4 w-4" />
               Powered by Review
             </div>
             <div className="my-2">
-              <HeartFilledIcon className="h-12 w-12" />
+              <HeartFilledIcon className="h-12 w-12 text-black" />
             </div>
             <h1 className="form_title">{formData.introTitle}</h1>
             <p className="mb-3 text-gray-500">{introMsg[0]}</p>
@@ -100,12 +100,12 @@ const ReviewForm: React.FC<ReviewFormProps> = (props) => {
         {/* Response Page  */}
         {currentStepId === 'RESPONSE_PAGE' && (
           <div className="relative w-full max-w-lg rounded-xl bg-white p-6 pt-4 shadow-lg">
-            <div className="absolute -top-3.5 right-3 flex items-center gap-2 rounded-full border bg-white px-4 py-1 text-sm">
+            <div className="absolute -top-3.5 right-3 flex items-center gap-2 rounded-full border bg-white px-4 py-1 text-sm dark:text-black">
               <HeartFilledIcon className="h-4 w-4" />
               Powered by Review
             </div>
             <div className="my-2 flex w-full justify-between">
-              <HeartFilledIcon className="h-12 w-12" />
+              <HeartFilledIcon className="h-12 w-12 text-black" />
               <Button className="flex h-10 w-10 items-center justify-center rounded-full border bg-transparent p-2 text-gray-500 shadow-sm transition-all hover:bg-gray-100">
                 <ArrowLeft />
               </Button>
@@ -140,9 +140,10 @@ const ReviewForm: React.FC<ReviewFormProps> = (props) => {
               <Textarea
                 placeholder="Write something nice ✨"
                 name="testimonial"
-                className="mt-4"
+                className="mt-4 resize-none"
                 rows={7}
                 required
+
               />
               <Button
                 style={{ background: primaryColor }}
@@ -159,12 +160,12 @@ const ReviewForm: React.FC<ReviewFormProps> = (props) => {
         {currentStepId === 'CUSTOMER_DETAIL_PAGE' && (
           <>
             <div className="relative mb-8 mt-96 w-full max-w-lg rounded-xl bg-white p-6 pt-4 shadow-lg">
-              <div className="absolute -top-3.5 right-3 flex items-center gap-2 rounded-full border bg-white px-4 py-1 text-sm">
+              <div className="absolute -top-3.5 right-3 flex items-center gap-2 rounded-full border bg-white px-4 py-1 text-sm dark:text-black">
                 <HeartFilledIcon className="h-4 w-4" />
                 Powered by Review
               </div>
               <div className="my-2">
-                <HeartFilledIcon className="h-12 w-12" />
+                <HeartFilledIcon className="h-12 w-12 text-black" />
               </div>
               <h1 className="form_title">Almost done 🙌</h1>
               <form className="mt-5 flex  w-full flex-col gap-4 text-black">
@@ -206,7 +207,7 @@ const ReviewForm: React.FC<ReviewFormProps> = (props) => {
                             alt="logo"
                           />
                         </div>
-                        <p className="rounded-lg border border-input bg-background px-4 py-2 font-semibold hover:bg-accent hover:text-accent-foreground">
+                        <p className="rounded-lg border border-input bg-background px-4 py-2 font-semibold hover:bg-accent hover:text-accent-foreground dark:text-white ">
                           Pick an image
                         </p>
                       </div>
@@ -271,7 +272,7 @@ const ReviewForm: React.FC<ReviewFormProps> = (props) => {
           <div className="flex w-full max-w-lg flex-col items-center justify-center">
             <div className="w-full rounded-md bg-white px-6 py-4 shadow-lg">
               <div className="my-2">
-                <HeartFilledIcon className="h-12 w-12" />
+                <HeartFilledIcon className="h-12 w-12 text-black" />
               </div>
               <h1 className="form_title text-2xl">{formData.thankyouTitle}</h1>
               <p className="my-2 text-base text-gray-500">
@@ -280,9 +281,9 @@ const ReviewForm: React.FC<ReviewFormProps> = (props) => {
             </div>
             <div className="relative mt-12 w-full rounded-md border bg-white p-6">
               <div className="absolute -top-3.5 right-3 flex items-center gap-2 rounded-full border bg-white p-3 text-sm">
-                <HeartFilledIcon className="h-6 w-6" />
+                <HeartFilledIcon className="h-6 w-6 text-black" />
               </div>
-              <h1 className="text-xl font-bold">
+              <h1 className="text-xl font-bold dark:text-black">
                 You just sent a testimonial with Review
               </h1>
               <p className="my-2 text-lg text-gray-500">

diff --git a/pages/__app/signup.tsx b/pages/__app/signup.tsx
@@ -46,6 +46,7 @@ const SignUpPage: NextPage = () => {
     resolver: zodResolver(formSchema),
     defaultValues: {
       firstName: '',
+      lastName: '',
       email: '',
       password: '',
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,6 +97,7 @@ const DashboardSidebar: React.FC = () => { @@
                           />
                         </div>
                       ) : (
                         <p className="relative flex h-10 w-10 items-center justify-center rounded-full bg-violet-700 font-semibold text-white">
                           {user?.firstName.charAt(0)}
                           {user?.lastName?.charAt(0)}
@@ Expand Down @@