From c2f19cdd8c97916a2b18dee5a78f9ad058553451 Mon Sep 17 00:00:00 2001
From: Guilherme Eduardo <gegs23@inf.ufpr.br>
Date: Thu, 17 Apr 2025 10:11:51 -0300
Subject: [PATCH] Issue #299: FIX change name share button on profile page
---
src/app/components/ShareButton.js | 13 +++++++++----
src/app/perfil/[id]/components/MedalAchievements.js | 1 +
src/app/perfil/[id]/components/UserCard.js | 3 ++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/app/components/ShareButton.js b/src/app/components/ShareButton.js
index 47d19342..9bd1272d 100644
--- a/src/app/components/ShareButton.js
+++ b/src/app/components/ShareButton.js
@@ -11,10 +11,10 @@ import { usePathname } from 'next/navigation';
*/
export default function ShareButton({ type, id }) {
const [shareOpen, setShareOpen] = useState(false);
-
+
const baseUrl = typeof window !== 'undefined' ? window.location.origin : '';
- const link = `${baseUrl}/${type}/${id}`; // Gera o link dinâmico baseado no tipo e ID
-
+ const link = `${baseUrl}/${type}/${id}`; // Gera o link dinâmico baseado no tipo e ID
+
return (
<>
<button
@@ -23,7 +23,12 @@ export default function ShareButton({ type, id }) {
aria-label="Compartilhar"
>
<ShareOutlinedIcon fontSize="small" />
- <span className="hidden md:inline">Compartilhar</span>
+ {type === "perfil" ?
+ <span className="hidden md:inline">Compartilhar Perfil</span>
+ :
+ <span className="hidden md:inline">Compartilhar</span>
+ }
+
</button>
<ShareModal
open={shareOpen}
diff --git a/src/app/perfil/[id]/components/MedalAchievements.js b/src/app/perfil/[id]/components/MedalAchievements.js
index 0a6cdfad..293427e8 100644
--- a/src/app/perfil/[id]/components/MedalAchievements.js
+++ b/src/app/perfil/[id]/components/MedalAchievements.js
@@ -3,6 +3,7 @@ import mecredApi, { mecredURL } from '@/axiosConfig';
export default function MedalAchievements({ items }) {
+
return (
<div className="flex flex-row w-1/3 max-sm:w-full justify-end max-sm:justify-center xl:gap-x-6 max-sm:gap-x-2 md:gap-x-2 md:max-xl:ml-[80px] xl:mr-10 max-sm:mb-5">
diff --git a/src/app/perfil/[id]/components/UserCard.js b/src/app/perfil/[id]/components/UserCard.js
index 90194114..bc6e0d74 100644
--- a/src/app/perfil/[id]/components/UserCard.js
+++ b/src/app/perfil/[id]/components/UserCard.js
@@ -213,6 +213,7 @@ export default function UserCard({ profileData, idLogin, achievements, progresse
}
+ console.log ("teste", items)
return (
@@ -232,7 +233,7 @@ export default function UserCard({ profileData, idLogin, achievements, progresse
<div className=' flex flex-col justify-start '>
<div className='flex flex-row max-sm:flex-col-reverse'>
- <div className='flex flex-row w-2/3 max-sm:w-full items-center text-darkGray-HC-white font-bold max-sm:text-3xl text-4xl max-sm:mr-5 max-sm:mb-6'>
+ <div className={`flex flex-row w-2/3 max-sm:w-full items-center text-darkGray-HC-white font-bold max-sm:text-3xl text-4xl max-sm:mr-5 max-sm:mb-5 ${items.length === 0 ? "mb-3" : ""}`}>
<img src="/usuario-perfil.svg" alt="perfil" className='flex aspect-square mr-4 max-lg:mx-4 w-[28px] h-[28px] rounded-full' />
<div className='shrink-0 max-lg:w-[20px] max-lg:h-[20px] h-[28px] p-0 m-0' /> {profileData["name"]}
--
GitLab