diff --git a/zubhub_frontend/zubhub/src/components/activity/activity.jsx b/zubhub_frontend/zubhub/src/components/activity/activity.jsx index 8b137d98..555fa59f 100644 --- a/zubhub_frontend/zubhub/src/components/activity/activity.jsx +++ b/zubhub_frontend/zubhub/src/components/activity/activity.jsx @@ -1,34 +1,29 @@ -import React from 'react'; -import { Link } from 'react-router-dom'; -import PropTypes from 'prop-types'; -import { connect } from 'react-redux'; -import clsx from 'clsx'; -import { makeStyles } from '@mui/styles'; -import { style } from '../../assets/js/styles/components/activity/activityStyle'; -import BookmarkIcon from '@mui/icons-material/Bookmark'; -import BookmarkBorderIcon from '@mui/icons-material/BookmarkBorder'; +import EmojiObjectsIcon from '@mui/icons-material/EmojiObjects'; import VisibilityIcon from '@mui/icons-material/Visibility'; import { - getActivities, - activityToggleSave, - setActivity, -} from '../../store/actions/activityActions'; -import { + Box, Card, CardActions, CardContent, CardMedia, - Typography, - Box, - Grid, - Avatar, Tooltip, + Typography } from '@mui/material'; -import VisibilityIcon from '@mui/icons-material/Visibility'; +import { makeStyles } from '@mui/styles'; +import clsx from 'clsx'; +import PropTypes from 'prop-types'; +import { default as React, default as React } from 'react'; import { MdPublicOff } from 'react-icons/md'; +import { connect } from 'react-redux'; +import { Link } from 'react-router-dom'; import commonStyles from '../../assets/js/styles'; +import { style } from '../../assets/js/styles/components/activity/activityStyle'; import { dFormatter } from '../../assets/js/utils/scripts'; -import EmojiObjectsIcon from '@mui/icons-material/EmojiObjects'; +import { + activityToggleSave, + getActivities, + setActivity, +} from '../../store/actions/activityActions'; import Categories from '../categories/Categories'; import Creators from '../creators/Creators'; @@ -46,6 +41,13 @@ function Activity(props) { onClick={e => props.setActivity(activity)} > + {!activity.publish && ( + + + + + + )} {!activity.publish && ( @@ -59,6 +61,8 @@ function Activity(props) { alt={activity.title} className={clsx(classes.activityCardImage, !activity.publish && classes.unpublishedCardImage )} /> + className={clsx(classes.activityCardImage, !activity.publish && classes.unpublishedCardImage )} + /> @@ -69,6 +73,18 @@ function Activity(props) { > {activity.title} + + {activity.title} + )} + + + {activity.introduction.replace(/(<([^>]+)>)/gi, "")} + + {activity.category.length > 0 && ( + + )} + + {activity.views_count} + className={classes.captionIconStyle} + color="textSecondary" + variant="caption" + component="span" > {activity.views_count} @@ -102,8 +132,25 @@ function Activity(props) { {` - ${dFormatter(activity.created_on).value} - ${t(`date.${dFormatter(activity.created_on).key}`)} + ${dFormatter(activity.created_on).value} + ${t(`date.${dFormatter(activity.created_on).key}`)} + ${t('date.ago',)} + `} + + + + {activity.inspired_projects.length} + + + + {` + ${dFormatter(activity.created_on).value} + ${t(`date.${dFormatter(activity.created_on).key}`)} ${t('date.ago',)} `}