fix merge

ArtisanConnect/api/categories.jsx

@@ -8,9 +8,11 @@ export async function listCategories() {
   const headers = token ? { Authorization: `Bearer ${token}` } : {};
 
   try {
-    const response = await axios.get(`${API_URL}/vars/categories`, { headers: headers });
+    const response = await axios.get(`${API_URL}/vars/categories`, {
+      headers: headers,
+    });
     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(
-      `${API_URL}/clients/get/${userId}`,
-      headers
-    );
+    const response = await axios.get(`${API_URL}/clients/get/${userId}`, {
+      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/api/notices.jsx

@@ -2,7 +2,7 @@ import axios from "axios";
 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 = "https://hopp.zikor.pl/api/v1";
 
@@ -36,7 +36,9 @@ export async function createNotice(notice) {
   const { token } = useAuthStore.getState();
   const headers = token ? { Authorization: `Bearer ${token}` } : {};
   try {
-    const response = await axios.post(`${API_URL}/notices/add`, notice, {headers: headers});
+    const response = await axios.post(`${API_URL}/notices/add`, notice, {
+      headers: headers,
+    });
 
     if (response.data.noticeId !== null) {
       for (const imageUri of notice.image) {
@@ -71,7 +73,9 @@ export async function getAllImagesByNoticeId(noticeId) {
   const { token } = useAuthStore.getState();
   const headers = token ? { Authorization: `Bearer ${token}` } : {};
   try {
-    const listResponse = await axios.get(`${API_URL}/images/list/${noticeId}`, {headers: headers});
+    const listResponse = await axios.get(`${API_URL}/images/list/${noticeId}`, {
+      headers: headers,
+    });
 
     if (listResponse.data && listResponse.data.length > 0) {
       return listResponse.data.map((imageName) => ({

ArtisanConnect/api/order.jsx

@@ -1,6 +1,4 @@
 import axios from "axios";
-import FormData from "form-data";
-
 import { useAuthStore } from "@/store/authStore";
 
 const API_URL = "https://hopp.zikor.pl/api/v1/orders";
@@ -9,17 +7,16 @@ export async function createOrder(noticeId, orderType) {
   const { token } = useAuthStore.getState();
   const headers = token ? { Authorization: `Bearer ${token}` } : {};
   const clientId = 1;
+
   try {
     const response = await axios.post(
       `${API_URL}/add`,
-      { clientId, noticeId, orderType },
+      { clientId: clientId, noticeId: noticeId, orderType: orderType },
       {
-        headers: {
-          "Content-Type": "application/json",
-          ...headers,
-        },
+        headers: headers,
       }
     );
+
     return response.data;
   } catch (error) {
     console.log("Error", error.response?.data, error.response?.status);
@@ -33,13 +30,10 @@ export async function createPayment(orderId) {
   const clientId = 1;
   try {
     const response = await axios.post(
-      `${API_URL}/token`,
+      `${API_URL}/token?orderId=${orderId}`,
       {},
       {
-        headers: {
-          "Content-Type": "application/json",
-          ...headers,
-        },
+        headers: headers,
       }
     );
     return response.data;
@@ -49,13 +43,30 @@ export async function createPayment(orderId) {
   }
 }
 
+export async function getOrder(orderId) {
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
+  try {
+    const response = await axios.get(`${API_URL}/get/${orderId}`, { headers });
+    return response.data;
+  } catch (error) {
+    console.error(
+      "Error fetching order:",
+      error.response?.data,
+      error.response?.status
+    );
+    throw error;
+  }
+}
+
 export async function listOrders() {
   const { token } = useAuthStore.getState();
   const headers = token ? { Authorization: `Bearer ${token}` } : {};
 
   try {
     const response = await axios.get(`${API_URL}/get/all`, { headers });
-    return response.data; // to będzie tablica OrderWithPaymentsDTO
+    return response.data;
   } catch (error) {
     console.error(
       "Error fetching orders:",

ArtisanConnect/api/wishlist.jsx

@@ -28,11 +28,10 @@ export async function getWishlist() {
 
   try {
     const response = await axios.get(`${API_URL}/`, { headers });
-    console.log("Wishlist response:", response.data);
     return response.data;
   } catch (error) {
     console.error("Error fetching wishlist:", error);
     throw error;
   }
 }
-``
+``;

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)/_layout.jsx

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

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

@@ -7,7 +7,7 @@ import { Text } from "@/components/ui/text";
 import { VStack } from "@/components/ui/vstack";
 import { ActivityIndicator, FlatList } from "react-native";
 import { useEffect, useState, useRef } from "react";
-import { createOrder, createPayment } from "@/api/order";
+import { createOrder, createPayment, getOrder } from "@/api/order";
 import { Linking } from "react-native";
 import { Ionicons } from "@expo/vector-icons";
 import { useToast, Toast, ToastTitle } from "@/components/ui/toast";
@@ -22,27 +22,34 @@ export default function UserNotices() {
   const appState = useRef(AppState.currentState);
   const [toastId, setToastId] = useState(0);
   const { user_id } = useAuthStore.getState();
-  const currentUserId= user_id;
+  const currentUserId = user_id;
+  const [orderId, setOrderId] = useState(null);
 
   useEffect(() => {
     if (!isRedirecting) return;
     const subscription = AppState.addEventListener("change", (state) => {
       if (state === "active") {
-        setIsRedirecting(false);
-        const paymentStatus = "CORRECT";
-        if (paymentStatus === "INCORRECT") {
-          showNewToast("Płatność została anulowana.");
-        } else if (paymentStatus === "CORRECT") {
-          showNewToast("Płatność została zrealizowana.");
-        } else {
-          showNewToast("Płatność jeszcze nie wpłynęła.");
-        }
+        (async () => {
+          const lastOrder = await getOrder(orderId);
+          const lastPayments = lastOrder.payments;
+          const paymentStatus =
+            lastPayments.length > 0
+              ? lastPayments[lastPayments.length - 1].status
+              : null;
+          setIsRedirecting(false);
+          if (paymentStatus === "INCORRECT") {
+            showNewToast("Płatność została anulowana.");
+          } else if (paymentStatus === "CORRECT") {
+            showNewToast("Płatność została zrealizowana.");
+          } else {
+            showNewToast("Płatność jeszcze nie wpłynęła.");
+          }
+        })();
       }
-
       appState.current = state;
     });
     return () => subscription.remove();
-  }, [isRedirecting, toast]);
+  }, [isRedirecting, toast, orderId]);
 
   useEffect(() => {
     const loadNotices = async () => {
@@ -56,7 +63,7 @@ export default function UserNotices() {
       }
     };
     loadNotices();
-  }, []);
+  }, [fetchNotices]);
 
   const showNewToast = (title) => {
     const newId = Math.random();
@@ -81,23 +88,23 @@ export default function UserNotices() {
       try {
         const result = await createOrder(noticeId, type);
         if (result) {
+          setOrderId(result);
           try {
-            const paymentResult = await createPayment(); //trzeba dodać orderId
+            const paymentResult = await createPayment(result);
             if (paymentResult) {
               setIsRedirecting(true);
               await Linking.openURL(paymentResult);
-              setWaitingForPayment(true);
             } else {
-              console.log(`Nie udało się aktywować ogłoszenia ${noticeId}.`);
+              console.log(`Nie udało się aktywować ogłoszenia 4 ${noticeId}.`);
             }
           } catch (err) {
-            console.log("Błąd podczas aktywacji ogłoszenia:", err);
+            // console.log("Błąd podczas aktywacji ogłoszenia 3:", err);
           }
         } else {
-          console.log(`Nie udało się aktywować ogłoszenia ${noticeId}.`);
+          // console.log(`Nie udało się aktywować ogłoszenia 2 ${noticeId}.`);
         }
       } catch (err) {
-        console.log("Błąd podczas aktywacji ogłoszenia:", err);
+        console.log("Błąd podczas aktywacji ogłoszenia 1:", err);
       }
     }
   };
@@ -116,9 +123,9 @@ export default function UserNotices() {
 
   if (isLoading) {
     return (
-        <Box className="items-center justify-center flex-1">
-          <ActivityIndicator size="large" color="#787878"/>
-        </Box>
+      <Box className="items-center justify-center flex-1">
+        <ActivityIndicator size="large" color="#787878" />
+      </Box>
     );
   }
 
@@ -141,38 +148,42 @@ export default function UserNotices() {
               <NoticeCard notice={item} />
               <Box className="flex-row justify-between mt-2">
                 <Button
-                    className="ml-2"
-                    onPress={() => handleDeleteNotice(item.noticeId)}
-                    size="md"
-                    variant="outline"
-                    action="primary"
+                  className="ml-2"
+                  onPress={() => handleDeleteNotice(item.noticeId)}
+                  size="md"
+                  variant="outline"
+                  action="primary"
                 >
                   <ButtonText>Usuń</ButtonText>
                   <Ionicons name="trash-outline" size={14} />
                 </Button>
 
                 {item.status === "ACTIVE" ? (
-                    <Button
-                        className="mr-2"
-                        size="md"
-                        variant="solid"
-                        action="primary"
-                        onPress={() => handleOrder(item.noticeId, "BOOST")}
-                    >
-                      <ButtonText>Podbij</ButtonText>
-                      <Ionicons name="arrow-up" size={14} color="#fff" />
-                    </Button>
+                  <Button
+                    className="mr-2"
+                    size="md"
+                    variant="solid"
+                    action="primary"
+                    onPress={() => handleOrder(item.noticeId, "BOOST")}
+                  >
+                    <ButtonText>Podbij</ButtonText>
+                    <Ionicons name="arrow-up" size={14} color="#fff" />
+                  </Button>
                 ) : (
-                    <Button
-                        className="mr-2"
-                        size="md"
-                        variant="solid"
-                        action="primary"
-                        onPress={() => handleOrder(item.noticeId, "ACTIVATE")}
-                    >
-                      <ButtonText>Aktywuj</ButtonText>
-                      <Ionicons name="arrow-redo-outline" size={14} color="#fff" />
-                    </Button>
+                  <Button
+                    className="mr-2"
+                    size="md"
+                    variant="solid"
+                    action="primary"
+                    onPress={() => handleOrder(item.noticeId, "ACTIVATION")}
+                  >
+                    <ButtonText>Aktywuj</ButtonText>
+                    <Ionicons
+                      name="arrow-redo-outline"
+                      size={14}
+                      color="#fff"
+                    />
+                  </Button>
                 )}
               </Box>
             </Box>

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(() => {
-    setIsReady(true);
-  }, []);
+  // useEffect(() => {
+  //   setIsReady(true);
+  // }, []);
 
-  useEffect(() => {
-    if (isReady && !token) {
-      router.replace("/login");
-    }
-  }, [isReady, token, router]);
+  // useEffect(() => {
+  //   if (isReady && !token) {
+  //     router.replace("/login");
+  //   }
+  // }, [isReady, token, router]);
 
   useEffect(() => {
     if (token) {
@@ -32,11 +32,8 @@ export default function Home() {
   }, [token, fetchNotices]);
 
   const notices = useNoticesStore((state) => state.notices);
-  // console.log("Notices:", notices);
-  // console.log("Notices length:", notices.length);
 
   const activeNotices = notices.filter((notice) => notice.status === "ACTIVE");
-  // console.log("Activer Notices:", activeNotices.length);
   const latestNotices = [...activeNotices]
     .sort((a, b) => new Date(b.publishDate) - new Date(a.publishDate))
     .slice(0, 6);

ArtisanConnect/app/(tabs)/wishlist.jsx

@@ -4,27 +4,25 @@ import { NoticeCard } from "@/components/NoticeCard";
 import { Ionicons } from "@expo/vector-icons";
 import { Box } from "@/components/ui/box";
 import { Text } from "@/components/ui/text";
-import {useCallback} from "react";
+import { useCallback } from "react";
 import { useFocusEffect } from "@react-navigation/native";
 
-
 export default function Wishlist() {
   const wishlistNotices = useWishlist((state) => state.wishlistNotices);
   const fetchWishlist = useWishlist((state) => state.fetchWishlist);
 
   useFocusEffect(
-      useCallback(() => {
-        fetchWishlist();
-      }, [fetchWishlist])
+    useCallback(() => {
+      fetchWishlist();
+    }, [fetchWishlist])
   );
 
   const styles = {
     container: {
       margin: 10,
-    }
-  }
+    },
+  };
 
-  // console.log("Wishlist notices:", wishlistNotices);
   if (wishlistNotices.length === 0) {
     return (
       <Box style={styles.container} className="flex-row flex-1 justify-center">

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 {Box} from "@/components/ui/box";
-import {Card} from "@/components/ui/card";
-import {Heading} from "@/components/ui/heading";
-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 { Link, Stack, useLocalSearchParams } from "expo-router";
+import { Box } from "@/components/ui/box";
+import { Card } from "@/components/ui/card";
+import { Heading } from "@/components/ui/heading";
+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,
+  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, ScrollView} from "react-native";
-import {getUserById} from "@/api/client";
+import { useEffect, useState, useRef } from "react";
+import { useNoticesStore } from "@/store/noticesStore";
+import { useWishlist } from "@/store/wishlistStore";
+import { Pressable, ScrollView } from "react-native";
+import { getUserById } from "@/api/client";
 
-const {width} = Dimensions.get("window");
+const { width } = Dimensions.get("window");
 
 export default function NoticeDetails() {
-    const {id} = useLocalSearchParams();
-    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 { id } = useLocalSearchParams();
+  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);
+  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("");
+    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 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) => {
-        const date = new Date(dateString);
-        return date.toLocaleDateString("pl-PL", {
-            year: "numeric",
-            month: "2-digit",
-            day: "2-digit",
-        });
+    fetchNotice();
+  }, [id]);
+
+  useEffect(() => {
+    const fetchImage = async () => {
+      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();
-    const toggleNoticeInWishlist = useWishlist(
-        (state) => state.toggleNoticeInWishlist
-    );
+    if (notice) {
+      fetchImage();
+    }
+  }, [notice]);
 
-    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);
+  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);
         }
-    }).current;
+      }
+    };
 
-    const viewabilityConfig = useRef({
-        itemVisiblePercentThreshold: 70,
-    }).current;
+    fetchUser();
+  }, [notice]);
 
-    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);
-            }
-        };
+  if (isLoading) {
+    return <ActivityIndicator />;
+  }
 
-        fetchNotice();
-    }, [id]);
+  if (error) {
+    return <Text>Błąd, spróbuj ponownie póżniej: {error.message}</Text>;
+  }
 
-    useEffect(() => {
-        const fetchImage = async () => {
-            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 <Text>Nie znaleziono ogłoszenia</Text>;
+  }
 
-        if (notice) {
-            fetchImage();
-        }
-    }, [notice]);
+  return (
+    <Card className="p-0 rounded-lg m-3 flex-1">
+      <Stack.Screen
+        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(() => {
-        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);
-                }
-            }
-        };
+          {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>
+      )}
 
-        fetchUser();
-    }, [notice]);
+      <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>
 
-    if (isLoading) {
-        return <ActivityIndicator/>;
-    }
+          <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>
 
-    if (error) {
-        return <Text>Błąd, spróbuj ponownie póżniej: {error.message}</Text>;
-    }
+            <Pressable
+              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) {
-        return <Text>Nie znaleziono ogłoszenia</Text>;
-    }
-
-    return (
-        <Card className="p-0 rounded-lg m-3 flex-1">
-            <Stack.Screen
-                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 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>
+              </>
             ) : (
-                <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()}
-                    />
-
-                    {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>
+              <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>
 
-            <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>
+            <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}
+            />
 
-                    <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>
+            <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}
+            />
 
-                        <Pressable
-                            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>
+            <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>
 
-                    <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>
-    );
+              <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,9 +16,8 @@ export function CategorySection({ notices, title }) {
         setCategoryMap(data);
       }
     };
-
     fetchCategories();
-  });
+  }, []);
 
   const categories = Array.from(
     new Set(notices.map((notice) => notice.category))

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

@@ -1,142 +1,134 @@
-import {create} from "zustand";
-import {createJSONStorage, persist} from "zustand/middleware";
+import { create } from "zustand";
+import { createJSONStorage, persist } from "zustand/middleware";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import axios from "axios";
+import { router } from "expo-router";
 
 const API_URL = "https://hopp.zikor.pl/api/v1";
 
 let interceptorInitialized = false;
 
 export const useAuthStore = create(
-    persist(
-        (set, get) => {
-            if (!interceptorInitialized.current) {
-                axios.interceptors.response.use(
-                    (response) => response,
-                    (error) => {
-                        if (
-                            (error.response && error.response.status === 401) ||
-                            error.response.status === 403
-                        ) {
-                            set({user_id: null, token: null, isLoading: false});
-                            delete axios.defaults.headers.common["Authorization"];
-                        }
-                        return Promise.reject(error);
-                    }
-                );
-                interceptorInitialized = true;
+  persist(
+    (set, get) => {
+      if (!interceptorInitialized.current) {
+        axios.interceptors.response.use(
+          (response) => response,
+          (error) => {
+            if (
+              (error.response && error.response.status === 401) ||
+              error.response.status === 403
+            ) {
+              set({ user_id: null, token: null, isLoading: false });
+              delete axios.defaults.headers.common["Authorization"];
+              router.replace("/login");
             }
-            return {
-                user_id: null,
-                token: null,
-                isLoading: false,
-                error: null,
+            return Promise.reject(error);
+          }
+        );
+        interceptorInitialized = true;
+      }
+      return {
+        user_id: null,
+        token: null,
+        isLoading: false,
+        error: null,
 
-                signIn: async (email, password) => {
-                    set({isLoading: true, error: null});
-                    try {
-                        const response = await axios.post(`${API_URL}/auth/login`, {
-                            email,
-                            password,
-                        });
+        signIn: async (email, password) => {
+          set({ isLoading: true, error: null });
+          try {
+            const response = await axios.post(`${API_URL}/auth/login`, {
+              email,
+              password,
+            });
 
-                        const user_id = response.data.user_id;
-                        const token = response.data.token;
-                        set({user_id: user_id, token: token, isLoading: false});
+            const user_id = response.data.user_id;
+            const token = response.data.token;
+            set({ user_id: user_id, token: token, isLoading: false });
 
-                        axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
-                    } catch (error) {
-                        set({
-                            error: error.response?.data?.message || error.message,
-                            isLoading: false,
-                        });
-                        throw error;
-                    }
-                },
-
-                signUp: async (userData) => {
-                    set({isLoading: true, error: null});
-                    try {
-                        const response = await axios.post(
-                            `${API_URL}/auth/register`,
-                            userData,
-                            {
-                                headers: {"Content-Type": "application/json"},
-                            }
-                        );
-
-                        const user_id = response.data.user_id;
-                        const token = response.data.token;
-                        set({user_id: user_id, token: token, isLoading: false});
-
-                        axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
-                    } catch (error) {
-                        set({
-                            error: error.response?.data?.message || error.message,
-                            isLoading: false,
-                        });
-                        throw error;
-                    }
-                },
-
-                signInWithGoogle: async (googleToken) => {
-                    set({isLoading: true, error: null});
-                    try {
-                        const response = await axios.post(
-                            `${API_URL}/auth/google`,
-                            {googleToken: googleToken},
-                            {
-                                headers: {"Content-Type": "application/json"},
-                            }
-                        );
-                        const user_id = response.data.user_id;
-                        const token = response.data.token;
-                        set({user_id: user_id, token: token, isLoading: false});
-
-                        axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
-                    } catch (error) {
-                        set({
-                            error: error.response?.data?.message || error.message,
-                            isLoading: false,
-                        });
-                        throw error;
-                    }
-                },
-
-                signOut: async () => {
-                    try {
-                        await axios.post(`${API_URL}/auth/logout`);
-                    } catch (error) {
-                        console.error("Logout error:", error);
-                    } finally {
-                        delete axios.defaults.headers.common["Authorization"];
-                        set({user_id: null, token: null});
-                    }
-                },
-
-                // checkAuth: async () => {
-                //   const { token } = useAuthStore.getState();
-                //   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_id: response.data, isLoading: false });
-                //     return response.data;
-                //   } catch (error) {
-                //     delete axios.defaults.headers.common["Authorization"];
-                //     set({ user_id: null, token: null, isLoading: false });
-                //     return null;
-                //   }
-                // },
-            };
+            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+          } catch (error) {
+            set({
+              error: error.response?.data?.message || error.message,
+              isLoading: false,
+            });
+            throw error;
+          }
         },
-        {
-            name: "auth-storage",
-            storage: createJSONStorage(() => AsyncStorage),
-        }
-    )
+
+        signUp: async (userData) => {
+          set({ isLoading: true, error: null });
+          try {
+            const response = await axios.post(
+              `${API_URL}/auth/register`,
+              userData,
+              {
+                headers: { "Content-Type": "application/json" },
+              }
+            );
+
+            const user_id = response.data.user_id;
+            const token = response.data.token;
+            set({ user_id: user_id, token: token, isLoading: false });
+
+            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+          } catch (error) {
+            set({
+              error: error.response?.data?.message || error.message,
+              isLoading: false,
+            });
+            throw error;
+          }
+        },
+
+        signInWithGoogle: async (googleToken) => {
+          set({ isLoading: true, error: null });
+          try {
+            const response = await axios.post(
+              `${API_URL}/auth/google`,
+              { googleToken: googleToken },
+              {
+                headers: { "Content-Type": "application/json" },
+              }
+            );
+            const user_id = response.data.user_id;
+            const token = response.data.token;
+            set({ user_id: user_id, token: token, isLoading: false });
+
+            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+          } catch (error) {
+            set({
+              error: error.response?.data?.message || error.message,
+              isLoading: false,
+            });
+            throw error;
+          }
+        },
+
+        signOut: async () => {
+          const { token } = get();
+          const headers = token ? { Authorization: `Bearer ${token}` } : {};
+          try {
+            await axios.post(
+              `${API_URL}/auth/logout`,
+              {},
+              {
+                headers: headers,
+              }
+            );
+          } catch (error) {
+            console.error("Logout error:", error);
+          } finally {
+            delete axios.defaults.headers.common["Authorization"];
+            set({ user_id: null, token: null });
+            router.replace("/login");
+          }
+        },
+      };
+    },
+    {
+      name: "auth-storage",
+      storage: createJSONStorage(() => AsyncStorage),
+    }
+  )
 );