fix of api url and new version packages

ArtisanConnect/api/categories.jsx

@@ -1,14 +1,10 @@
 import axios from "axios";
-import { useAuthStore } from "@/store/authStore";
 
-const API_URL = "https://hopp.zikor.pl/api/v1";
+const API_URL = "https://testowe.zikor.pl/api/v1";
 
 export async function listCategories() {
-  const { token } = useAuthStore.getState();
-  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`);
         return response.data;
     } catch (err) {
         console.error("Nie udało się pobrać listy kategorii.", err.response.status);

ArtisanConnect/api/client.jsx

@@ -1,16 +0,0 @@
-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,18 +1,21 @@
 import axios from "axios";
-import FormData from "form-data";
+import FormData from 'form-data'
 import {useAuthStore} from "@/store/authStore";
 
-// const API_URL = "https://testowe.zikor.pl/api/v1";
+const API_URL = "https://testowe.zikor.pl/api/v1";
 
-const API_URL = "https://hopp.zikor.pl/api/v1";
+// const API_URL = "http://10.0.2.2:8080/api/v1";
 
 export async function listNotices() {
     const { token } = useAuthStore.getState();
-  const headers = token ? { Authorization: `Bearer ${token}` } : {};
+    const headers = token ? { 'Authorization': `Bearer ${token}` } : {};
+
+    console.log(token);
 
     const response = await fetch(`${API_URL}/notices/get/all`, {
-    headers: headers,
+        headers: headers
     });
+    console.log(response);
     const data = await response.json();
     if (!response.ok) {
         throw new Error(response.toString());
@@ -59,6 +62,8 @@ export async function getImageByNoticeId(noticeId) {
         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}`);
@@ -72,34 +77,33 @@ export async function getAllImagesByNoticeId(noticeId) {
         const listResponse = await axios.get(`${API_URL}/images/list/${noticeId}`);
 
         if (listResponse.data && listResponse.data.length > 0) {
-      return listResponse.data.map(
+            const imageUrls = listResponse.data.map(imageName =>
-        (imageName) => `${API_URL}/images/get/${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) {
-    if (err.response.status === 404) {
+        // console.log(`Błąd podczas pobierania listy zdjęć dla ogłoszenia o id: ${noticeId}`, err);
-      // 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 filename = imageUri.split("/").pop();
+    const filename = imageUri.split('/').pop();
 
     const match = /\.(\w+)$/.exec(filename);
-  const type = match ? `image/${match[1]}` : "image/jpeg";
+    const type = match ? `image/${match[1]}` : 'image/jpeg';
 
-  formData.append("file", {
+    formData.append('file', {
         uri: imageUri,
         name: filename,
         type: type,
@@ -111,19 +115,15 @@ export const uploadImage = async (noticeId, imageUri) => {
             formData,
             {
                 headers: {
-          "Content-Type": "multipart/form-data",
+                    'Content-Type': 'multipart/form-data',
                 },
             }
         );
-    console.info("Upload successful:", response.data);
+        console.info('Upload successful:', response.data);
         return response.data;
     } catch (error) {
         console.log("imageURI:", imageUri);
-    console.error(
+        console.error('Error uploading image:', error.response.data, error.response.status);
-      "Error uploading image:",
-      error.response.data,
-      error.response.status
-    );
         throw error;
     }
-};
+}

ArtisanConnect/api/wishlist.jsx

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

ArtisanConnect/app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "ArtisanConnect",
     "slug": "ArtisanConnect",
-    "scheme": "com.hamx.artisanconnect",
+    "scheme": "Artisanconnect",
     "version": "1.0.0",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
@@ -14,19 +14,13 @@
       "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"
@@ -46,12 +40,6 @@
         }
       ],
       "expo-web-browser"
-    ],
+    ]
-    "extra": {
-      "router": {},
-      "eas": {
-        "projectId": "7a0d8bc8-938f-4d2a-babb-945faee13429"
-      }
-    }
   }
 }

ArtisanConnect/app/(auth)/login.jsx

@@ -1,5 +1,5 @@
-import React, {useEffect, useState} from 'react';
+import React, {useState} from 'react';
-import {StyleSheet, ActivityIndicator, SafeAreaView, View, Platform} from 'react-native';
+import {StyleSheet, ActivityIndicator, SafeAreaView, View} from 'react-native';
 import {useAuthStore} from '@/store/authStore';
 import {useRouter, Link} from 'expo-router';
 
@@ -15,37 +15,12 @@ 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, signInWithGoogle} = useAuthStore();
+    const {signIn, isLoading} = 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.');
@@ -61,47 +36,6 @@ 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}>
@@ -148,7 +82,7 @@ export default function Login() {
                         </Text>
                         <Divider flex={1}/>
                     </HStack>
-                    <Button size="sm" onPress={() => promptAsync()}>
+                    <Button size="sm">
                         <Ionicons name="logo-google" color="#fff"/>
                     </Button>
                 </Box>

ArtisanConnect/app/(tabs)/_layout.jsx

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

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

@@ -1,15 +1,6 @@
-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={{
@@ -18,19 +9,10 @@ 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,105 +1,4 @@
-import { Link } from "expo-router";
-import { Pressable } from "react-native";
-import { Box } from "@/components/ui/box";
 import { Text } from "@/components/ui/text";
-import { VStack } from "@/components/ui/vstack";
+export default function User() {
-import { Image } from "@/components/ui/image";
+  return <Text>Użytkownik</Text>;
-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,75 +1,4 @@
-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() {
-  const { notices, fetchNotices } = useNoticesStore();
+  return <Text>Użytkownik</Text>;
-  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,20 +1,17 @@
 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 router = useRouter();
   const [isReady, setIsReady] = useState(false);
-  const fetchNotices = useNoticesStore((state) => state.fetchNotices);
 
   useEffect(() => {
     setIsReady(true);
@@ -26,15 +23,7 @@ export default function Home() {
     }
   }, [isReady, token, router]);
 
-  useEffect(() => {
-    if (token) {
-      fetchNotices();
-    }
-  }, [token, fetchNotices]);
-
   const notices = useNoticesStore((state) => state.notices);
-  // console.log("Notices:", notices);
-
    const latestNotices = [...notices]
     .sort((a, b) => new Date(b.publishDate) - new Date(a.publishDate))
     .slice(0, 6);
@@ -43,24 +32,14 @@ export default function Home() {
     .slice(0, 6);
 
   return (
-    <SafeAreaView className="flex-1 m-2">
+    <View>
-      {/* <View>    */}
     <SearchSection/>
-      <ScrollView showsVerticalScrollIndicator={false}>
+     <ScrollView showsVerticalScrollIndicator={false} className='m-2'>
         <CategorySection title="Polecane kategorie" notices={notices} />
-        <NoticeSection
+        <NoticeSection title="Najnowsze ogłoszenia" notices={latestNotices} ctaLink="/notices?sort=latest"/>
-          title="Najnowsze ogłoszenia"
-          notices={latestNotices}
-          ctaLink="/notices?sort=latest"
-        />
         <UserSection title="Popularni sprzedawcy" notices={notices} />
-        <NoticeSection
+        <NoticeSection title="Proponowane ogłoszenia" notices={recomendedNotices} ctaLink="/notices"/>
-          title="Proponowane ogłoszenia"
-          notices={recomendedNotices}
-          ctaLink="/notices"
-        />
      </ScrollView>
-      {/* </View> */}
+     </View>
-    </SafeAreaView>
   );
 }

ArtisanConnect/app/(tabs)/wishlist.jsx

@@ -13,8 +13,6 @@ export default function Wishlist() {
   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,13 +2,21 @@ 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,4 +1,4 @@
-import { Link, Stack, useLocalSearchParams } from "expo-router";
+import {Stack, useLocalSearchParams} from "expo-router";
 import {Box} from "@/components/ui/box";
 import {Card} from "@/components/ui/card";
 import {Heading} from "@/components/ui/heading";
@@ -6,72 +6,26 @@ 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 {
+import {ActivityIndicator} from "react-native";
-  ActivityIndicator,
+import {useEffect, useState} from "react";
-  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 {Pressable} from "react-native";
-import { getUserById } from "@/api/client";
-
-const { width } = Dimensions.get("window");
 
 export default function NoticeDetails() {
     const {id} = useLocalSearchParams();
-  const [images, setImages] = useState([]);
+    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 [user, setUser] = useState(null);
-  const [isUserLoading, setIsUserLoading] = useState(true);
-  const flatListRef = useRef(null);
-  const [currentIndex, setCurrentIndex] = useState(0);
-
-  const [isMessageFormVisible, setIsMessageFormVisible] = useState(false);
-  const [message, setMessage] = useState("");
-  const [Email, setEmail] = useState("");
-  const handleSendMessage = () => {
-    console.log("Wiadomość do:", user?.email);
-    console.log("Email nadawcy:", Email);
-    console.log("Treść:", message);
-
-    setIsMessageFormVisible(false);
-    setMessage("");
-    setEmail("");
-  };
-
-  const formatDate = (dateString) => {
-    const date = new Date(dateString);
-    return date.toLocaleDateString("pl-PL", {
-      year: "numeric",
-      month: "2-digit",
-      day: "2-digit",
-    });
-  };
 
     const {getNoticeById, getAllImagesByNoticeId} = useNoticesStore();
-  const toggleNoticeInWishlist = useWishlist(
+    const addNoticeToWishlist = useWishlist((state) => state.addNoticeToWishlist);
-    (state) => state.toggleNoticeInWishlist
+    const removeNoticeFromWishlist = useWishlist((state) => state.removeNoticeFromWishlist);
-  );
-
     const isInWishlist = useWishlist((state) =>
-    id ? state.wishlistNotices.some((item) => item.noticeId == id) : false
+        notice ? state.wishlistNotices.some((item) => item.noticeId === notice.noticeId) : false
     );
-  const onViewableItemsChanged = useRef(({ viewableItems }) => {
-    if (viewableItems.length > 0) {
-      setCurrentIndex(viewableItems[0].index);
-    }
-  }).current;
-
-  const viewabilityConfig = useRef({
-    itemVisiblePercentThreshold: 70,
-  }).current;
 
     useEffect(() => {
         const fetchNotice = async () => {
@@ -99,12 +53,8 @@ export default function NoticeDetails() {
             setIsImageLoading(true);
             if (notice) {
                 try {
-          const fetchedImages = await getAllImagesByNoticeId(notice.noticeId);
+                    const images = await getAllImagesByNoticeId(notice.noticeId);
-          setImages(
+                    setImage(images && images.length > 0 ? images[0] : "https://http.cat/404.jpg");
-            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");
@@ -119,24 +69,6 @@ export default function NoticeDetails() {
         }
     }, [notice]);
 
-  useEffect(() => {
-    const fetchUser = async () => {
-      if (notice && notice.clientId) {
-        setIsUserLoading(true);
-        try {
-          const userData = await getUserById(notice.clientId);
-          setUser(userData);
-        } catch (err) {
-          console.error("Nie udało się pobrać danych użytkownika:", err);
-        } finally {
-          setIsUserLoading(false);
-        }
-      }
-    };
-
-    fetchUser();
-  }, [notice]);
-
     if (isLoading) {
         return <ActivityIndicator/>;
     }
@@ -161,63 +93,31 @@ export default function NoticeDetails() {
                     <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: item }}
+                    source={{
-                  className="h-auto w-full rounded-md aspect-square"
+                        uri: image,
-                  alt={`Zdjęcie ${index + 1}`}
+                    }}
-                  resizeMode="contain"
+                    className="h-auto w-full rounded-md aspect-[1/1]"
+                    alt="image"
+                    resizeMode="cover"
                 />
-              </View>
-            )}
-            keyExtractor={(item, index) => index.toString()}
-          />
-
-          {images.length > 1 && (
-            <Box className="flex-row justify-center mt-2">
-              {images.map((_, index) => (
-                <Box
-                  key={index}
-                  className={`w-2 h-2 rounded-full mx-1 ${
-                    index === currentIndex ? "bg-primary-500" : "bg-gray-300"
-                  }`}
-                />
-              ))}
-            </Box>
-          )}
-        </Box>
             )}
 
-      <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">
-          <Box className="flex-row items-center  bg-gray-50 rounded-md p-2">
+                    <Heading size="md" className="flex-1">
-            <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);
+                            if (isInWishlist) {
+                                removeNoticeFromWishlist(notice.noticeId);
+                            } else {
+                                addNoticeToWishlist(notice);
+                            }
                         }}
                     >
                         <Ionicons
@@ -227,111 +127,7 @@ export default function NoticeDetails() {
                         />
                     </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>
-
-                <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

@@ -1,69 +0,0 @@
-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,37 +1,30 @@
-import { View, FlatList } from "react-native";
+import { View, FlatList} from 'react-native';
-import { useEffect, useState } from "react";
+import { useEffect, useState } from 'react'
-import { useAuthStore } from "@/store/authStore";
+import { Heading } from '@/components/ui/heading';
-import { Heading } from "@/components/ui/heading";
+import { Text } from '@/components/ui/text';
-import { Text } from "@/components/ui/text";
+import { Link } from 'expo-router';
-import { Link } from "expo-router";
+import { Pressable } from '@/components/ui/pressable';
-import { Pressable } from "@/components/ui/pressable";
+import axios from 'axios';
-import { listCategories } from "@/api/categories";
 
 export function CategorySection({notices, title}) {
+// const notices = useNoticesStore((state) => state.notices);
+
   const [categoryMap, setCategoryMap] = useState({});
 
   useEffect(() => {
-    const fetchCategories = async () => {
+    axios.get('https://testowe.zikor.pl/api/v1/vars/categories')
-      let data = await listCategories();
+      .then(res => setCategoryMap(res.data))
-      if (Array.isArray(data)) {
+      .catch(() => setCategoryMap({}));
-        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;
 
-  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>
@@ -56,4 +49,5 @@ export function CategorySection({ notices, title }) {
       />
     </View>
   );
+
 }

ArtisanConnect/components/SearchSection.jsx

@@ -2,7 +2,6 @@ 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();
@@ -15,17 +14,18 @@ export function SearchSection({ searchQuery, setSearchQuery }) {
     });
   };
   return (
-    <Box className="mb-2 bg-white p-2 rounded-md">
+    <Box className="m-2 bg-white">
-      <Input className="p-2">
+      <Input>
         <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,27 +1,22 @@
-import { View } from "react-native";
+import { View} from 'react-native';
-import { useEffect, useState } from "react";
+import { useEffect, useState } from 'react'
-import { Heading } from "@/components/ui/heading";
+import { Heading } from '@/components/ui/heading';
-import { FlatList } from "react-native";
+import { FlatList } from 'react-native';
-import axios from "axios";
+import axios from 'axios';
-import UserBlock from "@/components/UserBlock";
+import UserBlock from '@/components/UserBlock';
-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([]);
 
   useEffect(() => {
-    if (token) {
+    axios.get('https://testowe.zikor.pl/api/v1/clients/get/all')
-      axios
+      .then(res => setUsers(res.data))
-        .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.map(user => {
-    const count = notices.filter((n) => n.clientId === user.id).length;
+    const count = notices.filter(n => n.clientId === user.id).length;
     return { ...user, noticeCount: count };
   });
 
@@ -38,9 +33,12 @@ export function UserSection({ notices, title }) {
         showsHorizontalScrollIndicator={false}
         contentContainerStyle={{ paddingHorizontal: 8, gap: 12 }}
         renderItem={({ item }) => {
-          return <UserBlock user={item} />;
+          return (
+            <UserBlock user={item} />
+          );
         }}
       />
     </View>
   );
+
 }

ArtisanConnect/eas.json

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

ArtisanConnect/package.json

@@ -36,10 +36,10 @@
     "@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-image-picker": "~16.1.4",
     "expo-linking": "~7.1.4",
     "expo-router": "~5.0.5",
@@ -51,7 +51,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",
@@ -61,8 +61,7 @@
     "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

@@ -3,30 +3,12 @@ import { createJSONStorage, persist } from "zustand/middleware";
 import AsyncStorage from "@react-native-async-storage/async-storage";
 import axios from "axios";
 
-const API_URL = "https://hopp.zikor.pl/api/v1";
+const API_URL = "https://testowe.zikor.pl/api/v1";
 
 export const useAuthStore = create(
     persist(
-    (set, get) => {
+        (set) => ({
-      // Dodaj interceptor tylko raz
+            user: null,
-      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);
-          }
-        );
-      }
-
-      return {
-        user_id: null,
             token: null,
             isLoading: false,
             error: null,
@@ -36,19 +18,14 @@ export const useAuthStore = create(
                 try {
                     const response = await axios.post(`${API_URL}/auth/login`, {
                         email,
-              password,
+                        password
                     });
 
-            const user_id = response.data.user_id;
+                    const user = response.data.user;
                     const token = response.data.token;
-            set({ user_id: user_id, token: token, isLoading: false });
+                    set({user, token, isLoading: false});
-
-            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
                 } catch (error) {
-            set({
+                    set({error: error.response?.data?.message || error.message, isLoading: false});
-              error: error.response?.data?.message || error.message,
-              isLoading: false,
-            });
                     throw error;
                 }
             },
@@ -56,24 +33,21 @@ export const useAuthStore = create(
             signUp: async (userData) => {
                 set({isLoading: true, error: null});
                 try {
-            const response = await axios.post(
+                    console.log(userData);
-              `${API_URL}/auth/register`,
-              userData,
-              {
-                headers: { "Content-Type": "application/json" },
-              }
-            );
 
-            const user_id = response.data.user_id;
+                    const response = await axios.post(`${API_URL}/auth/register`, userData, {
-            const token = response.data.token;
+                        headers: {'Content-Type': 'application/json'}
-            set({ user_id: user_id, token: token, isLoading: false });
-
-            axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
-          } catch (error) {
-            set({
-              error: error.response?.data?.message || error.message,
-              isLoading: false,
                     });
+
+                    console.log(response.data);
+
+                    const user = response.data.user;
+                    const token = response.data.token;
+                    set({user, token, isLoading: false});
+
+                    return user;
+                } catch (error) {
+                    set({error: error.response?.data?.message || error.message, isLoading: false});
                     throw error;
                 }
             },
@@ -81,58 +55,51 @@ export const useAuthStore = create(
             signInWithGoogle: async (googleToken) => {
                 set({isLoading: true, error: null});
                 try {
-            const response = await axios.post(
+                    const response = await axios.post(`${API_URL}/auth/google`, {token: googleToken});
-              `${API_URL}/auth/google`,
+
-              { googleToken: googleToken },
+                    const {user, token} = response.data;
-              {
+                    set({user, token, isLoading: false});
-                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}`;
+
+                    return user;
                 } catch (error) {
-            set({
+                    set({error: error.response?.data?.message || error.message, isLoading: false});
-              error: error.response?.data?.message || error.message,
-              isLoading: false,
-            });
                     throw error;
                 }
             },
 
             signOut: async () => {
                 try {
+                    // Можно отправить запрос на бэкенд для инвалидации токена
                     await axios.post(`${API_URL}/auth/logout`);
                 } catch (error) {
                     console.error("Logout error:", error);
                 } finally {
                     delete axios.defaults.headers.common["Authorization"];
-            set({ user_id: null, token: null });
+                    set({user: null, token: null});
                 }
             },
 
-        // checkAuth: async () => {
+            checkAuth: async () => {
-        //   const { token } = useAuthStore.getState();
+                const {token} = useAuthStore.getState();
-        //   if (!token) return null;
+                if (!token) return null;
 
-        //   set({ isLoading: true });
+                set({isLoading: true});
-        //   try {
+                try {
-        //     axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+                    axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
 
-        //     const response = await axios.get(`${API_URL}/auth/me`);
+                    const response = await axios.get(`${API_URL}/auth/me`);
 
-        //     set({ user_id: response.data, isLoading: false });
+                    set({user: response.data, isLoading: false});
-        //     return response.data;
+                    return response.data;
-        //   } catch (error) {
+                } catch (error) {
-        //     delete axios.defaults.headers.common["Authorization"];
+                    delete axios.defaults.headers.common["Authorization"];
-        //     set({ user_id: null, token: null, isLoading: false });
+                    set({user: null, token: null, isLoading: false});
-        //     return null;
+                    return null;
-        //   }
+                }
-        // },
-      };
             },
+        }),
         {
             name: "auth-storage",
             storage: createJSONStorage(() => AsyncStorage),