Fix redirect admin

Fix QC Inno
Fix: - app/(application)/admin/donation/category-create.tsx - app/(application)/admin/donation/category-update.tsx - app/(application)/admin/donation/category.tsx - components/_ShareComponent/Admin/TableValue.tsx - screens/Authentication/LoginView.tsx - service/api-admin/api-master-admin.ts ### No Issue
2025-12-04 17:41:19 +08:00 · 2025-12-04 16:59:39 +08:00 · 2025-12-03 17:23:12 +08:00
12 changed files with 351 additions and 101 deletions
--- a/app.config.js
+++ b/app.config.js
@@ -19,7 +19,7 @@ export default {
      "NSLocationWhenInUseUsageDescription": "Aplikasi membutuhkan akses lokasi untuk menampilkan peta.",
    },
    associatedDomains: ["applinks:cld-dkr-staging-hipmi.wibudev.com"],
-    buildNumber: "10",
+    buildNumber: "12",
  },

  android: {
--- a/app/(application)/admin/donation/category-create.tsx
+++ b/app/(application)/admin/donation/category-create.tsx
@@ -1,17 +1,56 @@
 import {
  BoxButtonOnFooter,
  ButtonCustom,
+  StackCustom,
+  TextCustom,
  TextInputCustom,
  ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
+import { MainColor } from "@/constants/color-palet";
+import { apiAdminMasterDonationCategoryCreate } from "@/service/api-admin/api-master-admin";
 import { useRouter } from "expo-router";
+import { useState } from "react";
+import { Switch } from "react-native-paper";
+import Toast from "react-native-toast-message";

 export default function AdminDonationCategoryCreate() {
  const router = useRouter();
+  const [loading, setLoading] = useState(false);
+  const [data, setData] = useState({
+    name: "",
+    active: false,
+  });
+
+  const onSubmit = async () => {
+    try {
+      setLoading(true);
+      const response = await apiAdminMasterDonationCategoryCreate({ data });
+      if (response.success) {
+        Toast.show({
+          type: "success",
+          text2: "Data berhasil disimpan",
+        });
+        router.back();
+        return;
+      }
+
+      Toast.show({
+        type: "error",
+        text1: "Gagal menyimpan data",
+      });
+    } catch (error) {
+      console.log("[Error]", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
  const buttonSubmit = (
    <BoxButtonOnFooter>
-      <ButtonCustom onPress={() => router.back()}>Simpan</ButtonCustom>
+      <ButtonCustom isLoading={loading} onPress={onSubmit}>
+        Simpan
+      </ButtonCustom>
    </BoxButtonOnFooter>
  );
  return (
@@ -20,7 +59,23 @@ export default function AdminDonationCategoryCreate() {
        headerComponent={<AdminBackButtonAntTitle title="Tambah Kategori" />}
        footerComponent={buttonSubmit}
      >
-        <TextInputCustom placeholder="Masukkan Kategori" />
+        <TextInputCustom
+          label=""
+          placeholder="Masukkan Kategori"
+          value={data.name}
+          onChangeText={(text) => setData({ ...data, name: text })}
+        />
+        <StackCustom gap={"sm"}>
+          <TextCustom>Status</TextCustom>
+          <Switch
+            style={{
+              alignSelf: "flex-start",
+            }}
+            color={MainColor.yellow}
+            value={data.active}
+            onValueChange={(value) => setData({ ...data, active: value })}
+          />
+        </StackCustom>
      </ViewWrapper>
    </>
  );
--- a/app/(application)/admin/donation/category-update.tsx
+++ b/app/(application)/admin/donation/category-update.tsx
@@ -1,21 +1,76 @@
 import {
+  AlertDefaultSystem,
  BoxButtonOnFooter,
  ButtonCustom,
+  StackCustom,
+  TextCustom,
  TextInputCustom,
  ViewWrapper,
 } from "@/components";
 import AdminBackButtonAntTitle from "@/components/_ShareComponent/Admin/BackButtonAntTitle";
+import { MainColor } from "@/constants/color-palet";
+import {
+  apiAdminMasterDonationCategoryById,
+  apiAdminMasterDonationCategoryUpdate,
+} from "@/service/api-admin/api-master-admin";
 import { useLocalSearchParams, useRouter } from "expo-router";
-import { useState } from "react";
+import { useCallback, useEffect, useState } from "react";
+import { Switch } from "react-native-paper";

 export default function AdminDonationCategoryUpdate() {
+  const router = useRouter();
  const { id } = useLocalSearchParams();
  const [value, setValue] = useState(id);

-  const router = useRouter();
+  const [data, setData] = useState<any>(null);
+  const [isLoading, setIsLoading] = useState(false);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      const response = await apiAdminMasterDonationCategoryById({
+        id: id as any,
+      });
+      console.log(JSON.stringify(response.data, null, 2));
+
+      setData(response.data);
+    };
+    fetchData();
+  }, [id]);
+
+  const handlerSubmit = async () => {
+    try {
+      setIsLoading(true);
+      const response = await apiAdminMasterDonationCategoryUpdate({
+        id: id as any,
+        data: data,
+      });
+      console.log(JSON.stringify(response.data, null, 2));
+      router.back();
+    } catch (error) {
+      console.log(error);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
  const buttonSubmit = (
    <BoxButtonOnFooter>
-      <ButtonCustom onPress={() => router.back()}>Update</ButtonCustom>
+      <ButtonCustom
+        disabled={isLoading || data?.name === ""}
+        isLoading={isLoading}
+        onPress={() => {
+          AlertDefaultSystem({
+            title: "Update Data",
+            message: "Apakah anda yakin ingin mengupdate data ini?",
+            textLeft: "Batal",
+            textRight: "Ya",
+            onPressLeft: () => {},
+            onPressRight: () => handlerSubmit(),
+          });
+        }}
+      >
+        Update
+      </ButtonCustom>
    </BoxButtonOnFooter>
  );
  return (
@@ -25,10 +80,28 @@ export default function AdminDonationCategoryUpdate() {
        footerComponent={buttonSubmit}
      >
        <TextInputCustom
+          label="Nama Kategori"
          placeholder="Masukkan Kategori"
-          value={value as any}
-          onChangeText={setValue}
+          value={data?.name}
+          onChangeText={(value) => setData({ ...data, name: value })}
        />
+        <StackCustom
+          gap={"sm"}
+          style={{
+            alignContent: "flex-start",
+          }}
+        >
+          <TextCustom>Status</TextCustom>
+
+          <Switch
+            style={{
+              alignSelf: "flex-start",
+            }}
+            color={MainColor.yellow}
+            value={data?.active}
+            onValueChange={(value) => setData({ ...data, active: value })}
+          />
+        </StackCustom>
      </ViewWrapper>
    </>
  );
--- a/app/(application)/admin/donation/category.tsx
+++ b/app/(application)/admin/donation/category.tsx
@@ -1,11 +1,15 @@
 import {
-    ActionIcon,
-    BaseBox,
-    CenterCustom,
-    Spacing,
-    StackCustom,
-    TextCustom,
-    ViewWrapper,
+  ActionIcon,
+  BadgeCustom,
+  BaseBox,
+  CenterCustom,
+  ClickableCustom,
+  DividerCustom,
+  Grid,
+  Spacing,
+  StackCustom,
+  TextCustom,
+  ViewWrapper,
 } from "@/components";
 import { IconEdit } from "@/components/_Icon";
 import AdminActionIconPlus from "@/components/_ShareComponent/Admin/ActionIconPlus";
@@ -14,14 +18,56 @@ import AdminTitlePage from "@/components/_ShareComponent/Admin/TitlePage";
 import { GridView_3_3_6 } from "@/components/_ShareComponent/GridView_3_3_6";
 import { MainColor } from "@/constants/color-palet";
 import { ICON_SIZE_BUTTON } from "@/constants/constans-value";
-import { View } from "react-native";
+import { RefreshControl, View } from "react-native";
 import { Divider, Switch } from "react-native-paper";
-import { router } from "expo-router";
+import { router, useFocusEffect } from "expo-router";
+import { useCallback, useEffect, useState } from "react";
+import { apiAdminMasterDonationCategory } from "@/service/api-admin/api-master-admin";
+import { GridDetail_4_8 } from "@/components/_ShareComponent/GridDetail_4_8";
+import GridTwoView from "@/components/_ShareComponent/GridTwoView";

 export default function AdminDonationCategory() {
+  const [listData, setListData] = useState<any[]>([]);
+  const [refreshing, setRefreshing] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  useFocusEffect(
+    useCallback(() => {
+      fetchMaster();
+    }, [])
+  );
+
+  const fetchMaster = async () => {
+    try {
+      setLoading(true);
+      const response = await apiAdminMasterDonationCategory();
+      if (response.success) {
+        console.log(JSON.stringify(response.data, null, 2));
+        setListData(response.data);
+      } else {
+        setListData([]);
+      }
+    } catch (error) {
+      console.log("[Error]", error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const onRefresh = async () => {
+    setRefreshing(true);
+    await fetchMaster();
+    setRefreshing(false);
+  };
+
  return (
    <>
-      <ViewWrapper headerComponent={<AdminTitlePage title="Donasi" />}>
+      <ViewWrapper
+        refreshControl={
+          <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
+        }
+        headerComponent={<AdminTitlePage title="Donasi" />}
+      >
        <AdminComp_BoxTitle
          title="Kategori"
          rightComponent={
@@ -33,81 +79,50 @@ export default function AdminDonationCategory() {
          }
        />

-        <BaseBox>
-          <GridView_3_3_6
-            component1={
-              <TextCustom bold align="center">
-                Aksi
-              </TextCustom>
-            }
-            component2={<TextCustom bold>Status</TextCustom>}
-            component3={<TextCustom bold>Kategori</TextCustom>}
-          />
+        <View>
+          <Grid>
+            <Grid.Col style={{paddingLeft: 10}} span={4}>
+              <TextCustom bold>Status</TextCustom>
+            </Grid.Col>
+            <Grid.Col span={8}>
+              <TextCustom bold>Kategori</TextCustom>
+            </Grid.Col>
+          </Grid>
+
          <Divider />
          <Spacing />

          <StackCustom>
            {listData.map((item, index) => (
-              <View key={index}>
-                <GridView_3_3_6
-                  component1={
+              <ClickableCustom
+                onPress={() => {
+                  router.push(`/admin/donation/category-update?id=${item.id}`);
+                }}
+                key={index}
+              >
+                <Grid containerStyle={{ paddingBottom: 10 }}>
+                  <Grid.Col
+                    span={4}
+                    style={{paddingLeft: 10}}
+                     >
                    <CenterCustom>
-                      <ActionIcon
-                        icon={
-                          <IconEdit size={ICON_SIZE_BUTTON} color="black" />
-                        }
-                        onPress={() => {
-                            router.push(`/admin/donation/category-update?id=${index}`);
-                        }}
-                      />
+                      <BadgeCustom
+                        color={item.active ? MainColor.green : MainColor.red}
+                      >
+                        {item.active ? "Aktif" : "Tidak Aktif"}
+                      </BadgeCustom>
                    </CenterCustom>
-                  }
-                  component2={
-                    <Switch
-                      value={true}
-                      onValueChange={(item) => {
-                        console.log(item);
-                      }}
-                      color={MainColor.yellow}
-                      
-                    />
-                  }
-                  component3={<TextCustom bold>{item.label}</TextCustom>}
-                />
-                <Spacing height={10} />
+                  </Grid.Col>
+                  <Grid.Col span={8}>
+                    <TextCustom bold>{item.name}</TextCustom>
+                  </Grid.Col>
+                </Grid>
                <Divider />
-              </View>
+              </ClickableCustom>
            ))}
          </StackCustom>
-        </BaseBox>
+        </View>
      </ViewWrapper>
    </>
  );
 }
-
-const listData = [
-  {
-    label: "Kegiatan Sosial",
-    value: "kegiatan_sosial",
-  },
-  {
-    label: "Pendidikan",
-    value: "pendidikan",
-  },
-  {
-    label: "Kesehatan",
-    value: "kesehatan",
-  },
-  {
-    label: "Kebudayaan",
-    value: "kebudayaan",
-  },
-  {
-    label: "Bencana Alami",
-    value: "bencana_alami",
-  },
-  {
-    label: "Lainnya",
-    value: "lainnya",
-  },
-];
--- a/components/_ShareComponent/Admin/TableValue.tsx
+++ b/components/_ShareComponent/Admin/TableValue.tsx
@@ -1,17 +1,23 @@
 import Grid from "@/components/Grid/GridCustom";
 import React from "react";
-import { View } from "react-native";
+import { StyleProp, View, ViewStyle } from "react-native";
 import { Divider } from "react-native-paper";

 export default function AdminTableValue({
  value1,
  value2,
  value3,
+  style1,
+  style2,
+  style3,
  bottomLine = false,
 }: {
  value1: React.ReactNode;
  value2: React.ReactNode;
  value3: React.ReactNode;
+  style1?: ViewStyle;
+  style2?: ViewStyle;
+  style3?: ViewStyle;
  bottomLine?: boolean;
 }) {
  return (
@@ -25,6 +31,7 @@ export default function AdminTableValue({
              justifyContent: "center",
              paddingLeft: 10,
              paddingRight: 10,
+              ...style1,
            }}
          >
            {value1}
@@ -36,6 +43,7 @@ export default function AdminTableValue({
              justifyContent: "center",
              paddingLeft: 10,
              paddingRight: 10,
+              ...style2,
            }}
          >
            {value2}
@@ -44,9 +52,10 @@ export default function AdminTableValue({
            span={6}
            style={{
              justifyContent: "center",
-              alignItems: "center",
+              alignItems: "flex-start",
              paddingLeft: 10,
              paddingRight: 10,
+              ...style3,
            }}
          >
            {value3}
--- a/context/AuthContext.tsx
+++ b/context/AuthContext.tsx
@@ -72,10 +72,13 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
  const loginWithNomor = async (nomor: string) => {
    setIsLoading(true);
    try {
+      console.log("[Masuk provider]", nomor);
      const response = await apiLogin({ nomor: nomor });
      console.log("[RESPONSE AUTH]", JSON.stringify(response));

+
      if (response.success) {
+        console.log("[Keluar provider]", nomor);
        Toast.show({
          type: "success",
          text1: "Sukses",
@@ -83,10 +86,15 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
        });

        await AsyncStorage.setItem("kode_otp", response.kodeId);
-        router.replace(`/verification?nomor=${nomor}`);
+        router.push(`/verification?nomor=${nomor}`);
        return;
      } else {
-        router.replace(`/register?nomor=${nomor}`);
+        router.push(`/register?nomor=${nomor}`);
+        Toast.show({
+          type: "info",
+          text1: "Info",
+          text2: "Silahkan mendaftar",
+        });
        return;
      }
    } catch (error: any) {
--- a/ios/HIPMIBadungConnect/Info.plist
+++ b/ios/HIPMIBadungConnect/Info.plist
@@ -39,7 +39,7 @@
      </dict>
    </array>
    <key>CFBundleVersion</key>
-    <string>10</string>
+    <string>12</string>
    <key>ITSAppUsesNonExemptEncryption</key>
    <false/>
    <key>LSMinimumSystemVersion</key>
--- a/screens/Authentication/LoginView.tsx
+++ b/screens/Authentication/LoginView.tsx
@@ -1,3 +1,4 @@
+import { NewWrapper } from "@/components";
 import ButtonCustom from "@/components/Button/ButtonCustom";
 import Spacing from "@/components/_ShareComponent/Spacing";
 import ViewWrapper from "@/components/_ShareComponent/ViewWrapper";
@@ -5,9 +6,11 @@ import { MainColor } from "@/constants/color-palet";
 import { useAuth } from "@/hooks/use-auth";
 import { apiVersion } from "@/service/api-config";
 import { GStyles } from "@/styles/global-styles";
-import { Redirect, router } from "expo-router";
+import versionBadge from "@/utils/viersionBadge";
+import VersionBadge from "@/utils/viersionBadge";
+import { Redirect } from "expo-router";
 import { useEffect, useState } from "react";
-import { Text, View } from "react-native";
+import { RefreshControl, Text, View } from "react-native";
 import PhoneInput, { ICountry } from "react-native-international-phone-number";
 import Toast from "react-native-toast-message";

@@ -16,6 +19,7 @@ export default function LoginView() {
  const [selectedCountry, setSelectedCountry] = useState<null | ICountry>(null);
  const [inputValue, setInputValue] = useState<string>("");
  const [loading, setLoading] = useState<boolean>(false);
+  const [refreshing, setRefreshing] = useState<boolean>(false);

  const { loginWithNomor, token, isAdmin, isUserActive } = useAuth();

@@ -25,7 +29,18 @@ export default function LoginView() {

  async function onLoadVersion() {
    const res = await apiVersion();
-    setVersion(res.data);
+
+    if (res.success) {
+      setVersion(versionBadge());
+    }
+  }
+
+  async function handleRefresh() {
+    setRefreshing(true);
+    await onLoadVersion();
+    setInputValue("");
+    setLoading(false);
+    setRefreshing(false);
  }

  function handleInputValue(phoneNumber: string) {
@@ -65,8 +80,6 @@ export default function LoginView() {
    const isValid = await validateData();
    if (!isValid) return;

-    // const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
-    // const fixNumber = inputValue.replace(/\s+/g, "");
    const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
    let fixNumber = inputValue.replace(/\s+/g, "").replace(/^0+/, "");

@@ -74,9 +87,7 @@ export default function LoginView() {

    try {
      setLoading(true);
-      const response = await loginWithNomor(realNumber);
-      console.log("[RESPONSE UI]", response);
-      
+      await loginWithNomor(realNumber);
    } catch (error) {
      console.log("Error login", error);
      Toast.show({
@@ -130,7 +141,12 @@ export default function LoginView() {
  }

  return (
-    <ViewWrapper withBackground>
+    <NewWrapper
+      withBackground
+      refreshControl={
+        <RefreshControl refreshing={refreshing} onRefresh={handleRefresh} />
+      }
+    >
      <View style={GStyles.authContainer}>
        <View>
          <View style={GStyles.authContainerTitle}>
@@ -174,6 +190,6 @@ export default function LoginView() {
          Coba
        </ButtonCustom> */}
      </View>
-    </ViewWrapper>
+    </NewWrapper>
  );
 }
--- a/screens/Authentication/VerificationView.tsx
+++ b/screens/Authentication/VerificationView.tsx
@@ -17,6 +17,8 @@ import Toast from "react-native-toast-message";
 export default function VerificationView() {
  const { nomor } = useLocalSearchParams<{ nomor: string }>();

+  console.log("[NOMOR]", nomor);
+
  const [inputOtp, setInputOtp] = useState<string>("");
  const [userNumber, setUserNumber] = useState<string>("");
  const [loading, setLoading] = useState<boolean>(false);
@@ -52,7 +54,7 @@ export default function VerificationView() {
    try {
      const response = await apiCheckCodeOtp({ kodeId });
      console.log(
-        "Response check code otp >>",
+        "[OTP] >>",
        JSON.stringify(response.otp, null, 2)
      );
      // Kita tidak perlu simpan codeOtp di state karena verifikasi dilakukan di backend
--- a/service/api-admin/api-master-admin.ts
+++ b/service/api-admin/api-master-admin.ts
@@ -167,3 +167,56 @@ export async function apiAdminMasterTypeOfEventUpdate({
 }

 // ================== END EVENT ================== //
+
+// ================== START DONATION ================== //
+
+export async function apiAdminMasterDonationCategory() {
+  try {
+    const response = await apiConfig.get(`/mobile/admin/master/donation`);
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+export async function apiAdminMasterDonationCategoryById({ id }: { id: string }) {
+  try {
+    const response = await apiConfig.get(`/mobile/admin/master/donation/${id}`);
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+export async function apiAdminMasterDonationCategoryUpdate({
+  id,
+  data,
+}: {
+  id: string;
+  data: any;
+}) {
+  try {
+    const response = await apiConfig.put(
+      `/mobile/admin/master/donation/${id}`,
+      {
+        data: data,
+      }
+    );
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+export async function apiAdminMasterDonationCategoryCreate({ data }: { data: any }) {
+  try {
+    const response = await apiConfig.post(`/mobile/admin/master/donation`, {
+      data: data,
+    });
+    return response.data;
+  } catch (error) {
+    throw error;
+  }
+}
+
+// ================== END DONATION ================== //
--- a/service/api-config.ts
+++ b/service/api-config.ts
@@ -14,6 +14,7 @@ apiConfig.interceptors.request.use(
  async (config) => {
    console.log("API_BASE_URL >>", API_BASE_URL);
    const token = await AsyncStorage.getItem("authToken");
+    // console.log("[TOKEN] >>", token);
    if (token) {
      // config.timeout = 10000;
      config.headers["Content-Type"] = "application/json";
@@ -33,7 +34,7 @@ export async function apiVersion() {
 }

 export async function apiLogin({ nomor }: { nomor: string }) {
-  const response = await apiConfig.post("/mobile/auth/login", {
+  const response = await apiConfig.post("/auth/mobile-login", {
    nomor: nomor,
  });
  return response.data;;
@@ -45,7 +46,7 @@ export async function apiCheckCodeOtp({ kodeId }: { kodeId: string }) {
 }

 export async function apiValidationCode({ nomor }: { nomor: string }) {
-  const response = await apiConfig.post(`/auth/validasi`, {
+  const response = await apiConfig.post(`/auth/mobile-validasi`, {
    nomor: nomor,
  });
  return response.data;
@@ -56,7 +57,7 @@ export async function apiRegister({
 }: {
  data: { nomor: string; username: string; termsOfServiceAccepted: boolean };
 }) {
-  const response = await apiConfig.post(`/mobile/auth/register`, {
+  const response = await apiConfig.post(`/auth/mobile-register`, {
    data: data,
  });
  return response.data;
--- a/utils/viersionBadge.ts
+++ b/utils/viersionBadge.ts
@@ -0,0 +1,18 @@
+// VersionBadge.tsx
+import Constants from "expo-constants";
+import { Platform } from "react-native";
+
+export default function versionBadge() {
+  const expoConfig = Constants.expoConfig;
+
+  const version = expoConfig?.version; // "1.0.1"
+  const iosBuild = expoConfig?.ios?.buildNumber; // "10"
+  const androidBuild = expoConfig?.android?.versionCode; // 2
+
+  const build =
+    Platform.OS === "ios" ? iosBuild : androidBuild;
+
+    const result = `${version} ( ${build} )`;
+
+  return result
+}