Merge pull request #648 from enshkn/development

Main update from Development (react fixes)

dutluk/dutluk_frontend/src/Test_Frontend/profile.test.js

@@ -7,16 +7,38 @@ import Profile from '../components/Profile';
 jest.mock('axios');
 
 describe('Profile Component', () => {
-  it('renders the profile component correctly', async () => {
-    const mockUser = {
-      username: 'testuser',
-      biography: 'Test biography',
-    };
+  beforeEach(() => {
+    axios.get.mockReset();
+
+    axios.get.mockImplementation((url) => {
+      if (url.includes('/api/user/isFollowing/')) {
+        return Promise.resolve({ data: true });
+      }
+
+
+      if (url.includes('/api/user/')) {
+        return Promise.resolve({
+          data: {
+            username: 'testuser',
+            biography: 'Test biography',
+            profilePhoto: 'test_photo_url'
+          }
+        });
+      }
 
-    // Mock the Axios requests
-    axios.get.mockResolvedValueOnce({ data: mockUser }); // Mock user data
-    axios.get.mockResolvedValueOnce({ data: { message: 'Registered successfully!' } }); // Mock user profile data
+      if (url.includes('/api/story/fromUserId/')) {
+        return Promise.resolve({
+          data: [
+
+          ]
+        });
+      }
+
+      return Promise.reject(new Error('not found'));
+    });
+  });
 
+  it('renders the profile component correctly', async () => {
     render(
       <MemoryRouter initialEntries={['/profile/123']}>
         <Routes>
@@ -25,7 +47,17 @@ describe('Profile Component', () => {
       </MemoryRouter>
     );
 
-    // Wait for elements to appear in the DOM
-
+    await waitFor(() => {
+      // Verify user information is displayed
+      expect(screen.getByText('Username: testuser')).toBeInTheDocument();
+      expect(screen.getByText('Biography: Test biography')).toBeInTheDocument();
+      expect(screen.getByRole('img', { name: /testuser/i })).toHaveAttribute('src', 'test_photo_url');
+
+      // Verify follow/unfollow button text based on follow status
+      expect(screen.getByText('Unfollow')).toBeInTheDocument();
+
+
+    });
   });
+
 });

dutluk/dutluk_frontend/src/components/StoryDetails.js

@@ -231,7 +231,7 @@ function StoryDetails() {
                 </div>
               </div>
               <button className="like-button" onClick={handleLikeStory} style={{ backgroundColor: "#ff5500ca", color: "white", border: "none" }} type="submit">
-                Like
+                {isLiked ? 'Unlike' : 'Like!'}
               </button>
             </div>
 

dutluk/dutluk_frontend/src/components/TimelineSearch.js

@@ -327,6 +327,7 @@ const TimelineSearch = () => {
             <button
               type="button"
               className="btn btn-primary"
+              style={{ backgroundColor: "#ff5500ca", color: "white", border: "none", margin: "5px" }}
               onClick={handleSearch}
             >
               Search