- {PROFILEPAGES.PROFILE.INFO.map(({ head, value }, key) => (
-
- ))}
+
+
+
Profile
+
+
+
+
+
+
+
+ {PROFILEPAGES.PROFILE.INFO.map(({ head, value }) => (
+
+ ))}
+
+
-
-
-
-
- Your email is not yet verified. Verify Now
-
-
-
-
Joined on: {PROFILEPAGES.PROFILE.JOINDATE}
+
+
+ Your email is not yet verified. Verify Now
+
+
+ Joined on: {PROFILEPAGES.PROFILE.JOINDATE}
+
-
+
);
}
export default Profile;
const useStyles = makeStyles((theme) => ({
+ option: {
+ display: 'none',
+ [theme.breakpoints.down('sm')]: {
+ display: 'inline-flex',
+ fontWeight: '600',
+ marginTop: '15px',
+ fontFamily: 'IBM Plex Sans',
+ fontSize: '18px',
+ },
+ },
root: {
display: 'flex',
-
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
- [theme.breakpoints.down('md')]: {
+ [theme.breakpoints.down('sm')]: {
flexWrap: 'wrap',
paddingInline: '5%',
paddingBottom: '7%',
+ alignItems: 'flex-start',
},
},
wrapper: {
- display: 'flex',
- justifyContent: 'space-between',
- marginTop: '2rem',
- width: '84%',
- [theme.breakpoints.down('sm')]: {
- justifyContent: 'center',
- marginLeft: '0',
+ [theme.breakpoints.up('sm')]: {
+ display: 'flex',
+ justifyContent: 'space-between',
+ marginTop: '2rem',
+ padding: '10px',
+ width: '84%',
},
},
content: {
@@ -84,12 +100,22 @@ const useStyles = makeStyles((theme) => ({
flexDirection: 'column',
[theme.breakpoints.down('sm')]: {
alignItems: 'center',
+ display: 'inline-flex',
+ flexDirection: 'row-reverse',
+ alignItems: 'flex-start',
+ justifyContent: 'space-between',
+ paddingRight: '10px',
},
},
profilePic: {
height: '115px',
width: '115px',
position: 'relative',
+ [theme.breakpoints.down('sm')]: {
+ marginRight: '10px',
+ height: '70px',
+ width: '70px',
+ },
},
pp: {
borderRadius: '50%',
@@ -100,6 +126,12 @@ const useStyles = makeStyles((theme) => ({
right: '-3px',
borderRadius: '50%',
background: theme.palette.secondary.neutral50,
+ [theme.breakpoints.down('sm')]: {
+ position: 'absolute',
+ bottom: '-0.5px',
+ right: '-0.5px',
+ borderRadius: '50%',
+ },
},
infoBlocks: {
display: 'flex',
@@ -107,34 +139,10 @@ const useStyles = makeStyles((theme) => ({
justifyContent: 'space-between',
[theme.breakpoints.down('sm')]: {
alignItems: 'center',
+ display: 'inline',
+ marginBottom: '20px',
},
},
- infoBlock: {
- marginTop: '2.5rem',
- display: 'flex',
- flexDirection: 'column',
- },
- infoHead: {
- display: 'flex',
- [theme.breakpoints.down('sm')]: {
- justifyContent: 'center',
- },
- },
- editButton: {
- display: 'flex',
- alignItems: 'center',
- marginLeft: '0.25rem',
- },
- subInfo: {
- textAlign: 'center',
- fontSize: '1.5rem',
- fontWeight: '400',
- marginTop: '0.25rem',
- [theme.breakpoints.down('sm')]: {
- fontSize: '1.25rem',
- },
- },
-
subLine: {
fontFamily: 'Source Sans Pro',
width: '84%',
@@ -143,8 +151,7 @@ const useStyles = makeStyles((theme) => ({
alignItems: 'baseline',
flexWrap: 'wrap',
color: theme.palette.common.black,
-
- [theme.breakpoints.down('md')]: {
+ [theme.breakpoints.down('sm')]: {
marginTop: '1rem',
flexDirection: 'column',
justifyContent: 'space-around',
@@ -157,10 +164,10 @@ const useStyles = makeStyles((theme) => ({
fontWeight: '400',
color: theme.palette.secondary.neutral80,
[theme.breakpoints.down('sm')]: {
- fontSize: '1rem',
+ fontSize: '16px',
+ lineHeight: '24px',
whiteSpace: 'wrap',
textAlign: 'center',
- marginTop: '0.4rem',
},
'& span': {
'&:hover': {
@@ -169,7 +176,7 @@ const useStyles = makeStyles((theme) => ({
whiteSpace: 'nowrap',
fontSize: '1rem',
textDecoration: 'underline',
- color: theme.palette.secondary.main,
+ color: '#006DCC',
},
},
joined: {
@@ -180,6 +187,11 @@ const useStyles = makeStyles((theme) => ({
'& span': {
fontWeight: '600',
whiteSpace: 'nowrap',
+ [theme.breakpoints.down('sm')]: {
+ fontWeight: '700',
+ fontSize: '14px',
+ fontFamily: 'Source Sans Pro',
+ },
},
},
}));
diff --git a/client/src/components/userProfilePages/widgets/EditTextfield.js b/client/src/components/userProfilePages/widgets/EditTextfield.js
new file mode 100644
index 00000000..809c180e
--- /dev/null
+++ b/client/src/components/userProfilePages/widgets/EditTextfield.js
@@ -0,0 +1,89 @@
+import React, { useState } from 'react';
+import { Edit2 } from 'react-feather';
+import { Typography, TextField } from '@mui/material';
+import makeStyles from '@mui/styles/makeStyles';
+import theme from '../../../config/themes/light';
+
+function EditTextfield({ head, value }) {
+ const classes = useStyles(theme);
+ const [toggle, setToggle] = useState(false);
+
+ return (
+
+
+
+ {head}
+
+
+ {
+ setToggle(true);
+ }}
+ />
+
+
+
+ {toggle && (
+
+ )}
+ {!toggle && (
+ {value}
+ )}
+
+
+ );
+}
+
+export default EditTextfield;
+
+const useStyles = makeStyles((theme) => ({
+ head: {
+ fontFamily: 'IBM Plex Sans',
+ [theme.breakpoints.down('sm')]: {
+ fontSize: '16px',
+ fontWeight: '800',
+ },
+ },
+ typo: {
+ alignItems: 'flex-start',
+ justifyContent: 'center',
+ },
+ infoBlock: {
+ marginTop: '2.5rem',
+ display: 'flex',
+ flexDirection: 'column',
+ alignItems: 'flex-start',
+ justifyContent: 'flex-start',
+ },
+ edit: {
+ cursor: 'pointer',
+ },
+ infoHead: {
+ display: 'flex',
+ [theme.breakpoints.down('sm')]: {
+ justifyContent: 'center',
+ },
+ },
+ editButton: {
+ display: 'flex',
+ alignItems: 'center',
+ marginLeft: '0.25rem',
+ },
+ subInfo: {
+ fontFamily: 'Source Sans Pro',
+ textAlign: 'center',
+ fontSize: '24px',
+ fontWeight: '400',
+ marginTop: '0.25rem',
+ [theme.breakpoints.down('sm')]: {
+ fontSize: '16px',
+ },
+ },
+}));
diff --git a/client/src/screens/UserProfile.js b/client/src/screens/UserProfile.js
index 167b4275..e7c9b05d 100644
--- a/client/src/screens/UserProfile.js
+++ b/client/src/screens/UserProfile.js
@@ -1,4 +1,10 @@
-import { Button, Card, Container, Typography } from '@mui/material';
+import {
+ Button,
+ Card,
+ Container,
+ Typography,
+ useMediaQuery,
+} from '@mui/material';
import makeStyles from '@mui/styles/makeStyles';
import React, { useState } from 'react';
import theme from '../config/themes/light';
@@ -18,6 +24,7 @@ function UserProfile() {
];
const classes = useStyles(theme);
+ const matches = useMediaQuery(theme.breakpoints.down('md'));
const [option, setOption] = useState(0);
const [nLOption, setNLOption] = useState(0);
@@ -52,21 +59,36 @@ function UserProfile() {
-
- {options.map((option__value, key) => (
-
+
+
+ ))}
+
+ ) : (
+
+ {options.map((option__value, key) => (
+ handleOptionClick(key)}
+ >
+ {option__value}
+
+ ))}
+
+ )}
({
head: {
color: theme.palette.primary.blue60,
marginTop: '2rem',
+ marginBottom: '2rem',
[theme.breakpoints.down('md')]: {
+ color: 'black',
textAlign: 'center',
marginTop: '0.75rem',
+ marginBottom: '0.75rem',
},
},
body: {
display: 'flex',
[theme.breakpoints.down('md')]: {
- // display: 'none',
justifyContent: 'center',
flexWrap: 'wrap',
},
@@ -136,12 +160,13 @@ const useStyles = makeStyles((theme) => ({
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
- color: theme.palette.secondary.neutral70,
+ color: '#999999',
width: '276px',
height: '49px',
borderTop: '1px solid',
borderColor: theme.palette.secondary.neutral60,
borderRadius: '0',
+ fontFamily: 'Source Sans Pro',
[theme.breakpoints.down('md')]: {
width: '100%',
},
@@ -150,17 +175,35 @@ const useStyles = makeStyles((theme) => ({
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
- color: theme.palette.secondary.neutral70,
+ color: '#999999',
width: '276px',
height: '49px',
borderRadius: '0',
+ fontFamily: 'Source Sans Pro',
[theme.breakpoints.down('md')]: {
width: '100%',
},
},
+ button: {
+ display: 'inline-block',
+ marginRight: '10px',
+ marginTop: '10px',
+ backgroundColor: theme.palette.primary.blue10,
+ color: theme.palette.common.black,
+ borderRadius: '4px',
+ padding: '2px 6px',
+ cursor: 'pointer',
+ fontSize: '14px',
+ fontWeight: '400',
+ lineHeight: '20px',
+ },
selectedOption: {
color: `${theme.palette.secondary.main} !important`,
},
+ selectedOptionMobile: {
+ color: `${theme.palette.common.white} !important`,
+ backgroundColor: `${theme.palette.primary.blue50} !important`,
+ },
mainBox: {
width: '100%',
},