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.

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

[ADD]: MyFeed Page #863

Merged
merged 6 commits into from
Aug 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"redux-thunk": "^2.3.0",
"simple-peer": "^9.11.1",
"start-server-and-test": "^1.15.3",
"swiper": "^10.2.0",
"url": "^0.11.0",
"validator": "^13.6.0",
"y-quill": "^0.1.5",
Expand Down
164 changes: 164 additions & 0 deletions src/components/MyFeed/DiscoverCodelabz/CodelabzCarousel.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
import React, { useState, useEffect } from "react";
import { Swiper, SwiperSlide } from "swiper/react";
import { Navigation, Pagination } from "swiper/modules";
import "swiper/css/bundle";
import "swiper/css";
import "swiper/css/effect-coverflow";
import "swiper/css/pagination";
import Box from "@mui/material/Box";
import Grid from "@mui/material/Grid";
import Skeleton from "@mui/material/Skeleton";
import Card from "@mui/material/Card";
import CardActionArea from "@mui/material/CardActionArea";
import CardContent from "@mui/material/CardContent";
import CardMedia from "@mui/material/CardMedia";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import { Paper } from "@mui/material";
import { makeStyles } from "@mui/styles";
import { useDispatch, useSelector } from "react-redux";
import { useFirestore, useFirebase } from "react-redux-firebase";
import Default from "../../../assets/images/logo.jpeg";
import { Link } from "react-router-dom";
import { clearOrgData, getLaunchedOrgsData } from "../../../store/actions";
import {
getTutorialFeedIdArray,
getTutorialFeedData
} from "../../../store/actions/tutorialPageActions";

const useStyles = makeStyles(theme => ({
container: {
margin: "20px 0"
},
root: {
height: "100%",
display: "flex",
alignItems: "center",
justifyContent: "space-evenly",
flexDirection: "column"
},
media: {
height: "auto",
maxHeight: "180px",
minHeight: "200px",
width: "100%"
},
heading: {
padding: "10px 20px 0",
fontSize: "1.1rem",
fontWeight: "600"
}
}));

const CodelabzCarousel = ({ sortBy }) => {
const classes = useStyles();

const tutorials = useSelector(
({ tutorialPage }) => tutorialPage.feed.homepageFeedArray
) || [0, 0, 0, 0, 0, 0];
const profileData = useSelector(({ firebase: { profile } }) => profile);
const dispatch = useDispatch();
const firestore = useFirestore();
const firebase = useFirebase();

useEffect(() => {
const getFeed = async () => {
const tutorialIdArray = await getTutorialFeedIdArray(profileData.uid)(
firebase,
firestore,
dispatch
);
getTutorialFeedData(tutorialIdArray)(firebase, firestore, dispatch);
};
getFeed();
return () => {};
}, [firestore, dispatch]);

console.log(tutorials);

const getTitle = () => {
switch (sortBy) {
case "trending":
return "Trending Now";
case "featured":
return "Featured on Codelabz";
case "best":
return "Best of this month";
}
};
return (
<>
<Paper variant="outlined" className={classes.container}>
<Typography variant="h4" className={classes.heading}>
{getTitle()}
</Typography>
<Swiper
modules={[Navigation]}
navigation={true}
slidesPerView={4}
grabCursor={true}
loop={true}
spaceBetween={20}
style={{ padding: "20px 20px" }}
>
{tutorials.map((tutorial, i) => {
return tutorial == 0 ? (
<SwiperSlide>
<Paper variant="outlined" className={classes.root}>
<Skeleton
variant="rectangular"
animation="wave"
width={"100%"}
height={180}
/>
<Skeleton width={"100%"} height={"25px"} />
<Skeleton width={"60%"} height={"25px"} />
</Paper>
</SwiperSlide>
) : (
<SwiperSlide>
<Link to={`/tutorial/${tutorial?.tutorial_id}`}>
<Paper variant="outlined" className={classes.root}>
<CardActionArea>
<CardMedia
className={classes.media}
alt="CodeLabz"
component="img"
title="CodeLabz"
height={350}
image={
tutorial?.featured_image
? tutorial?.featured_image
: Default
}
/>
<CardContent
style={{
overflow: "hidden",
padding: 10
}}
>
<Typography gutterBottom variant="h5" component="h2">
{tutorial?.title}
</Typography>
<Typography
variant="body2"
color="textSecondary"
component="p"
>
{tutorial?.summary}
</Typography>
</CardContent>
</CardActionArea>
</Paper>
</Link>
</SwiperSlide>
);
})}
</Swiper>
</Paper>
</>
);
};

export default CodelabzCarousel;
51 changes: 51 additions & 0 deletions src/components/MyFeed/DiscoverCodelabz/CodelabzExplore.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import React, { useState, useEffect } from "react";
import Box from "@mui/material/Box";
import Typography from "@mui/material/Typography";
import { makeStyles } from "@mui/styles";
import { useDispatch, useSelector } from "react-redux";
import { useFirestore } from "react-redux-firebase";
import CodelabzCarousel from "./CodelabzCarousel";
const useStyles = makeStyles(theme => ({
container: {
padding: "30px"
},
heading: {
fontSize: "1.2rem",
fontWeight: "600",
marginBottom: "10px"
},
subHeading: {
fontSize: "1rem",
marginBottom: "10px",
fontWeight: "400"
}
}));
const CodelabzExplore = () => {
const [selectedTab, setSelectedTab] = useState(0);
const classes = useStyles();
const dispatch = useDispatch();
const firestore = useFirestore();

const handleTabChange = (e, value) => {
setSelectedTab(value);
};

return (
<>
<Box className={classes.container}>
<Typography variant="h4" className={classes.heading}>
Discover Codelabz
</Typography>
<Typography variant="h5" className={classes.subHeading}>
Explore top rated Codelabz and find what you are looking for
</Typography>

<CodelabzCarousel sortBy={"trending"} />
<CodelabzCarousel sortBy={"best"} />
<CodelabzCarousel sortBy={"featured"} />
</Box>
</>
);
};

export default CodelabzExplore;
100 changes: 100 additions & 0 deletions src/components/MyFeed/discoverOrgs/OrgExplore.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
import React, { useState, useEffect } from "react";
import Box from "@mui/material/Box";
import Grid from "@mui/material/Grid";
import Typography from "@mui/material/Typography";
import { Tabs, Tab, Paper } from "@mui/material";
import { makeStyles } from "@mui/styles";
import OrgsCarousel from "./components/orgsCarousel";
import TagCard from "../../CardTabs/Tags";
const useStyles = makeStyles(theme => ({
container: {
padding: "30px 40px 0"
},
heading: {
fontSize: "1.2rem",
fontWeight: "600",
marginBottom: "10px"
},
subHeading: {
fontSize: "1rem",
marginBottom: "10px",
fontWeight: "400"
}
}));
const OrgsExplore = () => {
const [selectedTab, setSelectedTab] = useState(0);
const classes = useStyles();

const [tags, setTags] = useState([
"HTML",
"JavaScript",
"Css",
"Python",
"React",
"Java",
"HTML",
"System Design",
"Cyber Security",
"Python",
"Node",
"Django",
"C",
"C++",
"Python",
"GoLang",
"ML",
"AI/ML",
"Cloud",
"DevOps",
"Figma",
"Angular"
]);

const handleTabChange = (e, value) => {
setSelectedTab(value);
};

return (
<>
<Box className={classes.container}>
<Typography
variant="h4"
className={classes.heading}
data-testId="codefeedTitle"
>
Discover Organizations
</Typography>
<Typography variant="h5" className={classes.subHeading}>
Explore top rated organization and find what you are looking for
</Typography>
<Tabs
scrollButtons="auto"
value={selectedTab}
onChange={handleTabChange}
>
<Tab label="All" />
<Tab label="Design" />
<Tab label="JavaScript" />
<Tab label="Web Development" />
<Tab label="Android" />
</Tabs>
<OrgsCarousel />
<Grid
container
alignContent="center"
direction="column"
style={{
width: "100%"
}}
data-testId="explorePageTag"
>
<Grid item>
<TagCard tags={tags} sx={{ width: "100%" }} />
</Grid>
</Grid>
</Box>
</>
);
};

export default OrgsExplore;
Loading
Loading