fix merge

ArtisanConnect/api/categories.jsx

@@ -13,6 +13,6 @@ export async function listCategories() {
     });
     return response.data;
   } catch (err) {
-    console.error("Nie udało się pobrać listy kategorii.", err.response.status);
+    // console.error("Nie udało się pobrać listy kategorii.", err.response.status);
   }
 }

ArtisanConnect/api/client.jsx

@@ -7,10 +7,9 @@ export async function getUserById(userId) {
   const { token } = useAuthStore.getState();
   const headers = token ? { Authorization: `Bearer ${token}` } : {};
   try {
-    const response = await axios.get(
+    const response = await axios.get(`${API_URL}/clients/get/${userId}`, {
-      `${API_URL}/clients/get/${userId}`,
+      headers: headers,
-      headers
+    });
-    );
     return response.data;
   } catch (err) {
     console.error(

ArtisanConnect/api/email.jsx

@@ -0,0 +1,30 @@
+import { useAuthStore } from "@/store/authStore";
+
+const API_URL = "https://hopp.zikor.pl/api/v1";
+
+export const sendEmail = async (emailData) => {
+    const token = useAuthStore.getState().token;
+
+    try {
+        const response = await fetch(`${API_URL}/email/send`, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+                ...(token && { Authorization: `Bearer ${token}` }),
+            },
+            body: JSON.stringify(emailData),
+        });
+
+        if (!response.ok) {
+            const errorMessage = `HTTP error! Status: ${response.status}`;
+            console.error("Error przy wysyłaniu maila", errorMessage);
+            return { success: false, error: errorMessage };
+        }
+
+        const result = await response.text();
+        return { success: true, result };
+    } catch (error) {
+        console.error("Error przy wysyłaniu maila:", error.message);
+        return { success: false, error: error.message };
+    }
+};

ArtisanConnect/app.json

@@ -5,7 +5,7 @@
     "scheme": "com.hamx.artisanconnect",
     "version": "1.0.0",
     "orientation": "portrait",
-    "icon": "./assets/icon.png",
+    "icon": "./assets/AppIco.png",
     "userInterfaceStyle": "light",
     "newArchEnabled": true,
     "splash": {

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

@@ -63,7 +63,7 @@ export default function UserNotices() {
       }
     };
     loadNotices();
-  }, []);
+  }, [fetchNotices]);
 
   const showNewToast = (title) => {
     const newId = Math.random();

ArtisanConnect/app/(tabs)/index.jsx

@@ -15,15 +15,15 @@ export default function Home() {
   const [isReady, setIsReady] = useState(false);
   const fetchNotices = useNoticesStore((state) => state.fetchNotices);
 
-  useEffect(() => {
+  // useEffect(() => {
-    setIsReady(true);
+  //   setIsReady(true);
-  }, []);
+  // }, []);
 
-  useEffect(() => {
+  // useEffect(() => {
-    if (isReady && !token) {
+  //   if (isReady && !token) {
-      router.replace("/login");
+  //     router.replace("/login");
-    }
+  //   }
-  }, [isReady, token, router]);
+  // }, [isReady, token, router]);
 
   useEffect(() => {
     if (token) {

ArtisanConnect/app/_layout.jsx

@@ -17,6 +17,7 @@ return (
           }}
         >
           <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+            <Stack.Screen name="user" options={{ headerShown: false }} />
           <Stack.Screen
             name="(auth)/login"
             options={{ headerShown: false }}/>

ArtisanConnect/app/notice/[id].jsx

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

@@ -0,0 +1,11 @@
+import { Stack } from 'expo-router';
+
+export default function UserLayout() {
+    return (
+        <Stack
+            screenOptions={{
+                headerTitle: 'Ogłoszenia użytkownika',
+            }}
+        />
+    );
+}

ArtisanConnect/components/CategorySection.jsx

@@ -1,6 +1,5 @@
 import { View, FlatList } from "react-native";
 import { useEffect, useState } from "react";
-import { useAuthStore } from "@/store/authStore";
 import { Heading } from "@/components/ui/heading";
 import { Text } from "@/components/ui/text";
 import { Link } from "expo-router";
@@ -17,7 +16,6 @@ export function CategorySection({ notices, title }) {
         setCategoryMap(data);
       }
     };
-
     fetchCategories();
   }, []);
 

ArtisanConnect/package-lock.json

@@ -43,6 +43,7 @@
         "expo-image-picker": "~16.1.4",
         "expo-linking": "~7.1.4",
         "expo-router": "~5.0.5",
+        "expo-screen-orientation": "~8.1.7",
         "expo-status-bar": "~2.2.3",
         "expo-web-browser": "~14.1.6",
         "form-data": "^4.0.2",
@@ -7012,6 +7013,16 @@
         "node": ">=10"
       }
     },
+    "node_modules/expo-screen-orientation": {
+      "version": "8.1.7",
+      "resolved": "https://registry.npmjs.org/expo-screen-orientation/-/expo-screen-orientation-8.1.7.tgz",
+      "integrity": "sha512-nYwadYtdU6mMDk0MCHMPPPQtBoeFYJ2FspLRW+J35CMLqzE4nbpwGeiImfXzkvD94fpOCfI4KgLj5vGauC3pfA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/expo-status-bar": {
       "version": "2.2.3",
       "license": "MIT",

ArtisanConnect/package.json

@@ -62,7 +62,8 @@
     "react-native-svg": "15.11.2",
     "react-native-web": "~0.20.0",
     "tailwindcss": "^3.4.17",
-    "zustand": "^5.0.3"
+    "zustand": "^5.0.3",
+    "expo-screen-orientation": "~8.1.7"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

ArtisanConnect/store/authStore.jsx

@@ -11,22 +11,23 @@ let interceptorInitialized = false;
 export const useAuthStore = create(
   persist(
     (set, get) => {
-      // if (!interceptorInitialized.current) {
+      if (!interceptorInitialized.current) {
-      //   axios.interceptors.response.use(
+        axios.interceptors.response.use(
-      //     (response) => response,
+          (response) => response,
-      //     (error) => {
+          (error) => {
-      //       if (
+            if (
-      //         (error.response && error.response.status === 401) ||
+              (error.response && error.response.status === 401) ||
-      //         error.response.status === 403
+              error.response.status === 403
-      //       ) {
+            ) {
-      //         set({ user_id: null, token: null, isLoading: false });
+              set({ user_id: null, token: null, isLoading: false });
-      //         delete axios.defaults.headers.common["Authorization"];
+              delete axios.defaults.headers.common["Authorization"];
-      //       }
+              router.replace("/login");
-      //       return Promise.reject(error);
+            }
-      //     }
+            return Promise.reject(error);
-      //   );
+          }
-      //   interceptorInitialized = true;
+        );
-      // }
+        interceptorInitialized = true;
+      }
       return {
         user_id: null,
         token: null,