Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Old dev server #1622

Merged
merged 5 commits into from
Aug 14, 2024
Merged

Old dev server #1622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
039ace6
fix(wadhwani):Fixed length of description
Aug 9, 2024
cbd6a8a
fix(home):Fixed counts of Impact
Aug 13, 2024
325e9be
fix(home):Used websocket values for impacts
Aug 13, 2024
b693a77
Merge pull request #1618 from karivarkey/old-dev
viraka Aug 13, 2024
1c68863
Merge pull request #1620 from gtech-mulearn/old-dev
viraka Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Components/Navbar/Mylinks.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,13 @@ export const links = [
link: "/buildforteam",
foreign: false,
},
{
name: "Wadhwani",
submenu: false,
sublinks: [],
link: "/wadhwani",
foreign: false,
},
],
},
],
Expand Down
102 changes: 83 additions & 19 deletions src/Pages/Home/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand All @@ -55,20 +55,29 @@ const MuLiveCounter = () => {
</p>
<p className={styles.cvc_text}>Learning Circles</p>
</div>
{counts.org_type_counts
.sort((a, b) => b.org_count - a.org_count)
.map((orgTypeCount) => (
<div className={styles.count}>
<p className={styles.cvc_heading}>
<CountUp end={orgTypeCount.org_count} duration={5} />+
</p>
<p className={styles.cvc_text}>
{orgTypeCount.org_type.endsWith("y")
? orgTypeCount.org_type.slice(0, -1) + "ies"
: orgTypeCount.org_type + "s"}
</p>
</div>
))}
{counts &&
counts.org_type_counts
.sort((a, b) => b.org_count - a.org_count)
.map((orgTypeCount) => (
<div key={orgTypeCount.org_type} className={styles.count}>
<p className={styles.cvc_heading}>
<CountUp
end={
orgTypeCount.org_type === "Company"
? 200
: orgTypeCount.org_count
}
duration={5}
/>
+
</p>
<p className={styles.cvc_text}>
{orgTypeCount.org_type.endsWith("y")
? orgTypeCount.org_type.slice(0, -1) + "ies"
: orgTypeCount.org_type + "s"}
</p>
</div>
))}

<div className={styles.count}>
<p className={styles.cvc_heading}>
Expand All @@ -82,6 +91,44 @@ const MuLiveCounter = () => {
</p>
<p className={styles.cvc_text}>Interest Groups</p>
</div>

<div className={styles.count}>
<p className={styles.cvc_heading}>
<CountUp end={counts.karma_pow_count.karma_count} duration={5} />+
</p>
<p className={styles.cvc_text}>Total Karma Mined</p>
</div>
<div className={styles.count}>
<p className={styles.cvc_heading}>
<CountUp end={counts.karma_pow_count.pow_count} duration={5} />+
</p>
<p className={styles.cvc_text}>Number of Proof of Works </p>
</div>
<div className={styles.count}>
<p className={styles.cvc_heading}>
<CountUp end={2000} duration={5} />+
</p>
<p className={styles.cvc_text}>Number of Internships</p>
</div>
<div className={styles.count}>
<p className={styles.cvc_heading}>
<CountUp end={1000} duration={5} />+
</p>
<p className={styles.cvc_text}>Jobs</p>
</div>
<div className={styles.count}>
<p className={styles.cvc_heading}>
<CountUp end={100} duration={5} />+
</p>
<p className={styles.cvc_text}>Products</p>
</div>
<div className={styles.count}>
<p className={styles.cvc_heading}>
<CountUp end={20} duration={5} />
</p>
<p className={styles.cvc_text}>Lakhs Gig Works</p>
</div>

{counts.enablers_mentors_count
.sort((a, b) => b.role_count - a.role_count)
.map((roleCount) => (
Expand Down Expand Up @@ -127,7 +174,11 @@ const Home = () => {
>
<button className={styles.primary}>Join µLearn</button>
</a>
<a rel="noopener noreferrer" target="_blank" href="https://launchpadkerala.org/">
<a
rel="noopener noreferrer"
target="_blank"
href="https://launchpadkerala.org/"
>
<button className={styles.secondary}>Join Launchpad 🚀</button>
</a>
</div>
Expand Down Expand Up @@ -466,10 +517,23 @@ const Home = () => {

<div className={styles.countviewmain_container}>
<div className={styles.countview_container}>
<div className={styles.count_view}>
<div className={styles.left_side}>
<div
className={styles.count_view}
style={{
height: "100%",
}}
>
<div
style={{
height: "100%", // Ensure the container takes full height of its parent
display: "flex",
flexDirection: "column",
justifyContent: "flex-start",
alignItems: "flex-start", // Align items to the start of the container\
}}
className={styles.left_side}
>
<p className={styles.cv_heading}>
{" "}
The <span>Impact</span> of <span>µLearn.</span>
</p>
<p className={styles.cv_text}>
Expand Down
5 changes: 3 additions & 2 deletions src/Pages/Home/Home.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ a {
display: grid;
grid-template-columns: 50% 50%;
margin-top: 2rem;
gap: 1rem;
}

.count {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -793,4 +794,4 @@ a {
margin-top: 1rem;
width: 49%;
}
}
}
15 changes: 8 additions & 7 deletions src/Pages/Wadhwani/Wadhwani.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -55,7 +55,10 @@ const Wadhwani = () => {
on the soft skills of the person.
</p>
<p>Feel free to check out our courses!</p>
<a className={styles.buttonMuorange} href="https://app.mulearn.org/dashboard/wadhwani">
<a
className={styles.buttonMuorange}
href="https://app.mulearn.org/dashboard/wadhwani"
>
Explore Wadhwani
</a>
</div>
Expand All @@ -71,23 +74,21 @@ 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",


}}
>
<CardContent>
<Typography gutterBottom variant="h5" component="div">
{item.courseName}
</Typography>
<Typography variant="body2" color="text.secondary">
{item.description.substring(0, 120)}...
{item.description}
</Typography>
<Typography variant="body4" color="text.secondary">
Duration: {item.CourseDuration} hrs
Expand Down
Loading