From b3908b6ace5df6af9dcd8c9d28393c139630ff50 Mon Sep 17 00:00:00 2001 From: jakubmanczak Date: Fri, 30 Dec 2022 18:08:03 +0100 Subject: [PATCH] profilecard on profilepages, settings page init & more --- .../ProfileCard/ProfileCard.module.scss | 3 + components/ProfileCard/ProfileCard.tsx | 74 +++++++-------- pages/ja.tsx | 77 ---------------- pages/ja/index.tsx | 92 +++++++++++++++++++ pages/ja/ustawienia.tsx | 42 +++++++++ pages/profil/[profname]/index.tsx | 78 +++++++++++----- styles/globals.scss | 11 +++ styles/ustawienia.module.scss | 10 ++ 8 files changed, 249 insertions(+), 138 deletions(-) delete mode 100644 pages/ja.tsx create mode 100644 pages/ja/index.tsx create mode 100644 pages/ja/ustawienia.tsx create mode 100644 styles/ustawienia.module.scss diff --git a/components/ProfileCard/ProfileCard.module.scss b/components/ProfileCard/ProfileCard.module.scss index 2f5083f..af8fb01 100644 --- a/components/ProfileCard/ProfileCard.module.scss +++ b/components/ProfileCard/ProfileCard.module.scss @@ -18,6 +18,9 @@ border-radius: 50%; height: 128px; width: 128px; + aspect-ratio: 1 / 1; + object-fit: cover; + object-position: 50% 35%; @media screen and (max-width: 600px) { height: 64px; width: 64px; diff --git a/components/ProfileCard/ProfileCard.tsx b/components/ProfileCard/ProfileCard.tsx index e32f3ea..9a11ca9 100644 --- a/components/ProfileCard/ProfileCard.tsx +++ b/components/ProfileCard/ProfileCard.tsx @@ -1,62 +1,64 @@ import styles from "./ProfileCard.module.scss"; type UserProfileCardProps = { - username: string; - description?: string; - picture?: string | null; - isAdmin?: boolean; - isDeveloper?: boolean; - experience?: { - level: number; - tilNextLevel?: number; - looseXP?: number; + data: { + username: string; + description?: string; + picture?: string | null; + isAdmin?: boolean; + isDeveloper?: boolean; + experience?: { + level: number; + tilNextLevel?: number; + looseXP?: number; + }; + badges?: { + badgeName: string; + badgeDesc?: string; + badgeMerit?: string; + badgeImage?: string; + }[]; + accentColor?: string; }; - badges?: { - badgeName: string; - badgeDesc?: string; - badgeMerit?: string; - badgeImage?: string; - }[]; - accentColor?: string; }; -const ProfileCard = (user: UserProfileCardProps) => { +const ProfileCard = ({ data }: UserProfileCardProps) => { return ( <>
{user.username}
-

{user.username}

+

{data.username}

- {user.experience?.level && ( + {data.experience?.level && ( <> {"LVL "} - {user.experience.level} + {data.experience.level} )}

-

{user.description}

+

{data.description}

- {user.isAdmin && ( + {data.isAdmin && (
Admin
)} - {user.isDeveloper && ( + {data.isDeveloper && (
DEV
@@ -64,23 +66,23 @@ const ProfileCard = (user: UserProfileCardProps) => {
- {user.experience?.looseXP && user.experience.tilNextLevel && ( + {data.experience?.looseXP && data.experience.tilNextLevel && (
-

XP: {user.experience.looseXP}

-

XP until next level: {user.experience.tilNextLevel}

+

XP: {data.experience.looseXP}

+

XP until next level: {data.experience.tilNextLevel}

)} - {user.experience?.looseXP && user.experience.tilNextLevel && ( + {data.experience?.looseXP && data.experience.tilNextLevel && (
{
)}