fix account

ArtisanConnect/api/categories.jsx

@@ -1,12 +1,16 @@
 import axios from "axios";
+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 listCategories() {
-    try {
-        const response = await axios.get(`${API_URL}/vars/categories`);
-        return response.data;
-    } catch (err) {
-        console.error("Nie udało się pobrać listy kategorii.", err.response.status);
-    }
-}
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
+  try {
+    const response = await axios.get(`${API_URL}/vars/categories`, { headers });
+    return response.data;
+  } catch (err) {
+    console.error("Nie udało się pobrać listy kategorii.", err.response.status);
+  }
+}

ArtisanConnect/api/client.jsx

@@ -0,0 +1,16 @@
+import axios from "axios";
+
+const API_URL = "https://hopp.zikor.pl/api/v1";
+
+export async function getUserById(userId) {
+  try {
+    const response = await axios.get(`${API_URL}/clients/get/${userId}`);
+    return response.data;
+  } catch (err) {
+    console.error(
+      `Nie udało się pobrać danych użytkownika o ID ${userId}.`,
+      err.response.status
+    );
+    throw err;
+  }
+}

ArtisanConnect/api/notices.jsx

@@ -1,129 +1,129 @@
 import axios from "axios";
-import FormData from 'form-data'
-import {useAuthStore} from "@/store/authStore";
+import FormData from "form-data";
+import { useAuthStore } from "@/store/authStore";
 
 // const API_URL = "https://testowe.zikor.pl/api/v1";
 
-const API_URL = "http://10.0.2.2:8080/api/v1";
+const API_URL = "https://hopp.zikor.pl/api/v1";
 
 export async function listNotices() {
-    const { token } = useAuthStore.getState();
-    const headers = token ? { 'Authorization': `Bearer ${token}` } : {};
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
 
-    console.log(token);
-
-    const response = await fetch(`${API_URL}/notices/get/all`, {
-        headers: headers
-    });
-    console.log(response);
-    const data = await response.json();
-    if (!response.ok) {
-        throw new Error(response.toString());
-    }
-    return data;
+  const response = await fetch(`${API_URL}/notices/get/all`, {
+    headers: headers,
+  });
+  const data = await response.json();
+  if (!response.ok) {
+    throw new Error(response.toString());
+  }
+  return data;
 }
 
 export async function getNoticeById(noticeId) {
-    const response = await fetch(`${API_URL}/notices/get/${noticeId}`);
+  const response = await fetch(`${API_URL}/notices/get/${noticeId}`);
 
-    const data = await response.json();
-    if (!response.ok) {
-        throw new Error("Error");
-    }
-    return data;
+  const data = await response.json();
+  if (!response.ok) {
+    throw new Error("Error");
+  }
+  return data;
 }
 
 export async function createNotice(notice) {
-    try {
-        const response = await axios.post(`${API_URL}/notices/add`, notice, {
-            headers: {
-                "Content-Type": "application/json",
-            },
-        });
+  try {
+    const response = await axios.post(`${API_URL}/notices/add`, notice, {
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
 
-        if (response.data.noticeId !== null) {
-            for (const imageUri of notice.image) {
-                await uploadImage(response.data.noticeId, imageUri);
-            }
-        }
-
-        return response.data;
-    } catch (error) {
-        console.log("Error", error.response.data, error.response.status);
-        return null;
+    if (response.data.noticeId !== null) {
+      for (const imageUri of notice.image) {
+        await uploadImage(response.data.noticeId, imageUri);
+      }
     }
+
+    return response.data;
+  } catch (error) {
+    console.log("Error", error.response.data, error.response.status);
+    return null;
+  }
 }
 
 export async function getImageByNoticeId(noticeId) {
-    let imageUrl;
-    try {
-        const listResponse = await axios.get(`${API_URL}/images/list/${noticeId}`);
+  let imageUrl;
+  try {
+    const listResponse = await axios.get(`${API_URL}/images/list/${noticeId}`);
 
-        const imageName = listResponse.data[0];
-        imageUrl = `${API_URL}/images/get/${imageName}`;
+    const imageName = listResponse.data[0];
+    imageUrl = `${API_URL}/images/get/${imageName}`;
 
-        console.log(`Pobrano zdjęcie o nazwie: ${imageName}`);
-
-        return imageUrl;
-    } catch (err) {
-        console.log(`Zdjęcie nie istnieje dla notice o id: ${noticeId}`);
-        imageUrl = "https://http.cat/404.jpg";
-        return imageUrl;
-    }
+    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) {
-    try {
-        const listResponse = await axios.get(`${API_URL}/images/list/${noticeId}`);
+  try {
+    const listResponse = await axios.get(`${API_URL}/images/list/${noticeId}`);
 
-        if (listResponse.data && listResponse.data.length > 0) {
-            const imageUrls = listResponse.data.map(imageName =>
-                `${API_URL}/images/get/${imageName}`
-            );
-
-            // console.log(`Pobrano ${imageUrls.length} zdjęć dla ogłoszenia o id: ${noticeId}`);
-            return imageUrls;
-        }
-
-        // console.log(`Brak zdjęć dla ogłoszenia o id: ${noticeId}`);
-        return ["https://http.cat/404.jpg"];
-    } catch (err) {
-        // console.log(`Błąd podczas pobierania listy zdjęć dla ogłoszenia o id: ${noticeId}`, err);
-        return ["https://http.cat/404.jpg"];
+    if (listResponse.data && listResponse.data.length > 0) {
+      return listResponse.data.map(
+        (imageName) => `${API_URL}/images/get/${imageName}`
+      );
     }
+
+    return ["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"];
+    }
+    console.warn(
+      `Nie udało się pobrać listy zdjęć dla ogłoszenia o id: ${noticeId}`,
+      err
+    );
+    return ["https://http.cat/404.jpg"];
+  }
 }
 
 export const uploadImage = async (noticeId, imageUri) => {
-    console.log(imageUri);
+  const formData = new FormData();
 
-    const formData = new FormData();
+  const filename = imageUri.split("/").pop();
 
-    const filename = imageUri.split('/').pop();
+  const match = /\.(\w+)$/.exec(filename);
+  const type = match ? `image/${match[1]}` : "image/jpeg";
 
-    const match = /\.(\w+)$/.exec(filename);
-    const type = match ? `image/${match[1]}` : 'image/jpeg';
+  formData.append("file", {
+    uri: imageUri,
+    name: filename,
+    type: type,
+  });
 
-    formData.append('file', {
-        uri: imageUri,
-        name: filename,
-        type: type,
-    });
-
-    try {
-        const response = await axios.post(
-            `${API_URL}/images/upload/${noticeId}`,
-            formData,
-            {
-                headers: {
-                    'Content-Type': 'multipart/form-data',
-                },
-            }
-        );
-        console.info('Upload successful:', response.data);
-        return response.data;
-    } catch (error) {
-        console.log("imageURI:", imageUri);
-        console.error('Error uploading image:', error.response.data, error.response.status);
-        throw error;
-    }
-}
+  try {
+    const response = await axios.post(
+      `${API_URL}/images/upload/${noticeId}`,
+      formData,
+      {
+        headers: {
+          "Content-Type": "multipart/form-data",
+        },
+      }
+    );
+    console.info("Upload successful:", response.data);
+    return response.data;
+  } catch (error) {
+    console.log("imageURI:", imageUri);
+    console.error(
+      "Error uploading image:",
+      error.response.data,
+      error.response.status
+    );
+    throw error;
+  }
+};

ArtisanConnect/api/wishlist.jsx

@@ -1,29 +1,38 @@
 import axios from "axios";
+import { useAuthStore } from "@/store/authStore";
 // import FormData from 'form-data'
 
-const API_URL = "https://testowe.zikor.pl/api/v1/wishlist";
+const API_URL = "https://hopp.zikor.pl/api/v1/wishlist";
 
 export async function toggleNoticeStatus(noticeId) {
-    try {
-        const response = await axios.post(`${API_URL}/toggle/${noticeId}`, null, {
-            headers: {
-                "Content-Type": "application/json",
-            },
-        });
-        return response.data;
-    } catch (error) {
-        console.error("Error toggling wishlist item:", error);
-        throw error;
-    }
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
+  try {
+    const response = await axios.post(
+      `${API_URL}/toggle/${noticeId}`,
+      {},
+      {
+        headers,
+      }
+    );
+    return response.data;
+  } catch (error) {
+    console.error("Error toggling wishlist item:", error);
+    throw error;
+  }
 }
 
 export async function getWishlist() {
-    try {
-        const response = await axios.get(`${API_URL}/`);
-        console.log("Wishlist response:", response.data);
-        return response.data;
-    } catch (error) {
-        console.error("Error fetching wishlist:", error);
-        throw error;
-    }
+  const { token } = useAuthStore.getState();
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+
+  try {
+    const response = await axios.get(`${API_URL}/`, { headers });
+    console.log("Wishlist response:", response.data);
+    return response.data;
+  } catch (error) {
+    console.error("Error fetching wishlist:", error);
+    throw error;
+  }
 }

ArtisanConnect/app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "ArtisanConnect",
     "slug": "ArtisanConnect",
-    "scheme": "Artisanconnect",
+    "scheme": "com.hamx.artisanconnect",
     "version": "1.0.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
@@ -14,13 +14,19 @@
       "backgroundColor": "#ffffff"
     },
     "ios": {
-      "supportsTablet": true
+      "supportsTablet": true,
+      "bundleIdentifier": "com.hamx.artisanconnect"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
-      }
+      },
+      "permissions": [
+        "android.permission.RECORD_AUDIO",
+        "android.permission.CAMERA"
+      ],
+      "package": "com.hamx.artisanconnect"
     },
     "web": {
       "favicon": "./assets/favicon.png"
@@ -40,6 +46,12 @@
         }
       ],
       "expo-web-browser"
-    ]
+    ],
+    "extra": {
+      "router": {},
+      "eas": {
+        "projectId": "7a0d8bc8-938f-4d2a-babb-945faee13429"
+      }
+    }
   }
 }

ArtisanConnect/app/(auth)/login.jsx

@@ -1,5 +1,5 @@
-import React, {useState} from 'react';
-import {StyleSheet, ActivityIndicator, SafeAreaView, View} from 'react-native';
+import React, {useEffect, useState} from 'react';
+import {StyleSheet, ActivityIndicator, SafeAreaView, View, Platform} from 'react-native';
 import {useAuthStore} from '@/store/authStore';
 import {useRouter, Link} from 'expo-router';
 
@@ -15,12 +15,37 @@ import {ArrowRightIcon} from "@/components/ui/icon"
 import {Divider} from '@/components/ui/divider';
 import {Ionicons} from "@expo/vector-icons";
 
+import * as WebBrowser from 'expo-web-browser';
+import * as Google from "expo-auth-session/providers/google";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+import {makeRedirectUri} from "expo-auth-session";
+
+import Constants from 'expo-constants';
+
+WebBrowser.maybeCompleteAuthSession();
+
+// client_id ios 936418008320-ohefdfcebd41f6oa2o8phh1mgj9s49sl.apps.googleusercontent.com
+// android 936418008320-d8dfjph5e4r28fcm1rbdfbh5phmbg03d.apps.googleusercontent.com
+
 export default function Login() {
     const [email, setEmail] = useState('');
     const [password, setPassword] = useState('');
-    const {signIn, isLoading} = useAuthStore();
+    const {signIn, isLoading, signInWithGoogle} = useAuthStore();
     const router = useRouter();
 
+    const [request, response, promptAsync] = Google.useAuthRequest({
+        androidClientId: "936418008320-d8dfjph5e4r28fcm1rbdfbh5phmbg03d.apps.googleusercontent.com",
+        iosClientId: "936418008320-ohefdfcebd41f6oa2o8phh1mgj9s49sl.apps.googleusercontent.com",
+        webClientId: "936418008320-btdngtlfnjac1p67guje72m9el5q59a7.apps.googleusercontent.com",
+        redirectUri:
+            Platform.OS === 'android'
+                ? makeRedirectUri({
+                    scheme: Constants.expoConfig.android.package,
+                    path: '/',
+                })
+                : undefined,
+    })
+
     const handleInternalLogin = async () => {
         if (!email || !password) {
             alert('Proszę wprowadzić email i hasło.');
@@ -36,6 +61,47 @@ export default function Login() {
         }
     }
 
+    useEffect(() => {
+        handleGoogleLogin();
+    }, [response]);
+
+    const handleGoogleLogin = async () => {
+        // const user = await AsyncStorage.getItem("@user");
+        let user = null;
+        if (!user) {
+            if(response.type === "success") {
+                user = await getUserInfo(response.authentication.accessToken)
+                await signInWithGoogle(response.authentication.accessToken);
+                alert(`Zalogowano jako ${user.email}`);
+            }
+
+        } else {
+            console.info("Pobrano użytkownika z AsyncStorage:", JSON.parse(user));
+            alert(`Zalogowano jako ${user.email}`);
+        }
+    };
+
+    const getUserInfo = async (token) => {
+        if(!token) {
+            return
+        }
+        try {
+            const response = await fetch("https://www.googleapis.com/userinfo/v2/me",
+                {
+                    headers: {
+                        Authorization: `Bearer ${token}`
+                    },
+                }
+            );
+            const user = await response.json();
+            await AsyncStorage.setItem("@user", JSON.stringify(user));
+            return user;
+        } catch (error) {
+            console.error("Błąd podczas pobierania informacji o użytkowniku:", error);
+            throw error;
+        }
+    }
+
     if (isLoading) {
         return (
             <View style={styles.container}>
@@ -82,7 +148,7 @@ export default function Login() {
                         </Text>
                         <Divider flex={1}/>
                     </HStack>
-                    <Button size="sm">
+                    <Button size="sm" onPress={() => promptAsync()}>
                         <Ionicons name="logo-google" color="#fff"/>
                     </Button>
                 </Box>

ArtisanConnect/app/(tabs)/_layout.jsx

@@ -1,64 +1,70 @@
-import {Tabs} from "expo-router";
-import {Ionicons} from "@expo/vector-icons";
+import { Tabs, Redirect } from "expo-router";
+import { Ionicons } from "@expo/vector-icons";
+import { useAuthStore } from "@/store/authStore";
 
 export default function TabLayout() {
-    return (
-        <Tabs
-            screenOptions={{
-                tabBarActiveTintColor: "rgb(var(--color-primary-500))",
-            }}
-        >
-            <Tabs.Screen
-                name="index"
-                options={{
-                    title: "Home",
-                    tabBarLabel: "Home",
-                    tabBarIcon: ({color, size}) => (
-                        <Ionicons name="home-outline" size={size} color={color}/>
-                    ),
-                }}
-            />
-            <Tabs.Screen
-                name="notices"
-                options={{
-                    title: "Ogłoszenia",
-                    tabBarLabel: "Ogłoszenia",
-                    tabBarIcon: ({color, size}) => (
-                        <Ionicons name="list-outline" size={size} color={color}/>
-                    ),
-                }}
-            />
-            <Tabs.Screen
-                name="notice/create"
-                options={{
-                    title: "Dodaj",
-                    tabBarLabel: "Dodaj",
-                    tabBarIcon: ({color, size}) => (
-                        <Ionicons name="add-circle-outline" size={size} color={color}/>
-                    ),
-                }}
-            />
-            <Tabs.Screen
-                name="wishlist"
-                options={{
-                    title: "Ulubione",
-                    tabBarLabel: "Ulubione",
-                    tabBarIcon: ({color, size}) => (
-                        <Ionicons name="heart-outline" size={size} color={color}/>
-                    ),
-                }}
-            />
-            <Tabs.Screen
-                name="dashboard"
-                options={{
-                    headerShown: false, 
-                    title: "Konto",
-                    tabBarLabel: "Konto",
-                    tabBarIcon: ({color, size}) => (
-                        <Ionicons name="person-outline" size={size} color={color}/>
-                    ),
-                }}
-            />
-        </Tabs>
-    );
+  const token = useAuthStore((state) => state.token);
+
+  if (!token) {
+    return <Redirect href="/login" />;
+  }
+  return (
+    <Tabs
+      screenOptions={{
+        tabBarActiveTintColor: "rgb(var(--color-primary-500))",
+      }}
+    >
+      <Tabs.Screen
+        name="index"
+        options={{
+          title: "Home",
+          tabBarLabel: "Home",
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="home-outline" size={size} color={color} />
+          ),
+        }}
+      />
+      <Tabs.Screen
+        name="notices"
+        options={{
+          title: "Ogłoszenia",
+          tabBarLabel: "Ogłoszenia",
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="list-outline" size={size} color={color} />
+          ),
+        }}
+      />
+      <Tabs.Screen
+        name="notice/create"
+        options={{
+          title: "Dodaj",
+          tabBarLabel: "Dodaj",
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="add-circle-outline" size={size} color={color} />
+          ),
+        }}
+      />
+      <Tabs.Screen
+        name="wishlist"
+        options={{
+          title: "Ulubione",
+          tabBarLabel: "Ulubione",
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="heart-outline" size={size} color={color} />
+          ),
+        }}
+      />
+      <Tabs.Screen
+        name="dashboard"
+        options={{
+          headerShown: false,
+          title: "Konto",
+          tabBarLabel: "Konto",
+          tabBarIcon: ({ color, size }) => (
+            <Ionicons name="person-outline" size={size} color={color} />
+          ),
+        }}
+      />
+    </Tabs>
+  );
 }

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

@@ -1,6 +1,15 @@
+import { DrawerItem } from "@react-navigation/drawer";
 import { Drawer } from "expo-router/drawer";
+import { useAuthStore } from "@/store/authStore";
+
+import {
+  DrawerContentScrollView,
+  DrawerItemList,
+} from "@react-navigation/drawer";
 
 export default function AccountDrawerLayout() {
+  const signOut = useAuthStore((state) => state.signOut);
+
   return (
     <Drawer
       screenOptions={{
@@ -9,10 +18,19 @@ export default function AccountDrawerLayout() {
         drawerActiveBackgroundColor: "#f0f0f0",
         drawerItemStyle: {
           borderRadius: 8,
-          // backgroundColor: "transparent",
         },
         headerTintColor: "#1c1c1e",
       }}
+      drawerContent={(props) => (
+        <DrawerContentScrollView {...props}>
+          <DrawerItemList {...props} />
+          <DrawerItem
+            label="Wyloguj"
+            onPress={signOut}
+            labelStyle={{ color: "red" }}
+          />
+        </DrawerContentScrollView>
+      )}
     >
       <Drawer.Screen name="account" options={{ title: "Konto" }} />
       <Drawer.Screen

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

@@ -1,4 +1,105 @@
+import { Link } from "expo-router";
+import { Pressable } from "react-native";
+import { Box } from "@/components/ui/box";
 import { Text } from "@/components/ui/text";
-export default function User() {
-  return <Text>Użytkownik</Text>;
+import { VStack } from "@/components/ui/vstack";
+import { Image } from "@/components/ui/image";
+import { ActivityIndicator } from "react-native";
+import { useEffect, useState } from "react";
+import { getUserById } from "@/api/client";
+import { HStack } from "@gluestack-ui/themed";
+
+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
+
+  useEffect(() => {
+    const fetchUser = async () => {
+      setIsLoading(true);
+      try {
+        const userData = await getUserById(currentUserId);
+        setUser(userData);
+      } catch (err) {
+        console.error("Błąd podczas pobierania danych użytkownika:", err);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+    fetchUser();
+  }, []);
+
+  if (isLoading) {
+    return <ActivityIndicator />;
+  }
+
+  if (!user) {
+    return <Text>Nie udało się pobrać danych użytkownika.</Text>;
+  }
+
+  return (
+    <VStack className="bg-gray-50 flex-1">
+      <Box className="bg-white pb-6 shadow-sm">
+        <Box className="items-center pt-6 mb-4">
+          <Image
+            source={{
+              uri:
+                user.profileImage ||
+                "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"
+            alt="Zdjęcie profilowe"
+          />
+        </Box>
+
+        <Text className="text-2xl font-bold text-center mb-1">
+          {user.firstName} {user.lastName}
+        </Text>
+      </Box>
+
+      <Box className="bg-white mt-4 p-5 border-t border-b border-gray-200">
+        <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="flex-1">{user.email || "brak danych"}</Text>
+        </HStack>
+
+        <Pressable
+          className="border border-[#002f34] rounded-md py-2 px-4 self-start"
+          onPress={() => console.log("Edytuj dane użytkownika")}
+        >
+          <Text className="text-[#002f34] font-medium">Edytuj profil</Text>
+        </Pressable>
+      </Box>
+
+      <Box className="bg-white mt-4 p-5">
+        <Text className="font-bold text-lg mb-3">Moje konto</Text>
+
+        <Link href="/dashboard/userNotices" asChild>
+          <Pressable className="py-3 flex-row items-center border-b border-gray-100">
+            <Text className="text-lg flex-1">Moje ogłoszenia</Text>
+            <Text>▶</Text>
+          </Pressable>
+        </Link>
+
+        {/*Tak dodałem, można zmienić na coś innego*/}
+        <Link href="/dashboard/userPaymentHistory" 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>
+          </Pressable>
+        </Link>
+
+        {/* <Pressable className="py-3 flex-row items-center">
+          <Text className="text-lg flex-1">Ustawienia powiadomień</Text>
+          <Text>▶</Text>
+        </Pressable> */}
+      </Box>
+
+      {/* <Pressable className="mt-8 mx-5 p-4 bg-white rounded-md items-center shadow-sm">
+        <Text className="text-red-500 font-medium">Wyloguj się</Text>
+      </Pressable> */}
+    </VStack>
+  );
 }

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

@@ -1,4 +1,75 @@
-import { Text } from "@/components/ui/text";
+import { useNoticesStore } from "@/store/noticesStore";
+import { NoticeCard } from "@/components/NoticeCard";
+import {Button} from "react-native";
+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";
+
 export default function UserNotices() {
-  return <Text>Użytkownik</Text>;
-}
+  const { notices, fetchNotices } = useNoticesStore();
+  const [isLoading, setIsLoading] = useState(true);
+  const currentUserId = 1; // Tymczasowo, do czasu zaimplementowania logowania bo nie moge pobrac usera
+
+  useEffect(() => {
+    const loadNotices = async () => {
+      setIsLoading(true);
+      try {
+        await fetchNotices();
+      } catch (err) {
+        console.error("Błąd podczas pobierania ogłoszeń:", err);
+      } finally {
+        setIsLoading(false);
+      }
+    };
+    loadNotices();
+  }, []);
+
+  const userNotices = notices.filter(notice => notice.clientId === currentUserId);
+
+  if (isLoading) {
+    return <ActivityIndicator />;
+  }
+
+  return (
+      <VStack className="p-4">
+        <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">
+                      <NoticeCard notice={item} />
+                      <Box className="flex-row justify-between mt-2">
+                        <Button
+                            title="Promuj"
+                            onPress={() => {
+                              // TODO: Implementacja promocji ogłoszenia
+                              console.log(`Promuj ogłoszenie ${item.noticeId}`);
+                            }}
+                            className="bg-primary-500 py-2 px-4 rounded-md"
+                        >
+                        </Button>
+                        <Button
+                            title="Podbij"
+                            onPress={() => {
+                              // TODO: Implementacja podbicia ogłoszenia
+                              console.log(`Podbij ogłoszenie ${item.noticeId}`);
+                            }}
+                            className="bg-primary-500 py-2 px-4 rounded-md"
+                        >
+                        </Button>
+                      </Box>
+                    </Box>
+                )}
+                keyExtractor={(item) => item.noticeId.toString()}
+            />
+        ) : (
+            <Text>Nie masz żadnych ogłoszeń.</Text>
+        )}
+      </VStack>
+  );
+}

ArtisanConnect/app/(tabs)/index.jsx

@@ -1,17 +1,20 @@
 import { ScrollView, View } from "react-native";
-import { useNoticesStore } from '@/store/noticesStore';
+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 { 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((state) => state.token);
   const router = useRouter();
   const [isReady, setIsReady] = useState(false);
+  const fetchNotices = useNoticesStore((state) => state.fetchNotices);
 
   useEffect(() => {
     setIsReady(true);
@@ -23,23 +26,41 @@ const token = useAuthStore((state) => state.token);
     }
   }, [isReady, token, router]);
 
+  useEffect(() => {
+    if (token) {
+      fetchNotices();
+    }
+  }, [token, fetchNotices]);
+
   const notices = useNoticesStore((state) => state.notices);
-   const latestNotices = [...notices]
+  // console.log("Notices:", notices);
+
+  const latestNotices = [...notices]
     .sort((a, b) => new Date(b.publishDate) - new Date(a.publishDate))
     .slice(0, 6);
-      const recomendedNotices = [...notices]
+  const recomendedNotices = [...notices]
     .sort(() => Math.random() - 0.5)
     .slice(0, 6);
 
   return (
-    <View>
-    <SearchSection/>
-     <ScrollView showsVerticalScrollIndicator={false} className='m-2'>
+    <SafeAreaView className="flex-1 m-2">
+      {/* <View>    */}
+      <SearchSection />
+      <ScrollView showsVerticalScrollIndicator={false}>
         <CategorySection title="Polecane kategorie" notices={notices} />
-        <NoticeSection title="Najnowsze ogłoszenia" notices={latestNotices} ctaLink="/notices?sort=latest"/>
+        <NoticeSection
+          title="Najnowsze ogłoszenia"
+          notices={latestNotices}
+          ctaLink="/notices?sort=latest"
+        />
         <UserSection title="Popularni sprzedawcy" notices={notices} />
-        <NoticeSection title="Proponowane ogłoszenia" notices={recomendedNotices} ctaLink="/notices"/>
-     </ScrollView>
-     </View>
+        <NoticeSection
+          title="Proponowane ogłoszenia"
+          notices={recomendedNotices}
+          ctaLink="/notices"
+        />
+      </ScrollView>
+      {/* </View> */}
+    </SafeAreaView>
   );
 }

ArtisanConnect/app/(tabs)/wishlist.jsx

@@ -7,12 +7,14 @@ import { Text } from "@/components/ui/text";
 import { useEffect } from "react";
 
 export default function Wishlist() {
-   const wishlistNotices = useWishlist((state) => state.wishlistNotices);
+  const wishlistNotices = useWishlist((state) => state.wishlistNotices);
   const fetchWishlist = useWishlist((state) => state.fetchWishlist);
 
   useEffect(() => {
     fetchWishlist();
   }, []);
+
+  // console.log("Wishlist notices:", wishlistNotices);
   if (wishlistNotices.length === 0) {
     return (
       <Box className="flex-row flex-1 justify-center">

ArtisanConnect/app/_layout.jsx

@@ -2,21 +2,13 @@ import { Stack, Redirect } from "expo-router";
 import "@/global.css";
 import { GluestackUIProvider } from "@/components/ui/gluestack-ui-provider";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { useEffect, useState } from "react";
-import { useNoticesStore } from "@/store/noticesStore"; 
 
 const queryClient = new QueryClient();
 export default function RootLayout() {
-   const fetchNotices = useNoticesStore((state) => state.fetchNotices);
-
-  useEffect(() => {
-    fetchNotices();
-  }, []);
   
 return (
     <QueryClientProvider client={queryClient}>
       <GluestackUIProvider>
-        
         <Stack
           screenOptions={{
             headerTintColor: "#1c1c1e",

ArtisanConnect/app/notice/[id].jsx

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

ArtisanConnect/app/user/[userId].jsx

@@ -0,0 +1,69 @@
+import { useLocalSearchParams } from "expo-router";
+import { useState, useEffect } from "react";
+import { FlatList, ActivityIndicator, Text } from "react-native";
+import { Box } from "@/components/ui/box";
+import { Image } from "@/components/ui/image";
+import { VStack } from "@/components/ui/vstack";
+import { Heading } from "@/components/ui/heading";
+import { getUserById } from "@/api/client";
+import { useNoticesStore } from "@/store/noticesStore";
+import { NoticeCard } from "@/components/NoticeCard";
+
+export default function UserProfile() {
+    const { userId } = useLocalSearchParams();
+    const [user, setUser] = useState(null);
+    const [isUserLoading, setIsUserLoading] = useState(true);
+    const { notices } = useNoticesStore();
+
+    useEffect(() => {
+        const fetchUser = async () => {
+            setIsUserLoading(true);
+            try {
+                const userData = await getUserById(Number(userId));
+                setUser(userData);
+            } catch (err) {
+                console.error("Błąd podczas pobierania danych użytkownika:", err);
+                setUser(null);
+            } finally {
+                setIsUserLoading(false);
+            }
+        };
+        fetchUser();
+    }, [userId]);
+
+    if (isUserLoading) {
+        return <ActivityIndicator />;
+    }
+
+    if (!user) {
+        return <Text>Nie znaleziono użytkownika</Text>;
+    }
+
+    const userNotices = notices.filter(notice => notice.clientId === Number(userId));
+
+    return (
+        <VStack className="p-4">
+            <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" }}
+                    className="h-16 w-16 rounded-full mr-4"
+                    alt="Zdjęcie profilowe"
+                />
+                <Heading size="lg">
+                    {user.firstName} {user.lastName}
+                </Heading>
+            </Box>
+            {userNotices.length > 0 ? (
+                <FlatList
+                    data={userNotices}
+                    numColumns={2}
+                    columnWrapperStyle={{ marginBottom: 10, justifyContent: "space-between" }}
+                    renderItem={({ item }) => <NoticeCard notice={item} />}
+                    keyExtractor={(item) => item.noticeId.toString()}
+                />
+            ) : (
+                <Text>Ten użytkownik nie ma żadnych ogłoszeń.</Text>
+            )}
+        </VStack>
+    );
+}

ArtisanConnect/components/CategorySection.jsx

@@ -1,31 +1,38 @@
-import { View, FlatList} from 'react-native';
-import { useEffect, useState } from 'react'
-import { Heading } from '@/components/ui/heading';
-import { Text } from '@/components/ui/text';
-import { Link } from 'expo-router';
-import { Pressable } from '@/components/ui/pressable';
-import axios from 'axios';
-
-export function CategorySection({notices, title}) {
-// const notices = useNoticesStore((state) => state.notices);
+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";
+import { Pressable } from "@/components/ui/pressable";
+import { listCategories } from "@/api/categories";
 
+export function CategorySection({ notices, title }) {
   const [categoryMap, setCategoryMap] = useState({});
 
   useEffect(() => {
-    axios.get('https://testowe.zikor.pl/api/v1/vars/categories')
-      .then(res => setCategoryMap(res.data))
-      .catch(() => setCategoryMap({}));
-  }, []);
-    
-const categories = Array.from(
-  new Set(notices.map((notice) => notice.category))
-).filter(Boolean);
+    const fetchCategories = async () => {
+      let data = await listCategories();
+      if (Array.isArray(data)) {
+        setCategoryMap(data);
+      }
+    };
 
+    fetchCategories();
+  });
+
+  const categories = Array.from(
+    new Set(notices.map((notice) => notice.category))
+  ).filter(Boolean);
 
   const getCount = (category) =>
     notices.filter((notice) => notice.category === category).length;
 
-return (
+  if (!categoryMap || Object.keys(categoryMap).length === 0) {
+    return null;
+  }
+
+  return (
     <View className="mb-6">
       <Heading className="text-2xl font-bold mb-4 mt-4">{title}</Heading>
       <FlatList
@@ -38,16 +45,15 @@ return (
           const categoryObj = categoryMap.find((cat) => cat.value === item);
           return (
             <Link href={`/notices?category=${item}`} asChild>
-            <Pressable className="bg-gray-200 p-4 rounded-lg mr-2">
-              <Text>
-                {categoryObj ? categoryObj.label : item} ({getCount(item)})
-              </Text>
-            </Pressable>
+              <Pressable className="bg-gray-200 p-4 rounded-lg mr-2">
+                <Text>
+                  {categoryObj ? categoryObj.label : item} ({getCount(item)})
+                </Text>
+              </Pressable>
             </Link>
           );
         }}
       />
     </View>
   );
-
-}
+}

ArtisanConnect/components/SearchSection.jsx

@@ -2,6 +2,7 @@ import { Input, InputField, InputIcon, InputSlot } from "@/components/ui/input"
 import { SearchIcon } from "@/components/ui/icon"
 import { Box } from "@/components/ui/box"
 import { useRouter } from "expo-router";
+import { View } from "react-native";
 
 export function SearchSection({ searchQuery, setSearchQuery }) {
     const router = useRouter();
@@ -14,18 +15,17 @@ export function SearchSection({ searchQuery, setSearchQuery }) {
     });
   };
   return (
-    <Box className="m-2 bg-white">
-      <Input>
+    <Box className="mb-2 bg-white p-2 rounded-md">
+      <Input className="p-2">
         <InputSlot>
           <InputIcon as={SearchIcon} />
         </InputSlot>
-        <InputField placeholder="Wyszukaj.."
+        <InputField placeholder="Wyszukaj..."
           value={searchQuery}
           onChangeText={setSearchQuery}
           onSubmitEditing={handleSubmit}
           returnKeyType="search" />
       </Input>
     </Box>
-
   )
 }

ArtisanConnect/components/UserSection.jsx

@@ -1,22 +1,27 @@
-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 { 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 { useAuthStore } from "@/store/authStore";
 
-export function UserSection({notices, title}) {
-
- const [users, setUsers] = useState([]);
+export function UserSection({ notices, title }) {
+  const token = useAuthStore((state) => state.token);
+  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+  const [users, setUsers] = useState([]);
 
   useEffect(() => {
-    axios.get('https://testowe.zikor.pl/api/v1/clients/get/all')
-      .then(res => setUsers(res.data))
-      .catch(() => setUsers([]));
-  }, []);
-    
- const usersWithNoticeCount = users.map(user => {
-    const count = notices.filter(n => n.clientId === user.id).length;
+    if (token) {
+      axios
+        .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 count = notices.filter((n) => n.clientId === user.id).length;
     return { ...user, noticeCount: count };
   });
 
@@ -24,7 +29,7 @@ export function UserSection({notices, title}) {
     .sort((a, b) => b.noticeCount - a.noticeCount)
     .slice(0, 5);
 
-return (
+  return (
     <View className="mb-6">
       <Heading className="text-2xl font-bold mb-4 mt-4">{title}</Heading>
       <FlatList
@@ -33,12 +38,9 @@ return (
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{ paddingHorizontal: 8, gap: 12 }}
         renderItem={({ item }) => {
-          return (
-            <UserBlock user={item} />
-          );
+          return <UserBlock user={item} />;
         }}
       />
     </View>
   );
-
-}
+}

ArtisanConnect/eas.json

@@ -0,0 +1,21 @@
+{
+  "cli": {
+    "version": ">= 16.8.0",
+    "appVersionSource": "remote"
+  },
+  "build": {
+    "development": {
+      "developmentClient": true,
+      "distribution": "internal"
+    },
+    "preview": {
+      "distribution": "internal"
+    },
+    "production": {
+      "autoIncrement": true
+    }
+  },
+  "submit": {
+    "production": {}
+  }
+}

ArtisanConnect/package.json

@@ -39,7 +39,7 @@
     "expo": "^53.0.0",
     "expo-auth-session": "~6.1.5",
     "expo-camera": "~16.1.6",
-    "expo-constants": "~17.1.5",
+    "expo-constants": "~17.1.6",
     "expo-image-picker": "~16.1.4",
     "expo-linking": "~7.1.4",
     "expo-router": "~5.0.5",
@@ -57,11 +57,12 @@
     "react-native-keyboard-aware-scroll-view": "^0.9.5",
     "react-native-reanimated": "~3.17.4",
     "react-native-safe-area-context": "5.4.0",
-    "react-native-screens": "~4.10.0",
+    "react-native-screens": "~4.11.1",
     "react-native-svg": "15.11.2",
     "react-native-web": "~0.20.0",
     "tailwindcss": "^3.4.17",
-    "zustand": "^5.0.3"
+    "zustand": "^5.0.3",
+    "expo-crypto": "~14.1.4"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

ArtisanConnect/store/authStore.jsx

@@ -1,108 +1,141 @@
-import {create} from "zustand";
-import {createJSONStorage, persist} from "zustand/middleware";
+import { create } from "zustand";
+import { createJSONStorage, persist } from "zustand/middleware";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import axios from "axios";
 
-const API_URL = "http://10.0.2.2:8080/api/v1";
+const API_URL = "https://hopp.zikor.pl/api/v1";
 
 export const useAuthStore = create(
-    persist(
-        (set) => ({
-            user: null,
-            token: null,
-            isLoading: false,
-            error: null,
+  persist(
+    (set, get) => {
+      // Dodaj interceptor tylko raz
+      if (!axios.interceptors.response.handlers.length) {
+        axios.interceptors.response.use(
+          (response) => response,
+          (error) => {
+            if (
+              (error.response && error.response.status === 401) ||
+              error.response.status === 403
+            ) {
+              set({ user: null, token: null, isLoading: false });
+              delete axios.defaults.headers.common["Authorization"];
+            }
+            return Promise.reject(error);
+          }
+        );
+      }
 
-            signIn: async (email, password) => {
-                set({isLoading: true, error: null});
-                try {
-                    const response = await axios.post(`${API_URL}/auth/login`, {
-                        email,
-                        password
-                    });
+      return {
+        user_id: null,
+        token: null,
+        isLoading: false,
+        error: null,
 
-                    const user = response.data.user;
-                    const token = response.data.token;
-                    set({user, token, isLoading: false});
-                } catch (error) {
-                    set({error: error.response?.data?.message || error.message, isLoading: false});
-                    throw error;
-                }
-            },
+        signIn: async (email, password) => {
+          set({ isLoading: true, error: null });
+          try {
+            const response = await axios.post(`${API_URL}/auth/login`, {
+              email,
+              password,
+            });
 
-            signUp: async (userData) => {
-                set({isLoading: true, error: null});
-                try {
-                    console.log(userData);
+            const user_id = response.data.user_id;
+            const token = response.data.token;
+            set({ user_id: user_id, token: token, isLoading: false });
 
-                    const response = await axios.post(`${API_URL}/auth/register`, userData, {
-                        headers: {'Content-Type': 'application/json'}
-                    });
+            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+          } catch (error) {
+            set({
+              error: error.response?.data?.message || error.message,
+              isLoading: false,
+            });
+            throw error;
+          }
+        },
 
-                    console.log(response.data);
+        signUp: async (userData) => {
+          set({ isLoading: true, error: null });
+          try {
+            const response = await axios.post(
+              `${API_URL}/auth/register`,
+              userData,
+              {
+                headers: { "Content-Type": "application/json" },
+              }
+            );
 
-                    const user = response.data.user;
-                    const token = response.data.token;
-                    set({user, token, isLoading: false});
+            const user_id = response.data.user_id;
+            const token = response.data.token;
+            set({ user_id: user_id, token: token, isLoading: false });
 
-                    return user;
-                } catch (error) {
-                    set({error: error.response?.data?.message || error.message, isLoading: false});
-                    throw error;
-                }
-            },
+            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+          } catch (error) {
+            set({
+              error: error.response?.data?.message || error.message,
+              isLoading: false,
+            });
+            throw error;
+          }
+        },
 
-            signInWithGoogle: async (googleToken) => {
-                set({isLoading: true, error: null});
-                try {
-                    const response = await axios.post(`${API_URL}/auth/google`, {token: googleToken});
+        signInWithGoogle: async (googleToken) => {
+          set({ isLoading: true, error: null });
+          try {
+            const response = await axios.post(
+              `${API_URL}/auth/google`,
+              { googleToken: googleToken },
+              {
+                headers: { "Content-Type": "application/json" },
+              }
+            );
+            const user_id = response.data.user_id;
+            const token = response.data.token;
+            set({ user_id: user_id, token: token, isLoading: false });
 
-                    const {user, token} = response.data;
-                    set({user, token, isLoading: false});
+            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+          } catch (error) {
+            set({
+              error: error.response?.data?.message || error.message,
+              isLoading: false,
+            });
+            throw error;
+          }
+        },
 
-                    axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+        signOut: async () => {
+          try {
+            await axios.post(`${API_URL}/auth/logout`);
+          } catch (error) {
+            console.error("Logout error:", error);
+          } finally {
+            delete axios.defaults.headers.common["Authorization"];
+            set({ user_id: null, token: null });
+          }
+        },
 
-                    return user;
-                } catch (error) {
-                    set({error: error.response?.data?.message || error.message, isLoading: false});
-                    throw error;
-                }
-            },
+        // checkAuth: async () => {
+        //   const { token } = useAuthStore.getState();
+        //   if (!token) return null;
 
-            signOut: async () => {
-                try {
-                    // Можно отправить запрос на бэкенд для инвалидации токена
-                    await axios.post(`${API_URL}/auth/logout`);
-                } catch (error) {
-                    console.error("Logout error:", error);
-                } finally {
-                    delete axios.defaults.headers.common["Authorization"];
-                    set({user: null, token: null});
-                }
-            },
+        //   set({ isLoading: true });
+        //   try {
+        //     axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
 
-            checkAuth: async () => {
-                const {token} = useAuthStore.getState();
-                if (!token) return null;
+        //     const response = await axios.get(`${API_URL}/auth/me`);
 
-                set({isLoading: true});
-                try {
-                    axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
-
-                    const response = await axios.get(`${API_URL}/auth/me`);
-
-                    set({user: response.data, isLoading: false});
-                    return response.data;
-                } catch (error) {
-                    delete axios.defaults.headers.common["Authorization"];
-                    set({user: null, token: null, isLoading: false});
-                    return null;
-                }
-            },
-        }),
-        {
-            name: "auth-storage",
-            storage: createJSONStorage(() => AsyncStorage),
-        }
-    )
-);
+        //     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;
+        //   }
+        // },
+      };
+    },
+    {
+      name: "auth-storage",
+      storage: createJSONStorage(() => AsyncStorage),
+    }
+  )
+);