feat: complete phone number and edit of that in user-profile
This commit is contained in:
@@ -109,15 +109,21 @@ export function UserProfileForm() {
|
|||||||
<Grid item xs={12} sm={6}>
|
<Grid item xs={12} sm={6}>
|
||||||
<Box sx={{ mb: 2 }}>
|
<Box sx={{ mb: 2 }}>
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> 280b19d (feat: complete phone number and edit of that in user-profile)
|
||||||
<Typography
|
<Typography
|
||||||
variant="subtitle2"
|
variant="subtitle2"
|
||||||
sx={{ color: 'gray', fontSize: '14px', ml: '34vh' }}
|
sx={{ color: 'gray', fontSize: '14px', ml: '34vh' }}
|
||||||
>
|
>
|
||||||
نام
|
نام
|
||||||
</Typography>
|
</Typography>
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
<Typography variant="subtitle2">نام</Typography>
|
<Typography variant="subtitle2">نام</Typography>
|
||||||
>>>>>>> f9815fb (fix: issue in user profile)
|
>>>>>>> f9815fb (fix: issue in user profile)
|
||||||
|
=======
|
||||||
|
>>>>>>> 280b19d (feat: complete phone number and edit of that in user-profile)
|
||||||
{isEditing ? (
|
{isEditing ? (
|
||||||
<TextField
|
<TextField
|
||||||
fullWidth
|
fullWidth
|
||||||
@@ -129,12 +135,18 @@ export function UserProfileForm() {
|
|||||||
inputProps={{
|
inputProps={{
|
||||||
sx: {
|
sx: {
|
||||||
height: '12px',
|
height: '12px',
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
fontSize: '16px',
|
fontSize: '16px',
|
||||||
fontWeight: 'bold',
|
fontWeight: 'bold',
|
||||||
direction: 'rtl',
|
direction: 'rtl',
|
||||||
=======
|
=======
|
||||||
>>>>>>> f9815fb (fix: issue in user profile)
|
>>>>>>> f9815fb (fix: issue in user profile)
|
||||||
|
=======
|
||||||
|
fontSize: '16px',
|
||||||
|
fontWeight: 'bold',
|
||||||
|
direction: 'rtl',
|
||||||
|
>>>>>>> 280b19d (feat: complete phone number and edit of that in user-profile)
|
||||||
},
|
},
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
@@ -147,15 +159,21 @@ export function UserProfileForm() {
|
|||||||
|
|
||||||
<Box>
|
<Box>
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> 280b19d (feat: complete phone number and edit of that in user-profile)
|
||||||
<Typography
|
<Typography
|
||||||
variant="subtitle2"
|
variant="subtitle2"
|
||||||
sx={{ color: 'gray', fontSize: '14px' }}
|
sx={{ color: 'gray', fontSize: '14px' }}
|
||||||
>
|
>
|
||||||
جنسیت
|
جنسیت
|
||||||
</Typography>
|
</Typography>
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
<Typography variant="subtitle2">جنسیت</Typography>
|
<Typography variant="subtitle2">جنسیت</Typography>
|
||||||
>>>>>>> f9815fb (fix: issue in user profile)
|
>>>>>>> f9815fb (fix: issue in user profile)
|
||||||
|
=======
|
||||||
|
>>>>>>> 280b19d (feat: complete phone number and edit of that in user-profile)
|
||||||
{isEditing ? (
|
{isEditing ? (
|
||||||
<FormControl sx={{ width: '230px' }}>
|
<FormControl sx={{ width: '230px' }}>
|
||||||
<InputLabel id="sex-label">جنسیت</InputLabel>
|
<InputLabel id="sex-label">جنسیت</InputLabel>
|
||||||
@@ -187,13 +205,19 @@ export function UserProfileForm() {
|
|||||||
<Grid item xs={12} sm={6}>
|
<Grid item xs={12} sm={6}>
|
||||||
<Box sx={{ mb: 2 }}>
|
<Box sx={{ mb: 2 }}>
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> 280b19d (feat: complete phone number and edit of that in user-profile)
|
||||||
<Typography
|
<Typography
|
||||||
variant="subtitle2"
|
variant="subtitle2"
|
||||||
sx={{ color: 'gray', fontSize: '14px' }}
|
sx={{ color: 'gray', fontSize: '14px' }}
|
||||||
>
|
>
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
<Typography variant="subtitle2" sx={{ width: '230px' }}>
|
<Typography variant="subtitle2" sx={{ width: '230px' }}>
|
||||||
>>>>>>> f9815fb (fix: issue in user profile)
|
>>>>>>> f9815fb (fix: issue in user profile)
|
||||||
|
=======
|
||||||
|
>>>>>>> 280b19d (feat: complete phone number and edit of that in user-profile)
|
||||||
نام خانوادگی
|
نام خانوادگی
|
||||||
</Typography>
|
</Typography>
|
||||||
{isEditing ? (
|
{isEditing ? (
|
||||||
@@ -219,15 +243,21 @@ export function UserProfileForm() {
|
|||||||
|
|
||||||
<Box>
|
<Box>
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> 280b19d (feat: complete phone number and edit of that in user-profile)
|
||||||
<Typography
|
<Typography
|
||||||
variant="subtitle2"
|
variant="subtitle2"
|
||||||
sx={{ color: 'gray', fontSize: '14px' }}
|
sx={{ color: 'gray', fontSize: '14px' }}
|
||||||
>
|
>
|
||||||
کد ملی
|
کد ملی
|
||||||
</Typography>
|
</Typography>
|
||||||
|
<<<<<<< HEAD
|
||||||
=======
|
=======
|
||||||
<Typography variant="subtitle2">کد ملی</Typography>
|
<Typography variant="subtitle2">کد ملی</Typography>
|
||||||
>>>>>>> f9815fb (fix: issue in user profile)
|
>>>>>>> f9815fb (fix: issue in user profile)
|
||||||
|
=======
|
||||||
|
>>>>>>> 280b19d (feat: complete phone number and edit of that in user-profile)
|
||||||
{isEditing ? (
|
{isEditing ? (
|
||||||
<TextField
|
<TextField
|
||||||
fullWidth
|
fullWidth
|
||||||
|
|||||||
Reference in New Issue
Block a user