From eb4f02238d021309ffa3641ae578e87c5e1dd5bb Mon Sep 17 00:00:00 2001
From: batuhancoskun <batuhancoskun@yaani.com>
Date: Fri, 13 Jun 2025 21:37:18 +0300
Subject: [PATCH] =?UTF-8?q?D=C3=BCzenlemeler=20ve=20hata=20giderme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                                    |  1 +
 .../right/Profile/Follow/FollowRight.jsx      | 13 +++++++----
 .../middlewares/menus/ProfileMenuBox.jsx      |  3 +--
 .../notifications/partials/PostSave.jsx       |  7 ++++--
 src/components/middlewares/peoples/User.jsx   |  2 +-
 src/components/middlewares/post/post.jsx      |  5 ++++-
 src/components/navbar/Navbar.jsx              |  6 +++--
 .../notifications/Notifications.jsx           |  4 ++--
 src/components/profiles/follows/UserBox.jsx   |  6 ++---
 src/middlewares/general/Text.jsx              |  6 +++++
 src/middlewares/profiles/follow.jsx           | 22 +++++++++++++++++++
 src/middlewares/profiles/getProfile.jsx       |  7 ++++++
 12 files changed, 65 insertions(+), 17 deletions(-)
 create mode 100644 src/middlewares/general/Text.jsx

diff --git a/src/App.js b/src/App.js
index f9f116a..2ec8c25 100644
--- a/src/App.js
+++ b/src/App.js
@@ -20,6 +20,7 @@ export default function App() {
   const [popup, setPopup] = useState("");
 
   const globalState = {
+    title: "Arslanşah",
     states: {
       rightMenu, setRightMenu, leftMenu, setLeftMenu, popup, setPopup
     }
diff --git a/src/components/menus/right/Profile/Follow/FollowRight.jsx b/src/components/menus/right/Profile/Follow/FollowRight.jsx
index 1451a83..9f52891 100644
--- a/src/components/menus/right/Profile/Follow/FollowRight.jsx
+++ b/src/components/menus/right/Profile/Follow/FollowRight.jsx
@@ -2,17 +2,22 @@ import React, { useContext, useEffect, useState } from 'react'
 import { GSContext } from '../../../../../middlewares/GlobalStore';
 import { Link } from 'react-router-dom';
 import { I18nContext } from '../../../../../middlewares/Locale';
+import { getProfileDetails } from '../../../../../middlewares/profiles/getProfile';
 
-export default function FollowRight({profile}) {
+export default function FollowRight({username}) {
     const { globalState } = useContext(GSContext);
     const { locale } = useContext(I18nContext);
     const [profileKeys, setProfileKeys] = useState();
+    const [profile, setProfile] = useState();
 
     useEffect(()=>{
-        if(profile){
-            setProfileKeys(Object.keys(profile));
+        if(username){
+            getProfileDetails(3001, username).then(res => {
+                setProfile(res);
+                setProfileKeys(Object.keys(res));
+            });
         };
-    },[profile]);
+    },[username]);
 
     
     if(profile){
diff --git a/src/components/middlewares/menus/ProfileMenuBox.jsx b/src/components/middlewares/menus/ProfileMenuBox.jsx
index f4ca9a2..16bca52 100644
--- a/src/components/middlewares/menus/ProfileMenuBox.jsx
+++ b/src/components/middlewares/menus/ProfileMenuBox.jsx
@@ -8,7 +8,6 @@ export default function ProfileMenuBox() {
   
   useEffect(()=>{
     setLoading(false);
-    console.log(globalState, 567891);
   },[]);
   
     if(loading === true){
@@ -16,7 +15,7 @@ export default function ProfileMenuBox() {
     }else{
       return (
         <Link to={`/profile/${globalState.user.username}/posts`} className={'flex h-24 w-full p-2 gap-2 bg-white rounded-2xl shadow-lg'}>
-          <img src='/1.1.jpg' className='h-full rounded-2xl'></img>
+          {/* <img src='/1.1.jpg' className='h-full rounded-2xl'></img> */}
           <div className='flex flex-col items-center justify-center gap-1'>
             <div>
               <p className='font-bold text-sm'>{globalState.user.first_name} {globalState.user.second_name}</p>
diff --git a/src/components/middlewares/notifications/partials/PostSave.jsx b/src/components/middlewares/notifications/partials/PostSave.jsx
index 21afce9..9f67cbe 100644
--- a/src/components/middlewares/notifications/partials/PostSave.jsx
+++ b/src/components/middlewares/notifications/partials/PostSave.jsx
@@ -9,8 +9,11 @@ export default function PostSave({data, localeCode}) {
             <div className='flex gap-1 justify-between'>
                 {/* <div className='flex items-center justify-center rounded-full m-1 aspect-square bg-pc'/> */}
                 <div className='flex items-center gap-1'>
-                    <Link to={data.user.href} className='font-bold'>{data.user.name}</Link>
-                    <Link to={data.blog.href} className=''>{locale[localeCode]}.</Link>
+                    <p>
+                        <Link to={data.user.href} className='font-bold'>{data.user.name}</Link>
+                        <br/>
+                        <Link to={data.blog.href} className=''>{locale[localeCode]}.</Link>
+                    </p>
                 </div>
                 <div className='flex items-center'>
                     <p>{data.datetime.createdAt.differance[data.datetime.createdAt.differance.current]} {locale[data.datetime.createdAt.differance.current]}</p>
diff --git a/src/components/middlewares/peoples/User.jsx b/src/components/middlewares/peoples/User.jsx
index 20fa40f..f6b6375 100644
--- a/src/components/middlewares/peoples/User.jsx
+++ b/src/components/middlewares/peoples/User.jsx
@@ -6,7 +6,7 @@ import FollowRight from '../../menus/right/Profile/Follow/FollowRight';
 export default function User({people}) {
     const {globalState} = useContext(GSContext);
     return (
-        <div to={"/profile/" + people.username} onClick={() => globalState.states.setRightMenu(<FollowRight profile={people}/>)} className='flex flex-col justify-center p-2 gap-1 cursor-pointer hover:bg-pc'>
+        <div to={"/profile/" + people.username} onClick={() => globalState.states.setRightMenu(<FollowRight username={people.username}/>)} className='flex flex-col justify-center p-2 gap-1 cursor-pointer hover:bg-pc'>
             <p>{people.first_name} {people.second_name}</p>
             <p>@{people.username}</p>
         </div>
diff --git a/src/components/middlewares/post/post.jsx b/src/components/middlewares/post/post.jsx
index 42b6a63..7f21b7b 100644
--- a/src/components/middlewares/post/post.jsx
+++ b/src/components/middlewares/post/post.jsx
@@ -8,10 +8,13 @@ import PostComments from './PostComments';
 import { openPopup, renderPopup } from '../../../middlewares/popups/popup';
 import { GSContext } from '../../../middlewares/GlobalStore';
 import Popup from '../../popup/Popup';
+import { convertHTML } from '../../../middlewares/general/Text';
 
 export default function Post({data}) {
     const {globalState} = useContext(GSContext);
 
+    console.log();
+
     if(data.reblog === true){
         return (
             <div key={data.id} className='flex bg-white rounded-2xl overflow-hidden w-full'>
@@ -87,7 +90,7 @@ export default function Post({data}) {
                     </div>
                     <div>
                         <p className='font-bold'>{data.title}</p>
-                        <p>{data.text}</p>
+                        <p dangerouslySetInnerHTML={{ __html: convertHTML(data.text) }}></p>
                     </div>
                     {/* <div className='flex max-h-96 bg-black rounded-2xl'>
                         <img className='w-full object-contain' src='/profile-photo.svg'></img>
diff --git a/src/components/navbar/Navbar.jsx b/src/components/navbar/Navbar.jsx
index 9b15869..3de6796 100644
--- a/src/components/navbar/Navbar.jsx
+++ b/src/components/navbar/Navbar.jsx
@@ -1,11 +1,13 @@
-import React from 'react'
+import React, { useContext } from 'react'
 import { Link } from 'react-router-dom'
+import { GSContext } from '../../middlewares/GlobalStore';
 
 export default function () {
+    const { globalState } = useContext(GSContext);
     return (
         <nav className='flex z-50 bg-pc sticky top-0 shadow-md justify-between p-navbar rounded-b-2xl mx-4'>
             <div>
-                <Link className='font-bold' to={'/'}>BAŞLIK</Link>
+                <Link className='font-bold' to={'/'}>{globalState.title}</Link>
             </div>
             <div>
                 <a className='p-2 rounded-lg cursor-pointer hover:bg-white hover:bg-opacity-70 hover:font-bold'>Çıkış Yap</a>
diff --git a/src/components/notifications/Notifications.jsx b/src/components/notifications/Notifications.jsx
index b63c020..9061077 100644
--- a/src/components/notifications/Notifications.jsx
+++ b/src/components/notifications/Notifications.jsx
@@ -15,13 +15,13 @@ export default function Notifications() {
     },[]);
 
     return (
-        <div className='flex flex-col bg-white rounded-2xl p-1 gap-2 w-full'>
+        <div className='flex flex-col bg-white rounded-2xl p-1 gap-2 w-full h-96'>
             <div className='flex items-center p-2 justify-between'>
                 <p className='font-bold'>{locale["notifications"]}</p>
                 <p onClick={() => {getNotifications().then(get => globalState.setNotifications(get))}} className='p-2 rounded-lg cursor-pointer hover:bg-pc'>Yenile</p>
             </div>
             <hr/>
-            <div className='flex flex-col gap-1'>
+            <div className='flex flex-col gap-1 overflow-hidden overflow-y-scroll'>
                 {
                     globalState.notifications.map((get) => 
                         <Notification key={get.id} data={get} notifications={get}/>
diff --git a/src/components/profiles/follows/UserBox.jsx b/src/components/profiles/follows/UserBox.jsx
index 561312d..9af72a2 100644
--- a/src/components/profiles/follows/UserBox.jsx
+++ b/src/components/profiles/follows/UserBox.jsx
@@ -1,6 +1,6 @@
 import React, { useContext } from 'react'
 import { Link } from 'react-router-dom';
-import { postFollow, postFollowSvar } from '../../../middlewares/profiles/follow';
+import { postFollow, postFollowDestroy, postFollowSvar } from '../../../middlewares/profiles/follow';
 import { GSContext } from '../../../middlewares/GlobalStore';
 import FollowRight from '../../menus/right/Profile/Follow/FollowRight';
 
@@ -9,7 +9,7 @@ export default function UserBox({uid="default", user, button = null}) {
     if(uid === "default"){
         return (
             <div className='flex items-center justify-between w-full border-solid border-b-2 p-2'>
-                <div to={"/profile/" + user.username} onClick={() => {globalState.states.setRightMenu(<FollowRight profile={user}/>)}} className='flex items-center gap-2 cursor-pointer'>
+                <div to={"/profile/" + user.username} onClick={() => {globalState.states.setRightMenu(<FollowRight username={user.username}/>)}} className='flex items-center gap-2 cursor-pointer'>
                     {/* <div className='flex h-16 aspect-square'>
                         <img className='aspect-square' src='/profile-photo.svg'></img>
                     </div> */}
@@ -19,7 +19,7 @@ export default function UserBox({uid="default", user, button = null}) {
                     </div>
                 </div>
                 <div className='flex'>
-                    <a onClick={(e) => postFollow(e, user.id)} className='cursor-pointer p-2 rounded-lg ml-auto hover:bg-pc'>{button.text}</a>
+                    <a onClick={(e) => {return (button.isDestroy === true) ? postFollowDestroy(e, user.id) : postFollow(e, user.id) }} className='cursor-pointer p-2 rounded-lg ml-auto hover:bg-pc'>{button.text}</a>
                 </div>
             </div>
         );
diff --git a/src/middlewares/general/Text.jsx b/src/middlewares/general/Text.jsx
new file mode 100644
index 0000000..b7c5477
--- /dev/null
+++ b/src/middlewares/general/Text.jsx
@@ -0,0 +1,6 @@
+import React from 'react'
+
+export function convertHTML(text) {
+    const splitText = text.replaceAll("\n", "<br>");
+    return splitText;
+};
\ No newline at end of file
diff --git a/src/middlewares/profiles/follow.jsx b/src/middlewares/profiles/follow.jsx
index 63d26e4..83363f1 100644
--- a/src/middlewares/profiles/follow.jsx
+++ b/src/middlewares/profiles/follow.jsx
@@ -43,6 +43,28 @@ export function postFollowSvar(e, userId, svar){
     .then(res => console.log(res));  
 }
 
+export function postFollowDestroy(e, userId){
+    return FetchPOST({
+        port: 3001,
+        pathname: "/post/follow/follower/destroy",
+        fetchData:{
+            method: "POST",
+            credentials: 'include',
+            headers: {
+                'Accept' : 'application/json',
+                'Content-Type' : 'application/json'
+            },
+            body: JSON.stringify({
+                userId: userId
+            })
+        }
+    }).then(res => {
+        e.target.remove();
+        console.log(e.target.parent);
+        // e.target.text = res.follow.title;
+    });
+};
+
 export function getFollow(username){
     return FetchPOST({
         port: 3001,
diff --git a/src/middlewares/profiles/getProfile.jsx b/src/middlewares/profiles/getProfile.jsx
index 65cc9a4..6906d12 100644
--- a/src/middlewares/profiles/getProfile.jsx
+++ b/src/middlewares/profiles/getProfile.jsx
@@ -13,4 +13,11 @@ export async function getProfile(port, username, setProfile, setLoading) {
         })
     ]);
     return data;
+};
+
+export async function getProfileDetails(port, username) {
+    return FetchPOST({
+        port: port,
+        pathname: "/get/user/details/" + username
+    });
 };
\ No newline at end of file