Skip to content

Commit d1dac8c

Browse files
committed
Merge branch 'zouhir-auth' into feat-streaks
2 parents dc42241 + d67a39c commit d1dac8c

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

src/features/settings/components/GeneralSettings/GeneralSettings.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@ interface UserInfoProps {
2626

2727
const UserInfo = ({ user }: UserInfoProps) => {
2828
const { logout, providerId } = useAuth()
29+
const providerName = providerId?.split('.')[0] || 'Unknown'
2930

3031
return (
3132
<div className="userContent">
3233
{user?.imageURL && <img src={user.imageURL} className="userImage"></img>}
3334
<div className="userInfos">
3435
<div className="userName">{user.name}</div>
35-
<div className="providerId">Logged using {providerId}</div>
36+
<div className="sub providerId">
37+
Connected with <span className="capitalize">{providerName}</span>
38+
</div>
3639
</div>
3740
<Button onClick={logout} size="small">
3841
Logout

src/features/settings/components/GeneralSettings/generalSettings.css

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,23 +104,22 @@ Select styles
104104
border-bottom: 1px solid var(--card-content-divider);
105105
}
106106
.userContent .userImage {
107-
width: 60px;
108-
height: 60px;
107+
width: 50px;
108+
height: 50px;
109109
border-radius: 100%;
110110
}
111111
.userContent .userInfos {
112112
flex: 1;
113+
display: flex;
114+
flex-direction: column;
115+
gap: 6px;
113116
width: auto;
114117
margin-left: 10px;
115118
}
116119
.userContent .userName {
117-
font-size: larger;
118120
font-weight: 600;
119121
}
120-
.userContent .userEmail {
121-
font-size: medium;
122-
margin-top: 6px;
123-
}
124-
.userContent .logoutBtn {
125-
margin-left: auto;
122+
.userContent .sub {
123+
font-size: 0.9em;
124+
opacity: 0.9;
126125
}

0 commit comments

Comments
 (0)