Skip to content

Commit 94b71d6

Browse files
committed
feat(ui): basic styling done tab bar
1 parent e1cd79d commit 94b71d6

6 files changed

Lines changed: 2182 additions & 5780 deletions

File tree

frontend/app/(tabs)/_layout.tsx

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
11
import { Tabs } from 'expo-router';
2+
import {Home,Search,Ticket,User } from 'lucide-react-native'
23

34
export default function TabLayout() {
45
return (
5-
<Tabs screenOptions={{ headerShown: false }}>
6-
<Tabs.Screen name="home/index" options={{ title: 'Home' }} />
7-
<Tabs.Screen name="search/index" options={{ title: 'Search' }} />
8-
<Tabs.Screen name="events/index" options={{ title: 'Events' }} />
6+
<Tabs
7+
screenOptions={{
8+
headerShown: false,
9+
tabBarShowLabel:false,
10+
tabBarStyle:{
11+
height:60,
12+
paddingTop:6,
13+
paddingBottom:6,
14+
},
15+
tabBarActiveTintColor:'#22c55e',
16+
tabBarInactiveTintColor:'#9ca3af'
17+
}}>
18+
<Tabs.Screen name="home/index" options={{title: 'Home', tabBarIcon:({color,size})=>(<Home color={color} size={size} strokeWidth={1}/>)
19+
}} />
20+
<Tabs.Screen name="search/index" options={{ title: 'Search',tabBarIcon:({color,size})=>(<Search color={color} size={size} strokeWidth={1} />) }} />
21+
<Tabs.Screen name="events/index" options={{ title: 'Events',tabBarIcon:({color,size})=>(<Ticket color={color} size={size} strokeWidth={1}/>) }} />
922
<Tabs.Screen name="events/[id]" options={{ href: null }} />
10-
<Tabs.Screen name="profile/index" options={{ title: 'Profile' }} />
23+
<Tabs.Screen name="profile/index" options={{ title: 'Profile', tabBarIcon:({color,size})=>(<User color={color} size={size} strokeWidth={1}/>) }} />
1124
</Tabs>
1225
);
1326
}

frontend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"expo-symbols": "~1.0.8",
3131
"expo-system-ui": "~6.0.9",
3232
"expo-web-browser": "~15.0.10",
33+
"lucide-react-native": "^0.562.0",
3334
"react": "19.1.0",
3435
"react-dom": "19.1.0",
3536
"react-native": "0.81.5",

frontend/screens/auth/PhoneScreen.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@ export default function PhoneScreen() {
2323
params: { phone: fullPhoneNumber },
2424
});
2525
}
26-
} finally {
26+
}catch(err:any){
27+
const data = err?.response?.data
28+
if(data.next=="login"){
29+
router.push("/(auth)/login")
30+
}
31+
}
32+
finally {
2733
setLoading(false);
2834
}
2935
};

frontend/screens/auth/RegisterScreen.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
import { useState } from 'react';
1111
import { useRouter, useLocalSearchParams } from 'expo-router';
1212
import { registerUser } from '@/services/auth/otp.service';
13+
import { storeTokens } from '@/services/token/token.storage';
1314

1415
const INTERESTS = [
1516
'Technology',
@@ -86,6 +87,7 @@ export default function RegisterScreen() {
8687

8788
if (res?.success) {
8889
router.replace('/(tabs)/home');
90+
storeTokens(res.accesstoken,res.refreshtoken)
8991
} else {
9092
Alert.alert('Registration failed', res?.message || 'Try again');
9193
}

frontend/screens/auth/loginScreen.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
import { useState } from 'react';
1010
import { useRouter } from 'expo-router';
1111
import { loginUser } from '@/services/auth/otp.service';
12+
import { storeTokens } from '@/services/token/token.storage';
1213

1314
export default function LoginScreen() {
1415
const router = useRouter();
@@ -18,9 +19,13 @@ export default function LoginScreen() {
1819

1920
async function handleLogin() {
2021
const res = await loginUser({ phoneNumber, password });
22+
console.log(res);
23+
2124

2225
if (res?.success) {
2326
router.replace('/(tabs)/home');
27+
storeTokens(res.accesstoken,res.refreshtoken)
28+
2429
}
2530
}
2631

0 commit comments

Comments
 (0)