From 8f72f285668305e3251aceae1f6d84babb915be1 Mon Sep 17 00:00:00 2001
From: Andrii Solianyk <asolianik2015@gmail.com>
Date: Tue, 10 Jun 2025 11:24:08 +0200
Subject: [PATCH] =?UTF-8?q?Order=20zwraca=C5=82=20403,=20bo=20nie=20by?=
 =?UTF-8?q?=C5=82o=20header=C3=B3w=20Zdj=C4=99cia=20nie=20by=C5=82y=20cent?=
 =?UTF-8?q?erowane=20wzgl=C4=99dem=20szeroko=C5=9Bci?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ArtisanConnect/api/order.jsx                  |  5 +-
 ArtisanConnect/app/(auth)/login.jsx           |  3 +-
 .../app/(tabs)/dashboard/account.jsx          |  2 +-
 ArtisanConnect/app/_layout.jsx                | 52 +++++++++----------
 ArtisanConnect/app/notice/[id].jsx            |  6 ++-
 5 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/ArtisanConnect/api/order.jsx b/ArtisanConnect/api/order.jsx
index b8348a3..fa984d6 100644
--- a/ArtisanConnect/api/order.jsx
+++ b/ArtisanConnect/api/order.jsx
@@ -27,7 +27,6 @@ export async function createOrder(noticeId, orderType) {
 export async function createPayment(orderId) {
   const { token } = useAuthStore.getState();
   const headers = token ? { Authorization: `Bearer ${token}` } : {};
-  const clientId = 1;
   try {
     const response = await axios.post(
       `${API_URL}/token?orderId=${orderId}`,
@@ -48,7 +47,7 @@ export async function getOrder(orderId) {
   const headers = token ? { Authorization: `Bearer ${token}` } : {};
 
   try {
-    const response = await axios.get(`${API_URL}/get/${orderId}`, { headers });
+    const response = await axios.get(`${API_URL}/get/${orderId}`, { headers: headers });
     return response.data;
   } catch (error) {
     console.error(
@@ -65,7 +64,7 @@ export async function listOrders() {
   const headers = token ? { Authorization: `Bearer ${token}` } : {};
 
   try {
-    const response = await axios.get(`${API_URL}/get/all`, { headers });
+    const response = await axios.get(`${API_URL}/get/all`, { headers: headers });
     return response.data;
   } catch (error) {
     console.error(
diff --git a/ArtisanConnect/app/(auth)/login.jsx b/ArtisanConnect/app/(auth)/login.jsx
index ec33970..ed5cf42 100644
--- a/ArtisanConnect/app/(auth)/login.jsx
+++ b/ArtisanConnect/app/(auth)/login.jsx
@@ -1,7 +1,7 @@
 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';
+import {useRouter} from 'expo-router';
 
 import {Box} from "@/components/ui/box"
 import {Button, ButtonText, ButtonIcon} from "@/components/ui/button"
@@ -73,6 +73,7 @@ export default function Login() {
                 user = await getUserInfo(response.authentication.accessToken)
                 await signInWithGoogle(response.authentication.accessToken);
                 alert(`Zalogowano jako ${user.email}`);
+                router.replace('/');
             }
 
         } else {
diff --git a/ArtisanConnect/app/(tabs)/dashboard/account.jsx b/ArtisanConnect/app/(tabs)/dashboard/account.jsx
index e04149e..40d3128 100644
--- a/ArtisanConnect/app/(tabs)/dashboard/account.jsx
+++ b/ArtisanConnect/app/(tabs)/dashboard/account.jsx
@@ -84,7 +84,7 @@ export default function Account() {
         </Link>
 
         {/*Tak dodałem, można zmienić na coś innego*/}
-        <Link href="/dashboard/userPaymentHistory" asChild>
+        <Link href="/dashboard/userOrders" asChild>
           <Pressable className="py-3 flex-row items-center border-b border-gray-100">
             <Text className="text-lg flex-1">Historia płatności</Text>
             <Text>▶</Text>
diff --git a/ArtisanConnect/app/_layout.jsx b/ArtisanConnect/app/_layout.jsx
index f6b4b19..efcb017 100644
--- a/ArtisanConnect/app/_layout.jsx
+++ b/ArtisanConnect/app/_layout.jsx
@@ -1,31 +1,31 @@
-import { Stack, Redirect } from "expo-router";
+import {Stack} from "expo-router";
 import "@/global.css";
-import { GluestackUIProvider } from "@/components/ui/gluestack-ui-provider";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import {GluestackUIProvider} from "@/components/ui/gluestack-ui-provider";
+import {QueryClient, QueryClientProvider} from "@tanstack/react-query";
 
 const queryClient = new QueryClient();
 export default function RootLayout() {
-  
-return (
-    <QueryClientProvider client={queryClient}>
-      <GluestackUIProvider>
-        <Stack
-          screenOptions={{
-            headerTintColor: "#1c1c1e",
-            headerBackTitleVisible: false,
-            headerBackTitle: "Wróć",
-          }}
-        >
-          <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-            <Stack.Screen name="user" options={{ headerShown: false }} />
-          <Stack.Screen
-            name="(auth)/login"
-            options={{ headerShown: false }}/>
-          <Stack.Screen 
-          name="registration"
-          options={{ headerShown: false }}/>
-        </Stack>
-      </GluestackUIProvider>
-    </QueryClientProvider>
-  );
+
+    return (
+        <QueryClientProvider client={queryClient}>
+            <GluestackUIProvider>
+                <Stack
+                    screenOptions={{
+                        headerTintColor: "#1c1c1e",
+                        headerBackTitleVisible: false,
+                        headerBackTitle: "Wróć",
+                    }}
+                >
+                    <Stack.Screen name="(tabs)" options={{headerShown: false}}/>
+                    {/*<Stack.Screen name="user" options={{headerShown: false}}/>*/}
+                    <Stack.Screen
+                        name="(auth)/login"
+                        options={{headerShown: false}}/>
+                    <Stack.Screen
+                        name="registration"
+                        options={{headerShown: false}}/>
+                </Stack>
+            </GluestackUIProvider>
+        </QueryClientProvider>
+    );
 }
diff --git a/ArtisanConnect/app/notice/[id].jsx b/ArtisanConnect/app/notice/[id].jsx
index e6d2f14..cf23971 100644
--- a/ArtisanConnect/app/notice/[id].jsx
+++ b/ArtisanConnect/app/notice/[id].jsx
@@ -49,6 +49,8 @@ export default function NoticeDetails() {
   const [Email, setEmail] = useState("");
   const [isSending, setIsSending] = useState(false);
 
+  const {width} = Dimensions.get("window");
+
   const handleSendMessage = async () => {
     setIsSending(true);
     console.log("Rozpoczynanie procesu wysyłania wiadomości...");
@@ -303,6 +305,7 @@ export default function NoticeDetails() {
             data={images}
             horizontal
             snapToAlignment="start"
+            snapToInterval={width}
             decelerationRate="fast"
             showsHorizontalScrollIndicator={false}
             pagingEnabled
@@ -311,13 +314,14 @@ export default function NoticeDetails() {
             style={isLandscape ? { flex: 1 } : {}}
             renderItem={({ item, index }) => (
               <View
-                style={{ width: Dimensions.get("window").width }}
+                style={{ width: width }}
                 className="p-1"
               >
                 <Image
                   source={item}
                   // className="h-auto w-auto rounded-md aspect-[1/1]"
                   alt={`Zdjęcie ${index + 1}`}
+                  resizeMode="cover"
                   renderMode="contain"
                   className={
                     isLandscape