Loading page refactor (#49)

carlotacb · Dec 30, 2023 · b565257 · b565257
1 parent 27df532
commit b565257
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 36 deletions.
diff --git 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() {
     <Container>
       <ScrollView contentContainerStyle={{ padding: 10 }}>
         {loading ? (
-          <View style={{ flex: 1, justifyContent: "center", marginTop: 30 }}>
-            <ActivityIndicator size="large" />
-          </View>
+          <LoadingPage />
         ) : (
           <View style={{ justifyContent: "center" }}>
             {events.length === 0 ? (

diff --git 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() {
     <Container>
       <ScrollView contentContainerStyle={{ padding: 20 }}>
         {loading ? (
-          <View style={{ flex: 1, justifyContent: "center" }}>
-            <ActivityIndicator size="large" />
-          </View>
+          <LoadingPage />
         ) : (
           <>
             <TitleContainer>

diff --git 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() {
       >
         <Toast />
         {loading ? (
-          <View style={{ flex: 1, justifyContent: "center" }}>
-            <ActivityIndicator size="large" />
-          </View>
+          <LoginPage />
         ) : (
           <>
             <Title>Welcome back!</Title>

diff --git 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() {
     <Container>
       <ScrollView contentContainerStyle={{ padding: 20 }}>
         {loading ? (
-          <View style={{ flex: 1, justifyContent: "center" }}>
-            <ActivityIndicator size="large" />
-          </View>
+          <LoadingPage />
         ) : (
           <>
             <Title>Welcome!</Title>