join #19

Merged
amaliadwiy merged 222 commits from join into v1 2026-02-09 11:18:03 +08:00
208 changed files with 4789 additions and 1685 deletions
Showing only changes of commit 5fcabc5d77 - Show all commits

View File

@@ -74,7 +74,7 @@ export default function CreateDivisionAddAdmin() {
return ( return (
<SafeAreaView> <>
<Stack.Screen <Stack.Screen
options={{ options={{
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />, headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -91,7 +91,7 @@ export default function CreateDivisionAddAdmin() {
) )
}} }}
/> />
<View style={[Styles.p15]}> <View style={[Styles.p15, { flex: 1 }]}>
<ScrollView> <ScrollView>
{ {
data.length > 0 ? data.length > 0 ?
@@ -126,6 +126,6 @@ export default function CreateDivisionAddAdmin() {
} }
</ScrollView> </ScrollView>
</View> </View>
</SafeAreaView> </>
) )
} }

View File

@@ -12,7 +12,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
import { AntDesign } from "@expo/vector-icons"; import { AntDesign } from "@expo/vector-icons";
import { router, Stack, useLocalSearchParams } from "expo-router"; import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Pressable, SafeAreaView, ScrollView, View } from "react-native"; import { Pressable, ScrollView, View } from "react-native";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
type Props = { type Props = {
@@ -60,7 +60,7 @@ export default function CreateDivisionAddMember() {
return ( return (
<SafeAreaView> <>
<Stack.Screen <Stack.Screen
options={{ options={{
headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />, headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
@@ -74,7 +74,7 @@ export default function CreateDivisionAddMember() {
) )
}} }}
/> />
<View style={[Styles.p15]}> <View style={[Styles.p15, { flex: 1 }]}>
<InputSearch onChange={(val) => setSearch(val)} value={search} /> <InputSearch onChange={(val) => setSearch(val)} value={search} />
{ {
@@ -135,6 +135,6 @@ export default function CreateDivisionAddMember() {
} }
</ScrollView> </ScrollView>
</View> </View>
</SafeAreaView> </>
) )
} }