From 039ace686f5fd78a79e73e7a223928a2d461a4e9 Mon Sep 17 00:00:00 2001
From: karivarkey
Date: Fri, 9 Aug 2024 07:31:55 +0530
Subject: [PATCH 1/3] fix(wadhwani):Fixed length of description
---
src/Components/Navbar/Mylinks.jsx | 7 +++++++
src/Pages/Wadhwani/Wadhwani.jsx | 15 ++++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/Components/Navbar/Mylinks.jsx b/src/Components/Navbar/Mylinks.jsx
index e5ab7a9d0..7edbbf608 100644
--- a/src/Components/Navbar/Mylinks.jsx
+++ b/src/Components/Navbar/Mylinks.jsx
@@ -237,6 +237,13 @@ export const links = [
link: "/buildforteam",
foreign: false,
},
+ {
+ name: "Wadhwani",
+ submenu: false,
+ sublinks: [],
+ link: "/wadhwani",
+ foreign: false,
+ },
],
},
],
diff --git a/src/Pages/Wadhwani/Wadhwani.jsx b/src/Pages/Wadhwani/Wadhwani.jsx
index 16244366d..fd25b45be 100644
--- a/src/Pages/Wadhwani/Wadhwani.jsx
+++ b/src/Pages/Wadhwani/Wadhwani.jsx
@@ -12,7 +12,7 @@ import Navbar from "../../Components/Navbar/Navbar";
import Footer from "../../Components/Footer/Footer";
import leader from "./assets/Leader.gif";
// import { getData } from "./services/api";
-import courseData from "./services/Data.json"
+import courseData from "./services/Data.json";
import { ThemeProvider, createTheme } from "@mui/material/styles";
const theme = createTheme({
palette: {
@@ -55,7 +55,10 @@ const Wadhwani = () => {
on the soft skills of the person.
Feel free to check out our courses!
-
+
Explore Wadhwani
@@ -71,15 +74,13 @@ const Wadhwani = () => {
key={index}
sx={{
width: 400,
- height: 200,
+ minHeight: 300,
border: "1px solid hsla(0, 0%, 100%, .18)",
borderRadius: "15px",
- boxShadow: "0 1px 12px 0 rgb(193 195 211 / 37%)",
+ boxShadow: "0 1px 12px 0 rgb(193 195 211 / 87%)",
marginBottom: "1rem",
display: "flex",
justifyContent: "space-between",
-
-
}}
>
@@ -87,7 +88,7 @@ const Wadhwani = () => {
{item.courseName}
- {item.description.substring(0, 120)}...
+ {item.description}
Duration: {item.CourseDuration} hrs
From cbd6a8a1170cc5a144e558a3ea3681d3fa6781c4 Mon Sep 17 00:00:00 2001
From: karivarkey
Date: Tue, 13 Aug 2024 07:33:09 +0530
Subject: [PATCH 2/3] fix(home):Fixed counts of Impact
---
src/Pages/Home/Home.jsx | 100 +++++++++++++++++++++++++++------
src/Pages/Home/Home.module.css | 5 +-
2 files changed, 85 insertions(+), 20 deletions(-)
diff --git a/src/Pages/Home/Home.jsx b/src/Pages/Home/Home.jsx
index fb2e1aa4e..5ce945746 100644
--- a/src/Pages/Home/Home.jsx
+++ b/src/Pages/Home/Home.jsx
@@ -55,20 +55,29 @@ const MuLiveCounter = () => {
Learning Circles
- {counts.org_type_counts
- .sort((a, b) => b.org_count - a.org_count)
- .map((orgTypeCount) => (
-
-
- +
-
-
- {orgTypeCount.org_type.endsWith("y")
- ? orgTypeCount.org_type.slice(0, -1) + "ies"
- : orgTypeCount.org_type + "s"}
-
-
- ))}
+ {counts &&
+ counts.org_type_counts
+ .sort((a, b) => b.org_count - a.org_count)
+ .map((orgTypeCount) => (
+
+
+
+ +
+
+
+ {orgTypeCount.org_type.endsWith("y")
+ ? orgTypeCount.org_type.slice(0, -1) + "ies"
+ : orgTypeCount.org_type + "s"}
+
+
+ ))}
@@ -82,6 +91,44 @@ const MuLiveCounter = () => {
Interest Groups
+
+
+
+ +
+
+
Total Karma Mined
+
+
+
+ +
+
+
Number of Proof of Works
+
+
+
+ +
+
+
Number of Internships
+
+
+
+
+
+
+
+
Lakhs Gig Works
+
+
{counts.enablers_mentors_count
.sort((a, b) => b.role_count - a.role_count)
.map((roleCount) => (
@@ -127,7 +174,11 @@ const Home = () => {
>
-
+
@@ -466,10 +517,23 @@ const Home = () => {
-
-
+
+
- {" "}
The Impact of µLearn.
diff --git a/src/Pages/Home/Home.module.css b/src/Pages/Home/Home.module.css
index 518a0cc55..9b6dbca0e 100644
--- a/src/Pages/Home/Home.module.css
+++ b/src/Pages/Home/Home.module.css
@@ -498,6 +498,7 @@ a {
display: grid;
grid-template-columns: 50% 50%;
margin-top: 2rem;
+ gap: 1rem;
}
.count {
@@ -551,7 +552,7 @@ a {
.countcontainer {
display: grid;
- grid-template-columns: 30% 30% 30%;
+ grid-template-columns: 25% 25% 25% 25%;
row-gap: 0rem;
column-gap: 2.5rem;
margin-top: 0rem;
@@ -793,4 +794,4 @@ a {
margin-top: 1rem;
width: 49%;
}
-}
\ No newline at end of file
+}
From 325e9be0011e9e4d47f4bfbcf6b05e7f321ef212 Mon Sep 17 00:00:00 2001
From: karivarkey
Date: Tue, 13 Aug 2024 20:24:16 +0530
Subject: [PATCH 3/3] fix(home):Used websocket values for impacts
---
src/Pages/Home/Home.jsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Pages/Home/Home.jsx b/src/Pages/Home/Home.jsx
index 5ce945746..6b0efaad2 100644
--- a/src/Pages/Home/Home.jsx
+++ b/src/Pages/Home/Home.jsx
@@ -31,7 +31,7 @@ const MuLiveCounter = () => {
socket.addEventListener("message", (event) => {
setCounts(JSON.parse(event.data));
- console.log("Message from server ", event.data);
+ //console.log("Message from server ", event.data);
});
socket.addEventListener("error", (event) => {
@@ -94,13 +94,13 @@ const MuLiveCounter = () => {
- +
+ +
Total Karma Mined
- +
+ +
Number of Proof of Works