diff --git a/frontend-plataforma-tutoriais/src/pages/private/contactos/index.tsx b/frontend-plataforma-tutoriais/src/pages/private/contactos/index.tsx index e15a66b..95ecb28 100644 --- a/frontend-plataforma-tutoriais/src/pages/private/contactos/index.tsx +++ b/frontend-plataforma-tutoriais/src/pages/private/contactos/index.tsx @@ -100,7 +100,7 @@ export default function Contactos() {
-
+
diff --git a/frontend-plataforma-tutoriais/src/pages/private/dashboard/index.tsx b/frontend-plataforma-tutoriais/src/pages/private/dashboard/index.tsx index 5808979..794ac0f 100644 --- a/frontend-plataforma-tutoriais/src/pages/private/dashboard/index.tsx +++ b/frontend-plataforma-tutoriais/src/pages/private/dashboard/index.tsx @@ -246,7 +246,7 @@ export default function Home() {
{workshops.length > 0 ? workshops.map((workshop: Workshop) => (
-
+
{workshop.time_start.slice(0, 5)} - {workshop.time_end.slice(0, 5)}

-
-

{workshop.title}

-
+

{workshop.title}

+
{workshop.date.split('-').reverse().join('-')} {workshop.time_start.slice(0, 5).split(':').join('h')} - {workshop.time_end.slice(0, 5).split(':').join('h')}
-
Detalhes {role !== 1 ? ( (workshop.users as unknown as number[]).includes(userId as number) ? ( - ) : ( - ) diff --git a/frontend-plataforma-tutoriais/src/pages/private/dashboard/styles.module.css b/frontend-plataforma-tutoriais/src/pages/private/dashboard/styles.module.css index 5422ab6..aafe9c7 100644 --- a/frontend-plataforma-tutoriais/src/pages/private/dashboard/styles.module.css +++ b/frontend-plataforma-tutoriais/src/pages/private/dashboard/styles.module.css @@ -73,7 +73,7 @@ .linkWorkshop { display: block; - width: fit-content; + width: 160px; border-radius: var(--border-radius); transition: all 0.3s ease; font-weight: 600; @@ -90,7 +90,7 @@ .btncancelarInscricao { display: block; - width: fit-content; + width: 160px; border-radius: var(--border-radius); transition: all 0.3s ease; font-weight: 600; @@ -107,7 +107,7 @@ .btnInscrever { display: block; - width: fit-content; + width: 160px; border-radius: var(--border-radius); transition: all 0.3s ease; font-weight: 600; diff --git a/frontend-plataforma-tutoriais/src/pages/private/profile/index.tsx b/frontend-plataforma-tutoriais/src/pages/private/profile/index.tsx index c4d35c6..a21913a 100644 --- a/frontend-plataforma-tutoriais/src/pages/private/profile/index.tsx +++ b/frontend-plataforma-tutoriais/src/pages/private/profile/index.tsx @@ -212,7 +212,7 @@ export default function Profile() {
Membro desde: {new Date(userData?.created_at as string).toLocaleDateString('pt-PT')} -
+
-
+

{role === 1 ? "Workshops agendados" : "Workshops Inscrito"}

Ver workshops @@ -359,7 +359,7 @@ export default function Profile() {
{role !== 1 && workshopsCount > 0 ? workshops.map((workshop: Workshop) => (
-
+
-

{workshop.date.split('-').reverse().join('-')}

-

{workshop.time_start.slice(0, 5)} - {workshop.time_end.slice(0, 5)}

+

{workshop.date.split('-').reverse().join('-')}

+

{workshop.time_start.slice(0, 5)} - {workshop.time_end.slice(0, 5)}

-
-

{workshop.title}

-
+

{workshop.title}

+
{workshop.date.split('-').reverse().join('-')} {workshop.time_start.slice(0, 5).split(':').join('h')} - {workshop.time_end.slice(0, 5).split(':').join('h')}
-
Detalhes {role !== 1 ? ( - + ) : null}
@@ -398,7 +396,7 @@ export default function Profile() {
) : null} -{role === 1 && workshopsCount > 0 ? nextWorkshops.map((workshop: Workshop) => ( + {role === 1 && workshopsCount > 0 ? nextWorkshops.map((workshop: Workshop) => (
@@ -410,8 +408,8 @@ export default function Profile() { onLoad={onImageSkeletonLoad} />
-

{workshop.date.split('-').reverse().join('-')}

-

{workshop.time_start.slice(0, 5)} - {workshop.time_end.slice(0, 5)}

+

{workshop.date.split('-').reverse().join('-')}

+

{workshop.time_start.slice(0, 5)} - {workshop.time_end.slice(0, 5)}

@@ -436,7 +434,7 @@ export default function Profile() {
- +
); } \ No newline at end of file diff --git a/frontend-plataforma-tutoriais/src/pages/private/profile/styles.module.css b/frontend-plataforma-tutoriais/src/pages/private/profile/styles.module.css index caf6bf0..0d7003d 100644 --- a/frontend-plataforma-tutoriais/src/pages/private/profile/styles.module.css +++ b/frontend-plataforma-tutoriais/src/pages/private/profile/styles.module.css @@ -227,17 +227,19 @@ height: 150px; } +.icon{ + color: var(--text-primary-color); +} + .linkWorkshop { display: block; - width: fit-content; + width: 160px; border-radius: var(--border-radius); transition: all 0.3s ease; font-weight: 600; - background-color: var(--bg-grey); color: var(--text-black); transition: all .3s ease; - &:hover { background-color: var(--bg-primary-color-opacity); color: var(--text-primary-color); @@ -246,15 +248,13 @@ .btncancelarInscricao { display: block; - width: fit-content; + width: 160px; border-radius: var(--border-radius); transition: all 0.3s ease; font-weight: 600; - background-color: var(--bg-primary-color-opacity); color: var(--text-primary-color); transition: all .3s ease; - &:hover { background-color: var(--bg-primary-color); color: var(--text-white); @@ -263,7 +263,7 @@ .btnInscrever { display: block; - width: fit-content; + width: 160px; border-radius: var(--border-radius); transition: all 0.3s ease; font-weight: 600; diff --git a/frontend-plataforma-tutoriais/src/pages/private/workshops/index.tsx b/frontend-plataforma-tutoriais/src/pages/private/workshops/index.tsx index 4e25bf4..71dd395 100644 --- a/frontend-plataforma-tutoriais/src/pages/private/workshops/index.tsx +++ b/frontend-plataforma-tutoriais/src/pages/private/workshops/index.tsx @@ -245,7 +245,7 @@ export default function Workshops() { <> {workshops.map((workshop) => (
-
+
{workshop.time_start.slice(0, 5)} - {workshop.time_end.slice(0, 5)}

-
-

{workshop.title}

-
+

{workshop.title}

+
{workshop.date.split('-').reverse().join('-')} {workshop.time_start.slice(0, 5).split(':').join('h')} - {workshop.time_end.slice(0, 5).split(':').join('h')}
-
{workshop.status === "realized" || workshop.status === "canceled" ? ( @@ -286,7 +284,7 @@ export default function Workshops() { search: debouncedSearch, status: selectedWorkshopStatus, }); - }} key={workshop.id} style={{ width: '180px' }}> + }} key={workshop.id}> Anular inscrição @@ -301,7 +299,7 @@ export default function Workshops() { search: debouncedSearch, status: selectedWorkshopStatus, }); - }} key={workshop.id} style={{ width: '180px' }}> + }} key={workshop.id}> Inscrever-me diff --git a/frontend-plataforma-tutoriais/src/pages/private/workshops/styles.module.css b/frontend-plataforma-tutoriais/src/pages/private/workshops/styles.module.css index 081a682..1d401e6 100644 --- a/frontend-plataforma-tutoriais/src/pages/private/workshops/styles.module.css +++ b/frontend-plataforma-tutoriais/src/pages/private/workshops/styles.module.css @@ -45,11 +45,10 @@ .linkWorkshop{ display: block; - width: fit-content; + width: 160px; border-radius: var(--border-radius); transition: all 0.3s ease; font-weight: 600; - background-color: var(--bg-grey); color: var(--text-black); transition: all .3s ease; @@ -61,11 +60,10 @@ .btncancelarInscricao{ display: block; - width: fit-content; + width: 160px; border-radius: var(--border-radius); transition: all 0.3s ease; font-weight: 600; - background-color: var(--bg-primary-color-opacity); color: var(--text-primary-color); transition: all .3s ease; @@ -77,11 +75,10 @@ .btnInscrever{ display: block; - width: fit-content; + width: 160px; border-radius: var(--border-radius); transition: all 0.3s ease; font-weight: 600; - background-color: var(--tertiary-color); color: var(--text-white); transition: all .3s ease;