fix merge

a co jak będę chciał usunąć ogłoszenie które nie jest aktywne?

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 });
+    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

@@ -1,10 +1,15 @@
 import axios from "axios";
+import { useAuthStore } from "@/store/authStore";
 
 const API_URL = "https://hopp.zikor.pl/api/v1";
 
 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}`);
+    const response = await axios.get(`${API_URL}/clients/get/${userId}`, {
+      headers: headers,
+    });
     return response.data;
   } catch (err) {
     console.error(

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";
 
@@ -14,9 +14,11 @@ export async function listNotices() {
     headers: headers,
   });
   const data = await response.json();
+
   if (!response.ok) {
     throw new Error(response.toString());
   }
+  // console.info("Notices fetched successfully:", data);
   return data;
 }
 
@@ -31,11 +33,11 @@ export async function getNoticeById(noticeId) {
 }
 
 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: {
-        "Content-Type": "application/json",
-      },
+      headers: headers,
     });
 
     if (response.data.noticeId !== null) {
@@ -68,30 +70,40 @@ export async function getImageByNoticeId(noticeId) {
 }
 
 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}`);
+    const listResponse = await axios.get(`${API_URL}/images/list/${noticeId}`, {
+      headers: headers,
+    });
 
     if (listResponse.data && listResponse.data.length > 0) {
-      return listResponse.data.map(
-        (imageName) => `${API_URL}/images/get/${imageName}`
-      );
+      return listResponse.data.map((imageName) => ({
+        uri: `${API_URL}/images/get/${imageName}`,
+        headers: headers,
+      }));
     }
 
-    return ["https://http.cat/404.jpg"];
+    return [{ uri: "https://http.cat/404.jpg" }];
   } catch (err) {
     if (err.response.status === 404) {
       // console.info(`Ogłoszenie o id: ${noticeId} nie posiada zdjęć.`);
-      return ["https://http.cat/404.jpg"];
+      return [{ uri: "https://http.cat/404.jpg" }];
     }
     console.warn(
       `Nie udało się pobrać listy zdjęć dla ogłoszenia o id: ${noticeId}`,
       err
     );
-    return ["https://http.cat/404.jpg"];
+    return [{ uri: "https://http.cat/404.jpg" }];
   }
 }
 
 export const uploadImage = async (noticeId, imageUri) => {
+  const { token } = useAuthStore.getState();
+  const headers = {
+    ...(token ? { Authorization: `Bearer ${token}` } : {}),
+    'Content-Type': 'multipart/form-data'
+  };
   const formData = new FormData();
 
   const filename = imageUri.split("/").pop();
@@ -100,7 +112,7 @@ export const uploadImage = async (noticeId, imageUri) => {
   const type = match ? `image/${match[1]}` : "image/jpeg";
 
   formData.append("file", {
-    uri: imageUri,
+    uri: imageUri.uri,
     name: filename,
     type: type,
   });
@@ -110,9 +122,7 @@ export const uploadImage = async (noticeId, imageUri) => {
       `${API_URL}/images/upload/${noticeId}`,
       formData,
       {
-        headers: {
-          "Content-Type": "multipart/form-data",
-        },
+        headers: headers,
       }
     );
     console.info("Upload successful:", response.data);
@@ -127,3 +137,23 @@ export const uploadImage = async (noticeId, imageUri) => {
     throw error;
   }
 };
+
+export const deleteNotice = async (noticeId) => {
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
+  try {
+    const response = await axios.delete(
+      `${API_URL}/notices/delete/${noticeId}`,
+      { headers }
+    );
+    return response.data;
+  } catch (error) {
+    console.error(
+      "Error deleting notice:",
+      error.response?.data,
+      error.response?.status
+    );
+    throw error;
+  }
+};

ArtisanConnect/api/order.jsx

@@ -1,12 +1,78 @@
 import axios from "axios";
-import FormData from "form-data";
+import { useAuthStore } from "@/store/authStore";
 
-const API_URL = "https://hopp.zikor.pl/api/v1";
-export async function listOrders() {
-  const response = await fetch(`${API_URL}/orders/get/all`);
-  const data = await response.json();
-  if (!response.ok) {
-    throw new Error(response.toString());
+const API_URL = "https://hopp.zikor.pl/api/v1/orders";
+
+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: clientId, noticeId: noticeId, orderType: orderType },
+      {
+        headers: headers,
+      }
+    );
+
+    return response.data;
+  } catch (error) {
+    console.log("Error", error.response?.data, error.response?.status);
+    return null;
+  }
+}
+
+export async function createPayment(orderId) {
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+  const clientId = 1;
+  try {
+    const response = await axios.post(
+      `${API_URL}/token?orderId=${orderId}`,
+      {},
+      {
+        headers: headers,
+      }
+    );
+    return response.data;
+  } catch (error) {
+    console.log("Error", error.response?.data, error.response?.status);
+    return null;
+  }
+}
+
+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;
+  } catch (error) {
+    console.error(
+      "Error fetching orders:",
+      error.response?.data,
+      error.response?.status
+    );
+    throw error;
   }
-  return data;
 }

ArtisanConnect/api/wishlist.jsx

@@ -1,6 +1,5 @@
 import axios from "axios";
 import { useAuthStore } from "@/store/authStore";
-// import FormData from 'form-data'
 
 const API_URL = "https://hopp.zikor.pl/api/v1/wishlist";
 
@@ -29,10 +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/(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/_layout.jsx

@@ -37,6 +37,7 @@ export default function AccountDrawerLayout() {
         name="userNotices"
         options={{ title: "Moje ogłoszenia" }}
       />
+      <Drawer.Screen name="userOrders" options={{ title: "Moje zamówienia" }} />
     </Drawer>
   );
 }

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

@@ -37,7 +37,6 @@ export default function Account() {
     return <Text>Nie udało się pobrać danych użytkownika.</Text>;
   }
 
-  console.log(user);
   return (
     <VStack className=" flex-1 m-2">
       <Box className="bg-white p-5 rounded-lg ">

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

@@ -1,17 +1,55 @@
 import { useNoticesStore } from "@/store/noticesStore";
 import { NoticeCard } from "@/components/NoticeCard";
-import { Button } from "react-native";
+import { Button, ButtonText } from "@/components/ui/button";
+
 import { Box } from "@/components/ui/box";
 import { Text } from "@/components/ui/text";
 import { VStack } from "@/components/ui/vstack";
 import { ActivityIndicator, FlatList } from "react-native";
-import { useEffect, useState } from "react";
-import {useAuthStore} from "@/store/authStore";
+import { useEffect, useState, useRef } from "react";
+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";
+import { AppState } from "react-native";
+import { useAuthStore } from "@/store/authStore";
 
 export default function UserNotices() {
-  const { notices, fetchNotices } = useNoticesStore();
-  const currentUserId = useAuthStore((state) => state.user_id);
+  const { notices, fetchNotices, deleteNotice } = useNoticesStore();
   const [isLoading, setIsLoading] = useState(true);
+  const [isRedirecting, setIsRedirecting] = useState(false);
+  const toast = useToast();
+  const appState = useRef(AppState.currentState);
+  const [toastId, setToastId] = useState(0);
+  const { user_id } = useAuthStore.getState();
+  const currentUserId = user_id;
+  const [orderId, setOrderId] = useState(null);
+
+  useEffect(() => {
+    if (!isRedirecting) return;
+    const subscription = AppState.addEventListener("change", (state) => {
+      if (state === "active") {
+        (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, orderId]);
 
   useEffect(() => {
     const loadNotices = async () => {
@@ -27,55 +65,126 @@ export default function UserNotices() {
     loadNotices();
   }, [fetchNotices]);
 
+  const showNewToast = (title) => {
+    const newId = Math.random();
+    setToastId(newId);
+    toast.show({
+      id: newId,
+      placement: "top",
+      duration: 3000,
+      render: ({ id }) => {
+        const uniqueToastId = "toast-" + id;
+        return (
+          <Toast nativeID={uniqueToastId} action="muted" variant="solid">
+            <ToastTitle>{title}</ToastTitle>
+          </Toast>
+        );
+      },
+    });
+  };
+
+  const handleOrder = async (noticeId, type) => {
+    {
+      try {
+        const result = await createOrder(noticeId, type);
+        if (result) {
+          setOrderId(result);
+          try {
+            const paymentResult = await createPayment(result);
+            if (paymentResult) {
+              setIsRedirecting(true);
+              await Linking.openURL(paymentResult);
+            } else {
+              console.log(`Nie udało się aktywować ogłoszenia 4 ${noticeId}.`);
+            }
+          } catch (err) {
+            // console.log("Błąd podczas aktywacji ogłoszenia 3:", err);
+          }
+        } else {
+          // console.log(`Nie udało się aktywować ogłoszenia 2 ${noticeId}.`);
+        }
+      } catch (err) {
+        console.log("Błąd podczas aktywacji ogłoszenia 1:", err);
+      }
+    }
+  };
+
+  const handleDeleteNotice = async (noticeId) => {
+    try {
+      await deleteNotice(noticeId);
+    } catch (err) {
+      console.error("Błąd podczas usuwania ogłoszenia:", err);
+    }
+  };
+
   const userNotices = notices
     .filter((notice) => notice.clientId === currentUserId)
     .sort((a, b) => new Date(b.publishDate) - new Date(a.publishDate));
 
   if (isLoading) {
-    return <ActivityIndicator />;
+    return (
+      <Box className="items-center justify-center flex-1">
+        <ActivityIndicator size="large" color="#787878" />
+      </Box>
+    );
   }
 
   return (
     <VStack className="p-2">
+      {isRedirecting && (
+        <Box className="absolute inset-0 bg-white bg-opacity-30 justify-center items-center z-50">
+          <Ionicons name="card-outline" size="30" className="pt-4" />
+          <Text className="text-lg font-bold pt-2">
+            Przekierowanie do płatności...
+          </Text>
+        </Box>
+      )}
       {/* <Text className="text-2xl font-bold mb-4">Moje ogłoszenia</Text> */}
       {userNotices.length > 0 ? (
         <FlatList
           data={userNotices}
-          // numColumns={1}
-          // columnWrapperStyle={{
-          //   marginBottom: 10,
-          //   justifyContent: "space-between",
-          // }}
           renderItem={({ item }) => (
             <Box className="flex-1 mb-4 pb-2 bg-white rounded-lg">
               <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"
+                >
+                  <ButtonText>Usuń</ButtonText>
+                  <Ionicons name="trash-outline" size={14} />
+                </Button>
+
                 {item.status === "ACTIVE" ? (
                   <Button
-                    title="Usuń"
-                    onPress={() => {
-                      console.log(`Promuj ogłoszenie ${item.noticeId}`);
-                    }}
-                    className="bg-primary-500 py-2 px-4 rounded-md"
-                  ></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
-                    title="Aktywj"
-                    onPress={() => {
-                      console.log(`Promuj ogłoszenie ${item.noticeId}`);
-                    }}
-                    className="bg-primary-500 py-2 px-4 rounded-md"
-                  ></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>
                 )}
-
-                <Button
-                  title="Podbij"
-                  onPress={() => {
-                    // TODO: Implementacja podbicia ogłoszenia
-                    console.log(`Podbij ogłoszenie ${item.noticeId}`);
-                  }}
-                  className="bg-primary-500 py-2 px-4 rounded-md"
-                ></Button>
               </Box>
             </Box>
           )}

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

@@ -0,0 +1,24 @@
+import { View, Text } from "react-native";
+import { useState, useEffect, use } from "react";
+import { listOrders } from "@/api/order";
+
+export default function UserOrders() {
+  const [orders, setOrders] = useState([]);
+
+  useEffect(() => {
+    const fetchOrders = async () => {
+      try {
+        const data = await listOrders();
+        setOrders(data);
+      } catch (err) {}
+    };
+    fetchOrders();
+  }, []);
+
+  console.log("Orders:", orders);
+  return (
+    <View style={{ flex: 1, justifyContent: "center", alignItems: "center" }}>
+      <Text>Orders</Text>
+    </View>
+  );
+}

ArtisanConnect/app/(tabs)/index.jsx

@@ -1,30 +1,29 @@
-import { ScrollView, View } from "react-native";
+import { ScrollView } from "react-native";
 import { useNoticesStore } from "@/store/noticesStore";
 import { CategorySection } from "@/components/CategorySection";
 import { NoticeSection } from "@/components/NoticeSection";
 import { UserSection } from "@/components/UserSection";
 import { SearchSection } from "@/components/SearchSection";
-import { FlatList } from "react-native";
 import { useAuthStore } from "@/store/authStore";
 import { useRouter } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView } from "react-native";
 
 export default function Home() {
-  const token = useAuthStore((state) => state.token);
+  const { token } = useAuthStore.getState();
   const router = useRouter();
   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) {
@@ -33,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)/notice/create.jsx

@@ -1,13 +1,14 @@
 import {useState, useEffect} from "react";
-import {Image, StyleSheet} from "react-native";
+import {Image, StyleSheet, KeyboardAvoidingView, Platform, ActivityIndicator} from "react-native";
 import {Button, ButtonText} from "@/components/ui/button";
 import {FormControl} from "@/components/ui/form-control";
 import {Input, InputField} from "@/components/ui/input";
 import {Text} from "@/components/ui/text";
 import {VStack} from "@/components/ui/vstack";
 import {Textarea, TextareaInput} from "@/components/ui/textarea";
-import {ScrollView} from '@gluestack-ui/themed';
-import * as ImagePicker from 'expo-image-picker';
+import {ScrollView} from "@gluestack-ui/themed";
+import {Box} from "@/components/ui/box";
+import * as ImagePicker from "expo-image-picker";
 import {
     Select,
     SelectTrigger,
@@ -46,7 +47,7 @@ export default function CreateNotice() {
                     setSelectItems(data);
                 }
             } catch (error) {
-                console.error('Error fetching select items:', error);
+                console.error("Error fetching select items:", error);
             }
         };
 
@@ -67,8 +68,8 @@ export default function CreateNotice() {
     const styles = StyleSheet.create({
         container: {
             flex: 1,
-            alignItems: 'center',
-            justifyContent: 'center',
+            alignItems: "center",
+            justifyContent: "center",
         },
         image: {
             width: 100,
@@ -93,19 +94,19 @@ export default function CreateNotice() {
         try {
             const result = await addNotice({
                 title: title,
-                clientId: 1,
                 description: description,
                 price: price,
                 category: category,
-                status: "ACTIVE",
-                image: image
+                status: "INACTIVE",
+                image: image,
             });
 
             if (result) {
                 console.log("Notice created successfully with ID: ", result.noticeId);
                 await fetchNotices();
                 clearForm();
-                router.push("/(tabs)/notices");
+
+                router.push("/(tabs)/dashboard/userNotices");
             }
         } catch (error) {
             console.error("Error creating notice. Error message: ", error.message);
@@ -116,7 +117,7 @@ export default function CreateNotice() {
 
     const takePicture = async () => {
         const {status} = await ImagePicker.requestCameraPermissionsAsync();
-        if (status !== 'granted') {
+        if (status !== "granted") {
             return;
         }
         const result = await ImagePicker.launchCameraAsync({
@@ -124,13 +125,13 @@ export default function CreateNotice() {
         });
 
         if (!result.canceled && result.assets) {
-            setImage(result.assets.map(asset => asset.uri));
+            setImage(result.assets.map((asset) => asset.uri));
         }
-    }
+    };
 
     const pickImage = async () => {
         let result = await ImagePicker.launchImageLibraryAsync({
-            mediaTypes: 'images',
+            mediaTypes: "images",
             selectionLimit: 8,
             allowsEditing: false,
             allowsMultipleSelection: true,
@@ -139,7 +140,7 @@ export default function CreateNotice() {
         });
 
         if (!result.canceled) {
-            setImage(result.assets.map(asset => asset.uri));
+            setImage(result.assets.map((asset) => asset.uri));
         }
     };
 
@@ -154,103 +155,126 @@ export default function CreateNotice() {
             description: false,
             price: false,
             category: false,
-        })
+        });
+    };
+
+    if (isLoading) {
+        return (
+            <Box className="items-center justify-center flex-1">
+                <ActivityIndicator size="large" color="#787878"/>
+                <Text size="md" bold="true" className='mt-5'>
+                    Dodajemy ogłoszenie...
+                </Text>
+            </Box>
+        );
     }
 
     return (
-        <ScrollView h="$80" w="$80">
-            <FormControl className="p-4 border rounded-lg border-outline-300">
-                <VStack space="xl">
-                    <VStack space="md">
-                        <Text className="text-typography-500">Zdjęcia</Text>
-                        <Button onPress={pickImage}>
-                            <ButtonText>
-                                Wybierz zdjęcia
-                            </ButtonText>
+        <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+            style={{flex: 1}}
+            keyboardVerticalOffset={Platform.OS === 'ios' ? 64 : 0}
+        >
+            <ScrollView h="$80" w="$80">
+                <FormControl className="p-4 border rounded-lg border-outline-300">
+                    <VStack space="xl">
+                        <VStack space="md">
+                            <Text className="text-typography-500">Zdjęcia</Text>
+                            <Button onPress={pickImage}>
+                                <ButtonText>Wybierz zdjęcia</ButtonText>
+                            </Button>
+                            <Button onPress={takePicture}>
+                                <ButtonText>Zrób zdjęcie</ButtonText>
+                            </Button>
+                            <Text size="sm" bold="true">
+                                Pierwsze zdjęcie będzie zdjęciem głównym
+                            </Text>
+                            {image && image.length > 0 && (
+                                <VStack space="xs" className="flex-row flex-wrap">
+                                    {image.map((img, index) => (
+                                        <Image
+                                            key={index}
+                                            source={{uri: img}}
+                                            style={styles.image}
+                                            className="m-1"
+                                        />
+                                    ))}
+                                </VStack>
+                            )}
+                        </VStack>
+
+                        <VStack space="xs">
+                            <Text className="text-typography-500">Tytuł</Text>
+                            <Input className="min-w-[250px]" isInvalid={error.title}>
+                                <InputField
+                                    type="text"
+                                    value={title}
+                                    onChangeText={(value) => setTitle(value)}
+                                />
+                            </Input>
+                        </VStack>
+
+                        <VStack space="xs">
+                            <Text className="text-typography-500">Opis</Text>
+                            <Textarea
+                                size="md"
+                                className="min-w-[250px] "
+                                isInvalid={error.description}
+                            >
+                                <TextareaInput
+                                    placeholder="Opisz produkt"
+                                    value={description}
+                                    onChangeText={(value) => setDescription(value)}
+                                />
+                            </Textarea>
+                        </VStack>
+
+                        <VStack space="xs">
+                            <Text className="text-typography-500">Cena</Text>
+                            <Input className="min-w-[250px]" isInvalid={error.price}>
+                                <InputField
+                                    type="text"
+                                    value={price}
+                                    onChangeText={(value) => setPrice(value)}
+                                />
+                            </Input>
+                        </VStack>
+                        <VStack space="xs">
+                            <Text className="text-typography-500">Kategoria</Text>
+                            <Select
+                                onValueChange={(value) => setCategory(value)}
+                                isInvalid={error.category}
+                            >
+                                <SelectTrigger variant="outline" size="md">
+                                    <SelectInput placeholder="Wybierz kategorię"/>
+                                    <SelectIcon className="mr-3" as={ChevronDownIcon}/>
+                                </SelectTrigger>
+                                <SelectPortal>
+                                    <SelectBackdrop/>
+                                    <SelectContent style={{maxHeight: 400}}>
+                                        <SelectScrollView>
+                                            {selectItems.map((item) => (
+                                                <SelectItem
+                                                    key={item.value}
+                                                    label={item.label}
+                                                    value={item.value}
+                                                />
+                                            ))}
+                                        </SelectScrollView>
+                                    </SelectContent>
+                                </SelectPortal>
+                            </Select>
+                        </VStack>
+                        <Button
+                            className="mt-5 w-full"
+                            onPress={handleAddNotice}
+                            disabled={isLoading}
+                        >
+                            <ButtonText className="text-typography-0">Dodaj</ButtonText>
                         </Button>
-                        <Button onPress={takePicture}>
-                            <ButtonText>Zrób zdjęcie</ButtonText>
-                        </Button>
-                        <Text size="sm"
-                              bold="true"
-                        >
-                            Pierwsze zdjęcie będzie zdjęciem głównym</Text>
-                        {image && image.length > 0 && (
-                            <VStack space="xs" className="flex-row flex-wrap">
-                                {image.map((img, index) => (
-                                    <Image key={index} source={{uri: img}} style={styles.image} className="m-1"/>
-                                ))}
-                            </VStack>
-                        )}
                     </VStack>
-
-                    <VStack space="xs">
-                        <Text className="text-typography-500">Tytuł</Text>
-                        <Input className="min-w-[250px]" isInvalid={error.title}>
-                            <InputField
-                                type="text"
-                                value={title}
-                                onChangeText={(value) => setTitle(value)}
-                            />
-                        </Input>
-                    </VStack>
-
-                    <VStack space="xs">
-                        <Text className="text-typography-500">Opis</Text>
-                        <Textarea
-                            size="md"
-                            className="min-w-[250px] "
-                            isInvalid={error.description}
-                        >
-                            <TextareaInput
-                                placeholder="Opisz produkt"
-                                value={description}
-                                onChangeText={(value) => setDescription(value)}
-                            />
-                        </Textarea>
-                    </VStack>
-
-                    <VStack space="xs">
-                        <Text className="text-typography-500">Cena</Text>
-                        <Input className="min-w-[250px]" isInvalid={error.price}>
-                            <InputField
-                                type="text"
-                                value={price}
-                                onChangeText={(value) => setPrice(value)}
-                            />
-                        </Input>
-                    </VStack>
-                    <VStack space="xs">
-                        <Text className="text-typography-500">Kategoria</Text>
-                        <Select
-                            onValueChange={(value) => setCategory(value)}
-                            isInvalid={error.category}
-                        >
-                            <SelectTrigger variant="outline" size="md">
-                                <SelectInput placeholder="Wybierz kategorię"/>
-                                <SelectIcon className="mr-3" as={ChevronDownIcon}/>
-                            </SelectTrigger>
-                            <SelectPortal>
-                                <SelectBackdrop/>
-                                <SelectContent style={{maxHeight: 400}}>
-                                    <SelectScrollView>
-                                        {selectItems.map((item) => (
-                                            <SelectItem key={item.value} label={item.label} value={item.value}/>
-                                        ))}
-                                    </SelectScrollView>
-                                </SelectContent>
-                            </SelectPortal>
-                        </Select>
-                    </VStack>
-                    <Button
-                        className="mt-5 w-full"
-                        onPress={handleAddNotice}
-                        disabled={isLoading}
-                    >
-                        <ButtonText className="text-typography-0">Dodaj</ButtonText>
-                    </Button>
-                </VStack>
-            </FormControl>
-        </ScrollView>
+                </FormControl>
+            </ScrollView>
+        </KeyboardAvoidingView>
     );
-}
+}

ArtisanConnect/app/(tabs)/wishlist.jsx

@@ -4,25 +4,34 @@ import { NoticeCard } from "@/components/NoticeCard";
 import { Ionicons } from "@expo/vector-icons";
 import { Box } from "@/components/ui/box";
 import { Text } from "@/components/ui/text";
-import { useEffect } 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);
 
-  useEffect(() => {
-    fetchWishlist();
-  }, []);
+  useFocusEffect(
+    useCallback(() => {
+      fetchWishlist();
+    }, [fetchWishlist])
+  );
+
+  const styles = {
+    container: {
+      margin: 10,
+    },
+  };
 
-  // console.log("Wishlist notices:", wishlistNotices);
   if (wishlistNotices.length === 0) {
     return (
-      <Box className="flex-row flex-1 justify-center">
+      <Box style={styles.container} className="flex-row flex-1 justify-center">
         <Ionicons name="sad-outline" size={24} color="black" />
         <Text>Brak ulubionych ogłoszeń</Text>
       </Box>
     );
   }
+
   return (
     <FlatList
       data={wishlistNotices}
@@ -30,7 +39,6 @@ export default function Wishlist() {
       numColumns={2}
       columnContainerClassName="m-2"
       columnWrapperClassName="gap-2 m-2"
-      k
       renderItem={({ item }) => <NoticeCard notice={item} />}
     />
   );

ArtisanConnect/app/notice/[id].jsx

@@ -5,7 +5,6 @@ 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 { Avatar, AvatarImage, AvatarFallbackText } from "@gluestack-ui/themed";
 import { Ionicons } from "@expo/vector-icons";
 import {
   ActivityIndicator,
@@ -13,16 +12,14 @@ import {
   FlatList,
   View,
   TextInput,
-  SafeAreaView, Alert,
 } 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 * as ScreenOrientation from "expo-screen-orientation";
-import { useAuthStore } from "@/store/authStore";
-import { sendEmail } from "@/api/email";
+
+const { width } = Dimensions.get("window");
 
 export default function NoticeDetails() {
   const { id } = useLocalSearchParams();
@@ -33,74 +30,20 @@ export default function NoticeDetails() {
   const [notice, setNotice] = useState(null);
   const [user, setUser] = useState(null);
   const [isUserLoading, setIsUserLoading] = useState(true);
-  const [isLandscape, setIsLandscape] = useState(false);
   const flatListRef = useRef(null);
   const [currentIndex, setCurrentIndex] = useState(0);
+
   const [isMessageFormVisible, setIsMessageFormVisible] = useState(false);
   const [message, setMessage] = useState("");
-  const [isSending, setIsSending] = useState(false);
+  const [Email, setEmail] = useState("");
+  const handleSendMessage = () => {
+    console.log("Wiadomość do:", user?.email);
+    console.log("Email nadawcy:", Email);
+    console.log("Treść:", message);
 
-
-  const handleSendMessage = async () => {
-    setIsSending(true);
-    console.log("Rozpoczynanie procesu wysyłania wiadomości...");
-
-    const { user_id, token } = useAuthStore.getState();
-    console.log("Dane z authStore:", { user_id, token });
-
-    if (!user_id || !token) {
-      console.error("Brak danych zalogowanego użytkownika.");
-      Alert.alert("Błąd", "Zaloguj się, aby wysłać wiadomość.");
-      setIsSending(false);
-      return;
-    }
-
-    let currentUserEmail = "";
-    try {
-      console.log(`Pobieranie danych użytkownika dla user_id: ${user_id}`);
-      const currentUser = await getUserById(user_id);
-      console.log("Dane zalogowanego użytkownika:", currentUser);
-      currentUserEmail = currentUser?.email;
-      if (!currentUserEmail) {
-        console.error("Nie znaleziono adresu email zalogowanego użytkownika.");
-        Alert.alert("Błąd", "Nie znaleziono adresu email zalogowanego użytkownika.");
-        setIsSending(false);
-        return;
-      }
-      console.log(`Pobrano email zalogowanego użytkownika: ${currentUserEmail}`);
-    } catch (error) {
-      console.error("Błąd podczas pobierania danych użytkownika:", error);
-      Alert.alert("Błąd", "Nie udało się pobrać danych użytkownika. Spróbuj ponownie później.");
-      setIsSending(false);
-      return;
-    }
-
-    const emailData = {
-      to: user?.email || "",
-      subject: `Zapytanie ${currentUserEmail} o ogłoszenie ${notice.title}`,
-      body: message,
-    };
-    console.log("Dane emaila do wysyłki:", emailData);
-
-    if (!emailData.to || !emailData.subject || !emailData.body) {
-      console.error("Walidacja nieudana: brakujące pola w emailData.");
-      Alert.alert("Błąd", "Wszystkie pola są wymagane!");
-      setIsSending(false);
-      return;
-    }
-
-    const result = await sendEmail(emailData);
-    if (result.success) {
-      console.log("Wiadomość wysłana pomyślnie!", result.result);
-      setIsMessageFormVisible(false);
-      setMessage("");
-      Alert.alert("Sukces", "Wiadomość została wysłana!");
-    } else {
-      console.error("Błąd podczas wysyłania wiadomości:", result.error);
-      Alert.alert("Błąd", `Nie udało się wysłać wiadomości: ${result.error}`);
-    }
-    setIsSending(false);
-    console.log("Zakończono proces wysyłania wiadomości.");
+    setIsMessageFormVisible(false);
+    setMessage("");
+    setEmail("");
   };
 
   const formatDate = (dateString) => {
@@ -114,13 +57,12 @@ export default function NoticeDetails() {
 
   const { getNoticeById, getAllImagesByNoticeId } = useNoticesStore();
   const toggleNoticeInWishlist = useWishlist(
-      (state) => state.toggleNoticeInWishlist
+    (state) => state.toggleNoticeInWishlist
   );
 
   const isInWishlist = useWishlist((state) =>
-      id ? state.wishlistNotices.some((item) => item.noticeId == id) : false
+    id ? state.wishlistNotices.some((item) => item.noticeId === id) : false
   );
-
   const onViewableItemsChanged = useRef(({ viewableItems }) => {
     if (viewableItems.length > 0) {
       setCurrentIndex(viewableItems[0].index);
@@ -131,51 +73,6 @@ export default function NoticeDetails() {
     itemVisiblePercentThreshold: 70,
   }).current;
 
-  useEffect(() => {
-    const unlockOrientation = async () => {
-      try {
-        await ScreenOrientation.unlockAsync();
-      } catch (err) {
-        console.error("Error unlocking orientation:", err);
-      }
-    };
-
-    const getInitialOrientation = async () => {
-      try {
-        const orientation = await ScreenOrientation.getOrientationAsync();
-        setIsLandscape(
-            orientation === ScreenOrientation.Orientation.LANDSCAPE_LEFT ||
-            orientation === ScreenOrientation.Orientation.LANDSCAPE_RIGHT
-        );
-      } catch (err) {
-        console.error("Error getting initial orientation:", err);
-      }
-    };
-
-    unlockOrientation();
-    getInitialOrientation();
-
-    const subscription = ScreenOrientation.addOrientationChangeListener(
-        ({ orientationInfo }) => {
-          const isLandscapeMode =
-              orientationInfo.orientation ===
-              ScreenOrientation.Orientation.LANDSCAPE_LEFT ||
-              orientationInfo.orientation ===
-              ScreenOrientation.Orientation.LANDSCAPE_RIGHT;
-          setIsLandscape(isLandscapeMode);
-        }
-    );
-
-    return () => {
-      ScreenOrientation.removeOrientationChangeListener(subscription);
-      ScreenOrientation.lockAsync(
-          ScreenOrientation.OrientationLock.PORTRAIT_UP
-      ).catch((err) =>
-          console.error("Error locking orientation on unmount:", err)
-      );
-    };
-  }, []);
-
   useEffect(() => {
     const fetchNotice = async () => {
       setIsLoading(true);
@@ -203,15 +100,14 @@ export default function NoticeDetails() {
       if (notice) {
         try {
           const fetchedImages = await getAllImagesByNoticeId(notice.noticeId);
-          console.log("Fetched images:", fetchedImages);
           setImages(
-              fetchedImages && fetchedImages.length > 0
-                  ? fetchedImages
-                  : ["https://http.cat/404.jpg"]
+            fetchedImages && fetchedImages.length > 0
+              ? fetchedImages
+              : { uri: "https://http.cat/404.jpg" }
           );
         } catch (err) {
           console.error("Error while loading images:", err);
-          setImages(["https://http.cat/404.jpg"]);
+          setImage({ uri: "https://http.cat/404.jpg" });
         } finally {
           setIsImageLoading(false);
         }
@@ -246,209 +142,197 @@ export default function NoticeDetails() {
   }
 
   if (error) {
-    return <Text>Błąd, spróbuj ponownie później: {error.message}</Text>;
+    return <Text>Błąd, spróbuj ponownie póżniej: {error.message}</Text>;
   }
 
   if (!notice) {
     return <Text>Nie znaleziono ogłoszenia</Text>;
   }
 
-  const renderImageSection = () => {
-    if (isImageLoading) {
-      return (
-          <Box
-              className={`h-auto w-full rounded-md ${
-                  isLandscape ? "h-screen" : "aspect-[1/1]"
-              } bg-gray-100 items-center justify-center`}
-          >
-            <ActivityIndicator size="large" color="#3b82f6" />
-          </Box>
-      );
-    }
-
-    return (
-        <Box className={isLandscape ? "h-screen" : "sticky top-0 z-10 bg-white"}>
+  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
-              snapToAlignment="center"
-              decelerationRate="fast"
-              showsHorizontalScrollIndicator={false}
-              pagingEnabled
-              onViewableItemsChanged={onViewableItemsChanged}
-              viewabilityConfig={viewabilityConfig}
-              renderItem={({ item, index }) => (
-                  <View style={{ width: Dimensions.get("window").width }}>
-                    <Image
-                        source={{ uri: item }}
-                        className={`h-auto w-full rounded-md ${
-                            isLandscape ? "h-full" : "aspect-square"
-                        }`}
-                        alt={`Zdjęcie ${index + 1}`}
-                        resizeMode={isLandscape ? "cover" : "contain"}
-                        onError={(e) => console.error("Image load error:", e.nativeEvent.error)}
-                    />
-                  </View>
-              )}
-              keyExtractor={(item, index) => index.toString()}
+            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-500"}
-                }`}
-                    />
-                ))}
-              </Box>
+            <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>
-    );
-  };
+      )}
 
-  return (
-      <SafeAreaView style={{ flex: 1 }}>
-        <Card className="flex-1 p-4 m-3 rounded-lg shadow-sm">
-          <Stack.Screen
-              options={{
-                title: notice.title,
+      <ScrollView showsVerticalScrollIndicator={false}>
+        <VStack className="p-2">
+          <Text className="text-sm font-normal mb-2 text-typography-700">
+            {formatDate(notice.publishDate)}
+          </Text>
+          <Text className="text-2xl text-gray-950 font-bold mb-2 text-center bg-gray-50 rounded-md p-2">
+            {notice.title}
+          </Text>
+
+          <Box className="flex-row items-center  bg-gray-50 rounded-md p-2">
+            <Heading size="md" className="flex-1 text-xl text-gray-950">
+              <Text className="text-sm text-typography-500">Cena: </Text>
+              {notice.price} zł
+            </Heading>
+
+            <Pressable
+              onPress={() => {
+                toggleNoticeInWishlist(id);
               }}
-          />
-          <ScrollView showsVerticalScrollIndicator={false}>
-            {renderImageSection()}
-            <VStack className="p-4">
-              <Text className="text-sm font-normal mb-2 text-gray-600">
-                {formatDate(notice.publishDate)}
-              </Text>
-              <Text className="text-2xl font-bold mb-2 text-center bg-gray-100 rounded-md p-4">
-                {notice.title}
-              </Text>
-              <Box className="flex-row items-center bg-gray-100 rounded-md p-2">
-                <Heading size="md" className="flex-1 text-lg">
-                  <Text className="text-sm text-gray-500">Cena: </Text>
-                  {notice.price} zł
-                </Heading>
-                <Pressable
-                    onPress={() => {
-                      toggleNoticeInWishlist(id);
-                    }}
-                >
-                  <Ionicons
-                      name={isInWishlist ? "heart" : "heart-outline"}
-                      size={24}
-                      color="#3b82f6"
+            >
+              <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>
+
+          <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"
                   />
-                </Pressable>
-              </Box>
-              <Box className="mt-4 bg-gray-100 p-3 rounded-lg">
-                <Text className="text-sm text-gray-500">
-                  Kategoria:{" "}
-                  <Text className="font-bold text-gray-900">{notice.category}</Text>
-                </Text>
-              </Box>
-              <Box className="mt-4 bg-gray-100 p-3 rounded-lg">
-                <Text className="text-xl font-bold text-gray-900">Opis ogłoszenia</Text>
-                <Text className="text-sm text-gray-700">{notice.description}</Text>
-              </Box>
-              <Box className="mt-4 bg-gray-100 p-3 rounded-lg">
-                <Text className="text-sm text-gray-500">Użytkownik:</Text>
-                {isUserLoading ? (
-                    <ActivityIndicator />
-                ) : user ? (
-                    <>
-                      <Box className="mr-4">
-                        <Avatar size="md">
-                          <AvatarImage
-                              source={{
-                                uri:
-                                    user.image ||
-                                    "https://th.bing.com/th/id/OIP.3coo_N8sieled8QNroQmkgHaHa?rs=1&pid=ImgDetMain",
-                              }}
-                              alt="Zdjęcie profilowe"
-                          />
-                          <AvatarFallbackText>
-                            {user.firstName?.[0]}
-                            {user.lastName?.[0]}
-                          </AvatarFallbackText>
-                        </Avatar>
-                      </Box>
-                      <Box className="flex-1">
-                        <Text className="text-lg font-bold text-gray-900">
-                          {user.firstName} {user.lastName}
-                        </Text>
-                        <Text className="text-sm text-gray-700">
-                          Email: {user.email}
-                        </Text>
-                        <Pressable
-                            onPress={() => setIsMessageFormVisible(true)}
-                            className="mt-3 bg-blue-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-lg font-bold text-center text-blue-600 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}
+                </Box>
+
+                <Box className="flex-1">
+                  <Text className="text-xl font-bold text-gray-950">
+                    {user.firstName} {user.lastName}
                   </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 className="text-sm text-typography-700">
+                    Email: {user.email}
                   </Text>
-                  <Text className="text-sm font-medium mb-1">Temat:</Text>
-                  <Text className="bg-gray-100 p-3 rounded text-gray-500">
-                    Zapytanie o ogłoszenie '{notice.title || "Brak nazwy ogłoszenia"}'
-                  </Text>
-                  <Text className="text-sm font-medium mb-1">Treść:</Text>
-                  <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-blue-500 py-2 px-4 rounded-md"
-                        disabled={isSending}
-                    >
-                      {isSending ? (
-                          <ActivityIndicator color="#fff" />
-                      ) : (
-                          <Text className="text-white">Wyślij</Text>
-                      )}
-                    </Pressable>
-                  </View>
-                </View>
-              </View>
-          )}
-        </Card>
-      </SafeAreaView>
+                  <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/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/components/NoticeCard.jsx

@@ -1,117 +1,115 @@
-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 { Link } from "expo-router";
-import { Pressable, ActivityIndicator, View } from "react-native";
-import { useWishlist } from "@/store/wishlistStore";
-import { useNoticesStore } from "@/store/noticesStore";
-import { Ionicons } from "@expo/vector-icons";
-import { useEffect, useState } from "react";
+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 {Link} from "expo-router";
+import {Pressable, ActivityIndicator, View} from "react-native";
+import {useWishlist} from "@/store/wishlistStore";
+import {useNoticesStore} from "@/store/noticesStore";
+import {Ionicons} from "@expo/vector-icons";
+import {useEffect, useState} from "react";
 
-export function NoticeCard({ notice }) {
-  const noticeId = notice?.noticeId;
+export function NoticeCard({notice}) {
+    const noticeId = notice?.noticeId;
 
-  const toggleNoticeInWishlist = useWishlist(
-    (state) => state.toggleNoticeInWishlist
-  );
-  const isInWishlist = useWishlist((state) =>
-    noticeId
-      ? state.wishlistNotices.some((item) => item.noticeId === noticeId)
-      : false
-  );
+    const toggleNoticeInWishlist = useWishlist(
+        (state) => state.toggleNoticeInWishlist
+    );
+    const isInWishlist = useWishlist((state) =>
+        noticeId
+            ? state.wishlistNotices.some((item) => item.noticeId === noticeId)
+            : false
+    );
 
-  const [image, setImage] = useState(null);
-  const [isLoading, setIsLoading] = useState(true);
+    const [image, setImage] = useState(null);
+    const [isLoading, setIsLoading] = useState(true);
 
-  const { getAllImagesByNoticeId } = useNoticesStore();
+    const {getAllImagesByNoticeId} = useNoticesStore();
 
-  useEffect(() => {
-    let isMounted = true;
+    useEffect(() => {
+        let isMounted = true;
 
-    const fetchImage = async () => {
-      if (!noticeId) {
-        if (isMounted) {
-          setImage("https://http.cat/404.jpg");
-          setIsLoading(false);
-        }
-        return;
-      }
+        const fetchImage = async () => {
+            if (!noticeId) {
+                if (isMounted) {
+                    setImage({uri: "https://http.cat/404.jpg"});
+                    setIsLoading(false);
+                }
+                return;
+            }
 
-      setIsLoading(true);
-      try {
-        const images = await getAllImagesByNoticeId(noticeId);
-        if (isMounted) {
-          setImage(
-            images && images.length > 0 ? images[0] : "https://http.cat/404.jpg"
-          );
-        }
-      } catch (error) {
-        console.error(`Error while loading image: ${error}`);
-        if (isMounted) {
-          setImage("https://http.cat/404.jpg");
-        }
-      } finally {
-        if (isMounted) {
-          setIsLoading(false);
-        }
-      }
-    };
+            setIsLoading(true);
+            try {
+                const images = await getAllImagesByNoticeId(noticeId);
+                if (isMounted) {
+                    setImage(
+                        images && images.length > 0 ? images[0] : {uri: "https://http.cat/404.jpg"}
+                    );
+                }
+            } catch (error) {
+                console.error(`Error while loading image: ${error}`);
+                if (isMounted) {
+                    setImage({uri: "https://http.cat/404.jpg"});
+                }
+            } finally {
+                if (isMounted) {
+                    setIsLoading(false);
+                }
+            }
+        };
 
-    fetchImage();
+        fetchImage();
 
-    return () => {
-      isMounted = false;
-    };
-  }, [noticeId]);
+        return () => {
+            isMounted = false;
+        };
+    }, [noticeId]);
 
-  if (!notice) {
-    return <View style={{ flex: 1 }} />;
-  }
+    if (!notice) {
+        return <View style={{flex: 1}}/>;
+    }
 
-  return (
-    <Link href={`/notice/${noticeId}`} asChild>
-      <Pressable className="flex-1">
-        <Card className="p-0 rounded-lg max-w-[460px] flex-1">
-          {isLoading ? (
-            <Box className="h-auto w-full rounded-md aspect-[1/1] bg-gray-100 items-center justify-center">
-              <ActivityIndicator size="large" color="#3b82f6" />
-            </Box>
-          ) : (
-            <Image
-              source={{
-                uri: image,
-              }}
-              className="h-auto w-full rounded-md aspect-[1/1]"
-              alt="image"
-              resizeMode="cover"
-            />
-          )}
-          <VStack className="p-2">
-            <Text className="text-sm font-normal mb-2 text-typography-700">
-              {notice.title}
-            </Text>
-            <Box className="flex-row items-center">
-              <Heading size="md" className="flex-1">
-                {notice.price}zł
-              </Heading>
-              <Pressable
-                onPress={() => {
-                  toggleNoticeInWishlist(noticeId);
-                }}
-              >
-                <Ionicons
-                  name={isInWishlist ? "heart" : "heart-outline"}
-                  size={24}
-                  color={"primary-heading-500"}
-                />
-              </Pressable>
-            </Box>
-          </VStack>
-        </Card>
-      </Pressable>
-    </Link>
-  );
+    return (
+        <Link href={`/notice/${noticeId}`} asChild>
+            <Pressable className="flex-1">
+                <Card className="p-0 rounded-lg max-w-[460px] flex-1">
+                    {isLoading ? (
+                        <Box className="h-auto w-full rounded-md aspect-[1/1] bg-gray-100 items-center justify-center">
+                            <ActivityIndicator size="large" color="#3b82f6"/>
+                        </Box>
+                    ) : (
+                        <Image
+                            source={image}
+                            className="h-auto w-full rounded-md aspect-[1/1]"
+                            alt="image"
+                            resizeMode="cover"
+                        />
+                    )}
+                    <VStack className="p-2">
+                        <Text className="text-sm font-normal mb-2 text-typography-700">
+                            {notice.title}
+                        </Text>
+                        <Box className="flex-row items-center">
+                            <Heading size="md" className="flex-1">
+                                {notice.price}zł
+                            </Heading>
+                            <Pressable
+                                onPress={() => {
+                                    toggleNoticeInWishlist(noticeId);
+                                }}
+                            >
+                                <Ionicons
+                                    name={isInWishlist ? "heart" : "heart-outline"}
+                                    size={24}
+                                    color={"primary-heading-500"}
+                                />
+                            </Pressable>
+                        </Box>
+                    </VStack>
+                </Card>
+            </Pressable>
+        </Link>
+    );
 }

ArtisanConnect/components/ui/toast/index.tsx

@@ -0,0 +1,240 @@
+'use client';
+import React from 'react';
+import { createToastHook } from '@gluestack-ui/toast';
+import { AccessibilityInfo, Text, View, ViewStyle } from 'react-native';
+import { tva } from '@gluestack-ui/nativewind-utils/tva';
+import { cssInterop } from 'nativewind';
+import {
+  Motion,
+  AnimatePresence,
+  MotionComponentProps,
+} from '@legendapp/motion';
+import {
+  withStyleContext,
+  useStyleContext,
+} from '@gluestack-ui/nativewind-utils/withStyleContext';
+import type { VariantProps } from '@gluestack-ui/nativewind-utils';
+
+type IMotionViewProps = React.ComponentProps<typeof View> &
+  MotionComponentProps<typeof View, ViewStyle, unknown, unknown, unknown>;
+
+const MotionView = Motion.View as React.ComponentType<IMotionViewProps>;
+
+const useToast = createToastHook(MotionView, AnimatePresence);
+const SCOPE = 'TOAST';
+
+cssInterop(MotionView, { className: 'style' });
+
+const toastStyle = tva({
+  base: 'p-4 m-1 rounded-md gap-1 web:pointer-events-auto shadow-hard-5 border-outline-100',
+  variants: {
+    action: {
+      error: 'bg-error-800',
+      warning: 'bg-warning-700',
+      success: 'bg-success-700',
+      info: 'bg-info-700',
+      muted: 'bg-background-800',
+    },
+
+    variant: {
+      solid: '',
+      outline: 'border bg-background-0',
+    },
+  },
+});
+
+const toastTitleStyle = tva({
+  base: 'text-typography-0 font-medium font-body tracking-md text-left',
+  variants: {
+    isTruncated: {
+      true: '',
+    },
+    bold: {
+      true: 'font-bold',
+    },
+    underline: {
+      true: 'underline',
+    },
+    strikeThrough: {
+      true: 'line-through',
+    },
+    size: {
+      '2xs': 'text-2xs',
+      'xs': 'text-xs',
+      'sm': 'text-sm',
+      'md': 'text-base',
+      'lg': 'text-lg',
+      'xl': 'text-xl',
+      '2xl': 'text-2xl',
+      '3xl': 'text-3xl',
+      '4xl': 'text-4xl',
+      '5xl': 'text-5xl',
+      '6xl': 'text-6xl',
+    },
+  },
+  parentVariants: {
+    variant: {
+      solid: '',
+      outline: '',
+    },
+    action: {
+      error: '',
+      warning: '',
+      success: '',
+      info: '',
+      muted: '',
+    },
+  },
+  parentCompoundVariants: [
+    {
+      variant: 'outline',
+      action: 'error',
+      class: 'text-error-800',
+    },
+    {
+      variant: 'outline',
+      action: 'warning',
+      class: 'text-warning-800',
+    },
+    {
+      variant: 'outline',
+      action: 'success',
+      class: 'text-success-800',
+    },
+    {
+      variant: 'outline',
+      action: 'info',
+      class: 'text-info-800',
+    },
+    {
+      variant: 'outline',
+      action: 'muted',
+      class: 'text-background-800',
+    },
+  ],
+});
+
+const toastDescriptionStyle = tva({
+  base: 'font-normal font-body tracking-md text-left',
+  variants: {
+    isTruncated: {
+      true: '',
+    },
+    bold: {
+      true: 'font-bold',
+    },
+    underline: {
+      true: 'underline',
+    },
+    strikeThrough: {
+      true: 'line-through',
+    },
+    size: {
+      '2xs': 'text-2xs',
+      'xs': 'text-xs',
+      'sm': 'text-sm',
+      'md': 'text-base',
+      'lg': 'text-lg',
+      'xl': 'text-xl',
+      '2xl': 'text-2xl',
+      '3xl': 'text-3xl',
+      '4xl': 'text-4xl',
+      '5xl': 'text-5xl',
+      '6xl': 'text-6xl',
+    },
+  },
+  parentVariants: {
+    variant: {
+      solid: 'text-typography-50',
+      outline: 'text-typography-900',
+    },
+  },
+});
+
+const Root = withStyleContext(View, SCOPE);
+type IToastProps = React.ComponentProps<typeof Root> & {
+  className?: string;
+} & VariantProps<typeof toastStyle>;
+
+const Toast = React.forwardRef<React.ComponentRef<typeof Root>, IToastProps>(
+  function Toast(
+    { className, variant = 'solid', action = 'muted', ...props },
+    ref
+  ) {
+    return (
+      <Root
+        ref={ref}
+        className={toastStyle({ variant, action, class: className })}
+        context={{ variant, action }}
+        {...props}
+      />
+    );
+  }
+);
+
+type IToastTitleProps = React.ComponentProps<typeof Text> & {
+  className?: string;
+} & VariantProps<typeof toastTitleStyle>;
+
+const ToastTitle = React.forwardRef<
+  React.ComponentRef<typeof Text>,
+  IToastTitleProps
+>(function ToastTitle({ className, size = 'md', children, ...props }, ref) {
+  const { variant: parentVariant, action: parentAction } =
+    useStyleContext(SCOPE);
+  React.useEffect(() => {
+    // Issue from react-native side
+    // Hack for now, will fix this later
+    AccessibilityInfo.announceForAccessibility(children as string);
+  }, [children]);
+
+  return (
+    <Text
+      {...props}
+      ref={ref}
+      aria-live="assertive"
+      aria-atomic="true"
+      role="alert"
+      className={toastTitleStyle({
+        size,
+        class: className,
+        parentVariants: {
+          variant: parentVariant,
+          action: parentAction,
+        },
+      })}
+    >
+      {children}
+    </Text>
+  );
+});
+
+type IToastDescriptionProps = React.ComponentProps<typeof Text> & {
+  className?: string;
+} & VariantProps<typeof toastDescriptionStyle>;
+
+const ToastDescription = React.forwardRef<
+  React.ComponentRef<typeof Text>,
+  IToastDescriptionProps
+>(function ToastDescription({ className, size = 'md', ...props }, ref) {
+  const { variant: parentVariant } = useStyleContext(SCOPE);
+  return (
+    <Text
+      ref={ref}
+      {...props}
+      className={toastDescriptionStyle({
+        size,
+        class: className,
+        parentVariants: {
+          variant: parentVariant,
+        },
+      })}
+    />
+  );
+});
+
+Toast.displayName = 'Toast';
+ToastTitle.displayName = 'ToastTitle';
+ToastDescription.displayName = 'ToastDescription';
+
+export { useToast, Toast, ToastTitle, ToastDescription };

ArtisanConnect/package-lock.json

@@ -1788,7 +1788,9 @@
       }
     },
     "node_modules/@expo/fingerprint": {
-      "version": "0.12.4",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.13.0.tgz",
+      "integrity": "sha512-3IwpH0p3uO8jrJSLOUNDzJVh7VEBod0emnCBq0hD72sy6ICmzauM6Xf4he+2Tip7fzImCJRd63GaehV+CCtpvA==",
       "license": "MIT",
       "dependencies": {
         "@expo/spawn-async": "^1.7.2",
@@ -1796,7 +1798,8 @@
         "chalk": "^4.1.2",
         "debug": "^4.3.4",
         "find-up": "^5.0.0",
-        "getenv": "^1.0.0",
+        "getenv": "^2.0.0",
+        "ignore": "^5.3.1",
         "minimatch": "^9.0.0",
         "p-limit": "^3.1.0",
         "resolve-from": "^5.0.0",
@@ -1806,8 +1809,19 @@
         "fingerprint": "bin/cli.js"
       }
     },
+    "node_modules/@expo/fingerprint/node_modules/getenv": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/getenv/-/getenv-2.0.0.tgz",
+      "integrity": "sha512-VilgtJj/ALgGY77fiLam5iD336eSWi96Q15JSAG1zi8NRBysm3LXKdGnHb4m5cuyxvOLQQKWpBZAT6ni4FI2iQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/@expo/fingerprint/node_modules/semver": {
       "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -2579,6 +2593,8 @@
     },
     "node_modules/@gluestack-ui/toast": {
       "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@gluestack-ui/toast/-/toast-1.0.9.tgz",
+      "integrity": "sha512-aMlPczeoH/PZTMnhV29fqqW1Xc/9QmYEsR0bU9BfLyAGM9UMjW3vGe4yZSgxX7xjQ9C7+KO5WnTH0FmPoAbVtg==",
       "dependencies": {
         "@gluestack-ui/hooks": "0.1.13",
         "@gluestack-ui/overlay": "^0.1.20",
@@ -6006,6 +6022,8 @@
     },
     "node_modules/commander": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "license": "MIT",
       "engines": {
         "node": ">= 10"
@@ -6702,16 +6720,16 @@
       }
     },
     "node_modules/expo": {
-      "version": "53.0.10",
-      "resolved": "https://registry.npmjs.org/expo/-/expo-53.0.10.tgz",
-      "integrity": "sha512-rN3HcQOeum4i+4Fq1+wBuTWbUjHZqTE7YgGGioOtY2WnhYt+4OSrTlxjRjp13AtkLuKSKkh34gkdFMlUepKlXA==",
+      "version": "53.0.11",
+      "resolved": "https://registry.npmjs.org/expo/-/expo-53.0.11.tgz",
+      "integrity": "sha512-+QtvU+6VPd7/o4vmtwuRE/Li2rAiJtD25I6BOnoQSxphaWWaD0PdRQnIV3VQ0HESuJYRuKJ3DkAHNJ3jI6xwzA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.20.0",
         "@expo/cli": "0.24.14",
         "@expo/config": "~11.0.10",
         "@expo/config-plugins": "~10.0.2",
-        "@expo/fingerprint": "0.12.4",
+        "@expo/fingerprint": "0.13.0",
         "@expo/metro-config": "0.20.14",
         "@expo/vector-icons": "^14.0.0",
         "babel-preset-expo": "~13.2.0",
@@ -6720,7 +6738,7 @@
         "expo-file-system": "~18.1.10",
         "expo-font": "~13.3.1",
         "expo-keep-awake": "~14.1.4",
-        "expo-modules-autolinking": "2.1.10",
+        "expo-modules-autolinking": "2.1.11",
         "expo-modules-core": "2.4.0",
         "react-native-edge-to-edge": "1.6.0",
         "whatwg-url-without-unicode": "8.0.0-3"
@@ -6890,7 +6908,9 @@
       }
     },
     "node_modules/expo-modules-autolinking": {
-      "version": "2.1.10",
+      "version": "2.1.11",
+      "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-2.1.11.tgz",
+      "integrity": "sha512-KrWQo+cE4gWYNePBBhmHGVzf63gYV19ZLXe9EIH3GHTkViVzIX+Lp618H/7GxfawpN5kbhvilATH1QEKKnUUww==",
       "license": "MIT",
       "dependencies": {
         "@expo/spawn-async": "^1.7.2",
@@ -6907,6 +6927,8 @@
     },
     "node_modules/expo-modules-autolinking/node_modules/glob": {
       "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -6925,6 +6947,8 @@
     },
     "node_modules/expo-modules-autolinking/node_modules/minipass": {
       "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -7642,6 +7666,15 @@
       ],
       "license": "BSD-3-Clause"
     },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/image-size": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.1.tgz",

ArtisanConnect/package.json

@@ -40,6 +40,7 @@
     "expo-auth-session": "~6.2.0",
     "expo-camera": "~16.1.7",
     "expo-constants": "~17.1.5",
+    "expo-crypto": "~14.1.4",
     "expo-image-picker": "~16.1.4",
     "expo-linking": "~7.1.4",
     "expo-router": "~5.0.5",
@@ -62,7 +63,6 @@
     "react-native-web": "~0.20.0",
     "tailwindcss": "^3.4.17",
     "zustand": "^5.0.3",
-    "expo-crypto": "~14.1.4",
     "expo-screen-orientation": "~8.1.7"
   },
   "devDependencies": {

ArtisanConnect/store/authStore.jsx

@@ -2,14 +2,16 @@ 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) => {
-      // Dodaj interceptor tylko raz
-      if (!axios.interceptors.response.handlers.length) {
+      if (!interceptorInitialized.current) {
         axios.interceptors.response.use(
           (response) => response,
           (error) => {
@@ -17,14 +19,15 @@ export const useAuthStore = create(
               (error.response && error.response.status === 401) ||
               error.response.status === 403
             ) {
-              set({ user: null, token: null, isLoading: false });
+              set({ user_id: null, token: null, isLoading: false });
               delete axios.defaults.headers.common["Authorization"];
+              router.replace("/login");
             }
             return Promise.reject(error);
           }
         );
+        interceptorInitialized = true;
       }
-
       return {
         user_id: null,
         token: null,
@@ -103,34 +106,24 @@ export const useAuthStore = create(
         },
 
         signOut: async () => {
+          const { token } = get();
+          const headers = token ? { Authorization: `Bearer ${token}` } : {};
           try {
-            await axios.post(`${API_URL}/auth/logout`);
+            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");
           }
         },
-
-        // 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;
-        //   }
-        // },
       };
     },
     {

ArtisanConnect/store/noticesStore.jsx

@@ -1,41 +1,54 @@
-import {create} from "zustand";
+import { create } from "zustand";
 import * as api from "@/api/notices";
 
 export const useNoticesStore = create((set, get) => ({
-    notices: [],
-    fetchNotices: async () => {
-        set({error: null});
-        try {
-            const data = await api.listNotices();
-            set({notices: data});
-        } catch (error) {
-            set(error);
-        }
-    },
-
-    addNotice: async (notice) => {
-        try {
-            const newNotice = await api.createNotice(notice);
-            set((state) => ({
-                notices: [...state.notices, newNotice],
-            }));
-            return newNotice;
-        } catch (error) {
-            set({ error });
-            return null;
-        }
-    },
-
-    getNoticeById: (noticeId) => {
-        return get().notices.find((notice) => String(notice.noticeId) === String(noticeId));
-    },
-
-    getAllImagesByNoticeId: async (noticeId) => {
-        try {
-            return await api.getAllImagesByNoticeId(noticeId);
-        } catch (error) {
-            console.error("Error while getting images:", error);
-            return ["https://http.cat/404.jpg"];
-        }
+  notices: [],
+  fetchNotices: async () => {
+    set({ error: null });
+    try {
+      const data = await api.listNotices();
+      set({ notices: data });
+    } catch (error) {
+      set(error);
     }
-}));
+  },
+
+  addNotice: async (notice) => {
+    try {
+      const newNotice = await api.createNotice(notice);
+      set((state) => ({
+        notices: [...state.notices, newNotice],
+      }));
+      return newNotice;
+    } catch (error) {
+      set({ error });
+      return null;
+    }
+  },
+
+  getNoticeById: (noticeId) => {
+    return get().notices.find(
+      (notice) => String(notice.noticeId) === String(noticeId)
+    );
+  },
+
+  getAllImagesByNoticeId: async (noticeId) => {
+    try {
+      return await api.getAllImagesByNoticeId(noticeId);
+    } catch (error) {
+      console.error("Error while getting images:", error);
+      return ["https://http.cat/404.jpg"];
+    }
+  },
+
+  deleteNotice: async (noticeId) => {
+    try {
+      await api.deleteNotice(noticeId);
+      set((state) => ({
+        notices: state.notices.filter((notice) => notice.noticeId !== noticeId),
+      }));
+    } catch (error) {
+      console.error("Error deleting notice:", error);
+    }
+  },
+}));