Browse Source

Merge branch 'bugfix/1401' of https://git.dilig.net/selenaaasi/trampa-frontend

bugfix/1403
djordjemitrovic00 3 years ago
parent
commit
309cc8d234

+ 2
- 2
src/components/Cards/ProfileCard/BigProfileCard/BigProfileCard.styled.js View File

@@ -178,11 +178,11 @@ export const MessageIcon = styled(Mail)`
export const ProfileInfoContainer = styled(Grid)`
display: flex;
flex-direction: column;
justify-content: center;
/* justify-content: center; */
align-items: start;
@media (max-width: 600px) {
flex-direction: row;
gap: 18px;
justify-content: space-between;
/* justify-content: space-between; */
}
`;

+ 1
- 0
src/components/Cards/ProfileCard/ProfileCard.js View File

@@ -154,6 +154,7 @@ const ProfileCard = (props) => {
</ProfileCardHeader>
<ProfileCardWrapper
variant="outlined"
isAdmin={props.isAdmin}
isMyProfile={isMyProfile}
blocked={!props.isAdmin && profile?._blocked}
>

+ 2
- 0
src/components/Cards/ProfileCard/ProfileCard.styled.js View File

@@ -342,8 +342,10 @@ export const ProfileInfoContainer = styled(Grid)`
export const ProfileInfoAndContactContainer = styled(Box)`
display: flex;
flex-direction: column;
margin-bottom: ${props => props.isAdmin && "36px"};
@media (max-width: 600px) {
padding-bottom: 18px;
${props => props.isAdmin && 'gap: 18px;'}
flex-direction: ${props => props.isAdmin ? "row" : "column"};
}
`;

+ 4
- 3
src/components/Cards/ProfileCard/ProfileStats/ProfileStats.js View File

@@ -10,7 +10,7 @@ import { useTranslation } from "react-i18next";
const ProfileStats = (props) => {
const { t } = useTranslation();
return (
<ProfileStatsContainer className={props.className}>
<ProfileStatsContainer className={props.className} twoRows={props.twoRows}>
<ProfileStatsGrid>
<StatsItem variant="subtitle2">
<b>{props.profile?.statistics?.publishes?.count}</b>
@@ -21,8 +21,8 @@ const ProfileStats = (props) => {
<b>{props.percentOfSucceededExchanges}%</b>
{t("profile.successExchange")}
</StatsItem>
{/* </ProfileStatsGrid>
<ProfileStatsGrid> */}
</ProfileStatsGrid>
<ProfileStatsGrid>
<StatsItem variant="subtitle2">
<b>{props.profile?.statistics?.views?.count}</b>
{t("profile.numberOfViews")}
@@ -40,6 +40,7 @@ ProfileStats.propTypes = {
profile: PropTypes.object,
percentOfSucceededExchanges: PropTypes.number,
className: PropTypes.string,
twoRows: PropTypes.bool,
};

export default ProfileStats;

+ 4
- 1
src/components/Cards/ProfileCard/ProfileStats/ProfileStats.styled.js View File

@@ -5,13 +5,16 @@ import selectedTheme from "../../../../themes";
export const ProfileStatsContainer = styled(Grid)`
display: flex;
justify-content: start;
align-items: center;
flex-direction: row;
background: ${selectedTheme.colors.primaryDarkTextSecond};
width: calc(100% + 36px);
padding-top: 18px;
padding-bottom: 18px;
margin-bottom: -1rem;
margin-left: -18px;
@media (max-width: 600px) {
flex-direction: column;
}
/* border-radius: 0 0 4px 4px; */
`;
export const ProfileStatsGrid = styled(Grid)`

Loading…
Cancel
Save