Merge branch 'master' into add-profile

shyamtawli · Jun 17, 2024 · 77d6ed7 · 77d6ed7
2 parents 2189ba2 + 8c9c4aa
commit 77d6ed7
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 6 deletions.
diff --git a/public/data/Monalisha-Roy.json b/public/data/Monalisha-Roy.json
@@ -0,0 +1,13 @@
+{
+  "name": "Monalisha Roy",
+  "location": "Assam, India",
+  "bio": "Dedicated tech enthusiast pursuing B.Tech in Computer Science and Engineering. Passionate about technology and continuous learning. Open to collaborations for meaningful contributions to the tech landscape.",
+  "avatar": "https://github.com/Monalisha-Roy.png",
+  "portfolio": "https://github.com/Monalisha-Roy",
+  "skills": ["Nextjs", "ReactJS", "TailwindCSS", "NodeJS", "HTML", "CSS", "TypeScript", "PostgreSQL"],
+  "social": {
+    "GitHub": "https://github.com/Monalisha-Roy",
+    "Twitter": "https://twitter.com/RoyMonalis14310?t=gGFQSdjUq3E3AG_4SK4rZg&s=09",
+    "LinkedIn": "www.linkedin.com/in/monalisha-roy-995978252"
+  }
+}
diff --git a/public/data/Sahilll15.json b/public/data/Sahilll15.json
@@ -0,0 +1,27 @@
+{
+  "name": "Sahil Sanjay Chalke",
+  "location": "Mumbai, India 🇮🇳", 
+  "bio": "FULL STACK DEV",
+  "avatar": "https://avatars.githubusercontent.com/u/109215419?v=4",
+  "portfolio": "https://sahilchalke.online/",
+  "skills": [
+    "Javascript",
+    "C++",
+    "Typescript",
+    "Nodejs",
+    "Expressjs",
+    "React",
+    "Next.Js",
+    "MySQL",
+    "MongoDB",
+    "Docker",
+    "Git",
+    "Tailwind CSS",
+    "REST APIs",
+    "GraphQL"
+  ],
+  "social": {
+    "GitHub": "https://github.com/Sahilll15",
+    "LinkedIn": "https://www.linkedin.com/in/sahilchalke/"
+  }
+}
diff --git a/src/App.js b/src/App.js
@@ -125,7 +125,7 @@ function App() {
       <div className="w-full pl-5 pr-4 md:h-screen md:w-[77%] md:overflow-y-scroll md:py-7" ref={profilesRef}>
         <Search onSearch={handleSearch} />
         {profiles.length === 0 && searching ? <NoResultFound /> : renderProfiles()}
-        {profiles.length > 0 && (
+        {combinedData.length > 0 && (
           <Pagination
             currentPage={currentPage}
             totalPages={Math.ceil((searching ? profiles.length : shuffledProfiles.length) / recordsPerPage)}

diff --git a/src/ProfilesList.json b/src/ProfilesList.json
@@ -421,6 +421,8 @@
   "abhishek732.json",
   "root-0101.json",
   "prajwalmandlik2004.json",
-  "Kritika.json",
-  "BHS-Harish.json"
-]
+  "BHS-Harish.json",
+  "Monalisha-Roy.json",
+  "Sahilll15.json",
+  "Kritika.json"
+]
diff --git a/src/components/Profile/Profile.jsx b/src/components/Profile/Profile.jsx
@@ -49,14 +49,14 @@ function Card({ data }) {
             {data.location}
           </p>
           <div
-            className="skills-container mt-4 flex h-9 gap-4 overflow-hidden hover:overflow-x-scroll hover:scroll-smooth"
+            className="skills-container mt-4 flex h-auto flex-wrap gap-1 overflow-hidden hover:overflow-x-scroll hover:scroll-smooth md:gap-4"
             ref={cardRef}
           >
             {data.skills &&
               data.skills.map((skill, index) => {
                 return (
                   <div
-                    className="inline h-[30px] cursor-default whitespace-nowrap rounded-md bg-secondaryColor px-2 py-1 text-sm text-white"
+                    className="inline h-auto cursor-default whitespace-nowrap rounded-md bg-secondaryColor px-2 py-1 text-[9px] text-white sm:text-sm md:h-[30px]"
                     key={index}
                   >
                     {skill}