From eb1ebc3464e26c2e9556f935e7e4761bd23a8075 Mon Sep 17 00:00:00 2001
From: Kuba <sdpgrpg@gmail.com>
Date: Sun, 25 May 2025 17:41:07 +0200
Subject: [PATCH 1/9] V1

---
 ArtisanConnect/api/client.jsx      | 13 +++++
 ArtisanConnect/app/notice/[id].jsx | 77 ++++++++++++++++++++++++++++--
 2 files changed, 87 insertions(+), 3 deletions(-)
 create mode 100644 ArtisanConnect/api/client.jsx

diff --git a/ArtisanConnect/api/client.jsx b/ArtisanConnect/api/client.jsx
new file mode 100644
index 0000000..6f0489c
--- /dev/null
+++ b/ArtisanConnect/api/client.jsx
@@ -0,0 +1,13 @@
+import axios from "axios";
+
+const API_URL = "https://testowe.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;
+    }
+}
diff --git a/ArtisanConnect/app/notice/[id].jsx b/ArtisanConnect/app/notice/[id].jsx
index 5847f79..9da0bcd 100644
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/ArtisanConnect/app/notice/[id].jsx
@@ -11,6 +11,9 @@ import {useEffect, useState} from "react";
 import {useNoticesStore} from "@/store/noticesStore";
 import {useWishlist} from "@/store/wishlistStore";
 import {Pressable} from "react-native";
+import {getUserById} from "@/api/client";
+
+
 
 export default function NoticeDetails() {
     const {id} = useLocalSearchParams();
@@ -19,6 +22,9 @@ export default function NoticeDetails() {
     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 {getNoticeById, getAllImagesByNoticeId} = useNoticesStore();
     const addNoticeToWishlist = useWishlist((state) => state.addNoticeToWishlist);
@@ -69,6 +75,25 @@ 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/>;
     }
@@ -105,12 +130,17 @@ export default function NoticeDetails() {
 
             <VStack className="p-2">
                 <Text className="text-sm font-normal mb-2 text-typography-700">
+                    {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">
-                        {notice.price}zł
+
+                <Box className="flex-row items-center  bg-gray-50 rounded-md p-2">
+                    <Heading size="md" className="flex-1 text-xl text-gray-950">
+                        {notice.price} zł
                     </Heading>
+
                     <Pressable
                         onPress={() => {
                             if (isInWishlist) {
@@ -127,6 +157,47 @@ 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>
+                            <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>
+                        </Box>
+                    ) : (
+                        <Text>Błąd podczas ładowania danych użytkownika</Text>
+                    )}
+
+                </Box>
+
+                <Box className="mt-4 bg-gray-50 p-3 rounded-lg shadow-sm">
+                    <Text className="text-sm text-typography-500">
+                        {notice.clientId}
+                    </Text>
+                </Box>
+
             </VStack>
         </Card>
     );

From 06218dcdd40c0abc9a3a4ad4e7fb7976a3f4dace Mon Sep 17 00:00:00 2001
From: Kuba <sdpgrpg@gmail.com>
Date: Sun, 25 May 2025 20:38:35 +0200
Subject: [PATCH 2/9] Added Image Slider

---
 ArtisanConnect/app/notice/[id].jsx | 67 ++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 13 deletions(-)

diff --git a/ArtisanConnect/app/notice/[id].jsx b/ArtisanConnect/app/notice/[id].jsx
index 9da0bcd..e4bed13 100644
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/ArtisanConnect/app/notice/[id].jsx
@@ -6,24 +6,27 @@ 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 {useEffect, useState} from "react";
+import {ActivityIndicator, Dimensions, FlatList, View} 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 {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 {getNoticeById, getAllImagesByNoticeId} = useNoticesStore();
@@ -32,6 +35,15 @@ export default function NoticeDetails() {
     const isInWishlist = useWishlist((state) =>
         notice ? state.wishlistNotices.some((item) => item.noticeId === notice.noticeId) : false
     );
+    const onViewableItemsChanged = useRef(({ viewableItems }) => {
+        if (viewableItems.length > 0) {
+            setCurrentIndex(viewableItems[0].index);
+        }
+    }).current;
+
+    const viewabilityConfig = useRef({
+        itemVisiblePercentThreshold: 70,
+    }).current;
 
     useEffect(() => {
         const fetchNotice = async () => {
@@ -59,8 +71,9 @@ export default function NoticeDetails() {
             setIsImageLoading(true);
             if (notice) {
                 try {
-                    const images = await getAllImagesByNoticeId(notice.noticeId);
-                    setImage(images && images.length > 0 ? images[0] : "https://http.cat/404.jpg");
+                    const fetchedImages = await getAllImagesByNoticeId(notice.noticeId);
+                    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");
@@ -118,16 +131,44 @@ export default function NoticeDetails() {
                     <ActivityIndicator size="large" color="#3b82f6" />
                 </Box>
             ) : (
-                <Image
-                    source={{
-                        uri: image,
-                    }}
-                    className="h-auto w-full rounded-md aspect-[1/1]"
-                    alt="image"
-                    resizeMode="cover"
-                />
+                <Box>
+                    <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={{ uri: item }}
+                                    className="h-auto w-full rounded-md aspect-square"
+                                    alt={`Zdjęcie ${index + 1}`}
+                                    resizeMode="contain"
+                                />
+                            </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>
             )}
 
+
             <VStack className="p-2">
                 <Text className="text-sm font-normal mb-2 text-typography-700">
                     {notice.publishDate}

From 925dde0bb0c26ea4a13d7b2f737d69687f718feb Mon Sep 17 00:00:00 2001
From: Kuba <sdpgrpg@gmail.com>
Date: Tue, 27 May 2025 20:55:31 +0200
Subject: [PATCH 3/9] Added scrollview and send message button to notice

---
 ArtisanConnect/app/notice/[id].jsx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ArtisanConnect/app/notice/[id].jsx b/ArtisanConnect/app/notice/[id].jsx
index e4bed13..20f1e37 100644
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/ArtisanConnect/app/notice/[id].jsx
@@ -10,7 +10,7 @@ import {ActivityIndicator, Dimensions, FlatList, View} 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");
@@ -131,7 +131,7 @@ export default function NoticeDetails() {
                     <ActivityIndicator size="large" color="#3b82f6" />
                 </Box>
             ) : (
-                <Box>
+                <Box className="sticky top-0 z-10 bg-white">
                     <FlatList
                         ref={flatListRef}
                         data={images}
@@ -168,7 +168,9 @@ export default function NoticeDetails() {
                 </Box>
             )}
 
-
+            <ScrollView
+                showsVerticalScrollIndicator={false}
+            >
             <VStack className="p-2">
                 <Text className="text-sm font-normal mb-2 text-typography-700">
                     {notice.publishDate}
@@ -226,6 +228,12 @@ export default function NoticeDetails() {
                             <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>
                         </Box>
                     ) : (
                         <Text>Błąd podczas ładowania danych użytkownika</Text>
@@ -238,8 +246,8 @@ export default function NoticeDetails() {
                         {notice.clientId}
                     </Text>
                 </Box>
-
             </VStack>
+            </ScrollView>
         </Card>
     );
 }
\ No newline at end of file

From 95a632741a58e3cf8048f41489d3af74bc3a1481 Mon Sep 17 00:00:00 2001
From: Kuba <sdpgrpg@gmail.com>
Date: Tue, 27 May 2025 22:28:28 +0200
Subject: [PATCH 4/9] Added send message form

---
 ArtisanConnect/app/notice/[id].jsx | 71 +++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/ArtisanConnect/app/notice/[id].jsx b/ArtisanConnect/app/notice/[id].jsx
index 20f1e37..7d8dac6 100644
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/ArtisanConnect/app/notice/[id].jsx
@@ -6,7 +6,7 @@ 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, Dimensions, FlatList, View} from "react-native";
+import {ActivityIndicator, Dimensions, FlatList, View, TextInput} from "react-native";
 import {useEffect, useState, useRef} from "react";
 import {useNoticesStore} from "@/store/noticesStore";
 import {useWishlist} from "@/store/wishlistStore";
@@ -29,6 +29,19 @@ export default function NoticeDetails() {
     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 {getNoticeById, getAllImagesByNoticeId} = useNoticesStore();
     const addNoticeToWishlist = useWishlist((state) => state.addNoticeToWishlist);
     const removeNoticeFromWishlist = useWishlist((state) => state.removeNoticeFromWishlist);
@@ -221,7 +234,16 @@ export default function NoticeDetails() {
                     {isUserLoading ? (
                         <ActivityIndicator />
                     ) : user ? (
-                        <Box>
+                        <>
+                        <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>
@@ -235,6 +257,7 @@ export default function NoticeDetails() {
                                 <Text className="text-white text-center font-bold">Wyślij wiadomość</Text>
                             </Pressable>
                         </Box>
+                        </>
                     ) : (
                         <Text>Błąd podczas ładowania danych użytkownika</Text>
                     )}
@@ -248,6 +271,50 @@ export default function NoticeDetails() {
                 </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>
     );
 }
\ No newline at end of file

From 774b2ef192a8beb4ef5e67c251a587e75c6c66f4 Mon Sep 17 00:00:00 2001
From: Kuba <sdpgrpg@gmail.com>
Date: Tue, 27 May 2025 23:51:31 +0200
Subject: [PATCH 5/9] improved display of the time of adding notice

---
 ArtisanConnect/app/notice/[id].jsx | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/ArtisanConnect/app/notice/[id].jsx b/ArtisanConnect/app/notice/[id].jsx
index 7d8dac6..2547aac 100644
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/ArtisanConnect/app/notice/[id].jsx
@@ -42,6 +42,15 @@ export default function NoticeDetails() {
         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 removeNoticeFromWishlist = useWishlist((state) => state.removeNoticeFromWishlist);
@@ -58,6 +67,7 @@ export default function NoticeDetails() {
         itemVisiblePercentThreshold: 70,
     }).current;
 
+
     useEffect(() => {
         const fetchNotice = async () => {
             setIsLoading(true);
@@ -186,7 +196,7 @@ export default function NoticeDetails() {
             >
             <VStack className="p-2">
                 <Text className="text-sm font-normal mb-2 text-typography-700">
-                    {notice.publishDate}
+                    {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}
@@ -194,6 +204,7 @@ export default function NoticeDetails() {
 
                 <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>
 
@@ -264,11 +275,6 @@ export default function NoticeDetails() {
 
                 </Box>
 
-                <Box className="mt-4 bg-gray-50 p-3 rounded-lg shadow-sm">
-                    <Text className="text-sm text-typography-500">
-                        {notice.clientId}
-                    </Text>
-                </Box>
             </VStack>
             </ScrollView>
                 {isMessageFormVisible && (

From d12ae04f8ac2de20da6b8e51f29a919e7ad30645 Mon Sep 17 00:00:00 2001
From: Kuba <sdpgrpg@gmail.com>
Date: Mon, 2 Jun 2025 23:56:56 +0200
Subject: [PATCH 6/9] added the ability to see the notices of a particular
 user(transition from the notice)

---
 ArtisanConnect/app/notice/[id].jsx   |  9 +++-
 ArtisanConnect/app/user/[userId].jsx | 69 ++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 ArtisanConnect/app/user/[userId].jsx

diff --git a/ArtisanConnect/app/notice/[id].jsx b/ArtisanConnect/app/notice/[id].jsx
index 2547aac..a0fad91 100644
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/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,7 +6,7 @@ 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, Dimensions, FlatList, View, TextInput} from "react-native";
+import {ActivityIndicator, Dimensions, FlatList, View, TextInput, TouchableOpacity} from "react-native";
 import {useEffect, useState, useRef} from "react";
 import {useNoticesStore} from "@/store/noticesStore";
 import {useWishlist} from "@/store/wishlistStore";
@@ -267,6 +267,11 @@ export default function NoticeDetails() {
                             >
                                 <Text className="text-white text-center font-bold">Wyślij wiadomość</Text>
                             </Pressable>
+                            <Link href={`/user/${notice.clientId}`}>
+                                <Text className="text-sm text-typography-700 mt-3">
+                                    Zobacz więcej ogłoszeń od {user.firstName}
+                                </Text>
+                            </Link>
                         </Box>
                         </>
                     ) : (
diff --git a/ArtisanConnect/app/user/[userId].jsx b/ArtisanConnect/app/user/[userId].jsx
new file mode 100644
index 0000000..0f85231
--- /dev/null
+++ b/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>
+    );
+}
\ No newline at end of file

From 1c57984a36946cb98c5ee43357477d33167764c8 Mon Sep 17 00:00:00 2001
From: Kuba <sdpgrpg@gmail.com>
Date: Mon, 2 Jun 2025 23:59:05 +0200
Subject: [PATCH 7/9] Improved looking

---
 ArtisanConnect/app/notice/[id].jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ArtisanConnect/app/notice/[id].jsx b/ArtisanConnect/app/notice/[id].jsx
index a0fad91..f95f3c6 100644
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/ArtisanConnect/app/notice/[id].jsx
@@ -6,7 +6,7 @@ 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, Dimensions, FlatList, View, TextInput, TouchableOpacity} from "react-native";
+import {ActivityIndicator, Dimensions, FlatList, View, TextInput} from "react-native";
 import {useEffect, useState, useRef} from "react";
 import {useNoticesStore} from "@/store/noticesStore";
 import {useWishlist} from "@/store/wishlistStore";
@@ -268,7 +268,7 @@ export default function NoticeDetails() {
                                 <Text className="text-white text-center font-bold">Wyślij wiadomość</Text>
                             </Pressable>
                             <Link href={`/user/${notice.clientId}`}>
-                                <Text className="text-sm text-typography-700 mt-3">
+                                <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>

From 8722488a45df11f0f200796b6b2fde46aa77914a Mon Sep 17 00:00:00 2001
From: Kuba <sdpgrpg@gmail.com>
Date: Tue, 3 Jun 2025 00:19:12 +0200
Subject: [PATCH 8/9] Added content to account.jsx and userNotices.jsx

---
 .../app/(tabs)/dashboard/account.jsx          | 74 +++++++++++++++++-
 .../app/(tabs)/dashboard/userNotices.jsx      | 77 ++++++++++++++++++-
 2 files changed, 144 insertions(+), 7 deletions(-)

diff --git a/ArtisanConnect/app/(tabs)/dashboard/account.jsx b/ArtisanConnect/app/(tabs)/dashboard/account.jsx
index 7d3093d..25d74a6 100644
--- a/ArtisanConnect/app/(tabs)/dashboard/account.jsx
+++ b/ArtisanConnect/app/(tabs)/dashboard/account.jsx
@@ -1,4 +1,70 @@
-import { Text } from "@/components/ui/text";
-export default function User() {
-  return <Text>Użytkownik</Text>;
-}
+import { Link } from "expo-router";
+import {Button} from "react-native";
+import {Box} from "@/components/ui/box";
+import {Text} from "@/components/ui/text";
+import {VStack} from "@/components/ui/vstack";
+import {Image} from "@/components/ui/image";
+import {ActivityIndicator, } from "react-native";
+import {useEffect, useState} from "react";
+import {getUserById} from "@/api/client";
+
+export default function Account() {
+  const [user, setUser] = useState(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const currentUserId = 1; // 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="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 text-center rounded-full mr-4"
+              alt="Zdjęcie profilowe"
+          />
+          <Text className="text-xl font-bold">
+            {user.firstName} {user.lastName}
+          </Text>
+        </Box>
+        <Button className="mb-4"
+                title="Edytuj dane użytkownika"
+            onPress={() => {
+              // TODO: Implementacja edycji danych użytkownika
+              console.log("Edytuj dane użytkownika");
+            }}
+
+        >
+        </Button>
+        <Box className="mt-4">
+          <Link href="/dashboard/userNotices">
+            <Text className="text-lg text-primary-500">Moje ogłoszenia</Text>
+          </Link>
+          <Link href="/dashboard/userPaymentHistory">
+            <Text className="text-lg text-primary-500 mt-2">Moje płatności</Text>
+          </Link>
+        </Box>
+      </VStack>
+  );
+}
\ No newline at end of file
diff --git a/ArtisanConnect/app/(tabs)/dashboard/userNotices.jsx b/ArtisanConnect/app/(tabs)/dashboard/userNotices.jsx
index 9f5ef2f..7fe0f2b 100644
--- a/ArtisanConnect/app/(tabs)/dashboard/userNotices.jsx
+++ b/ArtisanConnect/app/(tabs)/dashboard/userNotices.jsx
@@ -1,4 +1,75 @@
-import { Text } from "@/components/ui/text";
+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>
+  );
+}
\ No newline at end of file

From f6065893d03ea95affb876f4f9bf66ad20b2e8a9 Mon Sep 17 00:00:00 2001
From: Kuba <sdpgrpg@gmail.com>
Date: Tue, 3 Jun 2025 22:21:39 +0200
Subject: [PATCH 9/9] better look for account

---
 .../app/(tabs)/dashboard/account.jsx          | 86 +++++++++++++------
 1 file changed, 60 insertions(+), 26 deletions(-)

diff --git a/ArtisanConnect/app/(tabs)/dashboard/account.jsx b/ArtisanConnect/app/(tabs)/dashboard/account.jsx
index 25d74a6..91b111d 100644
--- a/ArtisanConnect/app/(tabs)/dashboard/account.jsx
+++ b/ArtisanConnect/app/(tabs)/dashboard/account.jsx
@@ -1,5 +1,5 @@
 import { Link } from "expo-router";
-import {Button} from "react-native";
+import {Pressable} from "react-native";
 import {Box} from "@/components/ui/box";
 import {Text} from "@/components/ui/text";
 import {VStack} from "@/components/ui/vstack";
@@ -7,11 +7,12 @@ 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 = 1; // Tymczasowo, do czasu zaimplementowania logowania bo nie moge pobrac usera
+  const currentUserId = 2; // Tymczasowo, do czasu zaimplementowania logowania bo nie moge pobrac usera
 
   useEffect(() => {
     const fetchUser = async () => {
@@ -37,34 +38,67 @@ export default function Account() {
   }
 
   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 text-center rounded-full mr-4"
-              alt="Zdjęcie profilowe"
-          />
-          <Text className="text-xl font-bold">
+      <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>
-        </Box>
-        <Button className="mb-4"
-                title="Edytuj dane użytkownika"
-            onPress={() => {
-              // TODO: Implementacja edycji danych użytkownika
-              console.log("Edytuj dane użytkownika");
-            }}
 
-        >
-        </Button>
-        <Box className="mt-4">
-          <Link href="/dashboard/userNotices">
-            <Text className="text-lg text-primary-500">Moje ogłoszenia</Text>
-          </Link>
-          <Link href="/dashboard/userPaymentHistory">
-            <Text className="text-lg text-primary-500 mt-2">Moje płatności</Text>
-          </Link>
+          <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>
   );
 }
\ No newline at end of file