fix merge

2025-06-09 21:49:07 +02:00
parent a51345fd93
commit a04ef906cd
6 changed files with 246 additions and 351 deletions
--- a/ArtisanConnect/api/categories.jsx
+++ b/ArtisanConnect/api/categories.jsx
@@ -13,6 +13,6 @@ export async function listCategories() {
    });
    return response.data;
  } catch (err) {
-    console.error("Nie udało się pobrać listy kategorii.", err.response.status);
+    // console.error("Nie udało się pobrać listy kategorii.", err.response.status);
  }
 }
--- a/ArtisanConnect/api/client.jsx
+++ b/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(
--- a/ArtisanConnect/app/(tabs)/index.jsx
+++ b/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) {
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/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.");
+    setEmail("");
  };

  const formatDate = (dateString) => {
@@ -118,63 +61,18 @@ export default function NoticeDetails() {
  );

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

  const viewabilityConfig = useRef({
    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);
@@ -202,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"]
+              : { 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);
        }
@@ -220,10 +117,22 @@ export default function NoticeDetails() {
    if (notice) {
      fetchImage();
    }
+  }, [notice]);

-    if (!notice) {
-        return <Text>Nie znaleziono ogłoszenia</Text>;
+  useEffect(() => {
+    const fetchUser = async () => {
+      if (notice && notice.clientId) {
+        setIsUserLoading(true);
+        try {
+          const userData = await getUserById(notice.clientId);
+          setUser(userData);
+        } catch (err) {
+          console.error("Nie udało się pobrać danych użytkownika:", err);
+        } finally {
+          setIsUserLoading(false);
        }
+      }
+    };

    fetchUser();
  }, [notice]);
@@ -233,91 +142,80 @@ 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`}
-          >
+    <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>
-      );
-    }
-
-    return (
-        <Box className={isLandscape ? "h-screen" : "sticky top-0 z-10 bg-white"}>
+      ) : (
+        <Box className="sticky top-0 z-10 bg-white">
          <FlatList
            ref={flatListRef}
            data={images}
            horizontal
-              snapToAlignment="center"
+            snapToInterval={width}
+            snapToAlignment="start"
            decelerationRate="fast"
            showsHorizontalScrollIndicator={false}
            pagingEnabled
            onViewableItemsChanged={onViewableItemsChanged}
            viewabilityConfig={viewabilityConfig}
            renderItem={({ item, index }) => (
-                  <View style={{ width: Dimensions.get("window").width }}>
+              <View style={{ width: width }} className="p-1">
                <Image
-                        source={{ uri: item }}
-                        className={`h-auto w-full rounded-md ${
-                            isLandscape ? "h-full" : "aspect-square"
-                        }`}
+                  source={item}
+                  className="h-auto w-auto rounded-md aspect-[1/1]"
                  alt={`Zdjęcie ${index + 1}`}
-                        resizeMode={isLandscape ? "cover" : "contain"}
-                        onError={(e) => console.error("Image load error:", e.nativeEvent.error)}
+                  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"}
+                    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}>
-            {renderImageSection()}
-            <VStack className="p-4">
-              <Text className="text-sm font-normal mb-2 text-gray-600">
+        <VStack className="p-2">
+          <Text className="text-sm font-normal mb-2 text-typography-700">
            {formatDate(notice.publishDate)}
          </Text>
-              <Text className="text-2xl font-bold mb-2 text-center bg-gray-100 rounded-md p-4">
+          <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-100 rounded-md p-2">
-                <Heading size="md" className="flex-1 text-lg">
-                  <Text className="text-sm text-gray-500">Cena: </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);
@@ -326,59 +224,58 @@ export default function NoticeDetails() {
              <Ionicons
                name={isInWishlist ? "heart" : "heart-outline"}
                size={24}
-                      color="#3b82f6"
+                color={"primary-heading-500"}
              />
            </Pressable>
          </Box>
-              <Box className="mt-4 bg-gray-100 p-3 rounded-lg">
-                <Text className="text-sm text-gray-500">
+          <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-900">{notice.category}</Text>
+              <Text className="font-bold text-gray-950">{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 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-100 p-3 rounded-lg">
-                <Text className="text-sm text-gray-500">Użytkownik:</Text>
+
+          <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">
-                        <Avatar size="md">
-                          <AvatarImage
+                  <Image
                    source={{
                      uri:
-                                    user.image ||
+                        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"
                  />
-                          <AvatarFallbackText>
-                            {user.firstName?.[0]}
-                            {user.lastName?.[0]}
-                          </AvatarFallbackText>
-                        </Avatar>
                </Box>
+
                <Box className="flex-1">
-                        <Text className="text-lg font-bold text-gray-900">
+                  <Text className="text-xl font-bold text-gray-950">
                    {user.firstName} {user.lastName}
                  </Text>
-                        <Text className="text-sm text-gray-700">
+                  <Text className="text-sm text-typography-700">
                    Email: {user.email}
                  </Text>
                  <Pressable
                    onPress={() => setIsMessageFormVisible(true)}
-                            className="mt-3 bg-blue-500 py-2 px-4 rounded-md"
+                    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-lg font-bold text-center text-blue-600 mt-3">
+                    <Text className="text-xl p-3 font-bold text-center text-typography-700 mt-3">
                      Zobacz więcej ogłoszeń od {user.firstName}
                    </Text>
                  </Link>
@@ -396,15 +293,19 @@ export default function NoticeDetails() {
            <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">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>
+            <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
@@ -413,6 +314,7 @@ export default function NoticeDetails() {
              value={message}
              onChangeText={setMessage}
            />
+
            <View className="flex-row justify-end space-x-2">
              <Pressable
                onPress={() => setIsMessageFormVisible(false)}
@@ -420,22 +322,17 @@ export default function NoticeDetails() {
              >
                <Text className="text-gray-800">Anuluj</Text>
              </Pressable>
+
              <Pressable
                onPress={handleSendMessage}
-                        className="bg-blue-500 py-2 px-4 rounded-md"
-                        disabled={isSending}
+                className="bg-primary-500 py-2 px-4 rounded-md"
              >
-                      {isSending ? (
-                          <ActivityIndicator color="#fff" />
-                      ) : (
                <Text className="text-white">Wyślij</Text>
-                      )}
              </Pressable>
            </View>
          </View>
        </View>
      )}
    </Card>
-      </SafeAreaView>
  );
 }
--- a/ArtisanConnect/components/CategorySection.jsx
+++ b/ArtisanConnect/components/CategorySection.jsx
@@ -1,6 +1,5 @@
 import { View, FlatList } from "react-native";
 import { useEffect, useState } from "react";
-import { useAuthStore } from "@/store/authStore";
 import { Heading } from "@/components/ui/heading";
 import { Text } from "@/components/ui/text";
 import { Link } from "expo-router";
@@ -17,7 +16,6 @@ export function CategorySection({ notices, title }) {
        setCategoryMap(data);
      }
    };
-
    fetchCategories();
  }, []);

--- a/ArtisanConnect/store/authStore.jsx
+++ b/ArtisanConnect/store/authStore.jsx
@@ -11,22 +11,23 @@ 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;
-      // }
+      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 Promise.reject(error);
+          }
+        );
+        interceptorInitialized = true;
+      }
      return {
        user_id: null,
        token: null,