wibu/mobile-darmasaba
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'amalia/08-agustus-25' (#19) from amalia/08-agustus-25 into join

Browse Source 
Reviewed-on: bip/mobile-darmasaba#19
This commit is contained in:
amalia
2025-08-08 12:18:33 +08:00
parent b490b93c00 3060ea84a5
commit 5ad055f543
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/(application)/discussion/[id].tsx
View File

@@ -10,14 +10,15 @@ import Text from '@/components/Text';
import { ColorsStatus } from "@/constants/ColorsStatus";
import Styles from "@/constants/Styles";
import { apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar } from "@/lib/api";
import { getDB } from "@/lib/firebaseDatabase";
import { useAuthSession } from "@/providers/AuthProvider";
import { Ionicons, MaterialIcons } from "@expo/vector-icons";
import { firebase } from '@react-native-firebase/database';
import { ref } from '@react-native-firebase/database';
import { useHeaderHeight } from '@react-navigation/elements';
import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react";
import { KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from "react-native";
import { useSelector } from "react-redux";
import { useHeaderHeight } from '@react-navigation/elements';
type Props = {
id: string
@@ -49,7 +50,7 @@ export default function DetailDiscussionGeneral() {
const [loading, setLoading] = useState(true)
const [loadingKomentar, setLoadingKomentar] = useState(true)
const arrSkeleton = Array.from({ length: 3 }, (_, index) => index)
const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-general/${id}`);
const reference = ref(getDB(), `/discussion-general/${id}`);
const headerHeight = useHeaderHeight();
useEffect(() => {

7
app/(application)/division/[id]/(fitur-division)/calendar/index.tsx
View File

@@ -8,7 +8,6 @@ import Styles from "@/constants/Styles";
import { apiGetCalendarByDateDivision, apiGetIndicatorCalendar } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider";
import { Feather } from "@expo/vector-icons";
import dayjs from "dayjs";
import { router, Stack, useLocalSearchParams } from "expo-router";
import 'intl';
import 'intl/locale-data/jsonp/id';
@@ -53,7 +52,7 @@ export default function CalendarDivision() {
const hasil = await decryptToken(String(token?.current));
const response = await apiGetCalendarByDateDivision({
user: hasil,
date: dayjs(selected).format("YYYY-MM-DD"),
date: moment(selected).format("YYYY-MM-DD"),
division: id,
});
setData(response.data);
@@ -71,7 +70,7 @@ export default function CalendarDivision() {
const hasil = await decryptToken(String(token?.current));
const response = await apiGetIndicatorCalendar({
user: hasil,
date: dayjs(newDate).format("YYYY-MM-DD"),
date: moment(newDate).format("YYYY-MM-DD"),
division: id,
});
setDataIndicator(response.data);
@@ -113,6 +112,7 @@ export default function CalendarDivision() {
text={day.text}
isSelected={day.isSelected}
isSign={sign}
onPress={() => setSelected(new Date(today))}
/>
);
},
@@ -156,7 +156,6 @@ export default function CalendarDivision() {
mode="single"
date={selected}
month={month}
onChange={({ date }) => setSelected(date)}
onMonthChange={(month) => setMonth(month)}
styles={{
selected: Styles.selectedDate,

7
app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
View File

@@ -13,14 +13,15 @@ import {
apiGetDivisionOneFeature,
apiSendDiscussionCommentar,
} from "@/lib/api";
import { getDB } from "@/lib/firebaseDatabase";
import { useAuthSession } from "@/providers/AuthProvider";
import { Ionicons, MaterialIcons } from "@expo/vector-icons";
import { firebase } from "@react-native-firebase/database";
import { ref } from "@react-native-firebase/database";
import { useHeaderHeight } from '@react-navigation/elements';
import { router, Stack, useLocalSearchParams } from "expo-router";
import { useEffect, useState } from "react";
import { KeyboardAvoidingView, Platform, Pressable, RefreshControl, ScrollView, View } from "react-native";
import { useSelector } from "react-redux";
import { useHeaderHeight } from '@react-navigation/elements';
type Props = {
id: string;
@@ -58,7 +59,7 @@ export default function DiscussionDetail() {
const [loading, setLoading] = useState(true)
const [loadingKomentar, setLoadingKomentar] = useState(true)
const arrSkeleton = Array.from({ length: 3 })
const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-division/${detail}`);
const reference = ref(getDB(), `/discussion-division/${detail}`);
const [refreshing, setRefreshing] = useState(false)
const headerHeight = useHeaderHeight();

9
components/calendar/itemDateCalendar.tsx
View File

@@ -1,21 +1,22 @@
import Styles from "@/constants/Styles";
import { View } from "react-native";
import { Pressable, View } from "react-native";
import Text from "../Text";
type Props = {
text: string;
isSelected: boolean;
isSign: boolean;
onPress?: () => void;
}
export default function ItemDateCalendar({ text, isSelected, isSign }: Props) {
export default function ItemDateCalendar({ text, isSelected, isSign, onPress }: Props) {
return (
<>
<View style={{ alignItems: 'center' }}>
<Pressable style={{ alignItems: 'center' }} onPress={onPress}>
<Text style={[isSelected ? Styles.cWhite : Styles.cBlack]}>{text}</Text>
<View style={[Styles.signDate, { backgroundColor: isSign ? 'red' : 'transparent' }]}></View>
</View>
</Pressable>
</>
)
}

9
lib/firebaseDatabase.ts Normal file
View File

@@ -0,0 +1,9 @@
import { getApp } from '@react-native-firebase/app';
import { getDatabase } from '@react-native-firebase/database';
// Ganti URL sesuai punya kamu
const DATABASE_URL = 'https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app';
export function getDB() {
return getDatabase(getApp(), DATABASE_URL);
}