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

Bugfix 467 author profile mobile adaptation #710

Merged
merged 2 commits into from
Feb 4, 2022
Merged

Bugfix 467 author profile mobile adaptation #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce7cd78
Issue 467 created expert profile for mobile screen
Dergelyova Feb 1, 2022
6cb12ee
bugfix 467 adapted expert profile to mobile
Dergelyova Feb 1, 2022
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
36 changes: 34 additions & 2 deletions src/old/modules/experts/components/ExpertInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Avatar, Grid, Typography } from '@material-ui/core';
import React from 'react';
import { Avatar, Grid, Typography, Box, CardMedia } from '@material-ui/core';
import React, { useContext } from 'react';
import { IExpert } from '../../../lib/types';
import { useStyles } from '../styles/ExpertInfo.styles';
import Accordion from './Accordion';
import { ScreenContext } from '../../../provider/MobileProvider/ScreenContext';

export interface IExpertInfoProps {
expert: IExpert;
Expand All @@ -11,6 +12,37 @@ export interface IExpertInfoProps {
const ExpertInfo: React.FC<IExpertInfoProps> = ({ expert }) => {
const classes = useStyles();
const expertFullName = `${expert.firstName} ${expert.lastName}`;
const { mobile } = useContext(ScreenContext);

if (mobile) {
return (
<>
<Box className={classes.root}>
<Box className={classes.avatarSection}>
<Avatar
src={expert.avatar}
alt="Photo"
variant="circle"
className={classes.avatar}
/>
</Box>
<Box>
<Typography variant="h3" className={classes.fullName}>
{expertFullName}
</Typography>
<Typography align="justify" className={classes.bio}>
{expert.bio}
</Typography>
</Box>
</Box>
<Grid container item className={classes.accordionWrapper}>
{expert.email || expert.socialNetwork ? (
<Accordion expert={expert} />
) : null}
</Grid>
</>
);
}

return (
<>
Expand Down
244 changes: 139 additions & 105 deletions src/old/modules/experts/components/ExpertMaterialsContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box, Grid, Typography } from '@material-ui/core';
import { isEmpty, uniq } from 'lodash';
import React, { useEffect, useRef, useState } from 'react';
import React, { useEffect, useRef, useState, useContext } from 'react';
import { useSelector } from 'react-redux';
import { useHistory } from 'react-router-dom';
import SentimentVeryDissatisfiedIcon from '@material-ui/icons/SentimentVeryDissatisfied';
Expand Down Expand Up @@ -58,6 +58,8 @@ import {
} from '../../../../models/expertMaterials';
import { updatePostTypes, updateDir } from '../../utilities/utilityFunctions';
import { selectExpertPostsByIds } from '../../../../models/helpers/selectors';
import { ScreenContext } from '../../../provider/MobileProvider/ScreenContext';
import ExpertMaterialsMobile from './ExpertMaterialsMobile';

export interface IExpertMaterialsContainerProps {
expertId: number;
Expand Down Expand Up @@ -97,6 +99,7 @@ const ExpertMaterialsContainer: React.FC<IExpertMaterialsContainerProps> = ({
ActiveDirectionType[]
>();
const previous = usePrevious({ page });
const { mobile } = useContext(ScreenContext);

const [boundResetMaterials, boundFetchExpertMaterials] = useActions([
resetMaterials,
Expand Down Expand Up @@ -411,6 +414,138 @@ const ExpertMaterialsContainer: React.FC<IExpertMaterialsContainerProps> = ({
</Grid>
);
}
const FilterCheckboxes = propertiesLoaded && (
<>
<CheckboxLeftsideFilterForm
disabledPostTypes={disabledPostTypes}
expertId={expertId}
onFormChange={(checked, disabled) =>
setFilters(checked, FilterTypeEnum.POST_TYPES, disabled)
}
possibleFilters={postTypesInPlural}
selectedFilters={selectedPostTypes}
filterTitle={t(langTokens.common.byType).toLowerCase()}
allTitle={t(langTokens.common.allTypes)}
setTheOnlyAvailableFilter={(name) => {
handleChipsLogicTransform(name, FilterTypeEnum.POST_TYPES);
}}
filterType={QueryTypeEnum.POST_TYPES}
/>
<CheckboxLeftsideFilterForm
disabledDirections={disabledDirections}
expertId={expertId}
onFormChange={(checked, disabled) =>
setFilters(checked, FilterTypeEnum.DIRECTIONS, disabled)
}
possibleFilters={directions}
selectedFilters={selectedDirections}
filterTitle={t(langTokens.common.byDirection).toLowerCase()}
allTitle={t(langTokens.common.allDirections)}
setTheOnlyAvailableFilter={(name) => {
handleChipsLogicTransform(name, FilterTypeEnum.DIRECTIONS);
}}
filterType={QueryTypeEnum.DIRECTIONS}
/>
</>
);

const header = () => {
if (!mobile)
return (
<Typography
className={classes.chipsHeading}
component="div"
variant="subtitle2"
>
{`${t(langTokens.experts.selectedExpertMaterials)}:`}
</Typography>
);
return <></>;
};

const SelectedTypes = (
<Box className={classes.container}>
{header()}
{typeof selectedPostTypes === 'string' && !TheOnlyAvailablePostType ? (
<Typography
className={classes.selectedFilters}
component="div"
variant="subtitle2"
>
{t(langTokens.common.allTypes)}
</Typography>
) : (
<ChipsList
TheOnlyAvailablePostType={TheOnlyAvailablePostType}
filtersPlural={postTypesInPlural}
checkedNames={getPostTypes()}
handleDelete={handleDeleteChip}
chipsListType={ChipFilterEnum.POST_TYPE}
/>
)}
<Typography className={classes.divider} component="span">
|
</Typography>
{typeof selectedDirections === 'string' && !TheOnlyAvailableDirection ? (
<Typography
className={classes.selectedFilters}
component="div"
variant="subtitle2"
>
{t(langTokens.common.allDirections)}
</Typography>
) : (
<ChipsList
TheOnlyAvailableDirection={TheOnlyAvailableDirection}
checkedNames={getDirections()}
handleDelete={handleDeleteChip}
chipsListType={ChipFilterEnum.DIRECTION}
/>
)}
<Typography className={classes.divider} component="span">
|
</Typography>
<Typography
className={classes.totalFilters}
component="div"
variant="subtitle2"
color="textSecondary"
>
{totalElements}{' '}
{t(langTokens.materials.material, {
count: totalElements,
}).toLowerCase()}
</Typography>
</Box>
);

const LoadMoreButtonEl = (
<LoadMoreButton
clicked={loadMore}
isLastPage={isLastPage}
loading={loading}
totalPages={totalPages}
totalElements={totalElements}
pageNumber={pageNumber}
textType={LoadMoreButtonTextType.POST}
/>
);

if (mobile) {
return (
<ExpertMaterialsMobile
expert={expert}
page={page}
loading={loading}
totalElements={totalElements}
materials={materials}
SelectedTypes={SelectedTypes}
FilterCheckboxes={FilterCheckboxes}
resetPage={loadMore}
LoadMoreButton={LoadMoreButtonEl}
/>
);
}

return (
<>
Expand All @@ -428,40 +563,7 @@ const ExpertMaterialsContainer: React.FC<IExpertMaterialsContainerProps> = ({
>
{t(langTokens.experts.selectExpertMaterials)}
</Typography>
{propertiesLoaded && (
<>
<CheckboxLeftsideFilterForm
disabledPostTypes={disabledPostTypes}
expertId={expertId}
onFormChange={(checked, disabled) =>
setFilters(checked, FilterTypeEnum.POST_TYPES, disabled)
}
possibleFilters={postTypesInPlural}
selectedFilters={selectedPostTypes}
filterTitle={t(langTokens.common.byType).toLowerCase()}
allTitle={t(langTokens.common.allTypes)}
setTheOnlyAvailableFilter={(name) => {
handleChipsLogicTransform(name, FilterTypeEnum.POST_TYPES);
}}
filterType={QueryTypeEnum.POST_TYPES}
/>
<CheckboxLeftsideFilterForm
disabledDirections={disabledDirections}
expertId={expertId}
onFormChange={(checked, disabled) =>
setFilters(checked, FilterTypeEnum.DIRECTIONS, disabled)
}
possibleFilters={directions}
selectedFilters={selectedDirections}
filterTitle={t(langTokens.common.byDirection).toLowerCase()}
allTitle={t(langTokens.common.allDirections)}
setTheOnlyAvailableFilter={(name) => {
handleChipsLogicTransform(name, FilterTypeEnum.DIRECTIONS);
}}
filterType={QueryTypeEnum.DIRECTIONS}
/>
</>
)}
<div>{FilterCheckboxes}</div>
</Grid>
<Grid
className={classes.materialsContainer}
Expand All @@ -472,67 +574,7 @@ const ExpertMaterialsContainer: React.FC<IExpertMaterialsContainerProps> = ({
md={9}
direction="column"
>
<Box className={classes.container}>
<Typography
className={classes.chipsHeading}
component="div"
variant="subtitle2"
>
{`${t(langTokens.experts.selectedExpertMaterials)}:`}
</Typography>
{typeof selectedPostTypes === 'string' &&
!TheOnlyAvailablePostType ? (
<Typography
className={classes.selectedFilters}
component="div"
variant="subtitle2"
>
{t(langTokens.common.allTypes)}
</Typography>
) : (
<ChipsList
TheOnlyAvailablePostType={TheOnlyAvailablePostType}
filtersPlural={postTypesInPlural}
checkedNames={getPostTypes()}
handleDelete={handleDeleteChip}
chipsListType={ChipFilterEnum.POST_TYPE}
/>
)}
<Typography className={classes.divider} component="span">
|
</Typography>
{typeof selectedDirections === 'string' &&
!TheOnlyAvailableDirection ? (
<Typography
className={classes.selectedFilters}
component="div"
variant="subtitle2"
>
{t(langTokens.common.allDirections)}
</Typography>
) : (
<ChipsList
TheOnlyAvailableDirection={TheOnlyAvailableDirection}
checkedNames={getDirections()}
handleDelete={handleDeleteChip}
chipsListType={ChipFilterEnum.DIRECTION}
/>
)}
<Typography className={classes.divider} component="span">
|
</Typography>
<Typography
className={classes.totalFilters}
component="div"
variant="subtitle2"
color="textSecondary"
>
{totalElements}{' '}
{t(langTokens.materials.material, {
count: totalElements,
}).toLowerCase()}
</Typography>
</Box>
<div className={classes.selectedFiltersWraper}>{SelectedTypes}</div>
{page === 0 && loading === LoadingStatusEnum.pending ? (
<LoadingContainer loading={LoadingStatusEnum.pending} expand />
) : (
Expand All @@ -545,15 +587,7 @@ const ExpertMaterialsContainer: React.FC<IExpertMaterialsContainerProps> = ({
alignItems="center"
ref={gridRef}
>
<LoadMoreButton
clicked={loadMore}
isLastPage={isLastPage}
loading={loading}
totalPages={totalPages}
totalElements={totalElements}
pageNumber={pageNumber}
textType={LoadMoreButtonTextType.POST}
/>
{LoadMoreButtonEl}
</Grid>
) : null}
</>
Expand Down
Loading