mirror of
https://github.com/narrrl/holy-flavor-rater.git
synced 2026-11-03 16:41:27 +01:00
Merge branch 'main' into narl.io
This commit is contained in:
commit
bf4d594b61
2 files changed
+18
-7
No files matched your search
@@ -361,7 +361,7 @@ const Dashboard: React.FC = () => {
|
|||||||
</Typography>
|
</Typography>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
<RatingBadge score={rating.score} size="large" />
|
<RatingBadge score={rating.score} size={isMobile ? "medium" : "large"} />
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<Box sx={{ mb: 2, p: 2, bgcolor: alpha('#000', 0.02), borderRadius: 2 }}>
|
<Box sx={{ mb: 2, p: 2, bgcolor: alpha('#000', 0.02), borderRadius: 2 }}>
|
||||||
|
|||||||
@@ -257,7 +257,7 @@ const PublicProfile: React.FC<PublicProfileProps> = ({ adminMode }) => {
|
|||||||
width: { xs: 140, sm: 180 },
|
width: { xs: 140, sm: 180 },
|
||||||
height: { xs: 140, sm: 180 },
|
height: { xs: 140, sm: 180 },
|
||||||
border: '6px solid',
|
border: '6px solid',
|
||||||
borderColor: (theme) => theme.palette.background.paper,
|
borderColor: palette[0] || 'primary.main',
|
||||||
boxShadow: '0 12px 40px rgba(0,0,0,0.2)',
|
boxShadow: '0 12px 40px rgba(0,0,0,0.2)',
|
||||||
fontSize: '4.5rem',
|
fontSize: '4.5rem',
|
||||||
bgcolor: palette[0] || 'primary.main',
|
bgcolor: palette[0] || 'primary.main',
|
||||||
@@ -267,7 +267,7 @@ const PublicProfile: React.FC<PublicProfileProps> = ({ adminMode }) => {
|
|||||||
</Avatar>
|
</Avatar>
|
||||||
{data.ratings.length > 50 && (
|
{data.ratings.length > 50 && (
|
||||||
<Tooltip title="Master Collector">
|
<Tooltip title="Master Collector">
|
||||||
<VerifiedIcon color="primary" sx={{ position: 'absolute', bottom: 12, right: 12, bgcolor: 'background.paper', borderRadius: '50%', fontSize: '2.2rem', p: 0.2 }} />
|
<VerifiedIcon color="primary" sx={{ position: 'absolute', bottom: 12, right: 12, bgcolor: 'background.paper', borderRadius: '50%', fontSize: '2.2rem', p: 0.2, border: '2px solid', borderColor: palette[0] || 'primary.main' }} />
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
@@ -283,7 +283,18 @@ const PublicProfile: React.FC<PublicProfileProps> = ({ adminMode }) => {
|
|||||||
color: 'text.primary',
|
color: 'text.primary',
|
||||||
position: 'relative',
|
position: 'relative',
|
||||||
display: 'inline-block',
|
display: 'inline-block',
|
||||||
mb: 2.5
|
mb: 3,
|
||||||
|
'&::after': {
|
||||||
|
content: '""',
|
||||||
|
position: 'absolute',
|
||||||
|
bottom: -12,
|
||||||
|
left: { xs: '50%', sm: 0 },
|
||||||
|
transform: { xs: 'translateX(-50%)', sm: 'none' },
|
||||||
|
width: '80px',
|
||||||
|
height: '8px',
|
||||||
|
bgcolor: palette[0] || 'primary.main',
|
||||||
|
borderRadius: 1
|
||||||
|
}
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{data.username}
|
{data.username}
|
||||||
@@ -325,7 +336,7 @@ const PublicProfile: React.FC<PublicProfileProps> = ({ adminMode }) => {
|
|||||||
variant={data.is_following ? "outlined" : "contained"}
|
variant={data.is_following ? "outlined" : "contained"}
|
||||||
onClick={handleFollowToggle}
|
onClick={handleFollowToggle}
|
||||||
startIcon={data.is_following ? <PersonRemoveIcon /> : <PersonAddIcon />}
|
startIcon={data.is_following ? <PersonRemoveIcon /> : <PersonAddIcon />}
|
||||||
sx={{ borderRadius: 3, px: 4, fontWeight: '900', py: 1.2, textTransform: 'none', fontSize: '1rem' }}
|
sx={{ borderRadius: 1, px: 4, fontWeight: '900', py: 1.2, textTransform: 'none', fontSize: '1rem' }}
|
||||||
>
|
>
|
||||||
{data.is_following ? "Unfollow" : "Follow"}
|
{data.is_following ? "Unfollow" : "Follow"}
|
||||||
</Button>
|
</Button>
|
||||||
@@ -335,7 +346,7 @@ const PublicProfile: React.FC<PublicProfileProps> = ({ adminMode }) => {
|
|||||||
variant="outlined"
|
variant="outlined"
|
||||||
color="secondary"
|
color="secondary"
|
||||||
onClick={() => navigate(`/admin-panel/user/${data.id}`)}
|
onClick={() => navigate(`/admin-panel/user/${data.id}`)}
|
||||||
sx={{ borderRadius: 3, px: 2.5, fontWeight: 'bold', textTransform: 'none' }}
|
sx={{ borderRadius: 1, px: 2.5, fontWeight: 'bold', textTransform: 'none' }}
|
||||||
>
|
>
|
||||||
{t('admin.manageUser')}
|
{t('admin.manageUser')}
|
||||||
</Button>
|
</Button>
|
||||||
@@ -372,7 +383,7 @@ const PublicProfile: React.FC<PublicProfileProps> = ({ adminMode }) => {
|
|||||||
onClick={() => setCategoryTab(idx)}
|
onClick={() => setCategoryTab(idx)}
|
||||||
color={categoryTab === idx ? 'primary' : 'default'}
|
color={categoryTab === idx ? 'primary' : 'default'}
|
||||||
variant={categoryTab === idx ? 'filled' : 'outlined'}
|
variant={categoryTab === idx ? 'filled' : 'outlined'}
|
||||||
sx={{ fontWeight: '900', px: 1.5, borderRadius: 2 }}
|
sx={{ fontWeight: '900', px: 1.5, borderRadius: 1 }}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
Reference in new issue
Block a user