Merge remote-tracking branch 'origin/authentication' into wishlistIntegrationAndHomeScreen

ArtisanConnect/api/notices.jsx

@@ -1,12 +1,21 @@
 import axios from "axios";
 import FormData from 'form-data'
+import {useAuthStore} from "@/store/authStore";
 
-const API_URL = "https://testowe.zikor.pl/api/v1";
+// const API_URL = "https://testowe.zikor.pl/api/v1";
 
-// const API_URL = "http://172.20.10.2:8080/api/v1";
+const API_URL = "http://10.0.2.2:8080/api/v1";
 
 export async function listNotices() {
-    const response = await fetch(`${API_URL}/notices/get/all`);
+    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());
@@ -17,11 +26,11 @@ export async function listNotices() {
 export async function getNoticeById(noticeId) {
     const response = await fetch(`${API_URL}/notices/get/${noticeId}`);
 
-  const data = await response.json();
+    const data = await response.json();
-  if (!response.ok) {
+    if (!response.ok) {
-    throw new Error("Error");
+        throw new Error("Error");
-  }
+    }
-  return data;
+    return data;
 }
 
 export async function createNotice(notice) {

ArtisanConnect/app.json

@@ -38,7 +38,8 @@
         {
           "cameraPermission": "Please allow $(PRODUCT_NAME) to access your camera"
         }
-      ]
+      ],
+      "expo-web-browser"
     ]
   }
-}
+}

ArtisanConnect/app/(tabs)/_layout.jsx

@@ -1,64 +1,75 @@
-import { Tabs } from "expo-router";
+import {Tabs} from "expo-router";
-import { Ionicons } from "@expo/vector-icons";
+import {Ionicons} from "@expo/vector-icons";
 
 export default function TabLayout() {
-  return (
+    return (
-    <Tabs
+        <Tabs
-      screenOptions={{
+            screenOptions={{
-        tabBarActiveTintColor: "rgb(var(--color-primary-500))",
+                tabBarActiveTintColor: "rgb(var(--color-primary-500))",
-      }}
+            }}
-    >
+        >
-      <Tabs.Screen
+            <Tabs.Screen
-        name="index"
+                name="index"
-        options={{
+                options={{
-          title: "Home",
+                    title: "Home",
-          tabBarLabel: "Home",
+                    tabBarLabel: "Home",
-          tabBarIcon: ({ color, size }) => (
+                    tabBarIcon: ({color, size}) => (
-            <Ionicons name="home-outline" size={size} color={color} />
+                        <Ionicons name="home-outline" size={size} color={color}/>
-          ),
+                    ),
-        }}
+                }}
-      />
+            />
-      <Tabs.Screen
+            <Tabs.Screen
-        name="notices"
+                name="notices"
-        options={{
+                options={{
-          title: "Ogłoszenia",
+                    title: "Ogłoszenia",
-          tabBarLabel: "Ogłoszenia",
+                    tabBarLabel: "Ogłoszenia",
-          tabBarIcon: ({ color, size }) => (
+                    tabBarIcon: ({color, size}) => (
-            <Ionicons name="list-outline" size={size} color={color} />
+                        <Ionicons name="list-outline" size={size} color={color}/>
-          ),
+                    ),
-        }}
+                }}
-      />
+            />
-      <Tabs.Screen
+            <Tabs.Screen
-        name="notice/create"
+                name="notice/create"
-        options={{
+                options={{
-          title: "Dodaj",
+                    title: "Dodaj",
-          tabBarLabel: "Dodaj",
+                    tabBarLabel: "Dodaj",
-          tabBarIcon: ({ color, size }) => (
+                    tabBarIcon: ({color, size}) => (
-            <Ionicons name="add-circle-outline" size={size} color={color} />
+                        <Ionicons name="add-circle-outline" size={size} color={color}/>
-          ),
+                    ),
-        }}
+                }}
-      />
+            />
-      <Tabs.Screen
+            <Tabs.Screen
-        name="wishlist"
+                name="wishlist"
-        options={{
+                options={{
-          title: "Ulubione",
+                    title: "Ulubione",
-          tabBarLabel: "Ulubione",
+                    tabBarLabel: "Ulubione",
-          tabBarIcon: ({ color, size }) => (
+                    tabBarIcon: ({color, size}) => (
-            <Ionicons name="heart-outline" size={size} color={color} />
+                        <Ionicons name="heart-outline" size={size} color={color}/>
-          ),
+                    ),
-        }}
+                }}
-      />
+            />
-      <Tabs.Screen
+            <Tabs.Screen
-        name="dashboard"
+                name="login"
-        options={{
+                options={{
-          headerShown: false, // Ukryj nagłówek dla Drawer
+                    headerShown: false, // Ukryj nagłówek dla Drawer
-          title: "Konto",
+                    title: "Authentication",
-          tabBarLabel: "Konto",
+                    tabBarLabel: "Authentication",
-          tabBarIcon: ({ color, size }) => (
+                    tabBarIcon: ({color, size}) => (
-            <Ionicons name="person-outline" size={size} color={color} />
+                        <Ionicons name="key" size={size} color={color}/>
-          ),
+                    ),
-        }}
+                }}
-      />
+            />
-    </Tabs>
+            <Tabs.Screen
-  );
+                name="dashboard"
+                options={{
+                    headerShown: false, // Ukryj nagłówek dla Drawer
+                    title: "Konto",
+                    tabBarLabel: "Konto",
+                    tabBarIcon: ({color, size}) => (
+                        <Ionicons name="person-outline" size={size} color={color}/>
+                    ),
+                }}
+            />
+        </Tabs>
+    );
 }

ArtisanConnect/app/(tabs)/login.jsx

@@ -0,0 +1,114 @@
+import React, {useState} from 'react';
+import {StyleSheet, ActivityIndicator, SafeAreaView, View} from 'react-native';
+import {useAuthStore} from '@/store/authStore';
+import {useRouter, Link} from 'expo-router';
+
+import {Box} from "@/components/ui/box"
+import {Button, ButtonText, ButtonIcon} from "@/components/ui/button"
+import {Center} from "@/components/ui/center"
+import {Heading} from "@/components/ui/heading"
+import {Input, InputField} from "@/components/ui/input"
+import {Text} from "@/components/ui/text"
+import {VStack} from "@/components/ui/vstack"
+import {HStack} from "@/components/ui/hstack"
+import {ArrowRightIcon} from "@/components/ui/icon"
+import {Divider} from '@/components/ui/divider';
+import {Ionicons} from "@expo/vector-icons";
+
+export default function Login() {
+    const [email, setEmail] = useState('');
+    const [password, setPassword] = useState('');
+    const {signIn, isLoading} = useAuthStore();
+    const router = useRouter();
+
+    const handleInternalLogin = async () => {
+        if (!email || !password) {
+            alert('Proszę wprowadzić email i hasło.');
+            return;
+        }
+
+        try {
+            await signIn(email, password);
+            alert(`Zalogowano jako ${email}`);
+            router.replace('/');
+        } catch (e) {
+            alert("Błąd logowania: " + (e.response?.data?.message || e.message));
+        }
+    }
+
+    if (isLoading) {
+        return (
+            <View style={styles.container}>
+                <ActivityIndicator size="large"/>
+            </View>
+        );
+    }
+
+    return (
+        <SafeAreaView style={styles.container}>
+            <Center>
+                <Box className="p-5 max-w-96 border border-background-300 rounded-lg">
+                    <VStack className="pb-4" space="xs">
+                        <Heading className="leading-[30px]">Logowanie</Heading>
+                        <Box className="flex flex-row">
+                            <Link href="/registration" asChild>
+                                <Button variant="link" size="sm" className="p-0">
+                                    <ButtonText style={styles.signupbutton}>Nie masz jeszcze konta? Załóz je
+                                        tutaj!</ButtonText>
+                                    <ButtonIcon className="mr-1" size="md" as={ArrowRightIcon}/>
+                                </Button>
+                            </Link>
+                        </Box>
+                    </VStack>
+                    <VStack space="xl" className="py-2">
+                        <Input>
+                            <InputField className="py-2" placeholder="Login" onChangeText={setEmail}/>
+                        </Input>
+                        <Input>
+                            <InputField type="password" className="py-2" placeholder="Hasło"
+                                        onChangeText={setPassword}/>
+                        </Input>
+                    </VStack>
+                    <VStack space="lg" className="pt-4">
+                        <Button size="sm" onPress={handleInternalLogin}>
+                            <ButtonText>Zaloguj się</ButtonText>
+                        </Button>
+                    </VStack>
+
+                    <HStack alignItems="center" space="sm" className="pt-6 pb-6">
+                        <Divider flex={1}/>
+                        <Text fontSize="$sm" className="text-gray-300">
+                            lub
+                        </Text>
+                        <Divider flex={1}/>
+                    </HStack>
+                    <Button size="sm">
+                        <Ionicons name="logo-google" color="#fff"/>
+                    </Button>
+                </Box>
+            </Center>
+        </SafeAreaView>
+    );
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: 'center',
+        padding: 20,
+    },
+    input: {
+        borderWidth: 1,
+        borderColor: '#ddd',
+        borderRadius: 5,
+        marginBottom: 15,
+        padding: 10,
+    },
+    errorText: {
+        color: 'red',
+        marginBottom: 10,
+    },
+    signupbutton: {
+        fontWeight: '300',
+    },
+});

ArtisanConnect/app/registration.jsx

@@ -0,0 +1,96 @@
+import React, {useState} from 'react';
+import {StyleSheet, ActivityIndicator, SafeAreaView, View} from 'react-native';
+import {useAuthStore} from '@/store/authStore';
+import {useRouter} from 'expo-router';
+
+import {Box} from "@/components/ui/box"
+import {Button, ButtonText} from "@/components/ui/button"
+import {Center} from "@/components/ui/center"
+import {Heading} from "@/components/ui/heading"
+import {Input, InputField} from "@/components/ui/input"
+import {VStack} from "@/components/ui/vstack"
+
+export default function Registration() {
+    const [email, setEmail] = useState('');
+    const [password, setPassword] = useState('');
+    const [firstName, setFirstName] = useState('');
+    const [lastName, setLastName] = useState('');
+    const {signUp, isLoading} = useAuthStore();
+    const router = useRouter();
+
+    const handleInternalRegistration = async () => {
+        if (!email || !password || !firstName || !lastName) {
+            alert('Proszę uzupełnić wszystkie pola');
+            return;
+        }
+
+        try {
+            await signUp({email, password, firstName, lastName});
+            alert(`Zalogowano jako ${email}`);
+            router.replace('/');
+        } catch (e) {
+            alert("Błąd logowania: " + (e.response?.data?.message || e.message));
+        }
+    }
+
+    if (isLoading) {
+        return (
+            <View style={styles.container}>
+                <ActivityIndicator size="large"/>
+            </View>
+        );
+    }
+
+    return (
+        <SafeAreaView style={styles.container}>
+            <Center>
+                <Box className="p-5 w-[80%] border border-background-300 rounded-lg">
+                    <VStack className="pb-4" space="xs">
+                        <Heading className="leading-[30px]">Rejestracja</Heading>
+                    </VStack>
+                    <VStack space="xl" className="py-2">
+                        <Input>
+                            <InputField type="email" className="py-2" placeholder="E-mail" onChangeText={setEmail}/>
+                        </Input>
+                        <Input>
+                            <InputField className="py-2" placeholder="Imię" onChangeText={setFirstName}/>
+                        </Input>
+                        <Input>
+                            <InputField className="py-2" placeholder="Nazwisko" onChangeText={setLastName}/>
+                        </Input>
+                        <Input>
+                            <InputField type="password" className="py-2" placeholder="Hasło"
+                                        onChangeText={setPassword}/>
+                        </Input>
+                    </VStack>
+                    <VStack space="lg" className="pt-4">
+                        <Button size="sm" onPress={handleInternalRegistration}>
+                            <ButtonText>Zarejestruj się</ButtonText>
+                        </Button>
+                    </VStack>
+                </Box>
+            </Center>
+        </SafeAreaView>
+    );
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: 'center',
+    },
+    formContainer: {
+        width: '80%',
+    },
+    input: {
+        borderWidth: 1,
+        borderColor: '#ddd',
+        borderRadius: 5,
+        marginBottom: 15,
+        padding: 10,
+    },
+    errorText: {
+        color: 'red',
+        marginBottom: 10,
+    },
+});

ArtisanConnect/package.json

@@ -15,6 +15,7 @@
     "@gluestack-ui/actionsheet": "^0.2.53",
     "@gluestack-ui/avatar": "^0.1.18",
     "@gluestack-ui/button": "^1.0.14",
+    "@gluestack-ui/divider": "^0.1.10",
     "@gluestack-ui/form-control": "^0.1.19",
     "@gluestack-ui/hstack": "^0.1.17",
     "@gluestack-ui/icon": "^0.1.27",
@@ -29,19 +30,24 @@
     "@gluestack-ui/themed": "^1.1.73",
     "@gluestack-ui/toast": "^1.0.9",
     "@legendapp/motion": "^2.4.0",
+    "@react-native-async-storage/async-storage": "2.1.2",
+    "@react-native-community/cli-link-assets": "^18.0.0",
     "@react-navigation/drawer": "^7.3.11",
     "@tanstack/react-query": "^5.74.4",
     "axios": "^1.9.0",
     "babel-plugin-module-resolver": "^5.0.2",
     "expo": "^53.0.0",
+    "expo-auth-session": "~6.1.5",
     "expo-camera": "~16.1.6",
     "expo-constants": "~17.1.5",
     "expo-image-picker": "~16.1.4",
     "expo-linking": "~7.1.4",
     "expo-router": "~5.0.5",
     "expo-status-bar": "~2.2.3",
+    "expo-web-browser": "~14.1.6",
     "form-data": "^4.0.2",
     "fs": "^0.0.1-security",
+    "lucide-react-native": "^0.511.0",
     "nativewind": "^4.1.23",
     "react": "19.0.0",
     "react-dom": "19.0.0",

ArtisanConnect/store/authStore.jsx

@@ -0,0 +1,108 @@
+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";
+
+export const useAuthStore = create(
+    persist(
+        (set) => ({
+            user: null,
+            token: null,
+            isLoading: false,
+            error: null,
+
+            signIn: async (email, password) => {
+                set({isLoading: true, error: null});
+                try {
+                    const response = await axios.post(`${API_URL}/auth/login`, {
+                        email,
+                        password
+                    });
+
+                    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;
+                }
+            },
+
+            signUp: async (userData) => {
+                set({isLoading: true, error: null});
+                try {
+                    console.log(userData);
+
+                    const response = await axios.post(`${API_URL}/auth/register`, userData, {
+                        headers: {'Content-Type': 'application/json'}
+                    });
+
+                    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;
+                }
+            },
+
+            signInWithGoogle: async (googleToken) => {
+                set({isLoading: true, error: null});
+                try {
+                    const response = await axios.post(`${API_URL}/auth/google`, {token: googleToken});
+
+                    const {user, token} = response.data;
+                    set({user, token, isLoading: false});
+
+                    axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+
+                    return user;
+                } catch (error) {
+                    set({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: null, token: null});
+                }
+            },
+
+            checkAuth: async () => {
+                const {token} = useAuthStore.getState();
+                if (!token) return null;
+
+                set({isLoading: true});
+                try {
+                    axios.defaults.headers.common["Authorization"] = `Bearer ${token}`;
+
+                    const response = await axios.get(`${API_URL}/auth/me`);
+
+                    set({user: 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),
+        }
+    )
+);