diff --git a/organizator/app/(tabs)/(home)/index.tsx b/organizator/app/(tabs)/(home)/index.tsx index 87d41818..fd9c45ef 100644 --- a/organizator/app/(tabs)/(home)/index.tsx +++ b/organizator/app/(tabs)/(home)/index.tsx @@ -1,6 +1,5 @@ import React, { useEffect } from "react"; import { - ActivityIndicator, Image, Pressable, SafeAreaView, @@ -14,6 +13,7 @@ import { router } from "expo-router"; import { EventAllInformation } from "../../../utils/interfaces/Events"; import { getAllEvents } from "../../../utils/api/axiosEvents"; import Card from "../../../components/Card"; +import LoadingPage from "../../../components/LodingPage"; const Container = styled(SafeAreaView)` background-color: white; @@ -64,9 +64,7 @@ export default function Home() { {loading ? ( - - - + ) : ( {events.length === 0 ? ( diff --git a/organizator/app/(tabs)/profile.tsx b/organizator/app/(tabs)/profile.tsx index 9ec68866..20a0cc54 100644 --- a/organizator/app/(tabs)/profile.tsx +++ b/organizator/app/(tabs)/profile.tsx @@ -1,12 +1,5 @@ import React, { useEffect, useState } from "react"; -import { - ActivityIndicator, - Pressable, - SafeAreaView, - ScrollView, - Text, - View, -} from "react-native"; +import { Pressable, SafeAreaView, ScrollView, Text, View } from "react-native"; import { router } from "expo-router"; // @ts-ignore import styled from "styled-components/native"; @@ -21,6 +14,7 @@ import { getToken, removeToken } from "../../utils/sessionCalls"; import { UserInformation } from "../../utils/interfaces/Users"; import Input from "../../components/Input"; import Button from "../../components/StyledButton"; +import LoadingPage from "../../components/LodingPage"; const Container = styled(SafeAreaView)` padding: 30px; @@ -156,9 +150,7 @@ export default function Profile() { {loading ? ( - - - + ) : ( <> diff --git a/organizator/app/login.tsx b/organizator/app/login.tsx index 375699e8..76a8bf66 100644 --- a/organizator/app/login.tsx +++ b/organizator/app/login.tsx @@ -1,14 +1,7 @@ import React, { useEffect, useState } from "react"; // @ts-ignore import styled from "styled-components/native"; -import { - SafeAreaView, - Text, - ScrollView, - ActivityIndicator, - View, - Pressable, -} from "react-native"; +import { SafeAreaView, Text, ScrollView, View, Pressable } from "react-native"; import { Link, router } from "expo-router"; import Toast from "react-native-toast-message"; @@ -141,9 +134,7 @@ export default function LoginPage() { > {loading ? ( - - - + ) : ( <> Welcome back! diff --git a/organizator/app/register.tsx b/organizator/app/register.tsx index 9b70ed62..4410d0ce 100644 --- a/organizator/app/register.tsx +++ b/organizator/app/register.tsx @@ -1,13 +1,7 @@ import React, { useEffect, useState } from "react"; // @ts-ignore import styled from "styled-components/native"; -import { - SafeAreaView, - Text, - ScrollView, - ActivityIndicator, - View, -} from "react-native"; +import { SafeAreaView, Text, ScrollView, View } from "react-native"; import { router } from "expo-router"; import Toast from "react-native-toast-message"; @@ -16,6 +10,7 @@ import Button from "../components/StyledButton"; import { registerUser } from "../utils/api/axiosUsers"; import { RegisterResponse } from "../utils/interfaces/Users"; import { getToken } from "../utils/sessionCalls"; +import LoadingPage from "../components/LodingPage"; const Container = styled(SafeAreaView)` padding: 50px 40px; @@ -167,9 +162,7 @@ export default function RegisterPage() { {loading ? ( - - - + ) : ( <> Welcome!