From acacf9c125fe25c8e9983a9cea4e224801c92133 Mon Sep 17 00:00:00 2001 From: amaliadwiy Date: Fri, 13 Feb 2026 17:22:15 +0800 Subject: [PATCH] upd: redesign --- app/(application)/announcement/index.tsx | 2 +- app/(application)/discussion/[id].tsx | 2 +- app/(application)/discussion/index.tsx | 2 +- .../calendar/[detail]/add-member.tsx | 4 +- .../calendar/create-member.tsx | 2 +- .../[id]/(fitur-division)/calendar/index.tsx | 2 +- .../discussion/[detail]/index.tsx | 4 +- .../(fitur-division)/discussion/index.tsx | 6 +- .../[id]/(fitur-division)/document/index.tsx | 10 +- .../task/[detail]/add-member.tsx | 8 +- .../task/[detail]/add-task.tsx | 19 +-- .../(fitur-division)/task/create/member.tsx | 4 +- .../(fitur-division)/task/create/task.tsx | 19 +-- .../[id]/(fitur-division)/task/index.tsx | 6 +- .../(fitur-division)/task/update/[detail].tsx | 6 +- .../division/[id]/add-member.tsx | 4 +- .../division/create/add-admin-division.tsx | 2 +- .../division/create/add-member.tsx | 4 +- app/(application)/division/index.tsx | 2 +- app/(application)/group/index.tsx | 3 +- app/(application)/member/index.tsx | 2 +- app/(application)/notification.tsx | 2 +- app/(application)/position/index.tsx | 2 +- app/(application)/project/[id]/add-member.tsx | 4 +- app/(application)/project/[id]/add-task.tsx | 17 +-- app/(application)/project/create.tsx | 2 +- app/(application)/project/create/member.tsx | 4 +- app/(application)/project/create/task.tsx | 29 ++-- app/(application)/project/index.tsx | 135 +++++++++--------- app/(application)/project/update/[detail].tsx | 6 +- components/borderBottomItem2.tsx | 4 +- components/buttonSelect.tsx | 2 +- components/calendar/itemHistoryEvent.tsx | 2 +- .../division/discussionDivisionDetail.tsx | 4 +- components/division/fileDivisionDetail.tsx | 2 +- components/division/taskDivisionDetail.tsx | 2 +- components/document/modalInformasi.tsx | 2 +- components/document/modalSalinMove.tsx | 4 +- components/home/discussionHome.tsx | 2 +- components/home/divisionHome.tsx | 2 +- components/home/eventHome.tsx | 2 +- components/home/projectHome.tsx | 2 +- components/inputForm.tsx | 6 +- components/itemSectionTanggalTugas.tsx | 12 +- components/modalFilter.tsx | 2 +- components/modalSelect.tsx | 2 +- .../project/modalAddDetailTugasProject.tsx | 2 +- .../project/modalListDetailTugasProject.tsx | 2 +- components/project/sectionFile.tsx | 2 +- components/project/sectionMember.tsx | 2 +- components/project/sectionTanggalTugas.tsx | 2 +- components/sectionCancel.tsx | 2 +- components/sectionProgress.tsx | 9 +- components/task/modalListDetailTugasTask.tsx | 2 +- components/task/sectionFileTask.tsx | 2 +- components/task/sectionMemberTask.tsx | 8 +- components/task/sectionTanggalTugasTask.tsx | 2 +- constants/Styles.ts | 3 + 58 files changed, 200 insertions(+), 204 deletions(-) diff --git a/app/(application)/announcement/index.tsx b/app/(application)/announcement/index.tsx index c96797d..4319656 100644 --- a/app/(application)/announcement/index.tsx +++ b/app/(application)/announcement/index.tsx @@ -135,7 +135,7 @@ export default function Announcement() { } /> : - Tidak ada pengumuman + Tidak ada pengumuman } diff --git a/app/(application)/discussion/[id].tsx b/app/(application)/discussion/[id].tsx index 8b58960..8eff8d7 100644 --- a/app/(application)/discussion/[id].tsx +++ b/app/(application)/discussion/[id].tsx @@ -402,7 +402,7 @@ export default function DetailDiscussionGeneral() { /> : - + { data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota diskusi yang dapat memberikan komentar" } diff --git a/app/(application)/discussion/index.tsx b/app/(application)/discussion/index.tsx index 288987d..3f01cb6 100644 --- a/app/(application)/discussion/index.tsx +++ b/app/(application)/discussion/index.tsx @@ -187,7 +187,7 @@ export default function Discussion() { } /> : - Tidak ada data + Tidak ada data } 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 56dcf74..6706641 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 @@ -156,7 +156,7 @@ export default function AddMemberCalendarEvent() { : - Tidak ada member yang dipilih + Tidak ada member yang dipilih } {item.name} { - found && sudah menjadi anggota + found && sudah menjadi anggota } 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 3901085..7a2d153 100644 --- a/app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx +++ b/app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx @@ -143,7 +143,7 @@ export default function CreateCalendarAddMember() { : - Tidak ada member yang dipilih + Tidak ada member yang dipilih } )) ) : ( - Tidak ada acara + Tidak ada acara ) } 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 ce04db3..9d06ec3 100644 --- a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx @@ -354,7 +354,7 @@ export default function DiscussionDetail() { color="grey" style={Styles.mr05} /> - + {dataComment.length} Komentar @@ -519,7 +519,7 @@ export default function DiscussionDetail() { /> : - + { data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota divisi yang dapat memberikan komentar" } diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx index 09271c1..c4bac68 100644 --- a/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/discussion/index.tsx @@ -187,8 +187,8 @@ export default function DiscussionDivision() { desc={item.desc} leftBottomInfo={ - - Diskusikan + + Diskusikan } rightBottomInfo={item.total_komentar + ' Komentar'} @@ -207,7 +207,7 @@ export default function DiscussionDivision() { } /> : - (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 3aeaf64..d308578 100644 --- a/app/(application)/division/[id]/(fitur-division)/document/index.tsx +++ b/app/(application)/division/[id]/(fitur-division)/document/index.tsx @@ -12,7 +12,6 @@ import ModalLoading from "@/components/modalLoading"; 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 { @@ -480,14 +479,7 @@ export default function DocumentDivision() { ); }) ) : ( - + Tidak ada dokumen )} diff --git a/app/(application)/division/[id]/(fitur-division)/task/[detail]/add-member.tsx b/app/(application)/division/[id]/(fitur-division)/task/[detail]/add-member.tsx index 09bf071..84d6dca 100644 --- a/app/(application)/division/[id]/(fitur-division)/task/[detail]/add-member.tsx +++ b/app/(application)/division/[id]/(fitur-division)/task/[detail]/add-member.tsx @@ -151,7 +151,7 @@ export default function AddMemberTask() { : - Tidak ada member yang dipilih + Tidak ada member yang dipilih } { !found && onChoose(item.idUser, item.name, item.img) }} > - + {item.name} { - found && sudah menjadi anggota + found && sudah menjadi anggota } diff --git a/app/(application)/division/[id]/(fitur-division)/task/[detail]/add-task.tsx b/app/(application)/division/[id]/(fitur-division)/task/[detail]/add-task.tsx index 7498b06..3abd52b 100644 --- a/app/(application)/division/[id]/(fitur-division)/task/[detail]/add-task.tsx +++ b/app/(application)/division/[id]/(fitur-division)/task/[detail]/add-task.tsx @@ -1,5 +1,6 @@ import AppHeader from "@/components/AppHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader"; +import ButtonSelect from "@/components/buttonSelect"; import { InputForm } from "@/components/inputForm"; import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask"; import Text from "@/components/Text"; @@ -17,7 +18,8 @@ import 'intl/locale-data/jsonp/id'; import moment from "moment"; import { useEffect, useState } from "react"; import { - KeyboardAvoidingView, Platform, Pressable, SafeAreaView, + KeyboardAvoidingView, Platform, + SafeAreaView, ScrollView, View } from "react-native"; @@ -209,31 +211,32 @@ export default function TaskDivisionAddTask() { - Tanggal Mulai * + Tanggal Mulai * - + {from} - Tanggal Berakhir * + Tanggal Berakhir * - + {to} { - (error.endDate || error.startDate) && Tanggal tidak boleh kosong + (error.endDate || error.startDate) && Tanggal tidak boleh kosong } - { setModalDetail(true) }} > Detail - + */} + { setModalDetail(true) }} /> : - Tidak ada member yang dipilih + Tidak ada member yang dipilih } { onChoose(item.idUser, item.name, item.img) }} diff --git a/app/(application)/division/[id]/(fitur-division)/task/create/task.tsx b/app/(application)/division/[id]/(fitur-division)/task/create/task.tsx index 8c857b0..3095cf2 100644 --- a/app/(application)/division/[id]/(fitur-division)/task/create/task.tsx +++ b/app/(application)/division/[id]/(fitur-division)/task/create/task.tsx @@ -1,6 +1,6 @@ import AppHeader from "@/components/AppHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader"; -import { useTheme } from "@/providers/ThemeProvider"; +import ButtonSelect from "@/components/buttonSelect"; import { InputForm } from "@/components/inputForm"; import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask"; import Text from "@/components/Text"; @@ -8,6 +8,7 @@ import Styles from "@/constants/Styles"; import { formatDateOnly } from "@/lib/fun_formatDateOnly"; import { getDatesInRange } from "@/lib/fun_getDatesInRange"; import { setTaskCreate } from "@/lib/taskCreate"; +import { useTheme } from "@/providers/ThemeProvider"; import { useHeaderHeight } from '@react-navigation/elements'; import { router, Stack } from "expo-router"; import 'intl'; @@ -17,7 +18,6 @@ import { useEffect, useState } from "react"; import { KeyboardAvoidingView, Platform, - Pressable, SafeAreaView, ScrollView, View @@ -184,31 +184,32 @@ export default function CreateTaskAddTugas() { - Tanggal Mulai * + Tanggal Mulai * - + {from} - Tanggal Berakhir * + Tanggal Berakhir * - + {to} { - (error.endDate || error.startDate) && Tanggal tidak boleh kosong + (error.endDate || error.startDate) && Tanggal tidak boleh kosong } - { setModalDetail(true) }} > Detail - + */} + { setModalDetail(true) }} /> ) ) : ( - + Tidak ada data ) diff --git a/app/(application)/division/[id]/(fitur-division)/task/update/[detail].tsx b/app/(application)/division/[id]/(fitur-division)/task/update/[detail].tsx index a1c0f50..1511f0c 100644 --- a/app/(application)/division/[id]/(fitur-division)/task/update/[detail].tsx +++ b/app/(application)/division/[id]/(fitur-division)/task/update/[detail].tsx @@ -261,7 +261,7 @@ export default function UpdateProjectTaskDivision() { - Tanggal Mulai * + Tanggal Mulai * {from} @@ -269,7 +269,7 @@ export default function UpdateProjectTaskDivision() { - Tanggal Berakhir * + Tanggal Berakhir * {to} @@ -277,7 +277,7 @@ export default function UpdateProjectTaskDivision() { {(error.endDate || error.startDate) && ( - + Tanggal tidak boleh kosong )} diff --git a/app/(application)/division/[id]/add-member.tsx b/app/(application)/division/[id]/add-member.tsx index 5b72741..9218098 100644 --- a/app/(application)/division/[id]/add-member.tsx +++ b/app/(application)/division/[id]/add-member.tsx @@ -154,7 +154,7 @@ export default function AddMemberDivision() { : - Tidak ada member yang dipilih + Tidak ada member yang dipilih } {item.name} { - found && sudah menjadi anggota + found && sudah menjadi anggota } diff --git a/app/(application)/division/create/add-admin-division.tsx b/app/(application)/division/create/add-admin-division.tsx index 629fadc..b8618a8 100644 --- a/app/(application)/division/create/add-admin-division.tsx +++ b/app/(application)/division/create/add-admin-division.tsx @@ -125,7 +125,7 @@ export default function CreateDivisionAddAdmin() { {item.name} { - found && sudah menjadi anggota + found && sudah menjadi anggota } diff --git a/app/(application)/division/create/add-member.tsx b/app/(application)/division/create/add-member.tsx index c9d99c8..920b29c 100644 --- a/app/(application)/division/create/add-member.tsx +++ b/app/(application)/division/create/add-member.tsx @@ -108,7 +108,7 @@ export default function CreateDivisionAddMember() { : - Tidak ada member yang dipilih + Tidak ada member yang dipilih } {item.name} { - found && sudah menjadi anggota + found && sudah menjadi anggota } diff --git a/app/(application)/division/index.tsx b/app/(application)/division/index.tsx index a894e3e..d48fabd 100644 --- a/app/(application)/division/index.tsx +++ b/app/(application)/division/index.tsx @@ -218,7 +218,7 @@ export default function ListDivision() { : data.length == 0 ? ( - Tidak ada data + Tidak ada data ) : ( isList ? ( diff --git a/app/(application)/group/index.tsx b/app/(application)/group/index.tsx index 5a0bb19..deb0932 100644 --- a/app/(application)/group/index.tsx +++ b/app/(application)/group/index.tsx @@ -9,7 +9,6 @@ import MenuItemRow from "@/components/menuItemRow"; import SkeletonTwoItem from "@/components/skeletonTwoItem"; import Text from "@/components/Text"; import WrapTab from "@/components/wrapTab"; -import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { apiDeleteGroup, apiEditGroup, apiGetGroup } from "@/lib/api"; import { setUpdateGroup } from "@/lib/groupSlice"; @@ -195,7 +194,7 @@ export default function Index() { } /> : - Tidak ada data + Tidak ada data } diff --git a/app/(application)/member/index.tsx b/app/(application)/member/index.tsx index ed3734f..b789b78 100644 --- a/app/(application)/member/index.tsx +++ b/app/(application)/member/index.tsx @@ -176,7 +176,7 @@ export default function Index() { } /> : - Tidak ada data + Tidak ada data } diff --git a/app/(application)/notification.tsx b/app/(application)/notification.tsx index 736916e..7c56cd8 100644 --- a/app/(application)/notification.tsx +++ b/app/(application)/notification.tsx @@ -147,7 +147,7 @@ export default function Notification() { } /> : - Tidak ada data + Tidak ada data } diff --git a/app/(application)/position/index.tsx b/app/(application)/position/index.tsx index 76479bb..17a6ab1 100644 --- a/app/(application)/position/index.tsx +++ b/app/(application)/position/index.tsx @@ -220,7 +220,7 @@ export default function Index() { } /> : - Tidak ada data + Tidak ada data } setModal(false)} title={chooseData.name}> diff --git a/app/(application)/project/[id]/add-member.tsx b/app/(application)/project/[id]/add-member.tsx index a47fa35..0261476 100644 --- a/app/(application)/project/[id]/add-member.tsx +++ b/app/(application)/project/[id]/add-member.tsx @@ -150,7 +150,7 @@ export default function AddMemberProject() { : - Tidak ada member yang dipilih + Tidak ada member yang dipilih } {item.name} { - found && sudah menjadi anggota + found && sudah menjadi anggota } diff --git a/app/(application)/project/[id]/add-task.tsx b/app/(application)/project/[id]/add-task.tsx index 921fa58..f54ccce 100644 --- a/app/(application)/project/[id]/add-task.tsx +++ b/app/(application)/project/[id]/add-task.tsx @@ -1,5 +1,6 @@ import AppHeader from "@/components/AppHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader"; +import ButtonSelect from "@/components/buttonSelect"; import { InputForm } from "@/components/inputForm"; import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject"; import Text from "@/components/Text"; @@ -19,7 +20,6 @@ import { useEffect, useState } from "react"; import { KeyboardAvoidingView, Platform, - Pressable, SafeAreaView, ScrollView, View @@ -200,31 +200,32 @@ export default function ProjectAddTask() { - Tanggal Mulai * + Tanggal Mulai * - + {from} - Tanggal Berakhir * + Tanggal Berakhir * - + {to} { - (error.endDate || error.startDate) && Tanggal tidak boleh kosong + (error.endDate || error.startDate) && Tanggal tidak boleh kosong } - { setModalDetail(true) }} > Detail - + */} + { setModalDetail(true) }} /> Total {entitiesMember.length} Anggota - + {entitiesMember.map( (item: { img: any; name: any }, index: any) => { return ( diff --git a/app/(application)/project/create/member.tsx b/app/(application)/project/create/member.tsx index 947afad..d5f8ba2 100644 --- a/app/(application)/project/create/member.tsx +++ b/app/(application)/project/create/member.tsx @@ -127,7 +127,7 @@ export default function AddMemberCreateProject() { : - Tidak ada member yang dipilih + Tidak ada member yang dipilih } { onChoose(item.id, item.name, item.img) }} diff --git a/app/(application)/project/create/task.tsx b/app/(application)/project/create/task.tsx index 5aaad36..338d4f8 100644 --- a/app/(application)/project/create/task.tsx +++ b/app/(application)/project/create/task.tsx @@ -1,5 +1,6 @@ import AppHeader from "@/components/AppHeader"; import ButtonSaveHeader from "@/components/buttonSaveHeader"; +import ButtonSelect from "@/components/buttonSelect"; import { InputForm } from "@/components/inputForm"; import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject"; import Text from "@/components/Text"; @@ -17,7 +18,6 @@ import React, { useEffect, useState } from "react"; import { KeyboardAvoidingView, Platform, - Pressable, SafeAreaView, ScrollView, View @@ -173,12 +173,12 @@ export default function CreateProjectAddTask() { selected_label: Styles.cWhite, range_fill: Styles.selectRangeDate, month_label: { color: colors.text }, - month_selector_label: Styles.cBlack, - year_label: Styles.cBlack, - year_selector_label: Styles.cBlack, - day_label: Styles.cBlack, - time_label: Styles.cBlack, - weekday_label: Styles.cBlack, + month_selector_label: { color: colors.text }, + year_label: { color: colors.text }, + year_selector_label: { color: colors.text }, + day_label: { color: colors.text }, + time_label: { color: colors.text }, + weekday_label: { color: colors.text }, }} /> @@ -186,31 +186,32 @@ export default function CreateProjectAddTask() { - Tanggal Mulai * + Tanggal Mulai * - + {from} - Tanggal Berakhir * + Tanggal Berakhir * - + {to} { - (error.endDate || error.startDate) && Tanggal tidak boleh kosong + (error.endDate || error.startDate) && Tanggal tidak boleh kosong } - { setModalDetail(true) }} > Detail - + */} + { setModalDetail(true) }} /> - - { setStatusFix("0") }} - label="Segera" - icon={ - - } - n={4} - /> - { setStatusFix("1") }} - label="Dikerjakan" - icon={ - - } - n={4} - /> - { setStatusFix("2") }} - label="Selesai" - icon={ - - } - n={4} - /> - { setStatusFix("3") }} - label="Batal" - icon={ - - } - n={4} - /> - + + + { setStatusFix("0") }} + label="Segera" + icon={ + + } + n={4} + /> + { setStatusFix("1") }} + label="Dikerjakan" + icon={ + + } + n={4} + /> + { setStatusFix("2") }} + label="Selesai" + icon={ + + } + n={4} + /> + { setStatusFix("3") }} + label="Batal" + icon={ + + } + n={4} + /> + + + { router.push(`/project/${item.id}`); }} borderType="bottom" + bgColor="transparent" icon={ - + } @@ -316,17 +321,17 @@ export default function ListProject() { > - + {item.createdAt} - + {item.createdAt} - Tidak ada kegiatan + Tidak ada kegiatan } diff --git a/app/(application)/project/update/[detail].tsx b/app/(application)/project/update/[detail].tsx index 0aabbfe..f4a2057 100644 --- a/app/(application)/project/update/[detail].tsx +++ b/app/(application)/project/update/[detail].tsx @@ -234,20 +234,20 @@ export default function UpdateProjectTask() { - Tanggal Mulai * + Tanggal Mulai * {from} - Tanggal Berakhir * + Tanggal Berakhir * {to} { - (error.endDate || error.startDate) && Tanggal tidak boleh kosong + (error.endDate || error.startDate) && Tanggal tidak boleh kosong } { typeof leftBottomInfo == 'string' ? - {leftBottomInfo} + {leftBottomInfo} : leftBottomInfo } { typeof rightBottomInfo == 'string' ? - {rightBottomInfo} + {rightBottomInfo} : rightBottomInfo } diff --git a/components/buttonSelect.tsx b/components/buttonSelect.tsx index 9de3cb3..b7c128b 100644 --- a/components/buttonSelect.tsx +++ b/components/buttonSelect.tsx @@ -29,7 +29,7 @@ export default function ButtonSelect({ value, onPress, round, error, errorText } {value} - {error && ({errorText})} + {error && ({errorText})} ) } \ No newline at end of file diff --git a/components/calendar/itemHistoryEvent.tsx b/components/calendar/itemHistoryEvent.tsx index 5e277a3..017a44f 100644 --- a/components/calendar/itemHistoryEvent.tsx +++ b/components/calendar/itemHistoryEvent.tsx @@ -40,7 +40,7 @@ export default function ItemHistoryEvent({ data }: { data: Props }) { )) ) : ( - Tidak ada data + Tidak ada data ) } diff --git a/components/division/discussionDivisionDetail.tsx b/components/division/discussionDivisionDetail.tsx index f3b3259..09c9121 100644 --- a/components/division/discussionDivisionDetail.tsx +++ b/components/division/discussionDivisionDetail.tsx @@ -75,9 +75,7 @@ export default function DiscussionDivisionDetail({ refreshing }: { refreshing: b /> )) ) : ( - + Tidak ada diskusi ) diff --git a/components/division/fileDivisionDetail.tsx b/components/division/fileDivisionDetail.tsx index f106908..0717a10 100644 --- a/components/division/fileDivisionDetail.tsx +++ b/components/division/fileDivisionDetail.tsx @@ -154,7 +154,7 @@ export default function FileDivisionDetail({ refreshing }: { refreshing: boolean // )} // /> : - Tidak ada file + Tidak ada file } ) diff --git a/components/division/taskDivisionDetail.tsx b/components/division/taskDivisionDetail.tsx index e1ca4c3..915eadc 100644 --- a/components/division/taskDivisionDetail.tsx +++ b/components/division/taskDivisionDetail.tsx @@ -90,7 +90,7 @@ export default function TaskDivisionDetail({ refreshing }: { refreshing: boolean // )} // /> : - Tidak ada tugas + Tidak ada tugas } ) diff --git a/components/document/modalInformasi.tsx b/components/document/modalInformasi.tsx index 912a370..4800aec 100644 --- a/components/document/modalInformasi.tsx +++ b/components/document/modalInformasi.tsx @@ -98,7 +98,7 @@ export default function ModalInformasi({ data }: { data: any }) { ) : ( - Tidak ada data + Tidak ada data ) } diff --git a/components/document/modalSalinMove.tsx b/components/document/modalSalinMove.tsx index 9622c0f..1d45086 100644 --- a/components/document/modalSalinMove.tsx +++ b/components/document/modalSalinMove.tsx @@ -99,14 +99,14 @@ export default function ModalSalinMove({ open, close, category, onConfirm, dataC if (found) return; setPath(item.id); }} - subtitle={found ? Tidak dapat memilih folder ini : ''} + subtitle={found ? Tidak dapat memilih folder ini : ''} /> ) } ) : - Tidak ada data + Tidak ada data } diff --git a/components/home/discussionHome.tsx b/components/home/discussionHome.tsx index 2dc7f25..8850586 100644 --- a/components/home/discussionHome.tsx +++ b/components/home/discussionHome.tsx @@ -64,7 +64,7 @@ export default function DisccussionHome({ refreshing }: { refreshing: boolean }) { router.push(`/division/${item.idDivision}/discussion/${item.id}`) }} /> ) }) - : Tidak ada diskusi + : Tidak ada diskusi } diff --git a/components/home/divisionHome.tsx b/components/home/divisionHome.tsx index 872bbb6..2dd955a 100644 --- a/components/home/divisionHome.tsx +++ b/components/home/divisionHome.tsx @@ -92,7 +92,7 @@ export default function DivisionHome({ refreshing }: { refreshing: boolean }) { // )} // /> : - Tidak ada data + Tidak ada data } ) diff --git a/components/home/eventHome.tsx b/components/home/eventHome.tsx index 049b0e0..6e0927a 100644 --- a/components/home/eventHome.tsx +++ b/components/home/eventHome.tsx @@ -69,7 +69,7 @@ export default function EventHome({ refreshing }: { refreshing: boolean }) { { router.push(`/division/${item.idDivision}/calendar/${item.id}`) }} title={item.title} user={item.user_name} jamAwal={item.timeStart} jamAkhir={item.timeEnd} /> ) }) - : Tidak ada acara hari ini + : Tidak ada acara hari ini } diff --git a/components/home/projectHome.tsx b/components/home/projectHome.tsx index fa7ea0a..46c820f 100644 --- a/components/home/projectHome.tsx +++ b/components/home/projectHome.tsx @@ -97,7 +97,7 @@ export default function ProjectHome({ refreshing }: { refreshing: boolean }) { )} /> : - Tidak ada data + Tidak ada data } diff --git a/components/inputForm.tsx b/components/inputForm.tsx index 876b877..ff17cdf 100644 --- a/components/inputForm.tsx +++ b/components/inputForm.tsx @@ -46,7 +46,7 @@ export function InputForm({ label, value, placeholder, onChange, info, disable, multiline && { alignItems: 'flex-end' }, round && Styles.round30, { - backgroundColor: bg=="transparent" ? "transparent" : colors.input, + backgroundColor: bg == "transparent" ? "transparent" : colors.input, }, error ? { borderColor: colors.error } : { borderColor: colors.icon + '20' }, Platform.OS == 'ios' ? { paddingVertical: 10 } : { paddingVertical: 0, minHeight: 40 }, @@ -102,7 +102,7 @@ export function InputForm({ label, value, placeholder, onChange, info, disable, error ? { borderColor: colors.error } : { borderColor: colors.icon + '20' }, round && Styles.round30, { - backgroundColor: bg=="transparent" ? "transparent" : colors.input, + backgroundColor: bg == "transparent" ? "transparent" : colors.input, }, { color: colors.text }, multiline && { height: 150, textAlignVertical: 'top' } @@ -112,7 +112,7 @@ export function InputForm({ label, value, placeholder, onChange, info, disable, multiline={multiline} numberOfLines={multiline ? 5 : undefined} /> - {error && ({errorText})} + {error && ({errorText})} {info != undefined && ({info})} ) diff --git a/components/itemSectionTanggalTugas.tsx b/components/itemSectionTanggalTugas.tsx index e53f225..8030a9f 100644 --- a/components/itemSectionTanggalTugas.tsx +++ b/components/itemSectionTanggalTugas.tsx @@ -16,26 +16,26 @@ export default function ItemSectionTanggalTugas({ done, title, dateStart, dateEn const { colors } = useTheme(); return ( - + { done != undefined ? done ? <> - Selesai + Selesai : <> - Belum Selesai + Belum Selesai : <> } - + @@ -46,13 +46,13 @@ export default function ItemSectionTanggalTugas({ done, title, dateStart, dateEn Tanggal Mulai - + {dateStart} Tanggal Berakhir - + {dateEnd} diff --git a/components/modalFilter.tsx b/components/modalFilter.tsx index 8f07060..3168bf1 100644 --- a/components/modalFilter.tsx +++ b/components/modalFilter.tsx @@ -161,7 +161,7 @@ export default function ModalFilter({ open, close, page, category, valueGroup, v style={[ Styles.chip, { borderColor: colors.dimmed }, - chooseGroup == item.id && { backgroundColor: colors.primary }, + chooseYear == item.id && { backgroundColor: colors.primary }, ]} activeOpacity={0.8} onPress={() => { setChooseYear(item.id) }} diff --git a/components/modalSelect.tsx b/components/modalSelect.tsx index a0e6b19..ea0f500 100644 --- a/components/modalSelect.tsx +++ b/components/modalSelect.tsx @@ -152,7 +152,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on : - Tidak ada member yang dipilih + Tidak ada member yang dipilih } } diff --git a/components/project/modalAddDetailTugasProject.tsx b/components/project/modalAddDetailTugasProject.tsx index 766af45..6663683 100644 --- a/components/project/modalAddDetailTugasProject.tsx +++ b/components/project/modalAddDetailTugasProject.tsx @@ -98,7 +98,7 @@ export default function ModalAddDetailTugasProject({ isVisible, setVisible, data getItem={getItem} renderItem={({ item, index }: { item: Props, index: number }) => { return ( - + {item.date} diff --git a/components/project/modalListDetailTugasProject.tsx b/components/project/modalListDetailTugasProject.tsx index 4305286..ac5ea8b 100644 --- a/components/project/modalListDetailTugasProject.tsx +++ b/components/project/modalListDetailTugasProject.tsx @@ -109,7 +109,7 @@ export default function ModalListDetailTugasProject({ isVisible, setVisible, idT /> ) : - Tidak ada data + Tidak ada data } diff --git a/components/project/sectionFile.tsx b/components/project/sectionFile.tsx index 234659f..2072ada 100644 --- a/components/project/sectionFile.tsx +++ b/components/project/sectionFile.tsx @@ -161,7 +161,7 @@ export default function SectionFile({ status, member, refreshing }: { status: nu ) }) : - Tidak ada file + Tidak ada file } diff --git a/components/project/sectionMember.tsx b/components/project/sectionMember.tsx index 44d10d3..864876e 100644 --- a/components/project/sectionMember.tsx +++ b/components/project/sectionMember.tsx @@ -129,7 +129,7 @@ export default function SectionMember({ status, refreshing }: { status: number | ); }) : - Tidak ada anggota + Tidak ada anggota } diff --git a/components/project/sectionTanggalTugas.tsx b/components/project/sectionTanggalTugas.tsx index 8d1d866..ec96d72 100644 --- a/components/project/sectionTanggalTugas.tsx +++ b/components/project/sectionTanggalTugas.tsx @@ -149,7 +149,7 @@ export default function SectionTanggalTugasProject({ status, member, refreshing ); }) : - Tidak ada tugas + Tidak ada tugas } diff --git a/components/sectionCancel.tsx b/components/sectionCancel.tsx index 0aa6042..a3120d0 100644 --- a/components/sectionCancel.tsx +++ b/components/sectionCancel.tsx @@ -14,7 +14,7 @@ export default function SectionCancel({ text, title }: Props) { const { colors } = useTheme(); return ( - + {title ? title : 'Kegiatan Dibatalkan'} diff --git a/components/sectionProgress.tsx b/components/sectionProgress.tsx index 816c13d..fc1132d 100644 --- a/components/sectionProgress.tsx +++ b/components/sectionProgress.tsx @@ -1,10 +1,9 @@ -import { ColorsStatus } from "@/constants/ColorsStatus"; import Styles from "@/constants/Styles"; import { useTheme } from "@/providers/ThemeProvider"; import { AntDesign } from "@expo/vector-icons"; -import Text from "./Text"; import { View } from "react-native"; import ProgressBar from "./progressBar"; +import Text from "./Text"; type Props = { text: string, @@ -15,9 +14,9 @@ export default function SectionProgress({ text, progress }: Props) { const { colors } = useTheme(); return ( - - - + + + {text} diff --git a/components/task/modalListDetailTugasTask.tsx b/components/task/modalListDetailTugasTask.tsx index 7a79268..91371d0 100644 --- a/components/task/modalListDetailTugasTask.tsx +++ b/components/task/modalListDetailTugasTask.tsx @@ -109,7 +109,7 @@ export default function ModalListDetailTugasTask({ isVisible, setVisible, idTask /> ) : - Tidak ada data + Tidak ada data } diff --git a/components/task/sectionFileTask.tsx b/components/task/sectionFileTask.tsx index 134fad8..c1b4267 100644 --- a/components/task/sectionFileTask.tsx +++ b/components/task/sectionFileTask.tsx @@ -152,7 +152,7 @@ export default function SectionFileTask({ refreshing, isMemberDivision }: { refr ) }) : - Tidak ada file + Tidak ada file } diff --git a/components/task/sectionMemberTask.tsx b/components/task/sectionMemberTask.tsx index dd2c522..cf4b74d 100644 --- a/components/task/sectionMemberTask.tsx +++ b/components/task/sectionMemberTask.tsx @@ -132,13 +132,7 @@ export default function SectionMemberTask({ refreshing, isAdminDivision }: { ref ); }) ) : ( - + Tidak ada anggota ) diff --git a/components/task/sectionTanggalTugasTask.tsx b/components/task/sectionTanggalTugasTask.tsx index 100333d..7342503 100644 --- a/components/task/sectionTanggalTugasTask.tsx +++ b/components/task/sectionTanggalTugasTask.tsx @@ -151,7 +151,7 @@ export default function SectionTanggalTugasTask({ refreshing, isMemberDivision } ); }) : - Tidak ada tugas + Tidak ada tugas } diff --git a/constants/Styles.ts b/constants/Styles.ts index 9c336d0..b12a5a9 100644 --- a/constants/Styles.ts +++ b/constants/Styles.ts @@ -220,6 +220,9 @@ const Styles = StyleSheet.create({ round15: { borderRadius: 15 }, + round20: { + borderRadius: 20 + }, h100: { height: '100%' },