diff --git a/app/(application)/announcement/[id].tsx b/app/(application)/announcement/[id].tsx new file mode 100644 index 0000000..15d2397 --- /dev/null +++ b/app/(application)/announcement/[id].tsx @@ -0,0 +1,55 @@ +import HeaderRightAnnouncementDetail from "@/components/announcement/headerAnnouncementDetail"; +import ButtonBackHeader from "@/components/buttonBackHeader"; +import Styles from "@/constants/Styles"; +import { AntDesign, MaterialIcons } from "@expo/vector-icons"; +import { router, Stack, useLocalSearchParams } from "expo-router"; +import { SafeAreaView, ScrollView, SectionList, Text, View } from "react-native"; + +export default function DetailAnnouncement() { + const { id } = useLocalSearchParams() + return ( + + { router.back() }} />, + headerTitle: 'Pengumuman', + headerTitleAlign: 'center', + headerRight: () => , + }} + /> + {/* */} + + + + + Libur Nyepi + + + + Pengumuman terkait libur nyepi + + + + {item}} + renderSectionHeader={({ section }) => ( + {section.title} + )} + keyExtractor={item => `basicListEntry-${item}`} + /> + + + {/* */} + + ) +} \ No newline at end of file diff --git a/app/(application)/announcement/create.tsx b/app/(application)/announcement/create.tsx new file mode 100644 index 0000000..37b84e7 --- /dev/null +++ b/app/(application)/announcement/create.tsx @@ -0,0 +1,41 @@ +import AlertKonfirmasi from "@/components/alertKonfirmasi"; +import ButtonBackHeader from "@/components/buttonBackHeader"; +import { ButtonForm } from "@/components/buttonForm"; +import ButtonSelect from "@/components/buttonSelect"; +import { InputForm } from "@/components/inputForm"; +import Styles from "@/constants/Styles"; +import { router, Stack } from "expo-router"; +import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; + +export default function CreateAnnouncement() { + return ( + + { router.back() }} />, + headerTitle: 'Tambah Pengumuman', + headerTitleAlign: 'center', + }} + /> + + + + + + { + AlertKonfirmasi({ + title: 'Konfirmasi', + desc: 'Apakah anda yakin ingin menambahkan data?', + onPress: () => { + ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT) + router.push('/announcement') + } + }) + }} /> + + + + ) +} \ No newline at end of file diff --git a/app/(application)/announcement/edit/[id].tsx b/app/(application)/announcement/edit/[id].tsx new file mode 100644 index 0000000..adba867 --- /dev/null +++ b/app/(application)/announcement/edit/[id].tsx @@ -0,0 +1,41 @@ +import AlertKonfirmasi from "@/components/alertKonfirmasi" +import ButtonBackHeader from "@/components/buttonBackHeader" +import { ButtonForm } from "@/components/buttonForm" +import ButtonSelect from "@/components/buttonSelect" +import { InputForm } from "@/components/inputForm" +import Styles from "@/constants/Styles" +import { router, Stack } from "expo-router" +import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native" + +export default function EditAnnouncement() { + return ( + + { router.back() }} />, + headerTitle: 'Edit Pengumuman', + headerTitleAlign: 'center', + }} + /> + + + + + + { + AlertKonfirmasi({ + title: 'Konfirmasi', + desc: 'Apakah anda yakin ingin mengubah data?', + onPress: () => { + ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT) + router.push('/announcement') + } + }) + }} /> + + + + ) +} \ No newline at end of file diff --git a/app/(application)/announcement/index.tsx b/app/(application)/announcement/index.tsx new file mode 100644 index 0000000..068b88c --- /dev/null +++ b/app/(application)/announcement/index.tsx @@ -0,0 +1,114 @@ +import HeaderRightAnnouncementList from "@/components/announcement/headerAnnouncementList"; +import BorderBottomItem from "@/components/borderBottomItem"; +import ButtonBackHeader from "@/components/buttonBackHeader"; +import InputSearch from "@/components/inputSearch"; +import { ColorsStatus } from "@/constants/ColorsStatus"; +import Styles from "@/constants/Styles"; +import { MaterialIcons } from "@expo/vector-icons"; +import { router, Stack } from "expo-router"; +import { SafeAreaView, ScrollView, View } from "react-native"; + +export default function Announcement() { + return ( + + { router.back() }} />, + headerTitle: 'Pengumuman', + headerTitleAlign: 'center', + headerRight: () => + }} + /> + + + + + {router.push('/announcement/7493')}} + borderType="bottom" + icon={ + + + + } + title="Libur Nyepi" + desc="Pengumuman terkait libur nyepi" + rightTopInfo="23 Mar 2025" + /> + {router.push('/announcement/7493')}} + borderType="bottom" + icon={ + + + + } + title="Libur Nyepi" + desc="Pengumuman terkait libur nyepi" + rightTopInfo="23 Mar 2025" + /> + {router.push('/announcement/7493')}} + borderType="bottom" + icon={ + + + + } + title="Libur Nyepi" + desc="Pengumuman terkait libur nyepi" + rightTopInfo="23 Mar 2025" + /> + {router.push('/announcement/7493')}} + borderType="bottom" + icon={ + + + + } + title="Libur Nyepi" + desc="Pengumuman terkait libur nyepi" + rightTopInfo="23 Mar 2025" + /> + {router.push('/announcement/7493')}} + borderType="bottom" + icon={ + + + + } + title="Libur Nyepi" + desc="Pengumuman terkait libur nyepi" + rightTopInfo="23 Mar 2025" + /> + {router.push('/announcement/7493')}} + borderType="bottom" + icon={ + + + + } + title="Libur Nyepi" + desc="Pengumuman terkait libur nyepi" + rightTopInfo="23 Mar 2025" + /> + {router.push('/announcement/7493')}} + borderType="bottom" + icon={ + + + + } + title="Libur Nyepi" + desc="Pengumuman terkait libur nyepi" + rightTopInfo="23 Mar 2025" + /> + + + + ) +} \ No newline at end of file diff --git a/app/(application)/discussion/[id].tsx b/app/(application)/discussion/[id].tsx index bf302cb..046efd7 100644 --- a/app/(application)/discussion/[id].tsx +++ b/app/(application)/discussion/[id].tsx @@ -1,7 +1,153 @@ -import { Text } from "react-native"; +import BorderBottomItem from "@/components/borderBottomItem"; +import ButtonBackHeader from "@/components/buttonBackHeader"; +import HeaderRightDiscussionGeneralDetail from "@/components/discussion_general/headerDiscussionDetail"; +import { InputForm } from "@/components/inputForm"; +import LabelStatus from "@/components/labelStatus"; +import { ColorsStatus } from "@/constants/ColorsStatus"; +import Styles from "@/constants/Styles"; +import { Ionicons, MaterialIcons } from "@expo/vector-icons"; +import { router, Stack, useLocalSearchParams } from "expo-router"; +import { Image, ScrollView, Text, View } from "react-native"; export default function DetailDiscussionGeneral() { + const { id } = useLocalSearchParams() + return ( - Detail diskusi general + <> + { router.back() }} />, + headerTitle: 'Diskusi', + headerTitleAlign: 'center', + headerRight: () => , + }} + /> + + + + + + + + } + title="Danantara" + subtitle={ + + } + rightTopInfo="3 Jan 2025" + desc="Bagaimana dampak yg dirasakan akibat efisiensi?" + leftBottomInfo={ + + + 15 Komentar + + } + /> + + + } + title="Amalia Dwi" + rightTopInfo="3 Jan 2025" + desc="sangat berdampak dari berbagai sisi" + /> + + } + title="Amalia Dwi" + rightTopInfo="3 Jan 2025" + desc="semua menjadi terbatas.." + /> + + } + title="Amalia Dwi" + rightTopInfo="3 Jan 2025" + desc="semua menjadi terbatas.." + /> + + } + title="Amalia Dwi" + rightTopInfo="3 Jan 2025" + desc="semua menjadi terbatas.." + /> + + } + title="Amalia Dwi" + rightTopInfo="3 Jan 2025" + desc="semua menjadi terbatas.." + /> + + } + title="Amalia Dwi" + rightTopInfo="3 Jan 2025" + desc="semua menjadi terbatas.." + /> + + + } + title="Amalia Dwi" + rightTopInfo="3 Jan 2025" + desc="semua menjadi terbatas.." + /> + + + + + + + + } + /> + + + ) } \ No newline at end of file diff --git a/app/(application)/discussion/create.tsx b/app/(application)/discussion/create.tsx index bd3b99c..71b5235 100644 --- a/app/(application)/discussion/create.tsx +++ b/app/(application)/discussion/create.tsx @@ -1,7 +1,46 @@ -import { Text } from "react-native"; +import AlertKonfirmasi from "@/components/alertKonfirmasi"; +import ButtonBackHeader from "@/components/buttonBackHeader"; +import { ButtonForm } from "@/components/buttonForm"; +import ButtonSelect from "@/components/buttonSelect"; +import { InputForm } from "@/components/inputForm"; +import SelectForm from "@/components/selectForm"; +import Styles from "@/constants/Styles"; +import { router, Stack } from "expo-router"; +import { useState } from "react"; +import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native"; -export default function CreateDiscussionGeneral(){ - return( - Tambah diskusi general +export default function CreateDiscussionGeneral() { + const [chooseGroup, setChooseGroup] = useState({ val: '', label: '' }) + + return ( + + { router.back() }} />, + headerTitle: 'Tambah Diskusi', + headerTitleAlign: 'center', + }} + /> + + + { }} /> + + + + { + AlertKonfirmasi({ + title: 'Konfirmasi', + desc: 'Apakah anda yakin ingin menambahkan data?', + onPress: () => { + ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT) + router.push('/discussion?active=true') + } + }) + }} /> + + + ) } \ No newline at end of file diff --git a/app/(application)/discussion/edit/[id].tsx b/app/(application)/discussion/edit/[id].tsx new file mode 100644 index 0000000..141897e --- /dev/null +++ b/app/(application)/discussion/edit/[id].tsx @@ -0,0 +1,39 @@ +import AlertKonfirmasi from "@/components/alertKonfirmasi" +import ButtonBackHeader from "@/components/buttonBackHeader" +import { ButtonForm } from "@/components/buttonForm" +import { InputForm } from "@/components/inputForm" +import Styles from "@/constants/Styles" +import { router, Stack } from "expo-router" +import { SafeAreaView, ScrollView, ToastAndroid, View } from "react-native" + +export default function EditDiscussionGeneral() { + return ( + + { router.back() }} />, + headerTitle: 'Edit Diskusi', + headerTitleAlign: 'center', + }} + /> + + + + + { + AlertKonfirmasi({ + title: 'Konfirmasi', + desc: 'Apakah anda yakin ingin mengubah data?', + onPress: () => { + ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT) + router.back() + } + }) + }} /> + + + + ) +} \ No newline at end of file diff --git a/app/(application)/discussion/index.tsx b/app/(application)/discussion/index.tsx index 2b62923..4c50852 100644 --- a/app/(application)/discussion/index.tsx +++ b/app/(application)/discussion/index.tsx @@ -14,7 +14,7 @@ export default function Discussion() { return ( - + + { router.push('/discussion/1') }} + borderType="bottom" + icon={ + + + + } + title="Danantara" + subtitle={ + + } + rightTopInfo="3 Jan 2025" + desc="Bagaimana dampak yg dirasakan akibat efisiensi?" + leftBottomInfo={ + + + Diskusikan + + } + rightBottomInfo='15 Komentar' + /> + { router.push('/discussion/1') }} + borderType="bottom" + icon={ + + + + } + title="Danantara" + subtitle={ + + } + rightTopInfo="3 Jan 2025" + desc="Bagaimana dampak yg dirasakan akibat efisiensi?" + leftBottomInfo={ + + + Diskusikan + + } + rightBottomInfo='15 Komentar' + /> + { router.push('/discussion/1') }} + borderType="bottom" + icon={ + + + + } + title="Danantara" + subtitle={ + + } + rightTopInfo="3 Jan 2025" + desc="Bagaimana dampak yg dirasakan akibat efisiensi?" + leftBottomInfo={ + + + Diskusikan + + } + rightBottomInfo='15 Komentar' + /> + { router.push('/discussion/1') }} + borderType="bottom" + icon={ + + + + } + title="Danantara" + subtitle={ + + } + rightTopInfo="3 Jan 2025" + desc="Bagaimana dampak yg dirasakan akibat efisiensi?" + leftBottomInfo={ + + + Diskusikan + + } + rightBottomInfo='15 Komentar' + /> diff --git a/app/(application)/discussion/member/[id].tsx b/app/(application)/discussion/member/[id].tsx new file mode 100644 index 0000000..9daa918 --- /dev/null +++ b/app/(application)/discussion/member/[id].tsx @@ -0,0 +1,90 @@ +import BorderBottomItem from "@/components/borderBottomItem"; +import ButtonBackHeader from "@/components/buttonBackHeader"; +import { ColorsStatus } from "@/constants/ColorsStatus"; +import Styles from "@/constants/Styles"; +import { Feather } from "@expo/vector-icons"; +import { router, Stack, useLocalSearchParams } from "expo-router"; +import { Image, SafeAreaView, ScrollView, Text, View } from "react-native"; + +export default function MemberDiscussionDetail() { + const { id } = useLocalSearchParams() + return ( + + { router.back() }} />, + headerTitle: 'Anggota Diskusi', + headerTitleAlign: 'center', + }} + /> + + + 5 Anggota + + + + + } + title="Tambah Anggota" + /> + + + } + title="Amalia Dwi" + /> + + } + title="Amalia Dwi" + /> + + } + title="Amalia Dwi" + /> + + } + title="Amalia Dwi" + /> + + } + title="Amalia Dwi" + /> + + + + + + ) +} \ No newline at end of file diff --git a/app/(application)/feature.tsx b/app/(application)/feature.tsx index 6e309fe..234c193 100644 --- a/app/(application)/feature.tsx +++ b/app/(application)/feature.tsx @@ -19,12 +19,12 @@ export default function Feature() { } text="Divisi" /> } text="Kegiatan" /> - } text="Pengumuman" /> - } text="Diskusi" onPress={() => { router.push('/discussion?active=true') }}/> + } text="Pengumuman" onPress={() => { router.push('/announcement') }} /> + } text="Diskusi" onPress={() => { router.push('/discussion?active=true') }} /> - } text="Anggota" onPress={() => { router.push('/member?active=true') }}/> - } text="Jabatan" onPress={() => { router.push('/position?active=true') }}/> + } text="Anggota" onPress={() => { router.push('/member?active=true') }} /> + } text="Jabatan" onPress={() => { router.push('/position?active=true') }} /> } text="Lembaga Desa" onPress={() => { router.push('/group?active=true') }} /> } text="Tema" onPress={() => { }} /> diff --git a/components/announcement/headerAnnouncementDetail.tsx b/components/announcement/headerAnnouncementDetail.tsx new file mode 100644 index 0000000..b18aceb --- /dev/null +++ b/components/announcement/headerAnnouncementDetail.tsx @@ -0,0 +1,48 @@ +import Styles from "@/constants/Styles" +import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons" +import { router } from "expo-router" +import { useState } from "react" +import { ToastAndroid, View } from "react-native" +import AlertKonfirmasi from "../alertKonfirmasi" +import ButtonMenuHeader from "../buttonMenuHeader" +import DrawerBottom from "../drawerBottom" +import MenuItemRow from "../menuItemRow" + +type Props = { + id: string | string[] +} +export default function HeaderRightAnnouncementDetail({ id }: Props) { + const [isVisible, setVisible] = useState(false) + return ( + <> + { setVisible(true) }} /> + + + } + title="Edit" + onPress={() => { + setVisible(false) + router.push(`/announcement/edit/${id}`) + }} + /> + } + title="Hapus" + onPress={() => { + AlertKonfirmasi({ + title: 'Konfirmasi', + desc: 'Apakah anda yakin ingin menghapus pengumuman ini?', + onPress: () => { + setVisible(false) + ToastAndroid.show('Berhasil menghapus data', ToastAndroid.SHORT) + router.push('/announcement') + } + }) + }} + /> + + + + ) +} \ No newline at end of file diff --git a/components/announcement/headerAnnouncementList.tsx b/components/announcement/headerAnnouncementList.tsx new file mode 100644 index 0000000..8e10aee --- /dev/null +++ b/components/announcement/headerAnnouncementList.tsx @@ -0,0 +1,30 @@ +import { useState } from "react" +import ButtonMenuHeader from "../buttonMenuHeader" +import DrawerBottom from "../drawerBottom" +import { View } from "react-native" +import MenuItemRow from "../menuItemRow" +import { AntDesign } from "@expo/vector-icons" +import { router } from "expo-router" +import Styles from "@/constants/Styles" + +export default function HeaderRightAnnouncementList() { + const [isVisible, setVisible] = useState(false) + + return ( + <> + { setVisible(true) }} /> + + + } + title="Tambah Pengumuman" + onPress={() => { + setVisible(false) + router.push('/announcement/create') + }} + /> + + + + ) +} \ No newline at end of file diff --git a/components/borderBottomItem.tsx b/components/borderBottomItem.tsx index 6483a8c..0774fcf 100644 --- a/components/borderBottomItem.tsx +++ b/components/borderBottomItem.tsx @@ -11,16 +11,14 @@ type Props = { desc?: string rightTopInfo?: string onPress?: () => void - borderType: 'all' | 'bottom' + borderType: 'all' | 'bottom' | 'none' leftBottomInfo?: React.ReactNode | string rightBottomInfo?: React.ReactNode | string } export default function BorderBottomItem({ title, subtitle, icon, desc, onPress, rightTopInfo, borderType, leftBottomInfo, rightBottomInfo }: Props) { - - console.log(typeof rightBottomInfo) return ( - + {icon} @@ -43,7 +41,7 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress, {desc && {desc}} { - leftBottomInfo && rightBottomInfo && + (leftBottomInfo || rightBottomInfo )&& ( { diff --git a/components/buttonSelect.tsx b/components/buttonSelect.tsx new file mode 100644 index 0000000..c57c0e6 --- /dev/null +++ b/components/buttonSelect.tsx @@ -0,0 +1,22 @@ +import Styles from "@/constants/Styles"; +import { Feather } from "@expo/vector-icons"; +import { Pressable, Text, View } from "react-native"; + +type Props = { + value: string + onPress?: () => void + round?: boolean +} + +export default function ButtonSelect({ value, onPress, round }: Props) { + return ( + + + + + {value} + + + + ) +} \ No newline at end of file diff --git a/components/discussion_general/headerDiscussionDetail.tsx b/components/discussion_general/headerDiscussionDetail.tsx new file mode 100644 index 0000000..2199d1b --- /dev/null +++ b/components/discussion_general/headerDiscussionDetail.tsx @@ -0,0 +1,73 @@ +import { useState } from "react" +import ButtonMenuHeader from "../buttonMenuHeader" +import DrawerBottom from "../drawerBottom" +import { ToastAndroid, View } from "react-native" +import Styles from "@/constants/Styles" +import MenuItemRow from "../menuItemRow" +import { MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons" +import { router } from "expo-router" +import AlertKonfirmasi from "../alertKonfirmasi" + +type Props = { + id: string | string[] +} + +export default function HeaderRightDiscussionGeneralDetail({ id }: Props) { + const [isVisible, setVisible] = useState(false) + + return ( + <> + { setVisible(true) }} /> + + + } + title="Anggota" + onPress={() => { + setVisible(false) + router.push(`/discussion/member/${id}`) + }} + /> + } + title="Edit" + onPress={() => { + setVisible(false) + router.push(`/discussion/edit/${id}`) + }} + /> + } + title="Tutup Diskusi" + onPress={() => { + AlertKonfirmasi({ + title: 'Konfirmasi', + desc: 'Apakah anda yakin ingin menutup diskusi?', + onPress: () => { + setVisible(false) + ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT) + } + }) + }} + /> + + + } + title="Arsipkan" + onPress={() => { + AlertKonfirmasi({ + title: 'Konfirmasi', + desc: 'Apakah anda yakin ingin mengarsipkan diskusi?', + onPress: () => { + setVisible(false) + ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT) + } + }) + }} + /> + + + + ) +} \ No newline at end of file diff --git a/components/home/fiturHome.tsx b/components/home/fiturHome.tsx index fbe5249..a2012d8 100644 --- a/components/home/fiturHome.tsx +++ b/components/home/fiturHome.tsx @@ -12,8 +12,8 @@ export default function FiturHome() { } text="Divisi" /> } text="Kegiatan" /> - } text="Pengumuman" /> - } text="Semua" onPress={() => { router.push('/feature') }}/> + } text="Pengumuman" onPress={() => { router.push('/announcement') }} /> + } text="Semua" onPress={() => { router.push('/feature') }} /> ) diff --git a/components/menuItemRow.tsx b/components/menuItemRow.tsx index a459a49..7df3b30 100644 --- a/components/menuItemRow.tsx +++ b/components/menuItemRow.tsx @@ -12,7 +12,7 @@ export default function MenuItemRow({ onPress, icon, title }: Props) { { onPress() }} style={[Styles.btnMenuRow]}> {icon} - {title} + {title} ) diff --git a/constants/Styles.ts b/constants/Styles.ts index 11a3956..b7dc302 100644 --- a/constants/Styles.ts +++ b/constants/Styles.ts @@ -93,6 +93,9 @@ const Styles = StyleSheet.create({ mt10: { marginTop: 10 }, + mt15: { + marginTop: 15 + }, mr05: { marginRight: 5 }, @@ -253,7 +256,7 @@ const Styles = StyleSheet.create({ wrapPaper: { padding: 15, backgroundColor: 'white', - borderRadius: 15, + borderRadius: 10, }, contentItemCenter: { justifyContent: 'center', @@ -290,7 +293,15 @@ const Styles = StyleSheet.create({ borderRadius: 10, marginBottom: 10 }, - + wrapItemBorderNone: { + padding: 10, + marginBottom: 5 + }, + userProfileExtraSmall: { + width: 35, + height: 35, + borderRadius: 100 + }, userProfileSmall: { width: 48, height: 48,