resolving conflicts

Signed-off-by: Aditya-eddy <[email protected]>
keploy · Mar 28, 2024 · 457a9ec · 457a9ec
2 parents c6468aa + a400e22
commit 457a9ec
Show file tree

Hide file tree

Showing 8 changed files with 10,709 additions and 505 deletions.
diff --git a/app/(default)/page.tsx b/app/(default)/page.tsx
@@ -8,21 +8,52 @@ export const metadata = {
 import Hero from '@/components/hero'
 import Features from '@/components/features'
 import ProblemBlocks from '@/components/problem-blocks'
-import Testimonials from '@/components/testimonials'
 import Newsletter from '@/components/newsletter'
 import Language from "@/components/language";
 import Community from "@/components/community";
-import TwitterTestimonials from "@/components/TwitterTestimonials";
+
+import MarutiLogo from "@/public/images/users/Logo_for_Maruti_Suzuki.svg";
+import NutanixLogo from "@/public/images/users/Nutanix_Logo.svg";
+import { Testimonial } from "@/components/testimonial";
+
+const testimonialData = [
+  {
+    image: MarutiLogo,
+    content:
+      "Our recent collaboration with Keploy was truly remarkable. Keploy team provided exceptional support and remained highly proactive throughout the entire experience. Keploy platform has added business value to Maruti Suzuki.",
+    author: "Executive Member",
+    company: "@Maruti Suzuki",
+  },
+  {
+    image: NutanixLogo,
+    content:
+      "Makes it easy to unit test my complex systems with realistic test data.",
+    author: "Staff Engineer",
+    company: "@Nutanix",
+  },
+  // Add more testimonials as needed
+];
 
 export default function Home() {
   return (
     <>
         <Hero />
         <ProblemBlocks />
         <Features />
-        <Community/>
-        <Testimonials />
-        <TwitterTestimonials/>
+
+        <Testimonial
+          content={testimonialData[0].content}
+          author={testimonialData[0].author}
+          company={testimonialData[0].company}
+          image={testimonialData[0].image}
+        />
+        <Community />
+        <Testimonial
+          content={testimonialData[1].content}
+          author={testimonialData[1].author}
+          company={testimonialData[1].company}
+          image={testimonialData[1].image}
+        />
         <Language />
         <Newsletter />
 

diff --git a/components/FeatureMoblieView.tsx b/components/FeatureMoblieView.tsx
diff --git a/components/community.tsx b/components/community.tsx
@@ -32,7 +32,7 @@ const createCircleStyles = (
   totalCircles: number,
   index: number,
   containerWidth: number
-) : cardSurrondStyle => {
+): cardSurrondStyle => {
   const angle = 360 - 90;
   const dangle = 360 / totalCircles;
   const currentAngle = angle + dangle * index;
@@ -61,7 +61,7 @@ function SocialLinkCard({
         showExtraStyle ? "circle" : "w-3/4 mx-auto mb-5"
       } z-10 bg-white shadow-md rounded-lg border border-accent-500 p-4 hover:shadow-xl flex items-center justify-start group transition duration-300`}
     >
-      <div className="text-center w-12 h-12 sm:mr-2">
+      <div className="w-12 h-12 text-center sm:mr-2">
         <Image src={svgIcon} alt={platformName} />
       </div>
       <div className="mt-2 ml-2">
@@ -138,7 +138,7 @@ export default function Community() {
   ));
 
   return (
-    <section className="relative py-8">
+    <section className="relative py-8 ">
       <div className="max-w-3xl mx-auto text-center">
         <h2 className="h2 text-secondary-300">
           🐰 Join the Keploy community ✨
@@ -151,7 +151,7 @@ export default function Community() {
           <Image
             src={CommunityBunny}
             alt="Image"
-            className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 bg-white"
+            className="absolute -translate-x-1/2 -translate-y-1/2 bg-white top-1/2 left-1/2"
           />
         </div>
         <div className="md:hidden">