From e043d9a93379ab962ff7ad12f0a4e2a9b4b15eae Mon Sep 17 00:00:00 2001 From: Nils Pukropp Date: Wed, 18 Feb 2026 05:11:40 +0100 Subject: [PATCH] reverted some of the rounded corners --- frontend/src/components/RatingBadge.tsx | 34 +++++------ frontend/src/pages/PublicProfile.tsx | 65 ++++++++++----------- frontend/src/pages/flavors/FlavorDetail.tsx | 2 +- frontend/src/theme.ts | 14 ++++- 4 files changed, 61 insertions(+), 54 deletions(-) diff --git a/frontend/src/components/RatingBadge.tsx b/frontend/src/components/RatingBadge.tsx index 30cf83b..9fc6eff 100644 --- a/frontend/src/components/RatingBadge.tsx +++ b/frontend/src/components/RatingBadge.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Box, Typography, alpha, useTheme } from '@mui/material'; +import { Box, Typography, useTheme } from '@mui/material'; interface RatingBadgeProps { score: number; @@ -15,32 +15,32 @@ const RatingBadge: React.FC = ({ score, size = 'medium', sx }) return ( - {typeof score === 'number' ? score.toFixed(isLarge ? 1 : 0) : score} + {typeof score === 'number' ? (isLarge ? score.toFixed(1) : score.toFixed(0)) : score} / 10 diff --git a/frontend/src/pages/PublicProfile.tsx b/frontend/src/pages/PublicProfile.tsx index 3087d06..086390c 100644 --- a/frontend/src/pages/PublicProfile.tsx +++ b/frontend/src/pages/PublicProfile.tsx @@ -231,7 +231,8 @@ const PublicProfile: React.FC = ({ adminMode }) => { bgcolor: (theme) => alpha(theme.palette.background.paper, 0.6), backdropFilter: 'blur(20px)', mb: 4, - overflow: 'hidden' + overflow: 'hidden', + position: 'relative' }}> = ({ adminMode }) => { sx={{ width: { xs: 140, sm: 180 }, height: { xs: 140, sm: 180 }, - border: '4px solid', + border: '6px solid', borderColor: (theme) => theme.palette.background.paper, boxShadow: '0 12px 40px rgba(0,0,0,0.2)', fontSize: '4.5rem', @@ -322,7 +323,7 @@ const PublicProfile: React.FC = ({ adminMode }) => { { label: 'Following', val: data.following_count } ].map((stat, i) => ( - + {stat.val} {stat.label} @@ -365,7 +366,7 @@ const PublicProfile: React.FC = ({ adminMode }) => { onChange={(_, v) => setActiveTab(v)} variant="fullWidth" sx={{ - '& .MuiTab-root': { fontWeight: '900', textTransform: 'none', fontSize: '1rem' }, + '& .MuiTab-root': { fontWeight: '900', textTransform: 'none', fontSize: '1rem', borderRadius: 2 }, '& .Mui-selected': { color: 'primary.main' } }} > @@ -410,13 +411,13 @@ const PublicProfile: React.FC = ({ adminMode }) => { {tier.key} {tier.title} - {items.length} total items + {items.length} items @@ -425,32 +426,30 @@ const PublicProfile: React.FC = ({ adminMode }) => { {items.map((rating: Rating) => ( alpha(theme.palette.background.paper, 0.4), - transition: 'all 0.4s cubic-bezier(0.175, 0.885, 0.32, 1.275)', - '&:hover': { transform: 'translateY(-12px)', borderColor: 'primary.main', boxShadow: '0 20px 48px rgba(0,0,0,0.15)' } + transition: 'all 0.3s ease', + '&:hover': { transform: 'translateY(-8px)', borderColor: 'primary.main', boxShadow: '0 12px 32px rgba(0,0,0,0.1)' } }}> - - - - - - + + + + - - + + {rating.flavor_name} {adminMode && ( - + @@ -470,16 +469,16 @@ const PublicProfile: React.FC = ({ adminMode }) => { {activeTab === 1 && ( {currentUser && ( - + Leave a message
setNewComment(e.target.value)} - sx={{ mb: 3, '& .MuiOutlinedInput-root': { borderRadius: 4, bgcolor: 'background.paper' } }} + sx={{ mb: 3, '& .MuiOutlinedInput-root': { borderRadius: 3, bgcolor: 'background.paper' } }} /> -
@@ -487,18 +486,18 @@ const PublicProfile: React.FC = ({ adminMode }) => { {data.comments.length === 0 ? ( - + No entries in the guestbook yet. Be the first to leave a message! ) : ( data.comments.map(comment => ( - + - + {comment.author_username.charAt(0).toUpperCase()} @@ -515,7 +514,7 @@ const PublicProfile: React.FC = ({ adminMode }) => { )} - + @@ -533,9 +532,9 @@ const PublicProfile: React.FC = ({ adminMode }) => { ) : ( data.followers.map(user => ( - - - {user.username.charAt(0)} + + + {user.username.charAt(0)} {user.username} @@ -566,9 +565,9 @@ const PublicProfile: React.FC = ({ adminMode }) => { ) : ( data.following.map(user => ( - - - {user.username.charAt(0)} + + + {user.username.charAt(0)} {user.username} diff --git a/frontend/src/pages/flavors/FlavorDetail.tsx b/frontend/src/pages/flavors/FlavorDetail.tsx index 85f5f7c..8830cbe 100644 --- a/frontend/src/pages/flavors/FlavorDetail.tsx +++ b/frontend/src/pages/flavors/FlavorDetail.tsx @@ -295,7 +295,7 @@ const FlavorDetail: React.FC = ({ adminMode }) => { - {flavor.description} + {flavor.shop_url && ( diff --git a/frontend/src/theme.ts b/frontend/src/theme.ts index 7842f98..0c6f089 100644 --- a/frontend/src/theme.ts +++ b/frontend/src/theme.ts @@ -143,7 +143,7 @@ export const getTheme = (mode: CatppuccinTheme) => { } }, shape: { - borderRadius: 12, + borderRadius: 8, }, typography: { fontFamily: '"Plus Jakarta Sans", "Inter", "Roboto", sans-serif', @@ -193,7 +193,7 @@ export const getTheme = (mode: CatppuccinTheme) => { backdropFilter: 'blur(12px)', border: '1px solid', borderColor: alpha(palette.text.hex, 0.1), - borderRadius: '20px', + borderRadius: '12px', transition: 'all 0.2s ease-in-out', } } @@ -212,7 +212,7 @@ export const getTheme = (mode: CatppuccinTheme) => { MuiButton: { styleOverrides: { root: { - borderRadius: '10px', + borderRadius: '8px', padding: '8px 20px', }, containedPrimary: { @@ -228,6 +228,14 @@ export const getTheme = (mode: CatppuccinTheme) => { root: { minHeight: '48px', fontWeight: 700, + borderRadius: '8px', + } + } + }, + MuiOutlinedInput: { + styleOverrides: { + root: { + borderRadius: '8px', } } }