diff --git a/src/components/CardTabs/Events/index.jsx b/src/components/CardTabs/Events/index.jsx index 8161da71..2605b29b 100644 --- a/src/components/CardTabs/Events/index.jsx +++ b/src/components/CardTabs/Events/index.jsx @@ -6,77 +6,82 @@ import React, { useEffect } from "react"; import { makeStyles } from "@mui/styles"; import { Grid } from "@mui/material"; -const useStyles = makeStyles((theme) => ({ - root: { - display: "flex", - flexWrap: "wrap", - "& > *": { - margin: theme.spacing(0.5), - }, - marginBottom: "2rem", - width: "100%", - flex: 1, - }, - logo: { - width: "2rem", - height: "2rem", - borderRadius: "50%", - marginRight: "10px", - }, +const useStyles = makeStyles(theme => ({ + root: { + display: "flex", + flexWrap: "wrap", + "& > *": { + margin: theme.spacing(0.5) + }, + marginBottom: "2rem", + width: "100%", + flex: 1 + }, + logo: { + width: "2rem", + height: "2rem", + borderRadius: "50%", + marginRight: "10px" + }, - card: { - display: "flex", - width: "100%", - }, + card: { + display: "flex", + width: "100%" + } })); -const EventsCard = (props) => { - const classes = useStyles(); +const EventsCard = props => { + const classes = useStyles(); - return ( -
- - - - {props.title} - - {props.events.map(function (event, index) { - return ( - - - - + return ( +
+ + + + {props.title} + + {props.events.map(function (event, index) { + return ( + + + + - - - {event.name} - - - {event.date} - - - - ); - })} - - -
- ); + + + {event.name} + + + {event.date} + + +
+ ); + })} +
+
+
+ ); }; export default EventsCard; diff --git a/src/components/CardTabs/Tags/index.jsx b/src/components/CardTabs/Tags/index.jsx index a0a5ccd2..8a566662 100644 --- a/src/components/CardTabs/Tags/index.jsx +++ b/src/components/CardTabs/Tags/index.jsx @@ -5,69 +5,71 @@ import Typography from "@mui/material/Typography"; import React, { useEffect } from "react"; import { makeStyles } from "@mui/styles"; -const useStyles = makeStyles((theme) => ({ - root: { - display: "flex", - justifyContent: "center", - flexWrap: "wrap", - "& > *": { - margin: theme.spacing(0.5), - }, - marginBottom: "2rem", - [theme.breakpoints.down("md")]: { - marginBottom: theme.spacing(0), - margin: "0.25rem", - }, - }, - tagsContainer: { - [theme.breakpoints.down("sm")]: { - maxWidth: "90vw", - display: "flex", - whiteSpace: "nowrap", - overflow: "auto", - "&::-webkit-scrollbar": { - height: "5px", - }, - }, - }, - chip: { - margin: "0px 10px 10px 0px", - borderRadius: "5px", - cursor: "pointer", - }, +const useStyles = makeStyles(theme => ({ + root: { + display: "flex", + justifyContent: "center", + flexWrap: "wrap", + "& > *": { + margin: theme.spacing(0.5) + }, + marginBottom: "2rem", + [theme.breakpoints.down("md")]: { + marginBottom: theme.spacing(0), + margin: "0.25rem" + } + }, + tagsContainer: { + [theme.breakpoints.down("sm")]: { + maxWidth: "90vw", + display: "flex", + whiteSpace: "nowrap", + overflow: "auto", + "&::-webkit-scrollbar": { + height: "5px" + } + } + }, + chip: { + margin: "0px 10px 10px 0px", + borderRadius: "5px", + cursor: "pointer" + } })); -const TagCard = (props) => { - const classes = useStyles(); +const TagCard = props => { + const classes = useStyles(); - return ( -
- - - - Popular Tags - -
- {props.tags.map(function (tag, index) { - return ( - - ); - })} -
-
-
-
- ); + return ( +
+ + + + Popular Tags + +
+ {props.tags.map(function (tag, index) { + return ( + + ); + })} +
+
+
+
+ ); }; export default TagCard; diff --git a/src/components/CardTabs/Users/index.jsx b/src/components/CardTabs/Users/index.jsx index b9143ab8..d6b8e7f5 100644 --- a/src/components/CardTabs/Users/index.jsx +++ b/src/components/CardTabs/Users/index.jsx @@ -5,56 +5,62 @@ import React from "react"; import { makeStyles } from "@mui/styles"; import UserElement from "./UserElement"; -const useStyles = makeStyles((theme) => ({ - root: { - display: "flex", - flexWrap: "wrap", - "& > *": { - margin: theme.spacing(0.5), - }, - flex: 1, - marginBottom: "2rem", - }, - userImg: { - width: "2rem", - height: "2rem", - borderRadius: "50%", - marginRight: "10px", - }, +const useStyles = makeStyles(theme => ({ + root: { + display: "flex", + flexWrap: "wrap", + "& > *": { + margin: theme.spacing(0.5) + }, + flex: 1, + marginBottom: "2rem" + }, + userImg: { + width: "2rem", + height: "2rem", + borderRadius: "50%", + marginRight: "10px" + }, - card: { - display: "flex", - minWidth: "100%", - width: "100%", - }, + card: { + display: "flex", + minWidth: "100%", + width: "100%" + }, - cardContent: { - width: "100%", - }, + cardContent: { + width: "100%" + } })); -const UserCard = (props) => { - const classes = useStyles(); - return ( -
- - - - {props.title} - - {props.users.map(function (user, index) { - return ( - - ); - })} - - -
- ); +const UserCard = props => { + const classes = useStyles(); + return ( +
+ + + + {props.title} + + {props.users.map(function (user, index) { + return ( + + ); + })} + + +
+ ); }; export default UserCard; diff --git a/src/components/Topbar/Activity/ActivityList.jsx b/src/components/Topbar/Activity/ActivityList.jsx index 8b193e45..742aefca 100644 --- a/src/components/Topbar/Activity/ActivityList.jsx +++ b/src/components/Topbar/Activity/ActivityList.jsx @@ -40,6 +40,7 @@ function ActivityList({ value, toggle, acitvitylist, classname }) {