Merge pull request #83 from igrowker/juan_branch

Juan branch - modificar imagen de usuario en el festival y otros estilos en perfil
IgrowkerTraining · Dec 9, 2024 · 29f6481 · 29f6481
2 parents 0b82a20 + 9244c87
commit 29f6481
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 18 deletions.
diff --git a/src/app/festivals/[id]/FestivalClientContent.tsx b/src/app/festivals/[id]/FestivalClientContent.tsx
@@ -152,6 +152,7 @@ export default function FestivalClientContent({
                 href={dataFestival.url}
                 variant="primary"
                 text="Comprar entradas"
+                target="_BLANK"
                 className="text-[15px] w-full"
               />
               <Button

diff --git a/src/app/home/page.tsx b/src/app/home/page.tsx
@@ -36,7 +36,7 @@ export default function LandingPage() {
   useEffect(() => {
     const interval = setInterval(() => {
       setActivePage((prevPage) => (prevPage + 1) % pages.length)
-    }, 3000)
+    }, 6000)
 
     return () => clearInterval(interval)
   }, [])
@@ -62,7 +62,7 @@ export default function LandingPage() {
               <div className='absolute inset-0 bg-black bg-opacity-20'></div>
               <LandingPageHeader />
 
-              <div className='flex flex-col items-center justify-center h-full text-center text-white'>
+              <div className='mt-32 flex flex-col items-center justify-start h-full text-center text-white'>
                 <h1 className='text-4xl font-normal z-10'>{page.title}</h1>
                 {page.img && (
                   <Image

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -33,7 +33,7 @@ export default function RootLayout({
 }>) {
   return (
     <html lang="en" className={`${unbounded.variable} ${roboto.variable}`}>
-      <body>
+      <body className="min-h-screen">
         <ProfileProvider>
           <FestivalProvider>
             <SideBar />

diff --git a/src/app/profile/config/page.tsx b/src/app/profile/config/page.tsx
@@ -8,8 +8,12 @@ export default function Config() {
   return (
     <Container>
       <article className='w-full p-4 flex flex-col items-'>
-        <NavTitle link='historial' title='Configuracion' />
-        <p className='text-left leading-5 font-semibold'>
+        <NavTitle 
+          link='profile' 
+          title='Configuracion'
+          className='mt-2'
+        />
+        <p className='mt-5 text-left leading-5 font-semibold'>
           Centro de ayuda
         </p>
         <section className='flex flex-col gap-6 mt-5'>

diff --git a/src/app/profile/currentCrews/page.tsx b/src/app/profile/currentCrews/page.tsx
@@ -8,7 +8,7 @@ import Container from '@/components/elements/Container/Container'
 import NavTitle from '@/components/elements/headers/NavTitle'
 import GroupSection from '@/components/elements/Profile/GroupSection'
 
-export default function currentCrews() {
+export default function CurrentCrews() {
   const profileContext = useContext(ProfileContext)
 
   useEffect(() => {
@@ -67,7 +67,7 @@ export default function currentCrews() {
   return (
     <Container className='flex flex-col px-4 gap-6'>
       <article className='flex flex-col w-full min-h-screen bg-background'>
-        <NavTitle link='profile' title='Crews Actuales' />
+        <NavTitle link='profile' title='Crews Actuales' className='mt-4'/>
         <div className='flex flex-col justify-center mt-3 gap-6'>
           <GroupSection
             onDelete={handleDelete}

diff --git a/src/app/profile/historial/page.tsx b/src/app/profile/historial/page.tsx
@@ -65,7 +65,7 @@ export default function Historial() {
     return (
         <Container className='flex flex-col px-4 gap-6'>
             <article className='flex flex-col w-full min-h-screen bg-background'>
-                <NavTitle link='profile' title='Historial' />
+                <NavTitle link='profile' title='Historial' className='mt-4'/>
                 <div className='flex flex-col justify-center mt-3 gap-6'>
                     <GroupSection
                         showAddButton={false}

diff --git a/src/app/profile/information/page.tsx b/src/app/profile/information/page.tsx
@@ -55,9 +55,9 @@ export default function information() {
       <NavTitle
         link='profile'
         title='Información de Contacto'
-        className='absolute top-5 left-1 bg-background'
+        className='my-4 bg-background'
       />
-      <div className='flex flex-col gap-4 w-full px-5 sm:w-3/4 sm:px-0'>
+      <div className='flex flex-col gap-4 w-full px-5 sm:w-3/4 sm:px-0 pb-28'>
         {data.map((item, index) => (
           <div key={index} className='flex gap-2 nth-2:items-end'>
             {item.icon}

diff --git a/src/app/search/new-post/page.tsx b/src/app/search/new-post/page.tsx
@@ -196,7 +196,7 @@ export default function NewPost() {
                       value={createdPost.details}
                     />
                   </div>
-                  <div className='flex gap-2'>
+                  <div className='flex gap-2 mb-20'>
                     <button
                       type="button"
                       className="bg-primary text-background w-full text-center py-3 rounded-lg"

diff --git a/src/components/elements/Buttons/Button.tsx b/src/components/elements/Buttons/Button.tsx
@@ -8,6 +8,7 @@ type ButtonProps = {
     onClick?: () => void;
     href?: string;
     className?: string;
+    target?: string
 };
 
 export default function Button({
@@ -18,6 +19,7 @@ export default function Button({
     onClick,
     href,
     className = '',
+    target
 }: ButtonProps) {
 
     const buttonStyles = {
@@ -35,7 +37,7 @@ export default function Button({
     );
 
     return href ? (
-        <Link href={href} className={className}>
+        <Link href={href} className={className} target={target}>
             {content}
         </Link>
     ) : (

diff --git a/src/components/elements/Profile/GroupSection copy.tsx b/src/components/elements/Profile/GroupSection copy.tsx
@@ -2,7 +2,6 @@ import React, { useContext } from 'react'
 import { ProfileContext } from '@/context/ProfileContext'
 import UserChatItem from "../Chat/UserChatCard/UserChatItem"
 import HistorialHeader from "../headers/HistorialHeader"
-import { usePathname } from 'next/navigation'
 
 interface GroupSectionProps {
   onDelete: (index: number) => void;
@@ -29,7 +28,7 @@ const GroupSection: React.FC<GroupSectionProps> = ({ onDelete }) => {
         showAddButton={true}
       />
       <div className='flex flex-col w-full '>
-        {groups.map((group, chatIndex) => (
+        {groups.map((group, chatIndex: number) => (
           <UserChatItem
             key={chatIndex}
             avatar={group.festival?.avatar}

diff --git a/src/components/elements/Profile/GroupSection.tsx b/src/components/elements/Profile/GroupSection.tsx
@@ -4,7 +4,6 @@ import UserChatItem from '../Chat/UserChatCard/UserChatItem'
 import HistorialHeader from '../headers/HistorialHeader'
 import { usePathname } from 'next/navigation'
 import { chats } from '@/json/historial'
-import { boolean } from 'zod'
 import Link from 'next/link'
 interface GroupSectionProps {
     showAddButton?: boolean; // add this line

diff --git a/src/components/elements/headers/FestivalsHeader.tsx b/src/components/elements/headers/FestivalsHeader.tsx
@@ -25,7 +25,7 @@ export default function FestivalsHeader() {
       </div>
       <Link href={'/profile'}>
         <Avatar
-          src="/users/01.png"
+          src="/users/profile.png"
           alt="Usuario"
           width={40}
           height={40}

diff --git a/src/components/elements/headers/HistorialHeader.tsx b/src/components/elements/headers/HistorialHeader.tsx
@@ -44,7 +44,7 @@ const HistorialHeader: React.FC<HeaderProps> = ({
     return (
         <>
             {/* Titulo  */}
-            <div className='flex flex-row justify-between items-center'>
+            <div className='flex flex-row justify-between items-center mb-3'>
                 <h3 className='text-xl leading-none'>{festivalName}</h3>
                 <div className='flex flex-row gap-4 items-center'>
                     <span

diff --git a/src/components/elements/search/PostCard.tsx b/src/components/elements/search/PostCard.tsx
@@ -9,7 +9,7 @@ export default function PostCard(post: publicationInterface) {
 
   return (
     <>
-      <section className="flex flex-col mt-6">
+      <section className="flex flex-col mt-6 select-none">
         <div className="rounded-[20px] pb-1 p-4 bg-[url('/background_card.png')] bg-[length:140%_155%] bg-[position:-38px_-48px] text-background">
           <header className="flex items-center justify-between">
             <div className="flex items-center gap-2">