Merge pull request #51 from FSDSTR0225/dev

carlosdamota · web-flow · commit 239ea9d22f6d · 2025-07-07T12:51:46.000+02:00
Dev
diff --git a/src/features/recruiters/pages/DashBoarPage.jsx b/src/features/recruiters/pages/DashBoarPage.jsx
@@ -94,6 +94,9 @@ const handleDownloadCoverLetter = async (offerId, userId) => {
       {/* En pantallas menores a lg: siempre muestra ListDashBoard */}
       <div className="lg:hidden">
         <ListDashBoard offerId={offerId}
+          openChat={openChat}
+          handleDownloadCoverLetter={handleDownloadCoverLetter}
+          handleDownloadCV={handleDownloadCV}
           skillsOffer={skillsOffer}
           lists={lists}
           setLists={setLists}
@@ -109,6 +112,9 @@ const handleDownloadCoverLetter = async (offerId, userId) => {
           lists={lists}
           setLists={setLists}
           getCandidates={getCandidates} /> : <RecDashBoar offerId={offerId}
+            openChat={openChat}
+            handleDownloadCoverLetter={handleDownloadCoverLetter}
+            handleDownloadCV={handleDownloadCV}
             lists={lists}
             setLists={setLists} />}
       </div>
diff --git a/src/features/recruiters/pages/OfferInfoPage.jsx b/src/features/recruiters/pages/OfferInfoPage.jsx
@@ -83,7 +83,7 @@ export const OfferInfoPage = () => {
   const hasApplied =
     Array.isArray(offer?.applicants) &&
     profile?._id &&
-    offer?.applicants?.some((applicant) => applicant?.user === profile._id);
+    offer?.applicants?.some((applicant) => applicant?.user === profile._id || applicant?.user?._id === profile?._id || applicant?.user?.toString() === profile?._id);
 
   const getCandidates = async () => {
     const data = await getCandidatesByOfferId(id, localStorage.getItem("token"));
@@ -111,6 +111,8 @@ export const OfferInfoPage = () => {
     fetchOffer();
   }, [id]);
 
+
+
   const handleApplyModal = (e) => {
     e.stopPropagation();
     if (!token) {
@@ -121,6 +123,11 @@ export const OfferInfoPage = () => {
     setIsOpenApplyModal(true);
   };
 
+  const handleApplySuccess = (updatedOffer) => {
+    console.log("Offer applied successfully:", updatedOffer);
+    setOffer(updatedOffer);
+  };
+
   const colors = {
     pending: "bg-blue-500",
     reviewed: "bg-purple-500",
@@ -315,6 +322,7 @@ export const OfferInfoPage = () => {
           setIsOpen={setIsOpenApplyModal}
           token={token}
           handleApply={handleApplyModal}
+          onApplySuccess={handleApplySuccess}
         />
       )}
     </SectionContainer>
diff --git a/src/layout/Header.jsx b/src/layout/Header.jsx
@@ -63,7 +63,14 @@ export const Header = () => {
 
             {/* Panel de notificaciones */}
             {profile && notificationsOpen && (
-              <div className="absolute right-0 mt-2 w-80 max-w-xs bg-neutral-70 shadow-lg rounded-xl z-50">
+              <div
+                className={`
+                  absolute z-50 mt-2
+                  w-[95vw] max-w-xs left-1/2 -translate-x-1/2 right-auto
+                  sm:w-80 sm:max-w-xs sm:left-auto sm:right-0 sm:translate-x-0
+                  bg-neutral-70 shadow-lg rounded-xl
+                `}
+              >
                 <div className="flex justify-between items-center px-4 py-3 border-b border-base-200">
                   <span className="font-semibold text-base-content">Notificaciones</span>
                   <button
@@ -82,9 +89,9 @@ export const Header = () => {
                       .map((notif, index) => (
                         <div
                           key={notif._id || `${notif.senderName}-${notif.type}-${index}`}
-                          className="w-full bg-neutral-60 text-base-content shadow-md rounded-md p-3"
+                          className="w-full bg-neutral-60 text-base-content shadow-md rounded-md p-3 break-words"
                         >
-                          <div className="text-sm font-medium">
+                          <div className="text-sm font-medium break-words">
                             {getNotificationText(notif)}
                           </div>
                           <span className="text-xs opacity-60 block mt-1">
diff --git a/src/layout/chat/Widget.jsx b/src/layout/chat/Widget.jsx
@@ -6,29 +6,29 @@ import { ChatContext } from "./context/ChatContext";
 
 export function Widget() {
   // const [isOpen, setIsOpen] = useState(false);
-  const { profile, token } = useContext(AuthContext);
+  const { profile, token, notifications } = useContext(AuthContext);
   const {toggleChat, isOpen} = useContext(ChatContext);
-
+  const unreadChats = notifications.filter(n => n.type === 1).length;
   // const toggleChat = () => {
   //   setIsOpen(!isOpen);
   // };
 
-  return (
+return (
     <>
       {token && (
         <div className="fixed bottom-8 right-8 z-50">
           <div className="relative">
             {/* Panel */}
             <div
-              className={` z-60
-                absolute -bottom-4 -right-6 sm:bottom-16 sm:right-10 w-[95dvw] h-[95dvh]  md:right-8 sm:w-[320px] sm:h-[500px]
+              className={`z-60
+                absolute -bottom-4 -right-6 sm:bottom-16 sm:right-10 w-[95dvw] h-[95dvh] md:right-8 sm:w-[320px] sm:h-[500px]
                 bg-neutral-70 rounded-2xl shadow-2xl border border-neutral-60 overflow-hidden
                 transform origin-bottom-right
                 transition duration-500 ease-in-out
                 ${isOpen ? 'scale-100 opacity-100' : 'scale-0 opacity-0 pointer-events-none'}
               `}
               style={{
-                boxShadow: '0 50px 50px rgba(0, 0, 0, 0.8)' // más profunda
+                boxShadow: '0 50px 50px rgba(0, 0, 0, 0.8)'
               }}
             >
               <ChatPanel onClose={toggleChat} user={profile} />
@@ -42,9 +42,14 @@ export function Widget() {
               }}
               className="
                 w-14 h-14 rounded-full text-white flex items-center justify-center shadow-2xl hover:brightness-90
-                transition transform active:scale-90 duration-150 ease-out"
+                transition transform active:scale-90 duration-150 ease-out relative"
             >
               <PiChat size={28} />
+              {unreadChats > 0 && (
+                <span className="absolute -top-2 -right-2 bg-red-500 text-white text-xs px-2 py-0.5 rounded-full animate-pulse min-w-[22px] text-center">
+                  {unreadChats}
+                </span>
+              )}
             </button>
           </div>
         </div>
diff --git a/src/layout/chat/components/ChatScreen.jsx b/src/layout/chat/components/ChatScreen.jsx
@@ -35,10 +35,10 @@ export const ChatScreen = ({ onClose, messages, messageEndRef, userSelected, onl
             key={message._id}
             className={`chat ${message.senderId === profile._id ? "chat-end" : "chat-start"} `}
             ref={messageEndRef}>
-            <div className="chat-image avatar border rounded-full border-neutral-50">
+            <div className="chat-image ">
               {
                 message.senderId === profile._id
-                  ? <AvatarImage user={profile} width={8} /> || "/avatar.png"
+                  ? <AvatarImage classProps={""} user={profile} width={8} /> || "/avatar.png"
                   : <AvatarImage user={userSelected} width={8} /> || "/avatar.png"
               }
             </div>
diff --git a/src/layout/components/Navbar.jsx b/src/layout/components/Navbar.jsx
@@ -1,6 +1,6 @@
 import { Link } from "react-router"
 import logo from '../../assets/CodepplyLogo.svg'
-import { PiBriefcase, PiStack, PiUsers } from "react-icons/pi"
+import { PiBriefcase, PiList, PiStack, PiUsers } from "react-icons/pi"
 import favicon from '../../assets/CodepplyFly.svg'
 
 
@@ -13,34 +13,23 @@ export const Navbar = () => {
               aria-label='open sidebar'
               className='btn btn-square btn-ghost'
             >
-              <svg
-                xmlns='http://www.w3.org/2000/svg'
-                fill='none'
-                viewBox='0 0 24 24'
-                className='inline-block h-6 w-6 stroke-current'
-              >
-                <path
-                  strokeLinecap='round'
-                  strokeLinejoin='round'
-                  strokeWidth='2'
-                  d='M4 6h16M4 12h16M4 18h16'
-                ></path>
-              </svg>
+              <PiList  className="text-3xl"/>
+
             </label>
           </div>
           <Link
             to={"/"}
-            className='mr-4 pr-4 flex items-center'
+            className='mr-4  flex items-center'
           >
             <img
               src={logo}
               alt='Codepply Logo'
-              className='h-6 ml-3 sm:hidden md:block '
+              className='h-6 hidden  md:block '
             />
             <img
               src={favicon}
               alt='Codepply Logo'
-              className='h-6 ml-3 hidden sm:block md:hidden'
+              className='h-6 mx-4 sm:block md:hidden'
             />
           </Link>
           <div className='hidden flex-none sm:flex'>

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@ export const ChatScreen = ({ onClose, messages, messageEndRef, userSelected, onl`
`35`	`35`	`key={message._id}`
`36`	`36`	className={`chat ${message.senderId === profile._id ? "chat-end" : "chat-start"} `}
`37`	`37`	`ref={messageEndRef}>`
`38`		`- <div className="chat-image avatar border rounded-full border-neutral-50">`
	`38`	`+ <div className="chat-image ">`
`39`	`39`	`{`
`40`	`40`	`message.senderId === profile._id`
`41`		`- ? <AvatarImage user={profile} width={8} /> \|\| "/avatar.png"`
	`41`	`+ ? <AvatarImage classProps={""} user={profile} width={8} /> \|\| "/avatar.png"`
`42`	`42`	`: <AvatarImage user={userSelected} width={8} /> \|\| "/avatar.png"`
`43`	`43`	`}`
`44`	`44`	`</div>`