fix wishlist in notice screen

ArtisanConnect/api/categories.jsx

@@ -1,10 +1,14 @@
 import axios from "axios";
+import { useAuthStore } from "@/store/authStore";
 
-const API_URL = "https://testowe.zikor.pl/api/v1";
+const API_URL = "https://hopp.zikor.pl/api/v1";
 
 export async function listCategories() {
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
   try {
-        const response = await axios.get(`${API_URL}/vars/categories`);
+    const response = await axios.get(`${API_URL}/vars/categories`, { headers });
     return response.data;
   } catch (err) {
     console.error("Nie udało się pobrać listy kategorii.", err.response.status);

ArtisanConnect/api/client.jsx

@@ -0,0 +1,16 @@
+import axios from "axios";
+
+const API_URL = "https://hopp.zikor.pl/api/v1";
+
+export async function getUserById(userId) {
+  try {
+    const response = await axios.get(`${API_URL}/clients/get/${userId}`);
+    return response.data;
+  } catch (err) {
+    console.error(
+      `Nie udało się pobrać danych użytkownika o ID ${userId}.`,
+      err.response.status
+    );
+    throw err;
+  }
+}

ArtisanConnect/api/notices.jsx

@@ -1,21 +1,21 @@
 import axios from "axios";
-import FormData from 'form-data'
+import FormData from "form-data";
 import { useAuthStore } from "@/store/authStore";
 
-// const API_URL = "https://testowe.zikor.pl/api/v1";
+const API_URL = "https://hopp.zikor.pl/api/v1";
 
-const API_URL = "http://10.0.2.2:8080/api/v1";
+//const API_URL = "http://10.0.2.2:8080/api/v1";
 
 export async function listNotices() {
   const { token } = useAuthStore.getState();
-    const headers = token ? { 'Authorization': `Bearer ${token}` } : {};
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
 
   console.log(token);
 
   const response = await fetch(`${API_URL}/notices/get/all`, {
-        headers: headers
+    headers: headers,
   });
-    console.log(response);
+  // console.log(response);r
   const data = await response.json();
   if (!response.ok) {
     throw new Error(response.toString());
@@ -77,8 +77,8 @@ export async function getAllImagesByNoticeId(noticeId) {
     const listResponse = await axios.get(`${API_URL}/images/list/${noticeId}`);
 
     if (listResponse.data && listResponse.data.length > 0) {
-            const imageUrls = listResponse.data.map(imageName =>
+      const imageUrls = listResponse.data.map(
-                `${API_URL}/images/get/${imageName}`
+        (imageName) => `${API_URL}/images/get/${imageName}`
       );
 
       // console.log(`Pobrano ${imageUrls.length} zdjęć dla ogłoszenia o id: ${noticeId}`);
@@ -98,12 +98,12 @@ export const uploadImage = async (noticeId, imageUri) => {
 
   const formData = new FormData();
 
-    const filename = imageUri.split('/').pop();
+  const filename = imageUri.split("/").pop();
 
   const match = /\.(\w+)$/.exec(filename);
-    const type = match ? `image/${match[1]}` : 'image/jpeg';
+  const type = match ? `image/${match[1]}` : "image/jpeg";
 
-    formData.append('file', {
+  formData.append("file", {
     uri: imageUri,
     name: filename,
     type: type,
@@ -115,15 +115,19 @@ export const uploadImage = async (noticeId, imageUri) => {
       formData,
       {
         headers: {
-                    'Content-Type': 'multipart/form-data',
+          "Content-Type": "multipart/form-data",
         },
       }
     );
-        console.info('Upload successful:', response.data);
+    console.info("Upload successful:", response.data);
     return response.data;
   } catch (error) {
     console.log("imageURI:", imageUri);
-        console.error('Error uploading image:', error.response.data, error.response.status);
+    console.error(
+      "Error uploading image:",
+      error.response.data,
+      error.response.status
+    );
     throw error;
   }
-}
+};

ArtisanConnect/api/wishlist.jsx

@@ -1,15 +1,21 @@
 import axios from "axios";
+import { useAuthStore } from "@/store/authStore";
 // import FormData from 'form-data'
 
-const API_URL = "https://testowe.zikor.pl/api/v1/wishlist";
+const API_URL = "https://hopp.zikor.pl/api/v1/wishlist";
 
 export async function toggleNoticeStatus(noticeId) {
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
   try {
-        const response = await axios.post(`${API_URL}/toggle/${noticeId}`, null, {
+    const response = await axios.post(
-            headers: {
+      `${API_URL}/toggle/${noticeId}`,
-                "Content-Type": "application/json",
+      {},
-            },
+      {
-        });
+        headers,
+      }
+    );
     return response.data;
   } catch (error) {
     console.error("Error toggling wishlist item:", error);
@@ -18,8 +24,11 @@ export async function toggleNoticeStatus(noticeId) {
 }
 
 export async function getWishlist() {
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
   try {
-        const response = await axios.get(`${API_URL}/`);
+    const response = await axios.get(`${API_URL}/`, { headers });
     console.log("Wishlist response:", response.data);
     return response.data;
   } catch (error) {

ArtisanConnect/app/(tabs)/_layout.jsx

@@ -1,7 +1,13 @@
-import {Tabs} from "expo-router";
+import { Tabs, Redirect } from "expo-router";
 import { Ionicons } from "@expo/vector-icons";
+import { useAuthStore } from "@/store/authStore";
 
 export default function TabLayout() {
+  const token = useAuthStore((state) => state.token);
+
+  if (!token) {
+    return <Redirect href="/login" />;
+  }
   return (
     <Tabs
       screenOptions={{

ArtisanConnect/app/(tabs)/dashboard/_layout.jsx

@@ -1,6 +1,15 @@
+import { DrawerItem } from "@react-navigation/drawer";
 import { Drawer } from "expo-router/drawer";
+import { useAuthStore } from "@/store/authStore";
+
+import {
+  DrawerContentScrollView,
+  DrawerItemList,
+} from "@react-navigation/drawer";
 
 export default function AccountDrawerLayout() {
+  const signOut = useAuthStore((state) => state.signOut);
+
   return (
     <Drawer
       screenOptions={{
@@ -9,10 +18,19 @@ export default function AccountDrawerLayout() {
         drawerActiveBackgroundColor: "#f0f0f0",
         drawerItemStyle: {
           borderRadius: 8,
-          // backgroundColor: "transparent",
         },
         headerTintColor: "#1c1c1e",
       }}
+      drawerContent={(props) => (
+        <DrawerContentScrollView {...props}>
+          <DrawerItemList {...props} />
+          <DrawerItem
+            label="Wyloguj"
+            onPress={signOut}
+            labelStyle={{ color: "red" }}
+          />
+        </DrawerContentScrollView>
+      )}
     >
       <Drawer.Screen name="account" options={{ title: "Konto" }} />
       <Drawer.Screen

ArtisanConnect/app/(tabs)/dashboard/account.jsx

@@ -1,4 +1,105 @@
+import { Link } from "expo-router";
+import { Pressable } from "react-native";
+import { Box } from "@/components/ui/box";
 import { Text } from "@/components/ui/text";
-export default function User() {
+import { VStack } from "@/components/ui/vstack";
-  return <Text>Użytkownik</Text>;
+import { Image } from "@/components/ui/image";
+import { ActivityIndicator } from "react-native";
+import { useEffect, useState } from "react";
+import { getUserById } from "@/api/client";
+import { HStack } from "@gluestack-ui/themed";
+
+export default function Account() {
+  const [user, setUser] = useState(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const currentUserId = 2; // Tymczasowo, do czasu zaimplementowania logowania bo nie moge pobrac usera
+
+  useEffect(() => {
+    const fetchUser = async () => {
+      setIsLoading(true);
+      try {
+        const userData = await getUserById(currentUserId);
+        setUser(userData);
+      } catch (err) {
+        console.error("Błąd podczas pobierania danych użytkownika:", err);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+    fetchUser();
+  }, []);
+
+  if (isLoading) {
+    return <ActivityIndicator />;
+  }
+
+  if (!user) {
+    return <Text>Nie udało się pobrać danych użytkownika.</Text>;
+  }
+
+  return (
+    <VStack className="bg-gray-50 flex-1">
+      <Box className="bg-white pb-6 shadow-sm">
+        <Box className="items-center pt-6 mb-4">
+          <Image
+            source={{
+              uri:
+                user.profileImage ||
+                "https://th.bing.com/th/id/OIP.3coo_N8sieled8QNroQmkgHaHa?rs=1&pid=ImgDetMain",
+            }}
+            className="h-24 w-24 rounded-full border-4 border-white shadow-md"
+            alt="Zdjęcie profilowe"
+          />
+        </Box>
+
+        <Text className="text-2xl font-bold text-center mb-1">
+          {user.firstName} {user.lastName}
+        </Text>
+
+        <Pressable
+          className="border border-[#002f34] rounded-md py-2 px-4 self-center"
+          onPress={() => console.log("Edytuj dane użytkownika")}
+        >
+          <Text className="text-[#002f34] font-medium">Edytuj profil</Text>
+        </Pressable>
+      </Box>
+
+      <Box className="bg-white mt-4 p-5 border-t border-b border-gray-200">
+        <Text className="font-bold text-lg mb-3">Moje dane</Text>
+
+        <HStack className="mb-3">
+          <Text className="text-gray-600 w-24">E-mail</Text>
+          <Text className="flex-1">{user.email || "brak danych"}</Text>
+        </HStack>
+      </Box>
+
+      <Box className="bg-white mt-4 p-5">
+        <Text className="font-bold text-lg mb-3">Moje konto</Text>
+
+        <Link href="/dashboard/userNotices" asChild>
+          <Pressable className="py-3 flex-row items-center border-b border-gray-100">
+            <Text className="text-lg flex-1">Moje ogłoszenia</Text>
+            <Text>▶</Text>
+          </Pressable>
+        </Link>
+
+        {/*Tak dodałem, można zmienić na coś innego*/}
+        <Link href="/dashboard/userPaymentHistory" asChild>
+          <Pressable className="py-3 flex-row items-center border-b border-gray-100">
+            <Text className="text-lg flex-1">Historia płatności</Text>
+            <Text>▶</Text>
+          </Pressable>
+        </Link>
+
+        <Pressable className="py-3 flex-row items-center">
+          <Text className="text-lg flex-1">Ustawienia powiadomień</Text>
+          <Text>▶</Text>
+        </Pressable>
+      </Box>
+
+      <Pressable className="mt-8 mx-5 p-4 bg-white rounded-md items-center shadow-sm">
+        <Text className="text-red-500 font-medium">Wyloguj się</Text>
+      </Pressable>
+    </VStack>
+  );
 }

ArtisanConnect/app/(tabs)/dashboard/userNotices.jsx

@@ -1,4 +1,75 @@
+import { useNoticesStore } from "@/store/noticesStore";
+import { NoticeCard } from "@/components/NoticeCard";
+import {Button} from "react-native";
+import {Box} from "@/components/ui/box";
 import {Text} from "@/components/ui/text";
+import {VStack} from "@/components/ui/vstack";
+import {ActivityIndicator, FlatList } from "react-native";
+import {useEffect, useState} from "react";
+
 export default function UserNotices() {
-  return <Text>Użytkownik</Text>;
+  const { notices, fetchNotices } = useNoticesStore();
+  const [isLoading, setIsLoading] = useState(true);
+  const currentUserId = 1; // Tymczasowo, do czasu zaimplementowania logowania bo nie moge pobrac usera
+
+  useEffect(() => {
+    const loadNotices = async () => {
+      setIsLoading(true);
+      try {
+        await fetchNotices();
+      } catch (err) {
+        console.error("Błąd podczas pobierania ogłoszeń:", err);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+    loadNotices();
+  }, []);
+
+  const userNotices = notices.filter(notice => notice.clientId === currentUserId);
+
+  if (isLoading) {
+    return <ActivityIndicator />;
+  }
+
+  return (
+      <VStack className="p-4">
+        <Text className="text-2xl font-bold mb-4">Moje ogłoszenia</Text>
+        {userNotices.length > 0 ? (
+            <FlatList
+                data={userNotices}
+                numColumns={2}
+                columnWrapperStyle={{ marginBottom: 10, justifyContent: "space-between" }}
+                renderItem={({ item }) => (
+                    <Box className="flex-1">
+                      <NoticeCard notice={item} />
+                      <Box className="flex-row justify-between mt-2">
+                        <Button
+                            title="Promuj"
+                            onPress={() => {
+                              // TODO: Implementacja promocji ogłoszenia
+                              console.log(`Promuj ogłoszenie ${item.noticeId}`);
+                            }}
+                            className="bg-primary-500 py-2 px-4 rounded-md"
+                        >
+                        </Button>
+                        <Button
+                            title="Podbij"
+                            onPress={() => {
+                              // TODO: Implementacja podbicia ogłoszenia
+                              console.log(`Podbij ogłoszenie ${item.noticeId}`);
+                            }}
+                            className="bg-primary-500 py-2 px-4 rounded-md"
+                        >
+                        </Button>
+                      </Box>
+                    </Box>
+                )}
+                keyExtractor={(item) => item.noticeId.toString()}
+            />
+        ) : (
+            <Text>Nie masz żadnych ogłoszeń.</Text>
+        )}
+      </VStack>
+  );
 }

ArtisanConnect/app/(tabs)/index.jsx

@@ -1,17 +1,20 @@
 import { ScrollView, View } from "react-native";
-import { useNoticesStore } from '@/store/noticesStore';
+import { useNoticesStore } from "@/store/noticesStore";
 import { CategorySection } from "@/components/CategorySection";
 import { NoticeSection } from "@/components/NoticeSection";
 import { UserSection } from "@/components/UserSection";
 import { SearchSection } from "@/components/SearchSection";
-import { FlatList } from 'react-native';
+import { FlatList } from "react-native";
 import { useAuthStore } from "@/store/authStore";
 import { useRouter } from "expo-router";
 import { useEffect, useState } from "react";
+import { SafeAreaView } from "react-native";
+
 export default function Home() {
   const token = useAuthStore((state) => state.token);
   const router = useRouter();
   const [isReady, setIsReady] = useState(false);
+  const fetchNotices = useNoticesStore((state) => state.fetchNotices);
 
   useEffect(() => {
     setIsReady(true);
@@ -23,7 +26,15 @@ const token = useAuthStore((state) => state.token);
     }
   }, [isReady, token, router]);
 
+  useEffect(() => {
+    if (token) {
+      fetchNotices();
+    }
+  }, [token, fetchNotices]);
+
   const notices = useNoticesStore((state) => state.notices);
+  // console.log("Notices:", notices);
+
   const latestNotices = [...notices]
     .sort((a, b) => new Date(b.publishDate) - new Date(a.publishDate))
     .slice(0, 6);
@@ -32,14 +43,24 @@ const token = useAuthStore((state) => state.token);
     .slice(0, 6);
 
   return (
-    <View>
+    <SafeAreaView className="flex-1 m-2">
+      {/* <View>    */}
       <SearchSection />
-     <ScrollView showsVerticalScrollIndicator={false} className='m-2'>
+      <ScrollView showsVerticalScrollIndicator={false}>
         <CategorySection title="Polecane kategorie" notices={notices} />
-        <NoticeSection title="Najnowsze ogłoszenia" notices={latestNotices} ctaLink="/notices?sort=latest"/>
+        <NoticeSection
+          title="Najnowsze ogłoszenia"
+          notices={latestNotices}
+          ctaLink="/notices?sort=latest"
+        />
         <UserSection title="Popularni sprzedawcy" notices={notices} />
-        <NoticeSection title="Proponowane ogłoszenia" notices={recomendedNotices} ctaLink="/notices"/>
+        <NoticeSection
+          title="Proponowane ogłoszenia"
+          notices={recomendedNotices}
+          ctaLink="/notices"
+        />
       </ScrollView>
-     </View>
+      {/* </View> */}
+    </SafeAreaView>
   );
 }

ArtisanConnect/app/_layout.jsx

@@ -2,21 +2,13 @@ import { Stack, Redirect } from "expo-router";
 import "@/global.css";
 import { GluestackUIProvider } from "@/components/ui/gluestack-ui-provider";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { useEffect, useState } from "react";
-import { useNoticesStore } from "@/store/noticesStore"; 
 
 const queryClient = new QueryClient();
 export default function RootLayout() {
-   const fetchNotices = useNoticesStore((state) => state.fetchNotices);
-
-  useEffect(() => {
-    fetchNotices();
-  }, []);
   
 return (
     <QueryClientProvider client={queryClient}>
       <GluestackUIProvider>
-        
         <Stack
           screenOptions={{
             headerTintColor: "#1c1c1e",

ArtisanConnect/app/notice/[id].jsx

@@ -1,4 +1,4 @@
-import {Stack, useLocalSearchParams} from "expo-router";
+import { Link, Stack, useLocalSearchParams } from "expo-router";
 import { Box } from "@/components/ui/box";
 import { Card } from "@/components/ui/card";
 import { Heading } from "@/components/ui/heading";
@@ -6,27 +6,73 @@ import {Image} from "@/components/ui/image";
 import { Text } from "@/components/ui/text";
 import { VStack } from "@/components/ui/vstack";
 import { Ionicons } from "@expo/vector-icons";
-import {ActivityIndicator} from "react-native";
+import {
-import {useEffect, useState} from "react";
+  ActivityIndicator,
+  Dimensions,
+  FlatList,
+  View,
+  TextInput,
+} from "react-native";
+import { useEffect, useState, useRef } from "react";
 import { useNoticesStore } from "@/store/noticesStore";
 import { useWishlist } from "@/store/wishlistStore";
-import {Pressable} from "react-native";
+import { Pressable, ScrollView } from "react-native";
+import { getUserById } from "@/api/client";
+
+const { width } = Dimensions.get("window");
 
 export default function NoticeDetails() {
   const { id } = useLocalSearchParams();
-    const [image, setImage] = useState(null);
+  const [images, setImages] = useState([]);
   const [isImageLoading, setIsImageLoading] = useState(true);
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState(null);
   const [notice, setNotice] = useState(null);
+  const [user, setUser] = useState(null);
+  const [isUserLoading, setIsUserLoading] = useState(true);
+  const flatListRef = useRef(null);
+  const [currentIndex, setCurrentIndex] = useState(0);
+
+  const [isMessageFormVisible, setIsMessageFormVisible] = useState(false);
+  const [message, setMessage] = useState("");
+  const [Email, setEmail] = useState("");
+  const handleSendMessage = () => {
+    console.log("Wiadomość do:", user?.email);
+    console.log("Email nadawcy:", Email);
+    console.log("Treść:", message);
+
+    setIsMessageFormVisible(false);
+    setMessage("");
+    setEmail("");
+  };
+
+  const formatDate = (dateString) => {
+    const date = new Date(dateString);
+    return date.toLocaleDateString("pl-PL", {
+      year: "numeric",
+      month: "2-digit",
+      day: "2-digit",
+    });
+  };
 
   const { getNoticeById, getAllImagesByNoticeId } = useNoticesStore();
-    const addNoticeToWishlist = useWishlist((state) => state.addNoticeToWishlist);
+  const toggleNoticeInWishlist = useWishlist(
-    const removeNoticeFromWishlist = useWishlist((state) => state.removeNoticeFromWishlist);
+    (state) => state.toggleNoticeInWishlist
-    const isInWishlist = useWishlist((state) =>
-        notice ? state.wishlistNotices.some((item) => item.noticeId === notice.noticeId) : false
   );
 
+  const isInWishlist = useWishlist((state) =>
+    id ? state.wishlistNotices.some((item) => item.noticeId == id) : false
+  );
+  const onViewableItemsChanged = useRef(({ viewableItems }) => {
+    if (viewableItems.length > 0) {
+      setCurrentIndex(viewableItems[0].index);
+    }
+  }).current;
+
+  const viewabilityConfig = useRef({
+    itemVisiblePercentThreshold: 70,
+  }).current;
+
   useEffect(() => {
     const fetchNotice = async () => {
       setIsLoading(true);
@@ -53,8 +99,12 @@ export default function NoticeDetails() {
       setIsImageLoading(true);
       if (notice) {
         try {
-                    const images = await getAllImagesByNoticeId(notice.noticeId);
+          const fetchedImages = await getAllImagesByNoticeId(notice.noticeId);
-                    setImage(images && images.length > 0 ? images[0] : "https://http.cat/404.jpg");
+          setImages(
+            fetchedImages && fetchedImages.length > 0
+              ? fetchedImages
+              : ["https://http.cat/404.jpg"]
+          );
         } catch (err) {
           console.error("Error while loading images:", err);
           setImage("https://http.cat/404.jpg");
@@ -69,6 +119,24 @@ export default function NoticeDetails() {
     }
   }, [notice]);
 
+  useEffect(() => {
+    const fetchUser = async () => {
+      if (notice && notice.clientId) {
+        setIsUserLoading(true);
+        try {
+          const userData = await getUserById(notice.clientId);
+          setUser(userData);
+        } catch (err) {
+          console.error("Nie udało się pobrać danych użytkownika:", err);
+        } finally {
+          setIsUserLoading(false);
+        }
+      }
+    };
+
+    fetchUser();
+  }, [notice]);
+
   if (isLoading) {
     return <ActivityIndicator />;
   }
@@ -93,31 +161,63 @@ export default function NoticeDetails() {
           <ActivityIndicator size="large" color="#3b82f6" />
         </Box>
       ) : (
+        <Box className="sticky top-0 z-10 bg-white">
+          <FlatList
+            ref={flatListRef}
+            data={images}
+            horizontal
+            snapToAlignment="center"
+            decelerationRate="fast"
+            showsHorizontalScrollIndicator={false}
+            pagingEnabled
+            onViewableItemsChanged={onViewableItemsChanged}
+            viewabilityConfig={viewabilityConfig}
+            renderItem={({ item, index }) => (
+              <View style={{ width: width }}>
                 <Image
-                    source={{
+                  source={{ uri: item }}
-                        uri: image,
+                  className="h-auto w-full rounded-md aspect-square"
-                    }}
+                  alt={`Zdjęcie ${index + 1}`}
-                    className="h-auto w-full rounded-md aspect-[1/1]"
+                  resizeMode="contain"
-                    alt="image"
-                    resizeMode="cover"
                 />
+              </View>
+            )}
+            keyExtractor={(item, index) => index.toString()}
+          />
+
+          {images.length > 1 && (
+            <Box className="flex-row justify-center mt-2">
+              {images.map((_, index) => (
+                <Box
+                  key={index}
+                  className={`w-2 h-2 rounded-full mx-1 ${
+                    index === currentIndex ? "bg-primary-500" : "bg-gray-300"
+                  }`}
+                />
+              ))}
+            </Box>
+          )}
+        </Box>
       )}
 
+      <ScrollView showsVerticalScrollIndicator={false}>
         <VStack className="p-2">
           <Text className="text-sm font-normal mb-2 text-typography-700">
+            {formatDate(notice.publishDate)}
+          </Text>
+          <Text className="text-2xl text-gray-950 font-bold mb-2 text-center bg-gray-50 rounded-md p-2">
             {notice.title}
           </Text>
-                <Box className="flex-row items-center">
+
-                    <Heading size="md" className="flex-1">
+          <Box className="flex-row items-center  bg-gray-50 rounded-md p-2">
+            <Heading size="md" className="flex-1 text-xl text-gray-950">
+              <Text className="text-sm text-typography-500">Cena: </Text>
               {notice.price} zł
             </Heading>
+
             <Pressable
               onPress={() => {
-                            if (isInWishlist) {
+                toggleNoticeInWishlist(id);
-                                removeNoticeFromWishlist(notice.noticeId);
-                            } else {
-                                addNoticeToWishlist(notice);
-                            }
               }}
             >
               <Ionicons
@@ -127,7 +227,111 @@ export default function NoticeDetails() {
               />
             </Pressable>
           </Box>
+          <Box className="mt-4 bg-gray-50 p-3 rounded-lg shadow-sm">
+            <Text className="text-sm text-typography-500">
+              Kategoria:{" "}
+              <Text className="font-bold text-gray-950">{notice.category}</Text>
+            </Text>
+          </Box>
+          <Box className="mt-4 bg-gray-50 p-3 rounded-lg shadow-sm">
+            <Text className="text-2xl text-gray-950">Opis ogloszenia</Text>
+            <Text className="text-sm text-typography-700">
+              {notice.description}
+            </Text>
+          </Box>
+
+          <Box className="mt-4 bg-gray-50 p-3 rounded-lg shadow-sm">
+            <Text className="text-sm text-typography-500">Uzytkownik:</Text>
+            {isUserLoading ? (
+              <ActivityIndicator />
+            ) : user ? (
+              <>
+                <Box className="mr-4">
+                  <Image
+                    source={{
+                      uri:
+                        user.profileImage ||
+                        "https://th.bing.com/th/id/OIP.3coo_N8sieled8QNroQmkgHaHa?rs=1&pid=ImgDetMain",
+                    }} // Domyślny obraz, jeśli brak zdjęcia profilowego
+                    className="h-12 w-12 rounded-full"
+                    alt="Zdjęcie profilowe"
+                  />
+                </Box>
+
+                <Box className="flex-1">
+                  <Text className="text-xl font-bold text-gray-950">
+                    {user.firstName} {user.lastName}
+                  </Text>
+                  <Text className="text-sm text-typography-700">
+                    Email: {user.email}
+                  </Text>
+                  <Pressable
+                    onPress={() => setIsMessageFormVisible(true)}
+                    className="mt-3 bg-primary-500 py-2 px-4 rounded-md"
+                  >
+                    <Text className="text-white text-center font-bold">
+                      Wyślij wiadomość
+                    </Text>
+                  </Pressable>
+                  <Link href={`/user/${notice.clientId}`}>
+                    <Text className="text-xl p-3 font-bold text-center text-typography-700 mt-3">
+                      Zobacz więcej ogłoszeń od {user.firstName}
+                    </Text>
+                  </Link>
+                </Box>
+              </>
+            ) : (
+              <Text>Błąd podczas ładowania danych użytkownika</Text>
+            )}
+          </Box>
         </VStack>
+      </ScrollView>
+      {isMessageFormVisible && (
+        <View className="absolute inset-0 bg-black bg-opacity-50 justify-center items-center z-20">
+          <View className="bg-white p-4 rounded-lg w-4/5">
+            <Text className="text-lg font-bold mb-4">
+              Wyślij wiadomość do {user?.firstName}
+            </Text>
+
+            <Text className="text-sm font-medium mb-1">Do:</Text>
+            <Text className="bg-gray-100 p-3 rounded text-gray-500">
+              {user?.email || "Brak adresu e-mail"}
+            </Text>
+            <Text className="text-sm font-medium mb-1">Twój e-mail:</Text>
+            <TextInput
+              className="border border-gray-300 p-2 rounded"
+              placeholder="Wpisz swój adres e-mail"
+              value={Email}
+              onChangeText={setEmail}
+            />
+
+            <TextInput
+              className="border border-gray-300 rounded-md p-2 mb-4 h-32 text-left"
+              multiline
+              numberOfLines={4}
+              placeholder="Napisz swoją wiadomość..."
+              value={message}
+              onChangeText={setMessage}
+            />
+
+            <View className="flex-row justify-end space-x-2">
+              <Pressable
+                onPress={() => setIsMessageFormVisible(false)}
+                className="bg-gray-300 py-2 px-4 rounded-md"
+              >
+                <Text className="text-gray-800">Anuluj</Text>
+              </Pressable>
+
+              <Pressable
+                onPress={handleSendMessage}
+                className="bg-primary-500 py-2 px-4 rounded-md"
+              >
+                <Text className="text-white">Wyślij</Text>
+              </Pressable>
+            </View>
+          </View>
+        </View>
+      )}
     </Card>
   );
 }

ArtisanConnect/app/user/[userId].jsx

@@ -0,0 +1,69 @@
+import { useLocalSearchParams } from "expo-router";
+import { useState, useEffect } from "react";
+import { FlatList, ActivityIndicator, Text } from "react-native";
+import { Box } from "@/components/ui/box";
+import { Image } from "@/components/ui/image";
+import { VStack } from "@/components/ui/vstack";
+import { Heading } from "@/components/ui/heading";
+import { getUserById } from "@/api/client";
+import { useNoticesStore } from "@/store/noticesStore";
+import { NoticeCard } from "@/components/NoticeCard";
+
+export default function UserProfile() {
+    const { userId } = useLocalSearchParams();
+    const [user, setUser] = useState(null);
+    const [isUserLoading, setIsUserLoading] = useState(true);
+    const { notices } = useNoticesStore();
+
+    useEffect(() => {
+        const fetchUser = async () => {
+            setIsUserLoading(true);
+            try {
+                const userData = await getUserById(Number(userId));
+                setUser(userData);
+            } catch (err) {
+                console.error("Błąd podczas pobierania danych użytkownika:", err);
+                setUser(null);
+            } finally {
+                setIsUserLoading(false);
+            }
+        };
+        fetchUser();
+    }, [userId]);
+
+    if (isUserLoading) {
+        return <ActivityIndicator />;
+    }
+
+    if (!user) {
+        return <Text>Nie znaleziono użytkownika</Text>;
+    }
+
+    const userNotices = notices.filter(notice => notice.clientId === Number(userId));
+
+    return (
+        <VStack className="p-4">
+            <Box className="flex-row items-center mb-4">
+                <Image
+                    source={{ uri: user.profileImage || "https://th.bing.com/th/id/OIP.3coo_N8sieled8QNroQmkgHaHa?rs=1&pid=ImgDetMain" }}
+                    className="h-16 w-16 rounded-full mr-4"
+                    alt="Zdjęcie profilowe"
+                />
+                <Heading size="lg">
+                    {user.firstName} {user.lastName}
+                </Heading>
+            </Box>
+            {userNotices.length > 0 ? (
+                <FlatList
+                    data={userNotices}
+                    numColumns={2}
+                    columnWrapperStyle={{ marginBottom: 10, justifyContent: "space-between" }}
+                    renderItem={({ item }) => <NoticeCard notice={item} />}
+                    keyExtractor={(item) => item.noticeId.toString()}
+                />
+            ) : (
+                <Text>Ten użytkownik nie ma żadnych ogłoszeń.</Text>
+            )}
+        </VStack>
+    );
+}

ArtisanConnect/components/CategorySection.jsx

@@ -1,30 +1,37 @@
-import { View, FlatList} from 'react-native';
+import { View, FlatList } from "react-native";
-import { useEffect, useState } from 'react'
+import { useEffect, useState } from "react";
-import { Heading } from '@/components/ui/heading';
+import { useAuthStore } from "@/store/authStore";
-import { Text } from '@/components/ui/text';
+import { Heading } from "@/components/ui/heading";
-import { Link } from 'expo-router';
+import { Text } from "@/components/ui/text";
-import { Pressable } from '@/components/ui/pressable';
+import { Link } from "expo-router";
-import axios from 'axios';
+import { Pressable } from "@/components/ui/pressable";
+import { listCategories } from "@/api/categories";
 
 export function CategorySection({ notices, title }) {
-// const notices = useNoticesStore((state) => state.notices);
-
   const [categoryMap, setCategoryMap] = useState({});
 
   useEffect(() => {
-    axios.get('https://testowe.zikor.pl/api/v1/vars/categories')
+    const fetchCategories = async () => {
-      .then(res => setCategoryMap(res.data))
+      let data = await listCategories();
-      .catch(() => setCategoryMap({}));
+      if (Array.isArray(data)) {
-  }, []);
+        setCategoryMap(data);
+      }
+    };
+
+    fetchCategories();
+  });
 
   const categories = Array.from(
     new Set(notices.map((notice) => notice.category))
   ).filter(Boolean);
 
-
   const getCount = (category) =>
     notices.filter((notice) => notice.category === category).length;
 
+  if (!categoryMap || Object.keys(categoryMap).length === 0) {
+    return null;
+  }
+
   return (
     <View className="mb-6">
       <Heading className="text-2xl font-bold mb-4 mt-4">{title}</Heading>
@@ -49,5 +56,4 @@ return (
       />
     </View>
   );
-
 }

ArtisanConnect/components/SearchSection.jsx

@@ -2,6 +2,7 @@ import { Input, InputField, InputIcon, InputSlot } from "@/components/ui/input"
 import { SearchIcon } from "@/components/ui/icon"
 import { Box } from "@/components/ui/box"
 import { useRouter } from "expo-router";
+import { View } from "react-native";
 
 export function SearchSection({ searchQuery, setSearchQuery }) {
     const router = useRouter();
@@ -14,18 +15,17 @@ export function SearchSection({ searchQuery, setSearchQuery }) {
     });
   };
   return (
-    <Box className="m-2 bg-white">
+    <Box className="mb-2 bg-white p-2 rounded-md">
-      <Input>
+      <Input className="p-2">
         <InputSlot>
           <InputIcon as={SearchIcon} />
         </InputSlot>
-        <InputField placeholder="Wyszukaj.."
+        <InputField placeholder="Wyszukaj..."
           value={searchQuery}
           onChangeText={setSearchQuery}
           onSubmitEditing={handleSubmit}
           returnKeyType="search" />
       </Input>
     </Box>
-
   )
 }

ArtisanConnect/components/UserSection.jsx

@@ -1,22 +1,27 @@
-import { View} from 'react-native';
+import { View } from "react-native";
-import { useEffect, useState } from 'react'
+import { useEffect, useState } from "react";
-import { Heading } from '@/components/ui/heading';
+import { Heading } from "@/components/ui/heading";
-import { FlatList } from 'react-native';
+import { FlatList } from "react-native";
-import axios from 'axios';
+import axios from "axios";
-import UserBlock from '@/components/UserBlock';
+import UserBlock from "@/components/UserBlock";
+import { useAuthStore } from "@/store/authStore";
 
 export function UserSection({ notices, title }) {
-
+  const token = useAuthStore((state) => state.token);
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
   const [users, setUsers] = useState([]);
 
   useEffect(() => {
-    axios.get('https://testowe.zikor.pl/api/v1/clients/get/all')
+    if (token) {
-      .then(res => setUsers(res.data))
+      axios
+        .get("https://hopp.zikor.pl/api/v1/clients/get/all", { headers })
+        .then((res) => setUsers(res.data))
         .catch(() => setUsers([]));
-  }, []);
+    }
+  }, [token]);
 
- const usersWithNoticeCount = users.map(user => {
+  const usersWithNoticeCount = users.map((user) => {
-    const count = notices.filter(n => n.clientId === user.id).length;
+    const count = notices.filter((n) => n.clientId === user.id).length;
     return { ...user, noticeCount: count };
   });
 
@@ -33,12 +38,9 @@ return (
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{ paddingHorizontal: 8, gap: 12 }}
         renderItem={({ item }) => {
-          return (
+          return <UserBlock user={item} />;
-            <UserBlock user={item} />
-          );
         }}
       />
     </View>
   );
-
 }

ArtisanConnect/store/authStore.jsx

@@ -3,11 +3,28 @@ import {createJSONStorage, persist} from "zustand/middleware";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import axios from "axios";
 
-const API_URL = "http://10.0.2.2:8080/api/v1";
+const API_URL = "https://hopp.zikor.pl/api/v1";
 
 export const useAuthStore = create(
   persist(
-        (set) => ({
+    (set, get) => {
+      if (!axios.interceptors.response.handlers.length) {
+        axios.interceptors.response.use(
+          (response) => response,
+          (error) => {
+            if (
+              (error.response && error.response.status === 401) ||
+              error.response.status === 403
+            ) {
+              set({ user: null, token: null, isLoading: false });
+              delete axios.defaults.headers.common["Authorization"];
+            }
+            return Promise.reject(error);
+          }
+        );
+      }
+
+      return {
         user: null,
         token: null,
         isLoading: false,
@@ -18,14 +35,18 @@ export const useAuthStore = create(
           try {
             const response = await axios.post(`${API_URL}/auth/login`, {
               email,
-                        password
+              password,
             });
 
             const user = response.data.user;
             const token = response.data.token;
             set({ user, token, isLoading: false });
+            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
           } catch (error) {
-                    set({error: error.response?.data?.message || error.message, isLoading: false});
+            set({
+              error: error.response?.data?.message || error.message,
+              isLoading: false,
+            });
             throw error;
           }
         },
@@ -33,21 +54,24 @@ export const useAuthStore = create(
         signUp: async (userData) => {
           set({ isLoading: true, error: null });
           try {
-                    console.log(userData);
+            const response = await axios.post(
-
+              `${API_URL}/auth/register`,
-                    const response = await axios.post(`${API_URL}/auth/register`, userData, {
+              userData,
-                        headers: {'Content-Type': 'application/json'}
+              {
-                    });
+                headers: { "Content-Type": "application/json" },
-
+              }
-                    console.log(response.data);
+            );
 
             const user = response.data.user;
             const token = response.data.token;
             set({ user, token, isLoading: false });
-
+            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
             return user;
           } catch (error) {
-                    set({error: error.response?.data?.message || error.message, isLoading: false});
+            set({
+              error: error.response?.data?.message || error.message,
+              isLoading: false,
+            });
             throw error;
           }
         },
@@ -55,42 +79,44 @@ export const useAuthStore = create(
         signInWithGoogle: async (googleToken) => {
           set({ isLoading: true, error: null });
           try {
-                    const response = await axios.post(`${API_URL}/auth/google`, {token: googleToken});
+            const response = await axios.post(`${API_URL}/auth/google`, {
+              token: googleToken,
+            });
 
             const { user, token } = response.data;
             set({ user, token, isLoading: false });
-
             axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
-
             return user;
           } catch (error) {
-                    set({error: error.response?.data?.message || error.message, isLoading: false});
+            set({
+              error: error.response?.data?.message || error.message,
+              isLoading: false,
+            });
             throw error;
           }
         },
 
         signOut: async () => {
           try {
-                    // Можно отправить запрос на бэкенд для инвалидации токена
+            const { token } = get();
-                    await axios.post(`${API_URL}/auth/logout`);
+            const headers = token ? { Authorization: `Bearer ${token}` } : {};
+            await axios.post(`${API_URL}/auth/logout`, {}, { headers });
           } catch (error) {
-                    console.error("Logout error:", error);
+            // console.error("Logout error:", error);
           } finally {
             delete axios.defaults.headers.common["Authorization"];
-                    set({user: null, token: null});
+            set({ user: null, token: null, isLoading: false });
           }
         },
 
         checkAuth: async () => {
-                const {token} = useAuthStore.getState();
+          const { token } = get();
           if (!token) return null;
 
           set({ isLoading: true });
           try {
             axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
-
             const response = await axios.get(`${API_URL}/auth/me`);
-
             set({ user: response.data, isLoading: false });
             return response.data;
           } catch (error) {
@@ -99,7 +125,8 @@ export const useAuthStore = create(
             return null;
           }
         },
-        }),
+      };
+    },
     {
       name: "auth-storage",
       storage: createJSONStorage(() => AsyncStorage),