From 1cc0f601fbbae067a4aff826e580c7614b8f5138 Mon Sep 17 00:00:00 2001
From: Patryk <s094236@student.tu.kielce.pl>
Date: Mon, 9 Jun 2025 23:57:18 +0200
Subject: [PATCH] fixes

---
 ArtisanConnect/api/client.jsx                 |   8 +-
 .../app/(tabs)/dashboard/userOrders.jsx       |   2 +-
 ArtisanConnect/app/notice/[id].jsx            |  56 ++++++++-
 ArtisanConnect/app/user/[userId].jsx          | 114 ++++++++++--------
 4 files changed, 121 insertions(+), 59 deletions(-)

diff --git a/ArtisanConnect/api/client.jsx b/ArtisanConnect/api/client.jsx
index 4793d4d..3efb49f 100644
--- a/ArtisanConnect/api/client.jsx
+++ b/ArtisanConnect/api/client.jsx
@@ -12,10 +12,10 @@ export async function getUserById(userId) {
     });
     return response.data;
   } catch (err) {
-    console.error(
-      `Nie udało się pobrać danych użytkownika o ID ${userId}.`,
-      err.response.status
-    );
+    // console.error(
+    //   `Nie udało się pobrać danych użytkownika o ID ${userId}.`,
+    //   err.response.status
+    // );
     throw err;
   }
 }
diff --git a/ArtisanConnect/app/(tabs)/dashboard/userOrders.jsx b/ArtisanConnect/app/(tabs)/dashboard/userOrders.jsx
index c22b2f3..a6e6e2c 100644
--- a/ArtisanConnect/app/(tabs)/dashboard/userOrders.jsx
+++ b/ArtisanConnect/app/(tabs)/dashboard/userOrders.jsx
@@ -32,7 +32,7 @@ export default function UserOrders() {
       className="m-2"
       data={orders}
       renderItem={({ item }) => (
-        <Box className="p-4 rounded-md bg-white">
+        <Box className="p-4 rounded-md bg-white mb-2">
           <VStack>
             <HStack>
               <Text>{item.orderId}</Text>
diff --git a/ArtisanConnect/app/notice/[id].jsx b/ArtisanConnect/app/notice/[id].jsx
index 9c1a4be..31f5fde 100644
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/ArtisanConnect/app/notice/[id].jsx
@@ -1,4 +1,5 @@
 import { Link, Stack, useLocalSearchParams } from "expo-router";
+import { KeyboardAvoidingView, Platform } from "react-native";
 import { Box } from "@/components/ui/box";
 import { Card } from "@/components/ui/card";
 import { Heading } from "@/components/ui/heading";
@@ -287,8 +288,8 @@ export default function NoticeDetails() {
           </Box>
         </VStack>
       </ScrollView>
-      {isMessageFormVisible && (
-        <View className="absolute inset-0 bg-black bg-opacity-50 justify-center items-center z-20">
+      {/* {isMessageFormVisible && (
+        <View className="absolute inset-0 bg-black/50 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}
@@ -332,6 +333,57 @@ export default function NoticeDetails() {
             </View>
           </View>
         </View>
+      )} */}
+      {isMessageFormVisible && (
+        <KeyboardAvoidingView
+          behavior={Platform.OS === "ios" ? "padding" : "height"}
+          className="absolute inset-0 bg-black/50 justify-center items-center z-20"
+        >
+          <View className="bg-white p-4 rounded-lg w-4/5 max-h-4/5">
+            <ScrollView showsVerticalScrollIndicator={false}>
+              <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 mb-4"
+                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>
+            </ScrollView>
+          </View>
+        </KeyboardAvoidingView>
       )}
     </Card>
   );
diff --git a/ArtisanConnect/app/user/[userId].jsx b/ArtisanConnect/app/user/[userId].jsx
index 0f85231..49c92da 100644
--- a/ArtisanConnect/app/user/[userId].jsx
+++ b/ArtisanConnect/app/user/[userId].jsx
@@ -10,60 +10,70 @@ 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();
+  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]);
+  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 (isUserLoading) {
+    return <ActivityIndicator />;
+  }
 
-    if (!user) {
-        return <Text>Nie znaleziono użytkownika</Text>;
-    }
+  if (!user) {
+    return <Text>Nie znaleziono użytkownika</Text>;
+  }
 
-    const userNotices = notices.filter(notice => notice.clientId === Number(userId));
+  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
+  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",
+            gap: 8,
+          }}
+          renderItem={({ item }) => <NoticeCard notice={item} />}
+          keyExtractor={(item) => item.noticeId.toString()}
+        />
+      ) : (
+        <Text>Ten użytkownik nie ma żadnych ogłoszeń.</Text>
+      )}
+    </VStack>
+  );
+}