From 99c81f6f0d936048e6ad2ee0b9e7a298762dda39 Mon Sep 17 00:00:00 2001 From: amaliadwiy Date: Thu, 21 Aug 2025 12:16:39 +0800 Subject: [PATCH] upd: env Deskripsi; - env storage - env db firebase url No Issues --- app/(application)/banner/[id].tsx | 3 +- app/(application)/banner/index.tsx | 8 ++--- app/(application)/discussion/[id].tsx | 3 +- .../discussion/add-member/[id].tsx | 7 +++-- app/(application)/discussion/create.tsx | 3 +- app/(application)/discussion/member/[id].tsx | 3 +- .../calendar/[detail]/add-member.tsx | 7 +++-- .../calendar/[detail]/index.tsx | 5 ++-- .../calendar/create-member.tsx | 7 +++-- .../discussion/[detail]/index.tsx | 5 ++-- .../(fitur-division)/discussion/index.tsx | 30 ++----------------- .../[id]/(fitur-division)/document/index.tsx | 17 ++--------- .../task/[detail]/add-member.tsx | 7 +++-- .../[id]/(fitur-division)/task/create.tsx | 3 +- .../(fitur-division)/task/create/member.tsx | 7 +++-- .../division/[id]/add-member.tsx | 7 +++-- app/(application)/division/[id]/info.tsx | 3 +- .../division/create/add-admin-division.tsx | 5 ++-- .../division/create/add-member.tsx | 7 +++-- app/(application)/edit-profile.tsx | 3 +- app/(application)/member/[id].tsx | 3 +- app/(application)/member/edit/[id].tsx | 5 ++-- app/(application)/member/index.tsx | 3 +- app/(application)/profile.tsx | 3 +- app/(application)/project/[id]/add-member.tsx | 7 +++-- app/(application)/project/create.tsx | 3 +- app/(application)/project/create/member.tsx | 5 ++-- app/(application)/search.tsx | 3 +- components/division/fileDivisionDetail.tsx | 7 +++-- components/home/carouselHome.tsx | 3 +- components/modalSelect.tsx | 5 ++-- components/project/sectionFile.tsx | 11 ++----- components/project/sectionMember.tsx | 3 +- components/task/sectionFileTask.tsx | 14 ++------- components/task/sectionMemberTask.tsx | 5 ++-- lib/firebaseDatabase.ts | 3 +- 36 files changed, 100 insertions(+), 123 deletions(-) diff --git a/app/(application)/banner/[id].tsx b/app/(application)/banner/[id].tsx index 998e14b..daa7909 100644 --- a/app/(application)/banner/[id].tsx +++ b/app/(application)/banner/[id].tsx @@ -2,6 +2,7 @@ import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader"; import { InputForm } from "@/components/inputForm"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiEditBanner, apiGetBanner, apiGetBannerOne } from "@/lib/api"; import { setEntities } from "@/lib/bannerSlice"; @@ -50,7 +51,7 @@ export default function EditBanner() { const hasil = await decryptToken(String(token?.current)); const data = await apiGetBannerOne({ user: hasil, id }); setSelectedImage({ - uri: `https://wibu-storage.wibudev.com/api/files/${data.data.image}`, + uri: `${ConstEnv.url_storage}/files/${data.data.image}`, }); setTitle(data.data.title); }; diff --git a/app/(application)/banner/index.tsx b/app/(application)/banner/index.tsx index bb15f77..2e9513e 100644 --- a/app/(application)/banner/index.tsx +++ b/app/(application)/banner/index.tsx @@ -5,6 +5,7 @@ import ButtonBackHeader from "@/components/buttonBackHeader" import DrawerBottom from "@/components/drawerBottom" import MenuItemRow from "@/components/menuItemRow" import ModalLoading from "@/components/modalLoading" +import { ConstEnv } from "@/constants/ConstEnv" import Styles from "@/constants/Styles" import { apiDeleteBanner, apiGetBanner } from "@/lib/api" import { setEntities } from "@/lib/bannerSlice" @@ -20,7 +21,6 @@ import * as mime from 'react-native-mime-types' import Toast from "react-native-toast-message" import { useDispatch, useSelector } from "react-redux" - type Props = { id: string title: string @@ -71,7 +71,7 @@ export default function BannerList() { const openFile = () => { setModal(false) setLoadingOpen(true) - let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + selectFile?.image; + let remoteUrl = ConstEnv.url_storage + '/files/' + selectFile?.image; const fileName = selectFile?.title + '.' + selectFile?.extension; let localPath = `${FileSystem.documentDirectory}/${fileName}`; const mimeType = mime.lookup(fileName) @@ -112,7 +112,7 @@ export default function BannerList() { }} /> - } diff --git a/app/(application)/discussion/[id].tsx b/app/(application)/discussion/[id].tsx index 52306e2..b346042 100644 --- a/app/(application)/discussion/[id].tsx +++ b/app/(application)/discussion/[id].tsx @@ -8,6 +8,7 @@ import Skeleton from "@/components/skeleton"; import SkeletonContent from "@/components/skeletonContent"; import Text from '@/components/Text'; import { ColorsStatus } from "@/constants/ColorsStatus"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar } from "@/lib/api"; import { getDB } from "@/lib/firebaseDatabase"; @@ -184,7 +185,7 @@ export default function DetailDiscussionGeneral() { key={i} borderType="bottom" icon={ - + } title={item.username} rightTopInfo={item.createdAt} diff --git a/app/(application)/discussion/add-member/[id].tsx b/app/(application)/discussion/add-member/[id].tsx index 4655f2e..dec65bb 100644 --- a/app/(application)/discussion/add-member/[id].tsx +++ b/app/(application)/discussion/add-member/[id].tsx @@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew"; import ImageWithLabel from "@/components/imageWithLabel"; import InputSearch from "@/components/inputSearch"; import Text from '@/components/Text'; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiAddMemberDiscussionGeneral, apiGetDiscussionGeneralOne, apiGetUser } from "@/lib/api"; import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail"; @@ -121,7 +122,7 @@ export default function AddMemberDiscussionDetail() { onChoose(item.idUser, item.name, item.img)} /> )) @@ -147,7 +148,7 @@ export default function AddMemberDiscussionDetail() { }} > - + {item.name} { @@ -156,7 +157,7 @@ export default function AddMemberDiscussionDetail() { { - selectMember.some((i: any) => i.idUser == item.id) && + selectMember.some((i: any) => i.idUser == item.id) && } ) diff --git a/app/(application)/discussion/create.tsx b/app/(application)/discussion/create.tsx index 8037324..92124b1 100644 --- a/app/(application)/discussion/create.tsx +++ b/app/(application)/discussion/create.tsx @@ -7,6 +7,7 @@ import { InputForm } from "@/components/inputForm"; import ModalSelect from "@/components/modalSelect"; import SelectForm from "@/components/selectForm"; import Text from '@/components/Text'; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiCreateDiscussionGeneral } from "@/lib/api"; import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail"; @@ -215,7 +216,7 @@ export default function CreateDiscussionGeneral() { key={index} borderType="bottom" icon={ - + } title={item.name} /> diff --git a/app/(application)/discussion/member/[id].tsx b/app/(application)/discussion/member/[id].tsx index b62173f..0f527e2 100644 --- a/app/(application)/discussion/member/[id].tsx +++ b/app/(application)/discussion/member/[id].tsx @@ -7,6 +7,7 @@ import MenuItemRow from "@/components/menuItemRow"; import SkeletonTwoItem from "@/components/skeletonTwoItem"; import Text from '@/components/Text'; import { ColorsStatus } from "@/constants/ColorsStatus"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiDeleteMemberDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; @@ -109,7 +110,7 @@ export default function MemberDiscussionDetail() { key={index} borderType="bottom" icon={ - + } title={item.name} onPress={() => { diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/add-member.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/add-member.tsx index 4f26ed0..e6e9758 100644 --- a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/add-member.tsx +++ b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/add-member.tsx @@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew"; import ImageWithLabel from "@/components/imageWithLabel"; import InputSearch from "@/components/inputSearch"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiAddMemberCalendar, apiGetCalendarOne, apiGetDivisionMember } from "@/lib/api"; import { setUpdateCalendar } from "@/lib/calendarUpdate"; @@ -128,7 +129,7 @@ export default function AddMemberCalendarEvent() { onChoose(item.idUser, item.name, item.img)} /> )) @@ -154,7 +155,7 @@ export default function AddMemberCalendarEvent() { }} > - + {item.name} { @@ -163,7 +164,7 @@ export default function AddMemberCalendarEvent() { { - selectMember.some((i: any) => i.idUser == item.id) && + selectMember.some((i: any) => i.idUser == item.id) && } ) diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx index 2719d52..cd6970a 100644 --- a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx @@ -7,6 +7,7 @@ import ImageUser from "@/components/imageNew" import MenuItemRow from "@/components/menuItemRow" import Skeleton from "@/components/skeleton" import Text from "@/components/Text" +import { ConstEnv } from "@/constants/ConstEnv" import Styles from "@/constants/Styles" import { apiDeleteCalendarMember, apiGetCalendarOne, apiGetDivisionOneFeature } from "@/lib/api" import { setUpdateCalendar } from "@/lib/calendarUpdate" @@ -70,7 +71,7 @@ export default function DetailEventCalendar() { } } - async function handleLoad(loading:boolean) { + async function handleLoad(loading: boolean) { try { setLoading(loading) const hasil = await decryptToken(String(token?.current)); @@ -241,7 +242,7 @@ export default function DetailEventCalendar() { } + icon={} title={item.name} subtitle={item.email} onPress={() => { diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx index b96ebbe..9926406 100644 --- a/app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx +++ b/app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx @@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew"; import ImageWithLabel from "@/components/imageWithLabel"; import InputSearch from "@/components/inputSearch"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiCreateCalendar, apiGetDivisionMember } from "@/lib/api"; import { setFormCreateCalendar } from "@/lib/calendarCreate"; @@ -117,7 +118,7 @@ export default function CreateCalendarAddMember() { onChoose(item.idUser, item.name, item.img)} /> )) @@ -140,13 +141,13 @@ export default function CreateCalendarAddMember() { onPress={() => { onChoose(item.idUser, item.name, item.img) }} > - + {item.name} { - selectMember.some((i: any) => i.idUser == item.idUser) && + selectMember.some((i: any) => i.idUser == item.idUser) && } ) diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx index c603c23..dba1b1c 100644 --- a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx @@ -7,6 +7,7 @@ import LabelStatus from "@/components/labelStatus"; import Skeleton from "@/components/skeleton"; import SkeletonContent from "@/components/skeletonContent"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetDiscussionOne, @@ -220,7 +221,7 @@ export default function DiscussionDetail() { borderType="bottom" icon={ } @@ -267,7 +268,7 @@ export default function DiscussionDetail() { borderType="bottom" icon={ } diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx index ef0e3d0..c71d7c8 100644 --- a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx @@ -5,6 +5,7 @@ import InputSearch from "@/components/inputSearch"; import LabelStatus from "@/components/labelStatus"; import SkeletonContent from "@/components/skeletonContent"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetDiscussion } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; @@ -141,7 +142,7 @@ export default function DiscussionDivision() { onPress={() => { router.push(`./discussion/${item.id}`) }} borderType="bottom" icon={ - + } title={item.user_name} subtitle={ @@ -170,33 +171,8 @@ export default function DiscussionDivision() { /> } /> - // data.map((item, index) => ( - // { router.push(`./discussion/${item.id}`) }} - // borderType="bottom" - // icon={ - // - // } - // title={item.user_name} - // subtitle={ - // active == "true" ? item.status == 1 ? : : <> - // } - // rightTopInfo={item.createdAt} - // desc={item.desc} - // leftBottomInfo={ - // - // - // Diskusikan - // - // } - // rightBottomInfo={item.total_komentar + ' Komentar'} - // /> - // )) : - ( - Tidak ada diskusi - ) + (Tidak ada diskusi) } diff --git a/app/(application)/division/[id]/(fitur-division)/document/index.tsx b/app/(application)/division/[id]/(fitur-division)/document/index.tsx index b599dee..3668857 100644 --- a/app/(application)/division/[id]/(fitur-division)/document/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/document/index.tsx @@ -13,6 +13,7 @@ import ModalSelectMultiple from "@/components/modalSelectMultiple"; import Skeleton from "@/components/skeleton"; import Text from "@/components/Text"; import { ColorsStatus } from "@/constants/ColorsStatus"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiDocumentDelete, @@ -268,7 +269,7 @@ export default function DocumentDivision() { const openFile = (item: Props) => { if (Platform.OS == 'android') setLoadingOpen(true) - let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage; + let remoteUrl = ConstEnv.url_storage + '/files/' + item.idStorage; const fileName = item.name + '.' + item.extension; let localPath = `${FileSystem.documentDirectory}/${fileName}`; const mimeType = mime.lookup(fileName) @@ -440,20 +441,6 @@ export default function DocumentDivision() { {(selectedFiles.length > 0 || dariSelectAll) && ( - {/* - } - title="Unduh" - onPress={() => { }} - column="many" - color="white" - disabled={selectedFiles.length == 0 || !copyAllowed} - /> */} onChoose(item.idUser, item.name, item.img)} /> )) @@ -149,7 +150,7 @@ export default function AddMemberTask() { }} > - + {item.name} { @@ -158,7 +159,7 @@ export default function AddMemberTask() { { - selectMember.some((i: any) => i.idUser == item.idUser) && + selectMember.some((i: any) => i.idUser == item.idUser) && } ) diff --git a/app/(application)/division/[id]/(fitur-division)/task/create.tsx b/app/(application)/division/[id]/(fitur-division)/task/create.tsx index 1ba1767..c47423b 100644 --- a/app/(application)/division/[id]/(fitur-division)/task/create.tsx +++ b/app/(application)/division/[id]/(fitur-division)/task/create.tsx @@ -9,6 +9,7 @@ import MenuItemRow from "@/components/menuItemRow"; import ModalSelect from "@/components/modalSelect"; import SectionListAddTask from "@/components/project/sectionListAddTask"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiCreateTask } from "@/lib/api"; import { setMemberChoose } from "@/lib/memberChoose"; @@ -189,7 +190,7 @@ export default function CreateTaskDivision() { borderType="bottom" icon={ } diff --git a/app/(application)/division/[id]/(fitur-division)/task/create/member.tsx b/app/(application)/division/[id]/(fitur-division)/task/create/member.tsx index a58a7fe..347dc9d 100644 --- a/app/(application)/division/[id]/(fitur-division)/task/create/member.tsx +++ b/app/(application)/division/[id]/(fitur-division)/task/create/member.tsx @@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew"; import ImageWithLabel from "@/components/imageWithLabel"; import InputSearch from "@/components/inputSearch"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetDivisionMember } from "@/lib/api"; import { setMemberChoose } from "@/lib/memberChoose"; @@ -93,7 +94,7 @@ export default function AddMemberCreateTask() { onChoose(item.idUser, item.name, item.img)} /> )) @@ -118,13 +119,13 @@ export default function AddMemberCreateTask() { }} > - + {item.name} { - selectMember.some((i: any) => i.idUser == item.idUser) && + selectMember.some((i: any) => i.idUser == item.idUser) && } ) diff --git a/app/(application)/division/[id]/add-member.tsx b/app/(application)/division/[id]/add-member.tsx index 128a1ef..2655bbc 100644 --- a/app/(application)/division/[id]/add-member.tsx +++ b/app/(application)/division/[id]/add-member.tsx @@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew"; import ImageWithLabel from "@/components/imageWithLabel"; import InputSearch from "@/components/inputSearch"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiAddMemberDivision, apiGetDivisionOneDetail, apiGetUser } from "@/lib/api"; import { setUpdateDivision } from "@/lib/divisionUpdate"; @@ -124,7 +125,7 @@ export default function AddMemberDivision() { onChoose(item.idUser, item.name, item.img)} /> )) @@ -150,7 +151,7 @@ export default function AddMemberDivision() { }} > - + {item.name} { @@ -159,7 +160,7 @@ export default function AddMemberDivision() { { - selectMember.some((i: any) => i.idUser == item.id) && + selectMember.some((i: any) => i.idUser == item.id) && } ) diff --git a/app/(application)/division/[id]/info.tsx b/app/(application)/division/[id]/info.tsx index 5f5381e..e384326 100644 --- a/app/(application)/division/[id]/info.tsx +++ b/app/(application)/division/[id]/info.tsx @@ -8,6 +8,7 @@ import SectionCancel from "@/components/sectionCancel" import Skeleton from "@/components/skeleton" import SkeletonTwoItem from "@/components/skeletonTwoItem" import { ColorsStatus } from "@/constants/ColorsStatus" +import { ConstEnv } from "@/constants/ConstEnv" import Styles from "@/constants/Styles" import { apiDeleteMemberDivision, apiGetDivisionOneDetail, apiUpdateStatusAdminDivision } from "@/lib/api" import { useAuthSession } from "@/providers/AuthProvider" @@ -188,7 +189,7 @@ export default function InformationDivision() { borderType="bottom" onPress={() => { dataDetail?.isActive && handleChooseMember(item) }} icon={ - + } title={item.name} rightTopInfo={item.isAdmin ? "Admin" : "Anggota"} diff --git a/app/(application)/division/create/add-admin-division.tsx b/app/(application)/division/create/add-admin-division.tsx index fcb6d4c..61d55eb 100644 --- a/app/(application)/division/create/add-admin-division.tsx +++ b/app/(application)/division/create/add-admin-division.tsx @@ -2,6 +2,7 @@ import ButtonBackHeader from "@/components/buttonBackHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader"; import ImageUser from "@/components/imageNew"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiCreateDivision } from "@/lib/api"; import { setFormCreateDivision } from "@/lib/divisionCreate"; @@ -103,7 +104,7 @@ export default function CreateDivisionAddAdmin() { }} > - + {item.name} { @@ -112,7 +113,7 @@ export default function CreateDivisionAddAdmin() { { - selectMember.some((i: any) => i == item.idUser) && + selectMember.some((i: any) => i == item.idUser) && } ) diff --git a/app/(application)/division/create/add-member.tsx b/app/(application)/division/create/add-member.tsx index 65ce1ed..8ccdbe6 100644 --- a/app/(application)/division/create/add-member.tsx +++ b/app/(application)/division/create/add-member.tsx @@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew"; import ImageWithLabel from "@/components/imageWithLabel"; import InputSearch from "@/components/inputSearch"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetUser } from "@/lib/api"; import { setFormCreateDivision } from "@/lib/divisionCreate"; @@ -86,7 +87,7 @@ export default function CreateDivisionAddMember() { onChoose(item.idUser, item.name, item.img)} /> )) @@ -112,7 +113,7 @@ export default function CreateDivisionAddMember() { }} > - + {item.name} { @@ -121,7 +122,7 @@ export default function CreateDivisionAddMember() { { - selectMember.some((i: any) => i.idUser == item.id) && + selectMember.some((i: any) => i.idUser == item.id) && } ) diff --git a/app/(application)/edit-profile.tsx b/app/(application)/edit-profile.tsx index 9b8f041..e0ef9ba 100644 --- a/app/(application)/edit-profile.tsx +++ b/app/(application)/edit-profile.tsx @@ -4,6 +4,7 @@ import { InputForm } from "@/components/inputForm"; import ModalSelect from "@/components/modalSelect"; import SelectForm from "@/components/selectForm"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiEditProfile, apiGetProfile } from "@/lib/api"; import { setEntities } from "@/lib/entitiesSlice"; @@ -252,7 +253,7 @@ export default function EditProfile() { ) : ( { setErrorImg(true) }} /> diff --git a/app/(application)/member/[id].tsx b/app/(application)/member/[id].tsx index 6fcae1e..f1de502 100644 --- a/app/(application)/member/[id].tsx +++ b/app/(application)/member/[id].tsx @@ -5,6 +5,7 @@ import LabelStatus from "@/components/labelStatus"; import HeaderRightMemberDetail from "@/components/member/headerMemberDetail"; import Skeleton from "@/components/skeleton"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import { valueRoleUser } from "@/constants/RoleUser"; import Styles from "@/constants/Styles"; import { apiGetProfile } from "@/lib/api"; @@ -93,7 +94,7 @@ export default function MemberDetail() { : <> - + {data?.name} {data?.role} diff --git a/app/(application)/member/edit/[id].tsx b/app/(application)/member/edit/[id].tsx index cac30f1..55c0d9f 100644 --- a/app/(application)/member/edit/[id].tsx +++ b/app/(application)/member/edit/[id].tsx @@ -4,6 +4,7 @@ import { InputForm } from "@/components/inputForm"; import ModalSelect from "@/components/modalSelect"; import SelectForm from "@/components/selectForm"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiEditUser, apiGetProfile } from "@/lib/api"; import { setUpdateMember } from "@/lib/memberSlice"; @@ -83,7 +84,7 @@ export default function EditMember() { try { const response = await apiGetProfile({ id: id }); setData(response.data); - setSelectedImage({ uri: `https://wibu-storage.wibudev.com/api/files/${response.data.img}`, }); + setSelectedImage({ uri: `${ConstEnv.url_storage}/files/${response.data.img}`, }); setChoosePosition({ val: response.data.idPosition, label: response.data.position, @@ -270,7 +271,7 @@ export default function EditMember() { errorImg ? { setErrorImg(true) }} /> diff --git a/app/(application)/member/index.tsx b/app/(application)/member/index.tsx index b1b93d5..93376c7 100644 --- a/app/(application)/member/index.tsx +++ b/app/(application)/member/index.tsx @@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew"; import InputSearch from "@/components/inputSearch"; import SkeletonTwoItem from "@/components/skeletonTwoItem"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetUser } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; @@ -150,7 +151,7 @@ export default function Index() { onPress={() => { router.push(`/member/${item.id}`) }} borderType="all" icon={ - + } title={item.name} subtitle={`${item.group} - ${item.position}`} diff --git a/app/(application)/profile.tsx b/app/(application)/profile.tsx index 7863696..626172b 100644 --- a/app/(application)/profile.tsx +++ b/app/(application)/profile.tsx @@ -3,6 +3,7 @@ import ButtonBackHeader from "@/components/buttonBackHeader"; import { ButtonHeader } from "@/components/buttonHeader"; import ItemDetailMember from "@/components/itemDetailMember"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { useAuthSession } from "@/providers/AuthProvider"; import { AntDesign } from "@expo/vector-icons"; @@ -41,7 +42,7 @@ export default function Profile() { { setError(true) }} style={[Styles.userProfileBig]} /> diff --git a/app/(application)/project/[id]/add-member.tsx b/app/(application)/project/[id]/add-member.tsx index a1eff1b..3316bd9 100644 --- a/app/(application)/project/[id]/add-member.tsx +++ b/app/(application)/project/[id]/add-member.tsx @@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew"; import ImageWithLabel from "@/components/imageWithLabel"; import InputSearch from "@/components/inputSearch"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiAddMemberProject, apiGetProjectOne, apiGetUser } from "@/lib/api"; import { setUpdateProject } from "@/lib/projectUpdate"; @@ -122,7 +123,7 @@ export default function AddMemberProject() { onChoose(item.idUser, item.name, item.img)} /> )) @@ -147,7 +148,7 @@ export default function AddMemberProject() { }} > - + {item.name} { @@ -156,7 +157,7 @@ export default function AddMemberProject() { { - selectMember.some((i: any) => i.idUser == item.id) && + selectMember.some((i: any) => i.idUser == item.id) && } ) diff --git a/app/(application)/project/create.tsx b/app/(application)/project/create.tsx index 02c50a3..f90d186 100644 --- a/app/(application)/project/create.tsx +++ b/app/(application)/project/create.tsx @@ -10,6 +10,7 @@ import ModalSelect from "@/components/modalSelect"; import SectionListAddTask from "@/components/project/sectionListAddTask"; import SelectForm from "@/components/selectForm"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiCreateProject } from "@/lib/api"; import { setGroupChoose } from "@/lib/groupChoose"; @@ -300,7 +301,7 @@ export default function CreateProject() { borderType="bottom" icon={ } diff --git a/app/(application)/project/create/member.tsx b/app/(application)/project/create/member.tsx index aeee43d..7fcd303 100644 --- a/app/(application)/project/create/member.tsx +++ b/app/(application)/project/create/member.tsx @@ -4,6 +4,7 @@ import ImageUser from "@/components/imageNew"; import ImageWithLabel from "@/components/imageWithLabel"; import InputSearch from "@/components/inputSearch"; import Text from "@/components/Text"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetUser } from "@/lib/api"; import { setMemberChoose } from "@/lib/memberChoose"; @@ -100,7 +101,7 @@ export default function AddMemberCreateProject() { onChoose(item.idUser, item.name, item.img)} /> )) @@ -125,7 +126,7 @@ export default function AddMemberCreateProject() { }} > - + {item.name} diff --git a/app/(application)/search.tsx b/app/(application)/search.tsx index e898116..f5d5b98 100644 --- a/app/(application)/search.tsx +++ b/app/(application)/search.tsx @@ -3,6 +3,7 @@ import ButtonBackHeader from "@/components/buttonBackHeader"; import InputSearch from "@/components/inputSearch"; import Text from '@/components/Text'; import { ColorsStatus } from "@/constants/ColorsStatus"; +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetSearch } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; @@ -92,7 +93,7 @@ export default function Search() { } title={item.name} diff --git a/components/division/fileDivisionDetail.tsx b/components/division/fileDivisionDetail.tsx index a576c5e..01e89a2 100644 --- a/components/division/fileDivisionDetail.tsx +++ b/components/division/fileDivisionDetail.tsx @@ -1,3 +1,4 @@ +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetDivisionOneFeature } from "@/lib/api"; import { useAuthSession } from "@/providers/AuthProvider"; @@ -8,11 +9,11 @@ import { useLocalSearchParams } from "expo-router"; import * as Sharing from 'expo-sharing'; import React, { useEffect, useState } from "react"; import { Alert, Dimensions, Platform, Pressable, View } from "react-native"; -import Text from "../Text"; import * as mime from 'react-native-mime-types'; import { ICarouselInstance } from "react-native-reanimated-carousel"; -import Skeleton from "../skeleton"; import ModalLoading from "../modalLoading"; +import Skeleton from "../skeleton"; +import Text from "../Text"; type Props = { id: string @@ -52,7 +53,7 @@ export default function FileDivisionDetail() { const openFile = (item: Props) => { if (Platform.OS == 'android') setLoadingOpen(true) - let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + item.idStorage; + let remoteUrl = ConstEnv.url_storage + '/files/' + item.idStorage; const fileName = item.name + '.' + item.extension; let localPath = `${FileSystem.documentDirectory}/${fileName}`; const mimeType = mime.lookup(fileName) diff --git a/components/home/carouselHome.tsx b/components/home/carouselHome.tsx index 6dfaee4..e03fcc6 100644 --- a/components/home/carouselHome.tsx +++ b/components/home/carouselHome.tsx @@ -1,3 +1,4 @@ +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiGetBanner, apiGetProfile } from "@/lib/api"; import { setEntities } from "@/lib/bannerSlice"; @@ -50,7 +51,7 @@ export default function CaraouselHome() { onProgressChange={progress} renderItem={({ index }) => ( )} diff --git a/components/modalSelect.tsx b/components/modalSelect.tsx index fceb8d6..e253c65 100644 --- a/components/modalSelect.tsx +++ b/components/modalSelect.tsx @@ -1,3 +1,4 @@ +import { ConstEnv } from "@/constants/ConstEnv" import { valueGender } from "@/constants/Gender" import { valueRoleUser } from "@/constants/RoleUser" import Styles from "@/constants/Styles" @@ -140,7 +141,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on onChoose(item.idUser, item.name, item.img)} /> )) @@ -164,7 +165,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on category == 'member' ? - + {item.name} : diff --git a/components/project/sectionFile.tsx b/components/project/sectionFile.tsx index 77311f4..b72486e 100644 --- a/components/project/sectionFile.tsx +++ b/components/project/sectionFile.tsx @@ -1,3 +1,4 @@ +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiDeleteFileProject, apiGetProjectOne } from "@/lib/api"; import { setUpdateProject } from "@/lib/projectUpdate"; @@ -94,7 +95,7 @@ export default function SectionFile({ status, member, refreshing }: { status: nu const openFile = () => { setModal(false) setLoadingOpen(true) - let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + selectFile?.idStorage; + let remoteUrl = ConstEnv.url_storage + '/files/' + selectFile?.idStorage; const fileName = selectFile?.name + '.' + selectFile?.extension; let localPath = `${FileSystem.documentDirectory}/${fileName}`; const mimeType = mime.lookup(fileName) @@ -172,14 +173,6 @@ export default function SectionFile({ status, member, refreshing }: { status: nu openFile() }} /> - {/* } - title="Download" - onPress={() => { - // download() - // setModal(false) - }} - /> */} { !member && (entityUser.role == "user" || entityUser.role == "coadmin") ? <> : diff --git a/components/project/sectionMember.tsx b/components/project/sectionMember.tsx index 65ecf57..07cf817 100644 --- a/components/project/sectionMember.tsx +++ b/components/project/sectionMember.tsx @@ -1,3 +1,4 @@ +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiDeleteProjectMember, apiGetProjectOne } from "@/lib/api"; import { setUpdateProject } from "@/lib/projectUpdate"; @@ -112,7 +113,7 @@ export default function SectionMember({ status, refreshing }: { status: number | } + icon={} title={item.name} onPress={() => { if (status == 3) return diff --git a/components/task/sectionFileTask.tsx b/components/task/sectionFileTask.tsx index 68bedc0..c826e34 100644 --- a/components/task/sectionFileTask.tsx +++ b/components/task/sectionFileTask.tsx @@ -1,3 +1,4 @@ +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiDeleteFileTask, apiGetTaskOne } from "@/lib/api"; import { setUpdateTask } from "@/lib/taskUpdate"; @@ -27,7 +28,7 @@ type Props = { idStorage: string } -export default function SectionFileTask({refreshing}: {refreshing: boolean}) { +export default function SectionFileTask({ refreshing }: { refreshing: boolean }) { const [isModal, setModal] = useState(false) const { token, decryptToken } = useAuthSession() const { detail } = useLocalSearchParams<{ detail: string }>() @@ -68,7 +69,7 @@ export default function SectionFileTask({refreshing}: {refreshing: boolean}) { const openFile = () => { setModal(false) setLoadingOpen(true) - let remoteUrl = 'https://wibu-storage.wibudev.com/api/files/' + selectFile?.idStorage; + let remoteUrl = ConstEnv.url_storage + '/files/' + selectFile?.idStorage; const fileName = selectFile?.name + '.' + selectFile?.extension; let localPath = `${FileSystem.documentDirectory}/${fileName}`; const mimeType = mime.lookup(fileName) @@ -160,17 +161,8 @@ export default function SectionFileTask({refreshing}: {refreshing: boolean}) { title="Lihat / Share" onPress={() => { openFile() - // setModal(false) }} /> - {/* } - title="Download" - onPress={() => { - setModal(false) - }} - /> */} - } title="Hapus" diff --git a/components/task/sectionMemberTask.tsx b/components/task/sectionMemberTask.tsx index 2c80a54..4a66180 100644 --- a/components/task/sectionMemberTask.tsx +++ b/components/task/sectionMemberTask.tsx @@ -1,3 +1,4 @@ +import { ConstEnv } from "@/constants/ConstEnv"; import Styles from "@/constants/Styles"; import { apiDeleteTaskMember, apiGetTaskOne } from "@/lib/api"; import { setUpdateTask } from "@/lib/taskUpdate"; @@ -114,9 +115,7 @@ export default function SectionMemberTask({ refreshing }: { refreshing: boolean key={index} borderType="bottom" icon={ - + } title={item.name} onPress={() => { diff --git a/lib/firebaseDatabase.ts b/lib/firebaseDatabase.ts index 4b7fee4..9b3e385 100644 --- a/lib/firebaseDatabase.ts +++ b/lib/firebaseDatabase.ts @@ -1,8 +1,9 @@ import { getApp } from '@react-native-firebase/app'; import { getDatabase } from '@react-native-firebase/database'; +import Constants from 'expo-constants'; // Ganti URL sesuai punya kamu -const DATABASE_URL = 'https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app'; +const DATABASE_URL = Constants?.expoConfig?.extra?.URL_FIREBASE_DB export function getDB() { return getDatabase(getApp(), DATABASE_URL);