Merge remote-tracking branch 'origin/main'

Also added SafeAreView to userid

ArtisanConnect/api/auth.jsx

@@ -0,0 +1,63 @@
+import axios from "axios";
+
+const API_URL = "https://hopp.zikor.pl/api/v1";
+
+export async function login(userData) {
+    try {
+        const response = await axios.post(`${API_URL}/auth/login`, userData, {
+            headers: {"Content-Type": "application/json"},
+        });
+        return response.data;
+    } catch (error) {
+        console.error("Login failed:", error);
+        throw error.response?.data?.message || "Login failed";
+    }
+}
+
+export async function register(userData) {
+    try {
+        const response = await axios.post(`${API_URL}/auth/register`, userData, {
+            headers: {"Content-Type": "application/json"},
+        });
+
+        return response.data;
+    } catch (error) {
+        console.error("Registration failed:", error);
+        throw error.response?.data?.message || "Registration failed";
+    }
+}
+
+export async function googleLogin(googleToken) {
+    try {
+        const response = await axios.post(
+            `${API_URL}/auth/google`,
+            { googleToken: googleToken },
+            {
+                headers: { "Content-Type": "application/json" },
+            }
+        );
+
+        return response.data;
+    } catch (error) {
+        console.error("Google login failed:", error);
+        throw error.response?.data?.message || "Google login failed";
+    }
+}
+
+export async function logout(token) {
+    const headers = token ? { Authorization: `Bearer ${token}` } : {};
+    try {
+        const response = await axios.post(
+            `${API_URL}/auth/logout`,
+            {},
+            {
+                headers: headers,
+            }
+        );
+
+        return response.data;
+    } catch (error) {
+        console.error("Logout failed:", error);
+        throw error.response?.data?.message || "Logout failed";
+    }
+}

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(
@@ -14,3 +19,21 @@ export async function getUserById(userId) {
     throw err;
   }
 }
+
+export async function getAllUsers() {
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
+  try {
+    const response = await axios.get(`${API_URL}/clients/get/all`, {
+      headers: headers,
+    });
+    return response.data;
+  } catch (err) {
+    console.error(
+      `Nie udało się pobrać danych o użytkownikach`,
+      err.response.status
+    );
+    throw err;
+  }
+}

ArtisanConnect/api/email.jsx

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

ArtisanConnect/api/notices.jsx

@@ -2,8 +2,6 @@ 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";
 
 export async function listNotices() {
@@ -14,9 +12,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,16 +31,21 @@ 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: {
+      headers: headers,
-        "Content-Type": "application/json",
-      },
     });
 
     if (response.data.noticeId !== null) {
-      for (const imageUri of notice.image) {
+      for (const image of notice.image) {
-        await uploadImage(response.data.noticeId, imageUri);
+        if (notice.image.indexOf(image) === 0) {
+          await uploadImage(response.data.noticeId, image, true);
+        } else {
+          await uploadImage(response.data.noticeId, image, false);
+        }
+        console.log("Image uploaded successfully");
       }
     }
 
@@ -61,64 +66,70 @@ export async function getImageByNoticeId(noticeId) {
 
     return imageUrl;
   } catch (err) {
-    console.log(`Zdjęcie nie istnieje dla notice o id: ${noticeId}`);
     imageUrl = "https://http.cat/404.jpg";
     return imageUrl;
   }
 }
 
 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(
+      return listResponse.data.map((imageName) => ({
-        (imageName) => `${API_URL}/images/get/${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) => {
+export const uploadImage = async (noticeId, imageObj, isFirst) => {
+  const { token } = useAuthStore.getState();
+  const headers = {
+    ...(token ? { Authorization: `Bearer ${token}` } : {}),
+    "Content-Type": "multipart/form-data",
+  };
   const formData = new FormData();
 
-  const filename = imageUri.split("/").pop();
+  const filename = imageObj.split("/").pop();
 
   const match = /\.(\w+)$/.exec(filename);
   const type = match ? `image/${match[1]}` : "image/jpeg";
 
   formData.append("file", {
-    uri: imageUri,
+    uri: imageObj,
     name: filename,
     type: type,
   });
 
   try {
     const response = await axios.post(
-      `${API_URL}/images/upload/${noticeId}`,
+      `${API_URL}/images/upload/${noticeId}?isMainImage=${isFirst}`,
       formData,
       {
-        headers: {
+        headers: headers,
-          "Content-Type": "multipart/form-data",
-        },
       }
     );
-    console.info("Upload successful:", response.data);
+    console.log("Upload successful:", response.data);
     return response.data;
   } catch (error) {
-    console.log("imageURI:", imageUri);
     console.error(
       "Error uploading image:",
       error.response.data,
@@ -127,3 +138,85 @@ 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: headers }
+    );
+    return response.data;
+  } catch (error) {
+    console.error(
+      "Error deleting notice:",
+      error.response?.data,
+      error.response?.status
+    );
+    throw error;
+  }
+};
+
+export const editNotice = async (noticeId, notice) => {
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
+  try {
+    const response = await axios.put(
+      `${API_URL}/notices/edit/${noticeId}`,
+      {
+        title: notice.title,
+        description: notice.description,
+        price: notice.price,
+        category: notice.category,
+        status: notice.status,
+        attributes: notice.attributes,
+      },
+      {
+        headers: headers,
+      }
+    );
+
+    if (response.data && notice.image && notice.image.length > 0) {
+      for (let i = 0; i < notice.image.length; i++) {
+        const image = notice.image[i];
+        const isFirst = i === 0;
+
+        if (typeof image === "string" && !image.startsWith("http")) {
+          await uploadImage(noticeId, image, isFirst);
+        }
+      }
+    }
+
+    return response.data;
+  } catch (error) {
+    console.error(
+      "Error editing notice:",
+      error.response?.data,
+      error.response?.status
+    );
+    throw error;
+  }
+};
+
+export const deleteImage = async (filename) => {
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
+  try {
+    const response = await axios.delete(
+      `${API_URL}/images/delete/${filename}`,
+      { headers: headers }
+    );
+    return response.data;
+  } catch (error) {
+    console.error(
+      "Error deleting image:",
+      error.response?.data,
+      error.response?.status
+    );
+    throw error;
+  }
+};

ArtisanConnect/api/order.jsx

@@ -0,0 +1,76 @@
+import axios from "axios";
+import { useAuthStore } from "@/store/authStore";
+
+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}` } : {};
+
+  try {
+    const response = await axios.post(
+      `${API_URL}/add`,
+      { 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}` } : {};
+  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: 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: headers });
+    return response.data;
+  } catch (error) {
+    console.error(
+      "Error fetching orders:",
+      error.response?.data,
+      error.response?.status
+    );
+    throw error;
+  }
+}

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";
 
@@ -13,7 +12,7 @@ export async function toggleNoticeStatus(noticeId) {
       `${API_URL}/toggle/${noticeId}`,
       {},
       {
-        headers,
+        headers: headers,
       }
     );
     return response.data;
@@ -28,11 +27,11 @@ export async function getWishlist() {
   const headers = token ? { Authorization: `Bearer ${token}` } : {};
 
   try {
-    const response = await axios.get(`${API_URL}/`, { headers });
+    const response = await axios.get(`${API_URL}/`, { headers: headers });
-    console.log("Wishlist response:", response.data);
     return response.data;
   } catch (error) {
     console.error("Error fetching wishlist:", error);
     throw error;
   }
 }
+``;

ArtisanConnect/app.json

@@ -5,7 +5,7 @@
     "scheme": "com.hamx.artisanconnect",
     "version": "1.0.0",
     "orientation": "portrait",
-    "icon": "./assets/icon.png",
+    "icon": "./assets/AppIco.png",
     "userInterfaceStyle": "light",
     "newArchEnabled": true,
     "splash": {
@@ -18,6 +18,18 @@
       "bundleIdentifier": "com.hamx.artisanconnect"
     },
     "android": {
+      "intentFilters": [
+        {
+          "action": "VIEW",
+          "autoVerify": true,
+          "data": [
+            {
+              "scheme": "com.hamx.artisanconnect"
+            }
+          ],
+          "category": ["BROWSABLE", "DEFAULT"]
+        }
+      ],
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"

ArtisanConnect/app/(auth)/login.jsx

@@ -1,17 +1,17 @@
 import React, {useEffect, useState} from 'react';
-import {StyleSheet, ActivityIndicator, SafeAreaView, View, Platform} from 'react-native';
+import {StyleSheet, ActivityIndicator, SafeAreaView, View, Platform, KeyboardAvoidingView} from 'react-native';
 import {useAuthStore} from '@/store/authStore';
-import {useRouter, Link} from 'expo-router';
+import {useRouter} from 'expo-router';
 
 import {Box} from "@/components/ui/box"
 import {Button, ButtonText, ButtonIcon} from "@/components/ui/button"
 import {Center} from "@/components/ui/center"
 import {Heading} from "@/components/ui/heading"
-import {Input, InputField} from "@/components/ui/input"
+import {Input, InputField, InputIcon, InputSlot} from "@/components/ui/input"
 import {Text} from "@/components/ui/text"
 import {VStack} from "@/components/ui/vstack"
 import {HStack} from "@/components/ui/hstack"
-import {ArrowRightIcon} from "@/components/ui/icon"
+import {ArrowRightIcon, EyeIcon, EyeOffIcon} from "@/components/ui/icon"
 import {Divider} from '@/components/ui/divider';
 import {Ionicons} from "@expo/vector-icons";
 
@@ -30,6 +30,8 @@ WebBrowser.maybeCompleteAuthSession();
 export default function Login() {
     const [email, setEmail] = useState('');
     const [password, setPassword] = useState('');
+    const [emailError, setEmailError] = useState('');
+    const [showPassword, setShowPassword] = useState(false)
     const {signIn, isLoading, signInWithGoogle} = useAuthStore();
     const router = useRouter();
 
@@ -52,6 +54,11 @@ export default function Login() {
             return;
         }
 
+        if (!validateEmail(email)) {
+            setEmailError('Nieprawidłowy format adresu email');
+            return;
+        }
+
         try {
             await signIn(email, password);
             alert(`Zalogowano jako ${email}`);
@@ -73,6 +80,7 @@ export default function Login() {
                 user = await getUserInfo(response.authentication.accessToken)
                 await signInWithGoogle(response.authentication.accessToken);
                 alert(`Zalogowano jako ${user.email}`);
+                router.replace('/');
             }
 
         } else {
@@ -102,6 +110,17 @@ export default function Login() {
         }
     }
 
+    const validateEmail = (email) => {
+        const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+        return emailRegex.test(email);
+    };
+
+    const handleShowPassword = () => {
+        setShowPassword((showState) => {
+            return !showState
+        })
+    }
+
     if (isLoading) {
         return (
             <View style={styles.container}>
@@ -111,6 +130,11 @@ export default function Login() {
     }
 
     return (
+        <KeyboardAvoidingView
+            behavior={Platform.OS === "ios" ? "padding" : "height"}
+            style={{flex: 1}}
+            keyboardVerticalOffset={Platform.OS === "ios" ? 64 : 0}
+        >
             <SafeAreaView style={styles.container}>
                 <Center>
                     <Box className="p-5 max-w-96 border border-background-300 rounded-lg">
@@ -118,7 +142,8 @@ export default function Login() {
                             <Heading className="leading-[30px]">Logowanie</Heading>
                             <Box className="flex flex-row">
                                 {/* <Link href="/registration" asChild> */}
-                                <Button variant="link" size="sm" className="p-0" onPress={() => router.replace("/registration")}>
+                                <Button variant="link" size="sm" className="p-0"
+                                        onPress={() => router.replace("/registration")}>
                                     <ButtonText style={styles.signupbutton}>Nie masz jeszcze konta? Załóz je
                                         tutaj!</ButtonText>
                                     <ButtonIcon className="mr-1" size="md" as={ArrowRightIcon}/>
@@ -127,12 +152,26 @@ export default function Login() {
                             </Box>
                         </VStack>
                         <VStack space="xl" className="py-2">
-                        <Input>
+                            {emailError ? <Text style={styles.errorText}>{emailError}</Text> : null}
-                            <InputField className="py-2" placeholder="Login" onChangeText={setEmail}/>
+                            <Input isRequired={true} isInvalid={!!emailError}>
+                                <InputField className="py-2" inputMode="email" placeholder="Login"
+                                            onChangeText={(text) => {
+                                                setEmail(text);
+                                                if (text && !validateEmail(text)) {
+                                                    setEmailError('Nieprawidłowy format adresu email');
+                                                } else {
+                                                    setEmailError('');
+                                                }
+                                            }}
+                                />
                             </Input>
-                        <Input>
+                            <Input isRequired={true}>
-                            <InputField type="password" className="py-2" placeholder="Hasło"
+                                <InputField type={showPassword ? "text" : "password"} className="py-2"
+                                            placeholder="Hasło"
                                             onChangeText={setPassword}/>
+                                <InputSlot className="pr-3" onPress={handleShowPassword}>
+                                    <InputIcon as={showPassword ? EyeIcon : EyeOffIcon}/>
+                                </InputSlot>
                             </Input>
                         </VStack>
                         <VStack space="lg" className="pt-4">
@@ -154,6 +193,7 @@ export default function Login() {
                     </Box>
                 </Center>
             </SafeAreaView>
+        </KeyboardAvoidingView>
     );
 }
 
@@ -172,7 +212,7 @@ const styles = StyleSheet.create({
     },
     errorText: {
         color: 'red',
-        marginBottom: 10,
+        fontSize: 12,
     },
     signupbutton: {
         fontWeight: '300',

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

@@ -8,12 +8,12 @@ import { ActivityIndicator } from "react-native";
 import { useEffect, useState } from "react";
 import { getUserById } from "@/api/client";
 import { HStack } from "@gluestack-ui/themed";
+import { useAuthStore } from "@/store/authStore";
 
 export default function Account() {
   const [user, setUser] = useState(null);
   const [isLoading, setIsLoading] = useState(true);
-  const currentUserId = 2; // Tymczasowo, do czasu zaimplementowania logowania bo nie moge pobrac usera
+  const currentUserId = useAuthStore((state) => state.user_id);
-
   useEffect(() => {
     const fetchUser = async () => {
       setIsLoading(true);
@@ -38,13 +38,13 @@ export default function Account() {
   }
 
   return (
-    <VStack className="bg-gray-50 flex-1">
+    <VStack className=" flex-1 m-2">
-      <Box className="bg-white pb-6 shadow-sm">
+      <Box className="bg-white p-5 rounded-lg ">
         <Box className="items-center pt-6 mb-4">
           <Image
             source={{
               uri:
-                user.profileImage ||
+                user.image ||
                 "https://th.bing.com/th/id/OIP.3coo_N8sieled8QNroQmkgHaHa?rs=1&pid=ImgDetMain",
             }}
             className="h-24 w-24 rounded-full border-4 border-white shadow-md"
@@ -57,12 +57,12 @@ export default function Account() {
         </Text>
       </Box>
 
-      <Box className="bg-white mt-4 p-5 border-t border-b border-gray-200">
+      <Box className="bg-white mt-4 p-5 rounded-lg">
         <Text className="font-bold text-lg mb-3">Moje dane</Text>
 
         <HStack className="mb-3">
-          <Text className="text-gray-600 w-24">E-mail</Text>
+          <Text className="text-gray-600 w-24">E-mail: </Text>
-          <Text className="flex-1">{user.email || "brak danych"}</Text>
+          <Text className=" text-gray-600 ">{user.email}</Text>
         </HStack>
 
         <Pressable
@@ -73,7 +73,7 @@ export default function Account() {
         </Pressable>
       </Box>
 
-      <Box className="bg-white mt-4 p-5">
+      <Box className="bg-white mt-4 p-5 rounded-lg">
         <Text className="font-bold text-lg mb-3">Moje konto</Text>
 
         <Link href="/dashboard/userNotices" asChild>
@@ -84,7 +84,7 @@ export default function Account() {
         </Link>
 
         {/*Tak dodałem, można zmienić na coś innego*/}
-        <Link href="/dashboard/userPaymentHistory" asChild>
+        <Link href="/dashboard/userOrders" asChild>
           <Pressable className="py-3 flex-row items-center border-b border-gray-100">
             <Text className="text-lg flex-1">Historia płatności</Text>
             <Text>▶</Text>

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

@@ -1,16 +1,34 @@
 import { useNoticesStore } from "@/store/noticesStore";
 import { NoticeCard } from "@/components/NoticeCard";
-import {Button} from "react-native";
+import { Button, ButtonText } from "@/components/ui/button";
+import { usePathname } from "expo-router";
 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 { createOrder, createPayment, getOrder } from "@/api/order";
+import { Ionicons } from "@expo/vector-icons";
+import { useToast, Toast, ToastTitle } from "@/components/ui/toast";
+import { useAuthStore } from "@/store/authStore";
+import * as WebBrowser from "expo-web-browser";
+import { useRouter } from "expo-router";
 
 export default function UserNotices() {
-  const { notices, fetchNotices } = useNoticesStore();
+  const router = useRouter();
+  const pathname = usePathname();
+  const { notices, fetchNotices, deleteNotice } = useNoticesStore();
   const [isLoading, setIsLoading] = useState(true);
-  const currentUserId = 1; // Tymczasowo, do czasu zaimplementowania logowania bo nie moge pobrac usera
+  const [isRedirecting, setIsRedirecting] = useState(false);
+  const toast = useToast();
+  const [toastId, setToastId] = useState(0);
+  const { user_id } = useAuthStore.getState();
+  const currentUserId = user_id;
+  const [orderId, setOrderId] = useState(null);
+
+  useEffect(() => {
+    WebBrowser.maybeCompleteAuthSession();
+  }, []);
 
   useEffect(() => {
     const loadNotices = async () => {
@@ -24,44 +42,165 @@ export default function UserNotices() {
       }
     };
     loadNotices();
-  }, []);
+  }, [pathname, fetchNotices]);
 
-  const userNotices = notices.filter(notice => notice.clientId === currentUserId);
+  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 WebBrowser.openAuthSessionAsync(paymentResult);
+
+            setTimeout(async () => {
+              setIsRedirecting(false);
+
+              try {
+                const lastOrder = await getOrder(result);
+                const lastPayments = lastOrder.payments;
+                const paymentStatus =
+                  lastPayments.length > 0
+                    ? lastPayments[lastPayments.length - 1].status
+                    : null;
+
+                if (paymentStatus === "CORRECT") {
+                  showNewToast("Płatność została zrealizowana.");
+                  await fetchNotices();
+                  router.replace("/notices");
+                } else {
+                  showNewToast("Sprawdzanie statusu płatności...");
+                }
+              } catch (err) {
+                console.log("Błąd podczas sprawdzania płatności:", err);
+                showNewToast("Nie udało się sprawdzić statusu płatności.");
+              }
+            }, 300);
+          } else {
+            console.log(`Nie udało się aktywować ogłoszenia ${noticeId}.`);
+          }
+        } catch (err) {
+          setIsRedirecting(false);
+          console.log("Błąd podczas aktywacji ogłoszenia:", err);
+        }
+      }
+    } catch (err) {
+      console.log("Błąd podczas aktywacji ogłoszenia:", 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-4">
+    <VStack className="p-2">
-        <Text className="text-2xl font-bold mb-4">Moje ogłoszenia</Text>
+      {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={2}
-                columnWrapperStyle={{ marginBottom: 10, justifyContent: "space-between" }}
           renderItem={({ item }) => (
-                    <Box className="flex-1">
+            <Box className="flex-1 mb-4 pb-2 bg-white rounded-lg">
               <NoticeCard notice={item} />
               <Box className="flex-row justify-between mt-2">
+                <Box className="flex-row items-center">
                   <Button
-                            title="Promuj"
+                    className="ml-2"
-                            onPress={() => {
+                    onPress={() => handleDeleteNotice(item.noticeId)}
-                              // TODO: Implementacja promocji ogłoszenia
+                    size="md"
-                              console.log(`Promuj ogłoszenie ${item.noticeId}`);
+                    variant="outline"
-                            }}
+                    action="primary"
-                            className="bg-primary-500 py-2 px-4 rounded-md"
                   >
+                    <ButtonText>Usuń</ButtonText>
+                    <Ionicons name="trash-outline" size={14} />
                   </Button>
+                  {item.status === "INACTIVE" && (
                     <Button
-                            title="Podbij"
+                      className="ml-2"
                       onPress={() => {
-                              // TODO: Implementacja podbicia ogłoszenia
+                        router.replace(`notice/edit/${item.noticeId}`);
-                              console.log(`Podbij ogłoszenie ${item.noticeId}`);
                       }}
-                            className="bg-primary-500 py-2 px-4 rounded-md"
+                      size="md"
+                      variant="outline"
+                      action="primary"
                     >
+                      <ButtonText>Edytuj</ButtonText>
+                      <Ionicons name="pencil" size={14} />
                     </Button>
+                  )}
+                </Box>
+                {item.status === "ACTIVE" ? (
+                  <Button
+                    className="mr-2"
+                    size="md"
+                    variant="solid"
+                    action="primary"
+                    onPress={() => handleOrder(item.noticeId, "BOOST")}
+                  >
+                    <ButtonText>Podbij</ButtonText>
+                    <Ionicons name="arrow-up" size={14} color="#fff" />
+                  </Button>
+                ) : (
+                  <Button
+                    className="mr-2"
+                    size="md"
+                    variant="solid"
+                    action="primary"
+                    onPress={() => handleOrder(item.noticeId, "ACTIVATION")}
+                  >
+                    <ButtonText>Aktywuj</ButtonText>
+                    <Ionicons
+                      name="arrow-redo-outline"
+                      size={14}
+                      color="#fff"
+                    />
+                  </Button>
+                )}
               </Box>
             </Box>
           )}

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

@@ -0,0 +1,49 @@
+import { View, Text } from "react-native";
+import { useState, useEffect, use } from "react";
+import { FlatList, RefreshControl } from "react-native";
+import { listOrders } from "@/api/order";
+import { Box } from "@/components/ui/box";
+import { VStack } from "@/components/ui/vstack";
+import { HStack } from "@/components/ui/hstack";
+
+export default function UserOrders() {
+  const [orders, setOrders] = useState([]);
+
+  useEffect(() => {
+    const fetchOrders = async () => {
+      try {
+        const data = await listOrders();
+        setOrders(data);
+      } catch (err) {}
+    };
+    fetchOrders();
+  }, []);
+
+  if (orders.length === 0) {
+    return (
+      <View style={{ flex: 1, justifyContent: "center", alignItems: "center" }}>
+        <Text>Brak zamówień</Text>
+      </View>
+    );
+  }
+
+  return (
+    <FlatList
+      className="m-2"
+      data={orders}
+      renderItem={({ item }) => (
+        <Box className="p-4 rounded-md bg-white mb-2">
+          <VStack>
+            <HStack>
+              <Text>{item.orderId}</Text>
+              <Text className="ml-2">{item.orderType}</Text>
+            </HStack>
+            <Text className="mt-2">{item.status}</Text>
+            <Text className="mt-2">Cena: {item.amount} zł</Text>
+            <Text className="mt-2">{item.createdAt}</Text>
+          </VStack>
+        </Box>
+      )}
+    />
+  );
+}

ArtisanConnect/app/(tabs)/index.jsx

@@ -1,17 +1,16 @@
-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);
@@ -30,15 +29,15 @@ export default function Home() {
     if (token) {
       fetchNotices();
     }
-  }, [token, fetchNotices]);
+  }, [token]);
 
   const notices = useNoticesStore((state) => state.notices);
-  // console.log("Notices:", notices);
 
-  const latestNotices = [...notices]
+  const activeNotices = notices.filter((notice) => notice.status === "ACTIVE");
+  const latestNotices = [...activeNotices]
     .sort((a, b) => new Date(b.publishDate) - new Date(a.publishDate))
     .slice(0, 6);
-  const recomendedNotices = [...notices]
+  const recomendedNotices = [...activeNotices]
     .sort(() => Math.random() - 0.5)
     .slice(0, 6);
 
@@ -47,13 +46,13 @@ export default function Home() {
       {/* <View>    */}
       <SearchSection />
       <ScrollView showsVerticalScrollIndicator={false}>
-        <CategorySection title="Polecane kategorie" notices={notices} />
+        <CategorySection title="Polecane kategorie" notices={activeNotices} />
         <NoticeSection
           title="Najnowsze ogłoszenia"
           notices={latestNotices}
           ctaLink="/notices?sort=latest"
         />
-        <UserSection title="Popularni sprzedawcy" notices={notices} />
+        <UserSection title="Popularni sprzedawcy" notices={activeNotices} />
         <NoticeSection
           title="Proponowane ogłoszenia"
           notices={recomendedNotices}

ArtisanConnect/app/(tabs)/notice/create.jsx

@@ -1,13 +1,20 @@
 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 { ScrollView } from "@gluestack-ui/themed";
-import * as ImagePicker from 'expo-image-picker';
+import { Box } from "@/components/ui/box";
+import * as ImagePicker from "expo-image-picker";
 import {
   Select,
   SelectTrigger,
@@ -24,6 +31,7 @@ import {ChevronDownIcon} from "@/components/ui/icon";
 import { useNoticesStore } from "@/store/noticesStore";
 import { listCategories } from "@/api/categories";
 import { useRouter } from "expo-router";
+import { attributes } from "@/data/attributesData"; // Assuming you have a separate file for attributes data}
 
 export default function CreateNotice() {
   const router = useRouter();
@@ -35,6 +43,7 @@ export default function CreateNotice() {
   const [image, setImage] = useState([]);
   const [selectItems, setSelectItems] = useState([]);
   const [isLoading, setIsLoading] = useState(false);
+  const [selectedAttributes, setSelectedAttributes] = useState({});
 
   useEffect(() => {
     let isMounted = true;
@@ -46,7 +55,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 +76,8 @@ export default function CreateNotice() {
   const styles = StyleSheet.create({
     container: {
       flex: 1,
-            alignItems: 'center',
+      alignItems: "center",
-            justifyContent: 'center',
+      justifyContent: "center",
     },
     image: {
       width: 100,
@@ -85,27 +94,32 @@ export default function CreateNotice() {
     });
 
     if (!title || !description || !price || !category) {
-            console.log("Error in form");
       return;
     }
-
+    const formattedAttributes = Object.entries(selectedAttributes).map(
+      ([name, value]) => ({
+        name: name,
+        value: value,
+      })
+    );
     setIsLoading(true);
     try {
       const result = await addNotice({
         title: title,
-                clientId: 1,
         description: description,
         price: price,
         category: category,
-                status: "ACTIVE",
+        status: "INACTIVE",
-                image: image
+        image: image,
+        attributes: formattedAttributes,
       });
 
       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 +130,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 +138,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 +153,7 @@ export default function CreateNotice() {
     });
 
     if (!result.canceled) {
-            setImage(result.assets.map(asset => asset.uri));
+      setImage(result.assets.map((asset) => asset.uri));
     }
   };
 
@@ -149,43 +163,62 @@ export default function CreateNotice() {
     setPrice("");
     setCategory("");
     setImage([]);
+    setSelectedAttributes({});
     setError({
       title: false,
       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 (
+    <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>
+                <ButtonText>Wybierz zdjęcia</ButtonText>
-                                Wybierz zdjęcia
-                            </ButtonText>
               </Button>
               <Button onPress={takePicture}>
                 <ButtonText>Zrób zdjęcie</ButtonText>
               </Button>
-                        <Text size="sm"
+              <Text size="sm" bold="true">
-                              bold="true"
+                Pierwsze zdjęcie będzie zdjęciem głównym
-                        >
+              </Text>
-                            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"/>
+                    <Image
+                      key={index}
+                      source={{ uri: img }}
+                      style={styles.image}
+                      className="m-1"
+                    />
                   ))}
                 </VStack>
               )}
             </VStack>
 
             <VStack space="xs">
-                        <Text className="text-typography-500">Tytuł</Text>
+              <Text className="text-typography-500">Tytuł*</Text>
               <Input className="min-w-[250px]" isInvalid={error.title}>
                 <InputField
                   type="text"
@@ -196,7 +229,7 @@ export default function CreateNotice() {
             </VStack>
 
             <VStack space="xs">
-                        <Text className="text-typography-500">Opis</Text>
+              <Text className="text-typography-500">Opis*</Text>
               <Textarea
                 size="md"
                 className="min-w-[250px] "
@@ -211,7 +244,7 @@ export default function CreateNotice() {
             </VStack>
 
             <VStack space="xs">
-                        <Text className="text-typography-500">Cena</Text>
+              <Text className="text-typography-500">Cena*</Text>
               <Input className="min-w-[250px]" isInvalid={error.price}>
                 <InputField
                   type="text"
@@ -221,7 +254,7 @@ export default function CreateNotice() {
               </Input>
             </VStack>
             <VStack space="xs">
-                        <Text className="text-typography-500">Kategoria</Text>
+              <Text className="text-typography-500">Kategoria*</Text>
               <Select
                 onValueChange={(value) => setCategory(value)}
                 isInvalid={error.category}
@@ -235,13 +268,53 @@ export default function CreateNotice() {
                   <SelectContent style={{ maxHeight: 400 }}>
                     <SelectScrollView>
                       {selectItems.map((item) => (
-                                            <SelectItem key={item.value} label={item.label} value={item.value}/>
+                        <SelectItem
+                          key={item.value}
+                          label={item.label}
+                          value={item.value}
+                        />
                       ))}
                     </SelectScrollView>
                   </SelectContent>
                 </SelectPortal>
               </Select>
             </VStack>
+
+            {Object.entries(attributes).map(([label, options]) => (
+              <VStack key={label} space="xs">
+                <Text className="text-typography-500">{label}</Text>
+                <Select
+                  onValueChange={(value) =>
+                    setSelectedAttributes((prev) => ({
+                      ...prev,
+                      [label]: value,
+                    }))
+                  }
+                >
+                  <SelectTrigger variant="outline" size="md">
+                    <SelectInput
+                      placeholder={`Wybierz ${label.toLowerCase()}`}
+                    />
+                    <SelectIcon className="mr-3" as={ChevronDownIcon} />
+                  </SelectTrigger>
+                  <SelectPortal>
+                    <SelectBackdrop />
+                    <SelectContent style={{ maxHeight: 400 }}>
+                      <SelectScrollView>
+                        {options.map((option) => (
+                          <SelectItem
+                            key={option}
+                            label={option}
+                            value={option}
+                          />
+                        ))}
+                      </SelectScrollView>
+                    </SelectContent>
+                  </SelectPortal>
+                </Select>
+              </VStack>
+            ))}
+
             <Button
               className="mt-5 w-full"
               onPress={handleAddNotice}
@@ -252,5 +325,6 @@ export default function CreateNotice() {
           </VStack>
         </FormControl>
       </ScrollView>
+    </KeyboardAvoidingView>
   );
 }

ArtisanConnect/app/(tabs)/notices.jsx

@@ -1,4 +1,10 @@
-import { FlatList, Text, ActivityIndicator, RefreshControl, Dimensions } from "react-native";
+import {
+  FlatList,
+  Text,
+  ActivityIndicator,
+  RefreshControl,
+  Dimensions,
+} from "react-native";
 import { useState, useEffect } from "react";
 import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useNoticesStore } from "@/store/noticesStore";
@@ -11,7 +17,7 @@ import { listCategories } from "@/api/categories";
 import { FormControl, FormControlLabel } from "@/components/ui/form-control";
 import { Input, InputField } from "@/components/ui/input";
 import { HStack } from "@/components/ui/hstack";
-import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
+import { KeyboardAwareScrollView } from "react-native-keyboard-aware-scroll-view";
 import { KeyboardAvoidingView, Platform } from "react-native";
 import {
   Actionsheet,
@@ -33,11 +39,11 @@ import {
   SelectDragIndicator,
   SelectDragIndicatorWrapper,
   SelectItem,
+  SelectScrollView,
 } from "@/components/ui/select";
-import { ScrollView } from "react-native-gesture-handler";
+import { attributes } from "@/data/attributesData";
 
 export default function Notices() {
-    // Hooks
   const { notices, fetchNotices } = useNoticesStore();
   const [refreshing, setRefreshing] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
@@ -46,6 +52,7 @@ export default function Notices() {
   const [showSortSheet, setShowSortSheet] = useState(false);
   const [categories, setCategories] = useState([]);
   const [filteredNotices, setFilteredNotices] = useState([]);
+  const [selectedAttributes, setSelectedAttributes] = useState({});
   const params = useLocalSearchParams();
   const router = useRouter();
 
@@ -56,11 +63,11 @@ export default function Notices() {
         if (Array.isArray(data)) {
           setCategories(data);
         } else {
-                    console.error('listCategories did not return an array:', data);
+          console.error("listCategories did not return an array:", data);
-                    setError(new Error('Invalid categories data'));
+          setError(new Error("Invalid categories data"));
         }
       } catch (error) {
-                console.error('Error fetching select items:', error);
+        console.error("Error fetching select items:", error);
         setError(error);
       }
     };
@@ -72,10 +79,10 @@ export default function Notices() {
   }, []);
 
   useEffect(() => {
-        let result = notices;
+    let result = notices.filter((notice) => notice.status === "ACTIVE");
 
     if (params.category) {
-            result = result.filter(notice => notice.category === params.category);
+      result = result.filter((notice) => notice.category === params.category);
     }
 
     if (params.sort) {
@@ -100,11 +107,10 @@ export default function Notices() {
           return isNaN(priceA) || isNaN(priceB) ? 0 : priceB - priceA;
         });
       }
-
     }
 
     if (params.priceFrom) {
-            result = result.filter(notice => {
+      result = result.filter((notice) => {
         const price = parseFloat(notice.price);
         const priceFrom = parseFloat(params.priceFrom);
         return !isNaN(price) && price >= priceFrom;
@@ -112,32 +118,53 @@ export default function Notices() {
     }
 
     if (params.priceTo) {
-            result = result.filter(notice => {
+      result = result.filter((notice) => {
         const price = parseFloat(notice.price);
         const priceTo = parseFloat(params.priceTo);
         return !isNaN(price) && price <= priceTo;
       });
     }
 
-
     if (params.search) {
       const searchTerm = params.search.toLowerCase();
-            result = result.filter(notice => {
+      result = result.filter((notice) => {
         return notice.title.toLowerCase().includes(searchTerm);
       });
     }
 
+    Object.keys(params).forEach((key) => {
+      if (key.startsWith("attribute_")) {
+        const attributeName = key.replace("attribute_", "");
+        const attributeValue = params[key];
+
+        result = result.filter((notice) =>
+          notice.attributes?.some(
+            (attr) =>
+              attr.name === attributeName && attr.value === attributeValue
+          )
+        );
+      }
+    });
+
     setFilteredNotices(result);
-    }, [notices,
+  }, [
+    notices,
     params.category,
     params.sort,
     params.priceFrom,
     params.priceTo,
-    params.search]);
+    params.search,
-
+    params.attribute_Kolor,
-
+    params.attribute_Materiał,
-    let filterActive = !!params.category || !!params.sort || !!params.priceFrom || !!params.priceTo || !!params.search;
+  ]);
 
+  let filterActive =
+    !!params.category ||
+    !!params.sort ||
+    !!params.priceFrom ||
+    !!params.priceTo ||
+    !!params.search ||
+    Object.keys(params).some((key) => key.startsWith("attribute_"));
 
   const loadData = async () => {
     setIsLoading(true);
@@ -154,33 +181,46 @@ export default function Notices() {
   const handleCategorySelect = (value) => {
     router.replace({
       pathname: "/notices",
-            params: { ...params, category: value }
+      params: { ...params, category: value },
     });
   };
 
   const handlePriceFrom = (value) => {
     router.replace({
       pathname: "/notices",
-            params: { ...params, priceFrom: value }
+      params: { ...params, priceFrom: value },
     });
-    }
+  };
 
   const handlePriceTo = (value) => {
     router.replace({
       pathname: "/notices",
-            params: { ...params, priceTo: value }
+      params: { ...params, priceTo: value },
     });
+  };
+
+  const handleAttributeSelect = (attributeName, value) => {
+    const newParams = { ...params };
+
+    if (value) {
+      newParams[`attribute_${attributeName}`] = value;
     }
 
+    router.replace({
+      pathname: "/notices",
+      params: newParams,
+    });
+  };
+
   const handleClose = () => setShowActionsheet(false);
 
   const handleSort = (value) => {
     router.replace({
       pathname: "/notices",
-            params: { ...params, sort: value }
+      params: { ...params, sort: value },
     });
     setShowSortSheet(false);
-    }
+  };
 
   const onRefresh = async () => {
     setRefreshing(true);
@@ -201,15 +241,26 @@ export default function Notices() {
     return <Text>Nie udało się pobrać listy. {error.message}</Text>;
   }
 
-    const SCREEN_HEIGHT = Dimensions.get('window').height;
+  const SCREEN_HEIGHT = Dimensions.get("window").height;
 
-    const selectedCategory = params.category && categories?.find(
+  const selectedCategory =
-        (cat) => cat.value === params.category
+    (params.category &&
-    ) || null;
+      categories?.find((cat) => cat.value === params.category)) ||
+    null;
 
   return (
     <>
-            <Box style={{ flexDirection: "row", padding: 8, paddingTop: 16, paddingBottom: 16, backgroundColor: "white", alignItems: "center", justifyContent: "space-between" }}>
+      <Box
+        style={{
+          flexDirection: "row",
+          padding: 8,
+          paddingTop: 16,
+          paddingBottom: 16,
+          backgroundColor: "white",
+          alignItems: "center",
+          justifyContent: "space-between",
+        }}
+      >
         <Box style={{ flexDirection: "row", alignItems: "center", gap: 8 }}>
           <Button variant="outline" onPress={() => setShowActionsheet(true)}>
             <ButtonText>Filtruj</ButtonText>
@@ -227,9 +278,11 @@ export default function Notices() {
       </Box>
       <Actionsheet isOpen={showActionsheet} onClose={handleClose}>
         <ActionsheetBackdrop />
-                <ActionsheetContent  style={{ maxHeight: SCREEN_HEIGHT * 0.6, width: '100%' }} >
+        <ActionsheetContent
+          style={{ maxHeight: SCREEN_HEIGHT * 0.6, width: "100%" }}
+        >
           <KeyboardAwareScrollView
-      contentContainerStyle={{ flexGrow: 1, width: '100%' }}
+            contentContainerStyle={{ flexGrow: 1, width: "100%" }}
             enableOnAndroid={true}
             extraScrollHeight={40}
           >
@@ -238,24 +291,22 @@ export default function Notices() {
             </ActionsheetDragIndicatorWrapper>
             <Box className="mb-4" style={{ width: "100%" }}>
               <HStack space="md" style={{ width: "100%" }}>
-                            <FormControl
+                <FormControl style={{ flex: 1 }}>
-                                style={{ flex: 1 }}>
                   <Input>
                     <InputField
                       keyboardType="numeric"
                       placeholder="Od:"
-                                        value={params.priceFrom || ''}
+                      value={params.priceFrom || ""}
                       onChangeText={handlePriceFrom}
                     />
                   </Input>
                 </FormControl>
-                            <FormControl
+                <FormControl style={{ flex: 1 }}>
-                                style={{ flex: 1 }}>
                   <Input>
                     <InputField
                       keyboardType="numeric"
                       placeholder="Do:"
-                                        value={params.priceTo || ''}
+                      value={params.priceTo || ""}
                       onChangeText={handlePriceTo}
                     />
                   </Input>
@@ -265,7 +316,7 @@ export default function Notices() {
             <Box className="mb-4" style={{ flex: 1 }}>
               <Select
                 style={{ flex: 1 }}
-                            selectedValue={params.category || ''}
+                selectedValue={params.category || ""}
                 onValueChange={handleCategorySelect}
               >
                 <SelectTrigger variant="outline" size="md">
@@ -274,63 +325,109 @@ export default function Notices() {
                     placeholder="Wybierz kategorię"
                     value={selectedCategory ? selectedCategory.label : ""}
                   />
-                                <SelectIcon style={{ marginRight: 12 }} as={ChevronDownIcon} />
+                  <SelectIcon
+                    style={{ marginRight: 12 }}
+                    as={ChevronDownIcon}
+                  />
                 </SelectTrigger>
                 <SelectPortal>
                   <SelectBackdrop />
-                                <SelectContent
+                  <SelectContent style={{ maxHeight: SCREEN_HEIGHT * 0.6 }}>
-                                    style={{ maxHeight: SCREEN_HEIGHT * 0.6}}
-                                >
                     <SelectDragIndicatorWrapper>
                       <SelectDragIndicator />
                     </SelectDragIndicatorWrapper>
                     <FlatList
-                                        style={{ width: '100%' }}
+                      style={{ width: "100%" }}
                       data={categories}
-                                        keyExtractor={(item) => item.value?.toString() || item.id?.toString() || Math.random().toString()}
+                      keyExtractor={(item) =>
+                        item.value?.toString() ||
+                        item.id?.toString() ||
+                        Math.random().toString()
+                      }
                       renderItem={({ item }) => (
-                                            <SelectItem
+                        <SelectItem label={item.label} value={item.value} />
-                                                label={item.label}
-                                                value={item.value}
-                                            />
                       )}
                     />
                   </SelectContent>
                 </SelectPortal>
               </Select>
             </Box>
+            <Box>
+              {Object.entries(attributes).map(([label, options]) => (
+                <Box className="mb-4" key={label}>
+                  {/* <Text className="text-typography-500">{label}</Text> */}
+                  <Select
+                    style={{ flex: 1 }}
+                    onValueChange={(value) =>
+                      handleAttributeSelect(label, value)
+                    }
+                  >
+                    <SelectTrigger variant="outline" size="md">
+                      <SelectInput
+                        style={{ flex: 1 }}
+                        placeholder={`Wybierz ${label.toLowerCase()}`}
+                        value={params[`attribute_${label}`] || ""}
+                      />
+                      <SelectIcon className="mr-3" as={ChevronDownIcon} />
+                    </SelectTrigger>
+                    <SelectPortal>
+                      <SelectBackdrop />
+                      <SelectContent style={{ maxHeight: 400 }}>
+                        <SelectScrollView>
+                          {options.map((option) => (
+                            <SelectItem
+                              key={option}
+                              label={option}
+                              value={option}
+                            />
+                          ))}
+                        </SelectScrollView>
+                      </SelectContent>
+                    </SelectPortal>
+                  </Select>
+                </Box>
+              ))}
+            </Box>
           </KeyboardAwareScrollView>
         </ActionsheetContent>
       </Actionsheet>
-            <Actionsheet isOpen={showSortSheet} onClose={() => setShowSortSheet(false)}>
+      <Actionsheet
+        isOpen={showSortSheet}
+        onClose={() => setShowSortSheet(false)}
+      >
         <ActionsheetBackdrop />
         <ActionsheetContent>
           <ActionsheetDragIndicatorWrapper>
             <ActionsheetDragIndicator />
           </ActionsheetDragIndicatorWrapper>
           <ActionsheetItem
-                    className={ !params.sort ? 'bg-gray-200' : ''}
+            className={!params.sort ? "bg-gray-200" : ""}
-                    onPress={() => handleSort()}>
+            onPress={() => handleSort()}
+          >
             <ActionsheetItemText>Trafność</ActionsheetItemText>
           </ActionsheetItem>
           <ActionsheetItem
-                     className={ params.sort == 'latest' ? 'bg-gray-200' : ''}
+            className={params.sort == "latest" ? "bg-gray-200" : ""}
-                    onPress={() => handleSort('latest')}>
+            onPress={() => handleSort("latest")}
+          >
             <ActionsheetItemText>Najnowsze</ActionsheetItemText>
           </ActionsheetItem>
           <ActionsheetItem
-                     className={ params.sort == 'oldest' ? 'bg-gray-200' : ''}
+            className={params.sort == "oldest" ? "bg-gray-200" : ""}
-                    onPress={() => handleSort('oldest')}>
+            onPress={() => handleSort("oldest")}
+          >
             <ActionsheetItemText>Najstarsze</ActionsheetItemText>
           </ActionsheetItem>
           <ActionsheetItem
-                     className={ params.sort == 'cheapest' ? 'bg-gray-200' : ''}
+            className={params.sort == "cheapest" ? "bg-gray-200" : ""}
-                     onPress={() => handleSort('cheapest')}>
+            onPress={() => handleSort("cheapest")}
+          >
             <ActionsheetItemText>Najtańsze</ActionsheetItemText>
           </ActionsheetItem>
           <ActionsheetItem
-                     className={ params.sort == 'expensive' ? 'bg-gray-200' : ''}
+            className={params.sort == "expensive" ? "bg-gray-200" : ""}
-                    onPress={() => handleSort('expensive')}>
+            onPress={() => handleSort("expensive")}
+          >
             <ActionsheetItemText>Najdroższe</ActionsheetItemText>
           </ActionsheetItem>
         </ActionsheetContent>
@@ -338,6 +435,9 @@ export default function Notices() {
       <FlatList
         data={filteredNotices}
         numColumns={2}
+        // numColumns={2}
+        // columnContainerClassName="m-2"
+        columnWrapperClassName="m-2"
         columnWrapperStyle={{ gap: 8, marginHorizontal: 8 }}
         contentContainerStyle={{ paddingBottom: 16 }}
         renderItem={({ item }) => <NoticeCard notice={item} />}

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(() => {
+  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/_layout.jsx

@@ -1,4 +1,4 @@
-import { Stack, Redirect } from "expo-router";
+import {Stack} from "expo-router";
 import "@/global.css";
 import {GluestackUIProvider} from "@/components/ui/gluestack-ui-provider";
 import {QueryClient, QueryClientProvider} from "@tanstack/react-query";
@@ -17,6 +17,7 @@ return (
                     }}
                 >
                     <Stack.Screen name="(tabs)" options={{headerShown: false}}/>
+                    {/*<Stack.Screen name="user" options={{headerShown: false}}/>*/}
                     <Stack.Screen
                         name="(auth)/login"
                         options={{headerShown: false}}/>

ArtisanConnect/app/notice/[id].jsx

@@ -1,25 +1,37 @@
-import { Link, Stack, useLocalSearchParams } from "expo-router";
+import { Stack, useLocalSearchParams } from "expo-router";
+import { KeyboardAvoidingView, Platform } from "react-native";
 import { Box } from "@/components/ui/box";
 import { Card } from "@/components/ui/card";
 import { Heading } from "@/components/ui/heading";
+import { useRouter } from "expo-router";
 import { Image } from "@/components/ui/image";
 import { Text } from "@/components/ui/text";
 import { VStack } from "@/components/ui/vstack";
 import { Ionicons } from "@expo/vector-icons";
+import {
+  Avatar,
+  AvatarImage,
+  AvatarFallbackText,
+} from "@/components/ui/avatar";
 import {
   ActivityIndicator,
   Dimensions,
   FlatList,
   View,
   TextInput,
+  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";
-const { width } = Dimensions.get("window");
+import { useAuthStore } from "@/store/authStore";
+import { sendEmail } from "@/api/email";
+// import { Button } from "@gluestack-ui/themed";
+import { Button, ButtonText } from "@/components/ui/button";
+import { SafeAreaView } from "react-native-safe-area-context";
 
 export default function NoticeDetails() {
   const { id } = useLocalSearchParams();
@@ -30,20 +42,78 @@ 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 [Email, setEmail] = useState("");
+  const [isSending, setIsSending] = useState(false);
-  const handleSendMessage = () => {
+  const router = useRouter();
-    console.log("Wiadomość do:", user?.email);
-    console.log("Email nadawcy:", Email);
-    console.log("Treść:", message);
 
+  const { width } = Dimensions.get("window");
+
+  const handleSendMessage = async () => {
+    setIsSending(true);
+
+    const { user_id, token } = useAuthStore.getState();
+
+    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 {
+      const currentUser = await getUserById(user_id);
+      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;
+      }
+    } 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,
+    };
+
+    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) {
       setIsMessageFormVisible(false);
       setMessage("");
-    setEmail("");
+      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);
   };
 
   const formatDate = (dateString) => {
@@ -61,7 +131,7 @@ 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) {
@@ -73,6 +143,51 @@ 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);
@@ -103,11 +218,11 @@ export default function NoticeDetails() {
           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);
-          setImage("https://http.cat/404.jpg");
+          setImages({ uri: "https://http.cat/404.jpg" });
         } finally {
           setIsImageLoading(false);
         }
@@ -150,10 +265,12 @@ export default function NoticeDetails() {
   }
 
   return (
+    <SafeAreaView className="flex-1" edges={["right", "bottom", "left"]}>
       <Card className="p-0 rounded-lg m-3 flex-1">
         <Stack.Screen
           options={{
             title: notice.title,
+            headerShown: !isLandscape,
           }}
         />
         {isImageLoading ? (
@@ -161,24 +278,54 @@ export default function NoticeDetails() {
             <ActivityIndicator size="large" color="#3b82f6" />
           </Box>
         ) : (
-        <Box className="sticky top-0 z-10 bg-white">
+          <Box
+            className="sticky top-0 z-10 bg-white"
+            style={
+              isLandscape
+                ? {
+                    position: "absolute",
+                    top: 0,
+                    left: 0,
+                    right: 0,
+                    bottom: 0,
+                    zIndex: 30,
+                  }
+                : {}
+            }
+          >
             <FlatList
               ref={flatListRef}
               data={images}
               horizontal
-            snapToAlignment="center"
+              snapToAlignment="start"
+              snapToInterval={width}
               decelerationRate="fast"
               showsHorizontalScrollIndicator={false}
               pagingEnabled
               onViewableItemsChanged={onViewableItemsChanged}
               viewabilityConfig={viewabilityConfig}
+              style={isLandscape ? { flex: 1 } : {}}
               renderItem={({ item, index }) => (
-              <View style={{ width: width }}>
+                <View style={{ width: width }} className="p-1">
                   <Image
-                  source={{ uri: item }}
+                    source={item}
-                  className="h-auto w-full rounded-md aspect-square"
+                    // className="h-auto w-auto rounded-md aspect-[1/1]"
                     alt={`Zdjęcie ${index + 1}`}
-                  resizeMode="contain"
+                    resizeMode="cover"
+                    renderMode="contain"
+                    className={
+                      isLandscape
+                        ? "w-auto h-full"
+                        : "h-auto w-auto rounded-md aspect-[1/1]"
+                    }
+                    style={
+                      isLandscape
+                        ? {
+                            resizeMode: "contain",
+                          }
+                        : {}
+                    }
+                    // resizeMode={isLandscape ? "cover" : "contain"}
                   />
                 </View>
               )}
@@ -205,7 +352,7 @@ export default function NoticeDetails() {
             <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">
+            <Text className="text-2xl text-gray-950 font-bold mb-2 text-left bg-gray-50 rounded-md p-2">
               {notice.title}
             </Text>
 
@@ -230,9 +377,26 @@ export default function NoticeDetails() {
             <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 className="font-bold text-gray-950">
+                  {notice.category}
+                </Text>
               </Text>
             </Box>
+            {notice.attributes && notice.attributes.length > 0 && (
+              <Box className="mt-4 bg-gray-50 p-3 rounded-lg shadow-sm">
+                {notice.attributes.map((attribute, index) => (
+                  <Text
+                    key={index}
+                    className="text-sm text-typography-500 mb-1"
+                  >
+                    {attribute.name}:{" "}
+                    <Text className="font-bold text-gray-950">
+                      {attribute.value}
+                    </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">
@@ -247,15 +411,20 @@ export default function NoticeDetails() {
               ) : user ? (
                 <>
                   <Box className="mr-4">
-                  <Image
+                    <Avatar size="md">
+                      <AvatarImage
                         source={{
                           uri:
-                        user.profileImage ||
+                            user.image ||
                             "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">
@@ -273,11 +442,16 @@ export default function NoticeDetails() {
                         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">
+                    <Button
+                      variant="outline"
+                      className="mt-2"
+                      onPress={() => router.replace(`/user/${notice.clientId}`)}
+                    >
+                      <ButtonText>
                         Zobacz więcej ogłoszeń od {user.firstName}
-                    </Text>
+                      </ButtonText>
-                  </Link>
+                    </Button>
                   </Box>
                 </>
               ) : (
@@ -287,8 +461,12 @@ export default function NoticeDetails() {
           </VStack>
         </ScrollView>
         {isMessageFormVisible && (
-        <View className="absolute inset-0 bg-black bg-opacity-50 justify-center items-center z-20">
+          <KeyboardAvoidingView
-          <View className="bg-white p-4 rounded-lg w-4/5">
+            behavior={Platform.OS === "ios" ? "padding" : "height"}
+            className="absolute inset-0 bg-black/50 justify-center items-center z-20"
+          >
+            <View className="bg-white p-4 rounded-lg w-4/5 max-h-4/5">
+              <ScrollView showsVerticalScrollIndicator={false}>
                 <Text className="text-lg font-bold mb-4">
                   Wyślij wiadomość do {user?.firstName}
                 </Text>
@@ -297,13 +475,11 @@ export default function NoticeDetails() {
                 <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>
+                <Text className="text-sm font-medium mb-1">Temat:</Text>
-            <TextInput
+                <Text className="bg-gray-100 p-3 rounded text-gray-500">
-              className="border border-gray-300 p-2 rounded"
+                  Zapytanie o ogłoszenie '
-              placeholder="Wpisz swój adres e-mail"
+                  {notice.title || "Brak nazwy ogłoszenia"}'
-              value={Email}
+                </Text>
-              onChangeText={setEmail}
-            />
 
                 <TextInput
                   className="border border-gray-300 rounded-md p-2 mb-4 h-32 text-left"
@@ -324,14 +500,21 @@ export default function NoticeDetails() {
 
                   <Pressable
                     onPress={handleSendMessage}
-                className="bg-primary-500 py-2 px-4 rounded-md"
+                    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>
+              </ScrollView>
             </View>
-        </View>
+          </KeyboardAvoidingView>
         )}
       </Card>
+    </SafeAreaView>
   );
 }

ArtisanConnect/app/notice/edit/[id].jsx

@@ -0,0 +1,389 @@
+import { useState, useEffect } from "react";
+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 { Box } from "@/components/ui/box";
+import * as ImagePicker from "expo-image-picker";
+import {
+  Select,
+  SelectTrigger,
+  SelectInput,
+  SelectIcon,
+  SelectPortal,
+  SelectBackdrop,
+  SelectContent,
+  SelectItem,
+  SelectScrollView,
+} from "@/components/ui/select";
+
+import { ChevronDownIcon } from "@/components/ui/icon";
+import { useNoticesStore } from "@/store/noticesStore";
+import { listCategories } from "@/api/categories";
+import { useRouter } from "expo-router";
+import { attributes } from "@/data/attributesData";
+import { useLocalSearchParams, Stack } from "expo-router";
+import { Ionicons } from "@expo/vector-icons";
+
+export default function EditNotice() {
+  const { id } = useLocalSearchParams();
+  const router = useRouter();
+  const { editNotice, fetchNotices, notices } = useNoticesStore();
+  const [title, setTitle] = useState("");
+  const [description, setDescription] = useState("");
+  const [price, setPrice] = useState("");
+  const [category, setCategory] = useState("");
+  const [image, setImage] = useState([]);
+  const [isImageLoading, setIsImageLoading] = useState(true);
+  const [selectItems, setSelectItems] = useState([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const [selectedAttributes, setSelectedAttributes] = useState({});
+  const { getNoticeById, getAllImagesByNoticeId } = useNoticesStore();
+
+  useEffect(() => {
+    let isMounted = true;
+    const fetchSelectItems = async () => {
+      try {
+        let data = await listCategories();
+        if (isMounted && Array.isArray(data)) {
+          setSelectItems(data);
+        }
+      } catch (error) {
+        console.error("Error fetching select items:", error);
+      }
+    };
+
+    fetchSelectItems();
+
+    return () => {
+      isMounted = false;
+    };
+  }, []);
+
+  useEffect(() => {
+    const notice = notices.find((notice) => notice.noticeId == id);
+    if (notice) {
+      setTitle(notice.title || "");
+      setDescription(notice.description || "");
+      setPrice(notice.price?.toString() || "");
+      setCategory(notice.category || "");
+
+      if (notice.attributes && Array.isArray(notice.attributes)) {
+        const attributesObj = {};
+        notice.attributes.forEach((attr) => {
+          attributesObj[attr.name] = attr.value;
+        });
+        setSelectedAttributes(attributesObj);
+      }
+    }
+
+    const fetchImage = async () => {
+      setIsImageLoading(true);
+      try {
+        const fetchedImages = await getAllImagesByNoticeId(notice.noticeId);
+        if (fetchedImages && fetchedImages.length > 0) {
+          setImage(fetchedImages);
+        } else {
+          setImage([]);
+        }
+      } catch (err) {
+        console.error("Error while loading images:", err);
+        setImage([]);
+      } finally {
+        setIsImageLoading(false);
+      }
+    };
+
+    if (notice) {
+      fetchImage();
+    }
+  }, [notices, id]);
+
+  const [error, setError] = useState({
+    title: false,
+    description: false,
+    price: false,
+    category: false,
+  });
+
+  const styles = StyleSheet.create({
+    container: {
+      flex: 1,
+      alignItems: "center",
+      justifyContent: "center",
+    },
+    image: {
+      width: 100,
+      height: 100,
+    },
+  });
+
+  const handleEditNotice = async () => {
+    setError({
+      title: !title,
+      description: !description,
+      price: !price,
+      category: !category,
+    });
+
+    if (!title || !description || !price || !category) {
+      console.log("Error in form");
+      return;
+    }
+    const formattedAttributes = Object.entries(selectedAttributes).map(
+      ([name, value]) => ({
+        name: name,
+        value: value,
+      })
+    );
+    setIsLoading(true);
+    try {
+      const result = await editNotice(id, {
+        title: title,
+        description: description,
+        price: price,
+        category: category,
+        status: "INACTIVE",
+        image: image,
+        attributes: formattedAttributes,
+      });
+
+      if (result) {
+        await fetchNotices();
+
+        router.push("/(tabs)/dashboard/userNotices");
+      }
+    } catch (error) {
+      console.error("Error editing notice. Error message: ", error.message);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  const takePicture = async () => {
+    const { status } = await ImagePicker.requestCameraPermissionsAsync();
+    if (status !== "granted") {
+      return;
+    }
+    const result = await ImagePicker.launchCameraAsync({
+      allowsEditing: false,
+    });
+
+    if (!result.canceled && result.assets) {
+      setImage(result.assets.map((asset) => asset.uri));
+    }
+  };
+
+  const pickImage = async () => {
+    let result = await ImagePicker.launchImageLibraryAsync({
+      mediaTypes: "images",
+      selectionLimit: 8,
+      allowsEditing: false,
+      allowsMultipleSelection: true,
+      aspect: [4, 3],
+      quality: 0.5,
+    });
+
+    if (!result.canceled) {
+      setImage(result.assets.map((asset) => asset.uri));
+    }
+  };
+
+  if (isLoading) {
+    return (
+      <Box className="items-center justify-center flex-1">
+        <ActivityIndicator size="large" color="#787878" />
+        <Text size="md" bold="true" className="mt-5">
+          Edytuj ogłoszenie...
+        </Text>
+      </Box>
+    );
+  }
+
+  return (
+    <KeyboardAvoidingView
+      behavior={Platform.OS === "ios" ? "padding" : "height"}
+      style={{ flex: 1 }}
+      keyboardVerticalOffset={Platform.OS === "ios" ? 64 : 0}
+    >
+      <Stack.Screen
+        options={{
+          title: "Edycja",
+          headerLeft: () => (
+            <Button
+              variant="link"
+              size="sm"
+              onPress={() => router.replace("/(tabs)/dashboard/userNotices")}
+              className="mr-2"
+            >
+              <Ionicons name="arrow-back" size={24} color="#1c1c1e" />
+              <ButtonText className="text-typography-900">Wróć</ButtonText>
+            </Button>
+          ),
+        }}
+      />
+      <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) => {
+                    const imageSource =
+                      typeof img === "string" ? { uri: img } : img;
+
+                    return (
+                      <Image
+                        key={index}
+                        source={imageSource}
+                        style={styles.image}
+                        className="m-1"
+                        onError={(error) =>
+                          console.log(`Image ${index} error:`, error)
+                        }
+                      />
+                    );
+                  })}
+                </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}
+                selectedValue={category || ""}
+              >
+                <SelectTrigger variant="outline" size="md">
+                  <SelectInput
+                    placeholder="Wybierz kategorię"
+                    value={
+                      selectItems.find((item) => item.value === category)
+                        ?.label || ""
+                    }
+                  />
+                  <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>
+
+            {Object.entries(attributes).map(([label, options]) => (
+              <VStack key={label} space="xs">
+                <Text className="text-typography-500">{label}</Text>
+                <Select
+                  selectedValue={selectedAttributes[label] || ""}
+                  onValueChange={(value) =>
+                    setSelectedAttributes((prev) => ({
+                      ...prev,
+                      [label]: value,
+                    }))
+                  }
+                >
+                  <SelectTrigger variant="outline" size="md">
+                    <SelectInput
+                      placeholder={`Wybierz ${label.toLowerCase()}`}
+                    />
+                    <SelectIcon className="mr-3" as={ChevronDownIcon} />
+                  </SelectTrigger>
+                  <SelectPortal>
+                    <SelectBackdrop />
+                    <SelectContent style={{ maxHeight: 400 }}>
+                      <SelectScrollView>
+                        {options.map((option) => (
+                          <SelectItem
+                            key={option}
+                            label={option}
+                            value={option}
+                          />
+                        ))}
+                      </SelectScrollView>
+                    </SelectContent>
+                  </SelectPortal>
+                </Select>
+              </VStack>
+            ))}
+
+            <Button
+              className="mt-5 w-full"
+              onPress={handleEditNotice}
+              disabled={isLoading}
+            >
+              <ButtonText className="text-typography-0">Edytuj</ButtonText>
+            </Button>
+          </VStack>
+        </FormControl>
+      </ScrollView>
+    </KeyboardAvoidingView>
+  );
+}

ArtisanConnect/app/registration.jsx

@@ -1,22 +1,24 @@
 import React, {useState} from 'react';
-import {StyleSheet, ActivityIndicator, SafeAreaView, View} from 'react-native';
+import {StyleSheet, ActivityIndicator, SafeAreaView, View, Platform, KeyboardAvoidingView} from 'react-native';
 import {useAuthStore} from '@/store/authStore';
 import {useRouter} from 'expo-router';
 
 import {Box} from "@/components/ui/box"
 import {Button, ButtonText, ButtonIcon} from "@/components/ui/button"
-import {ArrowRightIcon} from "@/components/ui/icon"
+import {ArrowRightIcon, EyeIcon, EyeOffIcon} from "@/components/ui/icon"
 import {Center} from "@/components/ui/center"
 import {Heading} from "@/components/ui/heading"
-import {Input, InputField} from "@/components/ui/input"
+import {Input, InputField, InputIcon, InputSlot} from "@/components/ui/input"
 import {VStack} from "@/components/ui/vstack"
-import {Link} from "expo-router"
+import {Text} from "@/components/ui/text";
 
 export default function Registration() {
     const [email, setEmail] = useState('');
     const [password, setPassword] = useState('');
     const [firstName, setFirstName] = useState('');
     const [lastName, setLastName] = useState('');
+    const [emailError, setEmailError] = useState('');
+    const [showPassword, setShowPassword] = useState(false)
     const {signUp, isLoading} = useAuthStore();
     const router = useRouter();
 
@@ -26,6 +28,11 @@ export default function Registration() {
             return;
         }
 
+        if (!validateEmail(email)) {
+            setEmailError('Nieprawidłowy format adresu email');
+            return;
+        }
+
         try {
             await signUp({email, password, firstName, lastName});
             alert(`Zalogowano jako ${email}`);
@@ -35,6 +42,17 @@ export default function Registration() {
         }
     }
 
+    const validateEmail = (email) => {
+        const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+        return emailRegex.test(email);
+    };
+
+    const handleShowPassword = () => {
+        setShowPassword((showState) => {
+            return !showState
+        })
+    }
+
     if (isLoading) {
         return (
             <View style={styles.container}>
@@ -44,6 +62,11 @@ export default function Registration() {
     }
 
     return (
+        <KeyboardAvoidingView
+            behavior={Platform.OS === "ios" ? "padding" : "height"}
+            style={{flex: 1}}
+            keyboardVerticalOffset={Platform.OS === "ios" ? 64 : 0}
+        >
             <SafeAreaView style={styles.container}>
                 <Center>
 
@@ -52,7 +75,8 @@ export default function Registration() {
                             <Heading className="leading-[30px]">Rejestracja</Heading>
                             <Box className="flex flex-row">
                                 {/* <Link href="/login" asChild> */}
-                                <Button variant="link" size="sm" className="p-0" onPress={() => router.replace("/login")}>
+                                <Button variant="link" size="sm" className="p-0"
+                                        onPress={() => router.replace("/login")}>
                                     <ButtonText style={styles.signupbutton}>Masz już konto? Zaloguj się!</ButtonText>
                                     <ButtonIcon className="mr-1" size="md" as={ArrowRightIcon}/>
                                 </Button>
@@ -60,18 +84,32 @@ export default function Registration() {
                             </Box>
                         </VStack>
                         <VStack space="xl" className="py-2">
-                        <Input>
+                            {emailError ? <Text className="m-0 color-red-600">{emailError}</Text> : null}
-                            <InputField type="email" className="py-2" placeholder="E-mail" onChangeText={setEmail}/>
+                            <Input isRequired={true}>
+                                <InputField type="email" className="py-2" placeholder="E-mail"
+                                            onChangeText={(text) => {
+                                                setEmail(text);
+                                                if (text && !validateEmail(text)) {
+                                                    setEmailError('Nieprawidłowy format adresu email');
+                                                } else {
+                                                    setEmailError('');
+                                                }
+                                            }}
+                                />
                             </Input>
-                        <Input>
+                            <Input isRequired={true}>
                                 <InputField className="py-2" placeholder="Imię" onChangeText={setFirstName}/>
                             </Input>
-                        <Input>
+                            <Input isRequired={true}>
                                 <InputField className="py-2" placeholder="Nazwisko" onChangeText={setLastName}/>
                             </Input>
-                        <Input>
+                            <Input isRequired={true}>
-                            <InputField type="password" className="py-2" placeholder="Hasło"
+                                <InputField type={showPassword ? "text" : "password"} className="py-2"
+                                            placeholder="Hasło"
                                             onChangeText={setPassword}/>
+                                <InputSlot className="pr-3" onPress={handleShowPassword}>
+                                    <InputIcon as={showPassword ? EyeIcon : EyeOffIcon}/>
+                                </InputSlot>
                             </Input>
                         </VStack>
                         <VStack space="lg" className="pt-4">
@@ -83,6 +121,7 @@ export default function Registration() {
 
                 </Center>
             </SafeAreaView>
+        </KeyboardAvoidingView>
     );
 }
 

ArtisanConnect/app/user/[userId].jsx

@@ -1,6 +1,6 @@
-import { useLocalSearchParams } from "expo-router";
+import { useLocalSearchParams, Stack } from "expo-router";
 import { useState, useEffect } from "react";
-import { FlatList, ActivityIndicator, Text } from "react-native";
+import {FlatList, ActivityIndicator, Text, SafeAreaView} from "react-native";
 import { Box } from "@/components/ui/box";
 import { Image } from "@/components/ui/image";
 import { VStack } from "@/components/ui/vstack";
@@ -39,13 +39,25 @@ export default function UserProfile() {
     return <Text>Nie znaleziono użytkownika</Text>;
   }
 
-    const userNotices = notices.filter(notice => notice.clientId === Number(userId));
+  const userNotices = notices.filter(
+    (notice) => notice.clientId === Number(userId)
+  );
 
   return (
+      <SafeAreaView className="flex-1" edges={['right', 'bottom', 'left']}>
     <VStack className="p-4">
+      <Stack.Screen
+        options={{
+          title: "Ogłoszenia użytkownika",
+        }}
+      />
       <Box className="flex-row items-center mb-4">
         <Image
-                    source={{ uri: user.profileImage || "https://th.bing.com/th/id/OIP.3coo_N8sieled8QNroQmkgHaHa?rs=1&pid=ImgDetMain" }}
+          source={{
+            uri:
+              user.image ||
+              "https://th.bing.com/th/id/OIP.3coo_N8sieled8QNroQmkgHaHa?rs=1&pid=ImgDetMain",
+          }}
           className="h-16 w-16 rounded-full mr-4"
           alt="Zdjęcie profilowe"
         />
@@ -57,7 +69,11 @@ export default function UserProfile() {
         <FlatList
           data={userNotices}
           numColumns={2}
-                    columnWrapperStyle={{ marginBottom: 10, justifyContent: "space-between" }}
+          columnWrapperStyle={{
+            marginBottom: 10,
+            justifyContent: "space-between",
+            gap: 8,
+          }}
           renderItem={({ item }) => <NoticeCard notice={item} />}
           keyExtractor={(item) => item.noticeId.toString()}
         />
@@ -65,5 +81,6 @@ export default function UserProfile() {
         <Text>Ten użytkownik nie ma żadnych ogłoszeń.</Text>
       )}
     </VStack>
+      </SafeAreaView>
   );
 }

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

@@ -14,9 +14,13 @@ import {useEffect, useState} from "react";
 export function NoticeCard({notice}) {
     const noticeId = notice?.noticeId;
 
-    const toggleNoticeInWishlist = useWishlist((state) => state.toggleNoticeInWishlist);
+    const toggleNoticeInWishlist = useWishlist(
+        (state) => state.toggleNoticeInWishlist
+    );
     const isInWishlist = useWishlist((state) =>
-        noticeId ? state.wishlistNotices.some((item) => item.noticeId === noticeId) : false
+        noticeId
+            ? state.wishlistNotices.some((item) => item.noticeId === noticeId)
+            : false
     );
 
     const [image, setImage] = useState(null);
@@ -30,7 +34,7 @@ export function NoticeCard({notice}) {
         const fetchImage = async () => {
             if (!noticeId) {
                 if (isMounted) {
-                    setImage("https://http.cat/404.jpg");
+                    setImage({uri: "https://http.cat/404.jpg"});
                     setIsLoading(false);
                 }
                 return;
@@ -40,12 +44,14 @@ export function NoticeCard({notice}) {
             try {
                 const images = await getAllImagesByNoticeId(noticeId);
                 if (isMounted) {
-                    setImage(images && images.length > 0 ? images[0] : "https://http.cat/404.jpg");
+                    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("https://http.cat/404.jpg");
+                    setImage({uri: "https://http.cat/404.jpg"});
                 }
             } finally {
                 if (isMounted) {
@@ -75,9 +81,7 @@ export function NoticeCard({notice}) {
                         </Box>
                     ) : (
                         <Image
-                            source={{
+                            source={image}
-                                uri: image,
-                            }}
                             className="h-auto w-full rounded-md aspect-[1/1]"
                             alt="image"
                             resizeMode="cover"

ArtisanConnect/components/UserBlock.jsx

@@ -1,23 +1,35 @@
-import { VStack } from '@/components/ui/vstack';
+import { VStack } from "@/components/ui/vstack";
-import { Avatar, AvatarImage, AvatarFallbackText } from "@/components/ui/avatar";
+import {
+  Avatar,
+  AvatarImage,
+  AvatarFallbackText,
+} from "@/components/ui/avatar";
 import { Heading } from "@/components/ui/heading";
-import { Box } from '@/components/ui/box';
+import { Box } from "@/components/ui/box";
+import { Link } from "expo-router";
 
 export default function UserBlock({ user }) {
-      
   return (
+    <Link href={`/user/${user.id}`}>
       <Box className="rounded-md bg-white p-4 items-center justify-center mb-6">
-      <VStack space="md" className='items-center'>
+        <VStack space="md" className="items-center">
           <Avatar>
-          <AvatarFallbackText>{user.firstName} {user.lastName}</AvatarFallbackText>
+            <AvatarFallbackText>
+              {user.firstName} {user.lastName}
+            </AvatarFallbackText>
             <AvatarImage
               source={{
-              uri: user.image,
+                uri:
+                  user.image ||
+                  "https://th.bing.com/th/id/OIP.3coo_N8sieled8QNroQmkgHaHa?rs=1&pid=ImgDetMain",
               }}
             />
           </Avatar>
-          <Heading size="sm">{user.firstName} {user.lastName}</Heading>
+          <Heading size="sm">
+            {user.firstName} {user.lastName}
+          </Heading>
         </VStack>
       </Box>
+    </Link>
   );
 }

ArtisanConnect/components/UserSection.jsx

@@ -2,28 +2,36 @@ import { View } from "react-native";
 import { useEffect, useState } from "react";
 import { Heading } from "@/components/ui/heading";
 import { FlatList } from "react-native";
-import axios from "axios";
 import UserBlock from "@/components/UserBlock";
+import { getAllUsers } from "@/api/client";
 import { useAuthStore } from "@/store/authStore";
 
 export function UserSection({ notices, title }) {
-  const token = useAuthStore((state) => state.token);
-  const headers = token ? { Authorization: `Bearer ${token}` } : {};
   const [users, setUsers] = useState([]);
+  const { token } = useAuthStore.getState();
 
   useEffect(() => {
+    const fetchUsers = async () => {
+      try {
+        const data = await getAllUsers();
+        setUsers(data);
+      } catch (error) {
+        setUsers([]);
+      }
+    };
+
     if (token) {
-      axios
+        fetchUsers();
-        .get("https://hopp.zikor.pl/api/v1/clients/get/all", { headers })
-        .then((res) => setUsers(res.data))
-        .catch(() => setUsers([]));
     }
   }, [token]);
 
-  const usersWithNoticeCount = users.map((user) => {
+  const usersWithNoticeCount =
+    users && users.length > 0
+      ? users.map((user) => {
           const count = notices.filter((n) => n.clientId === user.id).length;
           return { ...user, noticeCount: count };
-  });
+        })
+      : [];
 
   const topUsers = usersWithNoticeCount
     .sort((a, b) => b.noticeCount - a.noticeCount)

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/data/attributesData.jsx

@@ -0,0 +1,28 @@
+export const attributes = {
+  Kolor: [
+    "Zielony",
+    "Czerwony",
+    "Niebieski",
+    "Żółty",
+    "Biały",
+    "Czarny",
+    "Różowy",
+    "Szary",
+    "Fioletowy",
+    "Pomarańczowy",
+    "Inny",
+  ],
+  Materiał: [
+    "Bawełna",
+    "Wełna",
+    "Syntetyk",
+    "Skóra",
+    "Len",
+    "Jedwab",
+    "Poliester",
+    "Akryl",
+    "Wiskoza",
+    "Nylon",
+    "Inny",
+  ],
+};

ArtisanConnect/package.json

@@ -36,10 +36,11 @@
     "@tanstack/react-query": "^5.74.4",
     "axios": "^1.9.0",
     "babel-plugin-module-resolver": "^5.0.2",
-    "expo": "^53.0.0",
+    "expo": "^53.0.10",
-    "expo-auth-session": "~6.1.5",
+    "expo-auth-session": "~6.2.0",
-    "expo-camera": "~16.1.6",
+    "expo-camera": "~16.1.7",
-    "expo-constants": "~17.1.6",
+    "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",
@@ -51,7 +52,7 @@
     "nativewind": "^4.1.23",
     "react": "19.0.0",
     "react-dom": "19.0.0",
-    "react-native": "0.79.2",
+    "react-native": "0.79.3",
     "react-native-css-interop": "^0.1.22",
     "react-native-gesture-handler": "~2.24.0",
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
@@ -62,7 +63,7 @@
     "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": {
     "@babel/core": "^7.20.0",

ArtisanConnect/store/authStore.jsx

@@ -2,14 +2,15 @@ import { create } from "zustand";
 import { createJSONStorage, persist } from "zustand/middleware";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import axios from "axios";
+import * as api from "@/api/auth";
+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 (!interceptorInitialized.current) {
-      if (!axios.interceptors.response.handlers.length) {
         axios.interceptors.response.use(
           (response) => response,
           (error) => {
@@ -17,14 +18,16 @@ export const useAuthStore = create(
               (error.response && error.response.status === 401) ||
               error.response.status === 403
             ) {
-              set({ user: null, token: null, isLoading: false });
+              console.warn(error.response.data);
+              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,
@@ -34,16 +37,8 @@ export const useAuthStore = create(
         signIn: async (email, password) => {
           set({ isLoading: true, error: null });
           try {
-            const response = await axios.post(`${API_URL}/auth/login`, {
+            const response = await api.login({email, password});
-              email,
+            set({ user_id: response.user_id, token: response.token, isLoading: false });
-              password,
-            });
-
-            const user_id = response.data.user_id;
-            const token = response.data.token;
-            set({ user_id: user_id, token: token, isLoading: false });
-
-            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
           } catch (error) {
             set({
               error: error.response?.data?.message || error.message,
@@ -56,19 +51,8 @@ export const useAuthStore = create(
         signUp: async (userData) => {
           set({ isLoading: true, error: null });
           try {
-            const response = await axios.post(
+            const response = await api.register(userData);
-              `${API_URL}/auth/register`,
+            set({ user_id: response.user_id, token: response.token, isLoading: false });
-              userData,
-              {
-                headers: { "Content-Type": "application/json" },
-              }
-            );
-
-            const user_id = response.data.user_id;
-            const token = response.data.token;
-            set({ user_id: user_id, token: token, isLoading: false });
-
-            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
           } catch (error) {
             set({
               error: error.response?.data?.message || error.message,
@@ -81,18 +65,8 @@ export const useAuthStore = create(
         signInWithGoogle: async (googleToken) => {
           set({ isLoading: true, error: null });
           try {
-            const response = await axios.post(
+            const response = await api.googleLogin(googleToken);
-              `${API_URL}/auth/google`,
+            set({ user_id: response.user_id, token: response.token, isLoading: false });
-              { googleToken: googleToken },
-              {
-                headers: { "Content-Type": "application/json" },
-              }
-            );
-            const user_id = response.data.user_id;
-            const token = response.data.token;
-            set({ user_id: user_id, token: token, isLoading: false });
-
-            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
           } catch (error) {
             set({
               error: error.response?.data?.message || error.message,
@@ -103,34 +77,16 @@ export const useAuthStore = create(
         },
 
         signOut: async () => {
+          const { token } = get();
           try {
-            await axios.post(`${API_URL}/auth/logout`);
+            await api.logout(token);
           } 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

@@ -26,8 +26,38 @@ export const useNoticesStore = create((set, get) => ({
     }
   },
 
+  editNotice: async (noticeId, notice) => {
+    try {
+      if (notice.image.length > 0 && typeof notice.image[0] == "string") {
+        const currentImages = await api.getAllImagesByNoticeId(noticeId);
+        if (currentImages && currentImages.length > 0) {
+          for (const image of currentImages) {
+            const filename = image.uri
+              ? image.uri.split("/").pop()
+              : image.split("/").pop();
+
+            await api.deleteImage(filename);
+          }
+        }
+      }
+      const updatedNotice = await api.editNotice(noticeId, notice);
+      set((state) => ({
+        notices: state.notices.map((n) =>
+          n.noticeId == noticeId ? updatedNotice : n
+        ),
+      }));
+      return updatedNotice;
+    } catch (error) {
+      console.error("Error editing notice:", error);
+      set({ error });
+      throw error;
+    }
+  },
+
   getNoticeById: (noticeId) => {
-        return get().notices.find((notice) => String(notice.noticeId) === String(noticeId));
+    return get().notices.find(
+      (notice) => String(notice.noticeId) === String(noticeId)
+    );
   },
 
   getAllImagesByNoticeId: async (noticeId) => {
@@ -37,5 +67,16 @@ export const useNoticesStore = create((set, get) => ({
       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);
+    }
+  },
 }));