refactor the urls so the main url is the home page

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

Hide file tree

Showing 9 changed files with 8 additions and 62 deletions.
diff --git a/organizator/app/(tabs)/home/[id].tsx → organizator/app/(tabs)/(home)/[id].tsx b/organizator/app/(tabs)/home/[id].tsx → organizator/app/(tabs)/(home)/[id].tsx
@@ -86,7 +86,7 @@ export default function EventPage() {
     deleteEvent(id)
       .then(() => {
         setShowAlert(false);
-        router.replace("/home");
+        router.replace("/");
       })
       .catch((error) => {
         console.log(error);

diff --git a/organizator/app/(tabs)/home/_layout.tsx → organizator/app/(tabs)/(home)/_layout.tsx b/organizator/app/(tabs)/home/_layout.tsx → organizator/app/(tabs)/(home)/_layout.tsx
diff --git a/organizator/app/(tabs)/home/index.tsx → organizator/app/(tabs)/(home)/index.tsx b/organizator/app/(tabs)/home/index.tsx → organizator/app/(tabs)/(home)/index.tsx
@@ -76,7 +76,7 @@ export default function Home() {
                   Come back in a few days... maybe we have news!
                 </SubTitle>
                 <Image
-                  source={require("../../../assets/noInformation.jpg")}
+                  source={require("../../../assets/empty.png")}
                   style={{ width: 280, height: 280, alignSelf: "center" }}
                 />
               </NoEventsContainer>
@@ -85,7 +85,7 @@ export default function Home() {
                 {events.map((event) => (
                   <Pressable
                     onPress={() => {
-                      router.push(`/home/${event.id}`);
+                      router.push(`/${event.id}`);
                     }}
                     key={event.id}
                   >

diff --git a/organizator/app/(tabs)/_layout.tsx b/organizator/app/(tabs)/_layout.tsx
@@ -6,7 +6,7 @@ export default function HomepageTabs() {
   return (
     <Tabs>
       <Tabs.Screen
-        name="home"
+        name="(home)"
         options={{
           tabBarLabel: "Home",
           headerTitle: "All upcoming events",

diff --git a/organizator/app/index.tsx b/organizator/app/index.tsx
diff --git a/organizator/app/login.tsx b/organizator/app/login.tsx
@@ -77,7 +77,7 @@ export default function LoginPage() {
   useEffect(() => {
     getToken().then((token) => {
       if (token) {
-        router.replace("/home");
+        router.replace("/");
       }
     });
   });
@@ -118,7 +118,7 @@ export default function LoginPage() {
         });
       } else {
         storeToken(response.token);
-        router.replace("/home");
+        router.replace("/");
       }
     });
   };

diff --git a/organizator/app/register.tsx b/organizator/app/register.tsx
@@ -66,7 +66,7 @@ export default function RegisterPage() {
   useEffect(() => {
     getToken().then((token) => {
       if (token) {
-        router.replace("/home");
+        router.replace("/");
       }
     });
   });
@@ -151,7 +151,7 @@ export default function RegisterPage() {
           visibilityTime: 8000,
         });
       } else {
-        router.replace("/home");
+        router.replace("/(home)login");
       }
     });
   };

diff --git a/organizator/assets/empty.png b/organizator/assets/empty.png
diff --git a/organizator/assets/noInformation.jpg b/organizator/assets/noInformation.jpg