Merge pull request 'join' (#19) from join into v1

Reviewed-on: http://wibugit.wibudev.com/wibu/mobile-darmasaba/pulls/19

.easignore

@@ -39,5 +39,7 @@ app-example
 
 x.ts
 x.sh
-/android
-/ios
+
+.env
+
+android/

.gitignore

@@ -32,6 +32,9 @@ yarn-error.*
 # local env files
 .env*.local
 
+#env
+.env
+
 # typescript
 *.tsbuildinfo
 
@@ -41,4 +44,5 @@ x.ts
 x.sh
 
 google-services.json
-mobile-darmasaba-firebase-adminsdk-fbsvc-f5abb292b5.json
+service-account.json
+

Panduan-Penggunaan-Aplikasi.md

@@ -0,0 +1,249 @@
+# Panduan Aplikasi Desa+
+
+## Daftar Isi
+
+1. [Gambaran Umum Aplikasi](#gambaran-umum-aplikasi)
+2. [User Roles dan Hak Akses](#user-roles-dan-hak-akses)
+3. [Fitur-fitur Aplikasi](#fitur-fitur-aplikasi)
+4. [Troubleshooting](#troubleshooting)
+
+## Gambaran Umum Aplikasi
+
+Aplikasi Desa+ adalah platform digital berbasis mobile yang dirancang untuk khusus untuk pegawai desa dalam mengelola data dan memantau progres kegiatan internal. Aplikasi ini menyediakan berbagai fitur seperti pengelolaan data per divisi, pemantauan kegiatan umum, forum diskusi, pengumuman, hingga manajemen folder dokumen, aplikasi ini membantu meningkatkan efisiensi kerja, koordinasi, serta transparansi di lingkungan desa.
+
+### Teknologi yang Digunakan
+
+- React Native dengan Expo
+- Firebase (Authentication, Realtime Database, Cloud Messaging)
+- Redux Toolkit untuk manajemen state
+- TypeScript untuk type safety
+
+## User Roles dan Hak Akses
+
+Aplikasi Desa+ memiliki sistem hierarki peran pengguna sebagai berikut:
+
+### 1. Super Admin
+
+- **Hak akses:**
+  - Semua fitur dan fungsi dalam aplikasi
+  - Manajemen pengguna dengan role Wakil Super Admin, Admin, Wakil Admin, dan User
+  - Akses ke semua data dan fungsi administratif
+
+### 2. Wakil Super Admin
+
+- **Hak akses:**
+  - Manajemen pengguna dengan role Admin, Wakil Admin, dan User
+  - Akses ke sebagian besar fitur administratif
+  - Dapat mengelola banner
+
+### 3. Admin
+
+- **Hak akses:**
+  - Manajemen pengguna dengan role Wakil Admin dan User
+  - Akses ke fitur-fitur administratif dasar
+  - Tidak dapat mengelola Wakil Super Admin dan Super Admin
+
+### 4. Wakil Admin
+
+- **Hak akses:**
+  - Manajemen pengguna dengan role User
+  - Akses terbatas ke fitur-fitur administratif
+  - Tidak dapat mengelola Admin ke atas
+
+### 5. User
+
+- **Hak akses:**
+  - Akses ke fitur-fitur umum
+  - Tidak dapat mengelola pengguna lain
+  - Tidak dapat mengakses fungsi administratif (kecuali dalam divisi dimana pengguna tersebut adalah anggota)
+
+## Fitur-fitur Aplikasi
+
+### 1. Otentikasi (Login & Verifikasi)
+
+**Deskripsi:** Sistem login menggunakan nomor telepon dan verifikasi OTP (One Time Password)
+
+- **Fungsi:** Memverifikasi identitas pengguna sebelum mengakses aplikasi
+- **Siapa yang bisa mengakses:** Semua pengguna yang terdaftar
+
+### 2. Dashboard/Home Screen
+
+**Deskripsi:** Tampilan utama aplikasi yang menampilkan informasi dan akses cepat ke berbagai fitur
+
+- **Fungsi:** Menyediakan ringkasan informasi desa dan akses cepat ke fitur-fitur utama
+- **Siapa yang bisa mengakses:** Semua pengguna yang telah login
+- **Komponen:**
+  - Carousel banner untuk promosi atau informasi penting
+  - Fitur untuk mengakses semua fitur aplikasi
+  - Grafik progres kegiatan
+  - Grafik jumlah dokumen
+  - Daftar kegiatan terupdate
+  - Daftar divisi aktif
+  - Daftar acara mendatang
+  - Diskusi terbaru
+
+### 3. Pencarian
+
+**Deskripsi:** Fitur untuk mencari anggota, kegiatan dan divisi
+
+- **Fungsi:** Mencari anggota, kegiatan dan divisi
+- **Siapa yang bisa mengakses:** Semua pengguna
+
+### 4. Notifikasi
+
+**Deskripsi:** Sistem notifikasi untuk memberitahu pengguna tentang aktivitas penting
+
+- **Fungsi:** Memberitahu pengguna tentang pengumuman, komentar, atau aktivitas lainnya
+- **Siapa yang bisa mengakses:** Semua pengguna
+
+### 5. Profil
+
+**Deskripsi:** Fitur untuk melihat dan mengedit informasi pribadi pengguna
+
+- **Fungsi:** Menampilkan dan mengelola informasi akun pengguna
+- **Siapa yang bisa mengakses:** Pengguna yang bersangkutan
+
+### 6. Banner
+
+**Deskripsi:** Fitur untuk mengelola banner promosi atau informasi penting di halaman utama
+
+- **Fungsi:** Menampilkan informasi atau promosi penting di tampilan awal
+- **Siapa yang bisa mengakses:** Super Admin, Wakil Super Admin
+
+### 7. Lembaga Desa
+
+**Deskripsi:** Fitur untuk mengelola berbagai lembaga dalam desa
+
+- **Fungsi:** Mengorganisir struktur organisasi desa berdasarkan lembaga
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus: Super Admin
+  - Melihat: Super Admin
+
+### 8. Jabatan
+
+**Deskripsi:** Fitur untuk mengelola posisi atau jabatan
+
+- **Fungsi:** Mengelola data jabatan
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus: Super Admin, Wakil Super Admin, Admin, Wakil Admin
+  - Melihat: Semua pengguna
+
+### 9. Anggota
+
+**Deskripsi:** Fitur untuk mengelola data pengguna
+
+- **Fungsi:** Menyimpan dan mengelola informasi tentang pengguna
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus: Super Admin, Wakil Super Admin, Admin, Wakil Admin
+  - Melihat: Semua pengguna
+
+### 10. Diskusi Umum
+
+**Deskripsi:** Forum diskusi untuk komunikasi anggota terpilih
+
+- **Fungsi:** Tempat berdiskusi mengenai berbagai topik yang berkaitan dengan desa
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus: Super Admin, Wakil Super Admin, Admin
+  - Melihat: Semua pengguna
+  - Berkomentar: Pengguna terpilih
+
+### 11. Kegiatan/Proyek
+
+**Deskripsi:** Fitur untuk mengelola dan melacak proyek atau kegiatan desa
+
+- **Fungsi:** Mengelola dan memonitor kemajuan proyek-proyek desa
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus/Membatalkan/Mengelola anggota: Super Admin, Wakil Super Admin, Admin
+  - Mengelola detail (file, task, link, laporan) : Super Admin, Wakil Super Admin, Admin, Anggota dari kegiatan
+  - Melihat: Semua pengguna
+- **Status Kegiatan:**
+  - Segera: Proyek yang akan segera dimulai
+  - Dikerjakan: Proyek yang sedang dalam proses pengerjaan
+  - Selesai: Proyek yang telah selesai
+  - Batal: Proyek yang dibatalkan
+
+### 12. Pengumuman
+
+**Deskripsi:** Fitur untuk membuat, melihat, dan mengelola pengumuman desa
+
+- **Fungsi:** Menyebarkan informasi penting kepada anggota divisi terpilih
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus: Super Admin, Wakil Super Admin, Admin
+  - Melihat:
+    - Super admin: Semua pengumuman
+    - Wakil super admin & admin : Pengumuman sesuai lembaga desa
+    - Lainnya: Pengumuman yang ditujukan ke divisi mereka
+
+### 13. Divisi
+
+**Deskripsi:** Fitur untuk mengelola data desa berdasarkan divisi
+
+- **Fungsi:** Mengorganisir tugas-tugas berdasarkan divisi-divisi tertentu
+- **Catatan:** Anggota divisi (role : Wakil Admin dan User) yg diangkat menjadi "Admin Divisi", mendapat akses khusus untuk mengelola divisi tersebut
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus: Super Admin, Wakil Super Admin, Admin
+  - Edit Divisi / Non aktifkan Divisi tertentu / Mengelola Anggota divisi tertentu : Super Admin, Wakil Super Admin, Admin, Admin Divisi
+  - Laporan semua divisi : Super Admin, Wakil Super Admin
+  - Laporan divisi tertentu : semua pengguna
+  - Melihat: Semua pengguna
+
+### 14. Diskusi Divisi
+
+**Deskripsi:** Forum diskusi khusus untuk masing-masing divisi
+
+- **Fungsi:** Tempat berdiskusi secara internal dalam divisi
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus: Super Admin, Wakil Super Admin, Admin, Admin Divisi
+  - Memberi komentar : Super Admin, Wakil Super Admin, Admin, Anggota divisi
+  - Melihat: Semua pengguna
+
+### 15. Tugas Divisi
+
+**Deskripsi:** Fitur untuk mengelola tugas-tugas dalam masing-masing divisi
+
+- **Fungsi:** Menetapkan dan melacak tugas-tugas yang harus diselesaikan oleh anggota divisi
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus: Super Admin, Wakil Super Admin, Admin, Admin Divisi
+  - Mengelola detail (file, task, link, laporan) : Super Admin, Wakil Super Admin, Admin, Anggota divisi
+  - Melihat: Semua pengguna
+
+### 16. Dokumen Divisi
+
+**Deskripsi:** Sistem manajemen dokumen untuk menyimpan dan mengelola file-file disetiap divisi
+
+- **Fungsi:** Menyimpan dokumen penting dalam struktur folder disetiap divisi
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus: Super Admin, Wakil Super Admin, Admin, Anggota divisi
+  - Melihat: Semua pengguna
+
+### 17. Kalender/Acara Divisi
+
+**Deskripsi:** Fitur untuk menjadwalkan dan mengelola acara-acara desa disetiap divisi
+
+- **Fungsi:** Menjadwalkan kegiatan dan acara penting desa disetiap divisi
+- **Siapa yang bisa mengakses:**
+  - Pembuatan/Edit/Hapus: Super Admin, Wakil Super Admin, Admin, Anggota divisi
+  - Melihat: Semua pengguna
+  - Riwayat: Semua pengguna
+
+## Troubleshooting
+
+### Masalah Login
+
+- Pastikan nomor telepon yang dimasukkan sudah benar dan terdaftar
+- Pastikan koneksi internet stabil saat menerima OTP
+- Jika tidak menerima OTP, coba kirim ulang setelah beberapa menit
+
+### Tidak Bisa Mengakses Fitur Tertentu
+
+- Pastikan peran Anda memiliki hak akses ke fitur tersebut
+- Beberapa fitur hanya tersedia untuk peran tertentu (misalnya Admin ke atas)
+
+### Lupa Password
+
+- Aplikasi ini menggunakan sistem login OTP, jadi tidak ada password yang disimpan
+- Cukup gunakan nomor telepon dan minta OTP kembali
+
+## Dukungan dan Bantuan
+
+Jika Anda mengalami masalah atau memiliki pertanyaan tentang penggunaan aplikasi, silakan hubungi tim pengembang aplikasi.

QWEN.md

@@ -0,0 +1,153 @@
+# Desa+ Mobile Application - Project Overview
+
+## Project Summary
+Desa+ is a comprehensive village/desa management mobile application built with React Native and Expo. The application serves as a digital platform for village administration, community communication, and information management. It provides various features to facilitate village governance, resident communication, and administrative tasks.
+
+## Architecture & Technology Stack
+- **Framework**: React Native with Expo (SDK 53)
+- **State Management**: Redux Toolkit with React-Redux
+- **Navigation**: Expo Router with React Navigation
+- **Backend Services**: Firebase (Authentication, Realtime Database, Cloud Messaging)
+- **UI Components**: Custom-built components with React Native elements
+- **Language**: TypeScript for type safety
+- **Build System**: EAS (Expo Application Service) for builds and deployments
+
+## Key Features
+- Announcement and village information system
+- Community discussion forums
+- Village event calendar
+- Document management and archiving
+- Project and task management
+- Member and organizational structure management
+- Push notifications for important updates
+- Verification and authentication features
+
+## Project Structure
+```
+├── app/                    # Application routes and pages (Expo Router)
+│   ├── (application)/     # Main application screens
+│   │   ├── announcement/
+│   │   ├── banner/
+│   │   ├── discussion/
+│   │   ├── division/
+│   │   ├── group/
+│   │   ├── member/
+│   │   ├── position/
+│   │   ├── project/
+│   │   ├── _layout.tsx
+│   │   ├── edit-profile.tsx
+│   │   ├── feature.tsx
+│   │   ├── home.tsx
+│   │   ├── notification.tsx
+│   │   ├── profile.tsx
+│   │   └── search.tsx
+│   ├── _layout.tsx        # Root layout
+│   ├── index.tsx          # Splash/login screen
+│   ├── verification.tsx   # OTP verification screen
+├── components/            # Reusable UI components
+│   ├── announcement/
+│   ├── auth/
+│   ├── banner/
+│   ├── calendar/
+│   ├── discussion/
+│   ├── division/
+│   ├── document/
+│   ├── group/
+│   ├── home/
+│   ├── member/
+│   ├── position/
+│   ├── project/
+│   ├── task/
+│   ├── alertKonfirmasi.ts
+│   ├── AppHeader.tsx
+│   ├── Text.tsx
+│   └── ... (many more components)
+├── constants/             # Constants and styles
+│   ├── Colors.ts
+│   ├── ColorsStatus.ts
+│   ├── ConstEnv.ts
+│   ├── Headers.ts
+│   ├── RoleUser.ts
+│   ├── Styles.ts
+│   └── ... (other constants)
+├── assets/                # Static assets (images, fonts)
+├── lib/                   # Business logic and API utilities
+├── providers/             # Context providers (AuthProvider)
+├── android/               # Android native code
+├── ios/                   # iOS native code
+├── scripts/               # Build and utility scripts
+├── index.js               # Entry point
+├── app.config.js          # Expo configuration
+├── package.json           # Dependencies and scripts
+└── eas.json               # EAS build configuration
+```
+
+## Environment Configuration
+The application uses environment variables defined in a `.env` file:
+- `URL_API` - API endpoint
+- `URL_OTP` - OTP service endpoint
+- `URL_STORAGE` - Storage endpoint
+- `URL_FIREBASE_DB` - Firebase database URL
+- `PASS_ENC` - Encryption password
+- `WA_SERVER_TOKEN` - WhatsApp server token
+- `IOS_GOOGLE_SERVICES_FILE` - Path to iOS Google services file
+
+## Building and Running
+
+### Development
+1. Install dependencies:
+   ```bash
+   npm install
+   ```
+
+2. Run the development server:
+   ```bash
+   npx expo start
+   ```
+
+3. For platform-specific builds:
+   - Android: `npm run android`
+   - iOS: `npm run ios`
+   - Web: `npm run web`
+
+### Production Builds
+- Android: `npm run build:android` (uses EAS to build an app bundle)
+
+### Testing
+- Run tests: `npm run test`
+
+### Linting
+- Check code quality: `npm run lint`
+
+## Key Dependencies
+- `@react-native-firebase/*` - Firebase integration
+- `@react-navigation/*` - Navigation solutions
+- `@reduxjs/toolkit` - State management
+- `expo-router` - File-based routing
+- `react-native-gesture-handler` - Touch gesture support
+- `react-native-reanimated` - Advanced animations
+- `react-native-svg` - SVG rendering support
+
+## Development Conventions
+- Uses TypeScript for type safety
+- Implements custom styling through the Styles.ts constant file
+- Follows Expo's file-based routing convention
+- Uses Redux Toolkit for centralized state management
+- Implements custom components in the components directory
+- Uses absolute imports with @/ alias (e.g., "@/components/...")
+- Implements Firebase for authentication and real-time data
+
+## Deployment
+- Uses EAS for building and submitting to app stores
+- Supports both Android (APK and App Bundle) and iOS (TestFlight/App Store)
+- Configured for internal testing, preview, and production distributions
+
+## Special Features
+- Background message handling for push notifications
+- Biometric authentication support
+- Image picking and media library access
+- Document picker functionality
+- Date/time pickers with localization
+- Custom toast notifications
+- Carousel components for featured content
+- Data visualization with charts

README.md

@@ -1,50 +1,114 @@
-# Welcome to your Expo app 👋
+# Desa+
 
-This is an [Expo](https://expo.dev) project created with [`create-expo-app`](https://www.npmjs.com/package/create-expo-app).
+Desa+ adalah aplikasi mobile berbasis React Native yang dikembangkan dengan Expo untuk membantu pengelolaan dan komunikasi di lingkungan desa/kelurahan. Aplikasi ini menyediakan berbagai fitur untuk memudahkan administrasi desa, komunikasi antar warga, dan pengelolaan informasi penting.
 
-## Get started
+## Fitur Utama
 
-1. Install dependencies
+- 📢 Pengumuman dan informasi desa
+- 💬 Forum diskusi komunitas
+- 📅 Kalender kegiatan desa
+- 📄 Dokumentasi dan arsip desa
+- 📊 Pengelolaan proyek dan tugas desa
+- 👥 Manajemen anggota dan struktur organisasi
+- 📱 Notifikasi push untuk informasi penting
+- 🎯 Fitur verifikasi dan otentikasi
 
+## Teknologi yang Digunakan
+
+- [React Native](https://reactnative.dev/) - Framework mobile cross-platform
+- [Expo](https://expo.dev/) - Platform pengembangan aplikasi React Native
+- [Firebase](https://firebase.google.com/) - Backend services (Authentication, Realtime Database, Cloud Messaging)
+- [Redux Toolkit](https://redux-toolkit.js.org/) - State management
+- [React Navigation](https://reactnavigation.org/) - Navigasi aplikasi
+- [TypeScript](https://www.typescriptlang.org/) - Type safety
+
+## Instalasi
+
+1. Clone repository ini
+   ```bash
+   git clone <repository-url>
+   cd mobile-darmasaba
+   ```
+
+2. Install dependencies
    ```bash
    npm install
    ```
 
-2. Start the app
-
-   ```bash
-    npx expo start
+3. Konfigurasi environment variables
+   Buat file `.env` di root direktori dan tambahkan variabel berikut:
+   ```
+   URL_API=<api-endpoint>
+   URL_OTP=<otp-service-endpoint>
+   URL_STORAGE=<storage-endpoint>
+   URL_FIREBASE_DB=<firebase-database-url>
+   PASS_ENC=<encryption-password>
+   WA_SERVER_TOKEN=<whatsapp-server-token>
+   IOS_GOOGLE_SERVICES_FILE=<path-to-ios-google-services>
    ```
 
-In the output, you'll find options to open the app in a
+4. Jalankan aplikasi
+   ```bash
+   npx expo start
+   ```
 
-- [development build](https://docs.expo.dev/develop/development-builds/introduction/)
-- [Android emulator](https://docs.expo.dev/workflow/android-studio-emulator/)
-- [iOS simulator](https://docs.expo.dev/workflow/ios-simulator/)
-- [Expo Go](https://expo.dev/go), a limited sandbox for trying out app development with Expo
+## Struktur Proyek
 
-You can start developing by editing the files inside the **app** directory. This project uses [file-based routing](https://docs.expo.dev/router/introduction).
-
-## Get a fresh project
-
-When you're ready, run:
-
-```bash
-npm run reset-project
+```
+├── app/                    # File-file halaman utama
+├── components/            # Komponen reusable
+│   ├── announcement/      # Komponen pengumuman
+│   ├── auth/             # Komponen otentikasi
+│   ├── discussion/       # Komponen forum diskusi
+│   ├── document/         # Komponen dokumentasi
+│   ├── project/          # Komponen pengelolaan proyek
+│   └── ...
+├── assets/               # Gambar dan aset statis
+├── constants/            # Konstanta global
+├── lib/                  # Library dan utilitas
+└── ...
 ```
 
-This command will move the starter code to the **app-example** directory and create a blank **app** directory where you can start developing.
+## Platform Support
 
-## Learn more
+Aplikasi ini didukung untuk:
+- ✅ Android
+- ✅ iOS
+- ❌ Web (belum dioptimalkan)
 
-To learn more about developing your project with Expo, look at the following resources:
+## Development
 
-- [Expo documentation](https://docs.expo.dev/): Learn fundamentals, or go into advanced topics with our [guides](https://docs.expo.dev/guides).
-- [Learn Expo tutorial](https://docs.expo.dev/tutorial/introduction/): Follow a step-by-step tutorial where you'll create a project that runs on Android, iOS, and the web.
+Untuk menjalankan aplikasi di masing-masing platform:
 
-## Join the community
+### Android
+```bash
+npm run android
+```
 
-Join our community of developers creating universal apps.
+### iOS
+```bash
+npm run ios
+```
 
-- [Expo on GitHub](https://github.com/expo/expo): View our open source platform and contribute.
-- [Discord community](https://chat.expo.dev): Chat with Expo users and ask questions.
+### Build Production
+
+Untuk membuat build production Android:
+```bash
+npm run build:android
+```
+
+## Kontribusi
+
+1. Fork repository ini
+2. Buat branch fitur baru (`git checkout -b fitur/NamaFitur`)
+3. Commit perubahan Anda (`git commit -m 'Tambahkan fitur NamaFitur'`)
+4. Push ke branch (`git push origin fitur/NamaFitur`)
+5. Buat pull request
+
+## Lisensi
+
+Proyek ini dilisensikan di bawah lisensi MIT - lihat file [LICENSE](LICENSE) untuk detail selengkapnya.
+
+## Dukungan
+
+Jika Anda menemukan masalah atau memiliki pertanyaan, silakan buka issue di repository ini.

android/.kotlin/errors/errors-1757572005452.log

@@ -0,0 +1,4 @@
+kotlin version: 2.0.21
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+

android/app/build.gradle

@@ -92,8 +92,8 @@ android {
         applicationId 'mobiledarmasaba.app'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 6
+        versionName "1.0.2"
     }
     signingConfigs {
         debug {

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
   <uses-permission android:name="android.permission.RECORD_AUDIO"/>
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>

android/app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-  <string name="app_name">mobile-darmasaba</string>
+  <string name="app_name">Desa+</string>
   <string name="expo_system_ui_user_interface_style" translatable="false">automatic</string>
   <string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
   <string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>

android/settings.gradle

@@ -31,7 +31,7 @@ extensions.configure(com.facebook.react.ReactSettingsExtension) { ex ->
 }
 expoAutolinking.useExpoModules()
 
-rootProject.name = 'mobile-darmasaba'
+rootProject.name = 'Desa+'
 
 expoAutolinking.useExpoVersionCatalog()
 

app.config.js

@@ -0,0 +1,84 @@
+import 'dotenv/config';
+
+export default {
+   expo: {
+      name: "Desa+",
+      slug: "mobile-darmasaba",
+      version: "2.0.5", // Versi aplikasi (App Store)
+      jsEngine: "jsc",
+      orientation: "portrait",
+      icon: "./assets/images/logo-icon-small.png",
+      scheme: "myapp",
+      userInterfaceStyle: "automatic",
+      newArchEnabled: false,
+      ios: {
+         supportsTablet: true,
+         bundleIdentifier: "mobiledarmasaba.app",
+         buildNumber: "7",
+         infoPlist: {
+            ITSAppUsesNonExemptEncryption: false,
+            CFBundleDisplayName: "Desa+"
+         },
+         googleServicesFile: process.env.IOS_GOOGLE_SERVICES_FILE
+      },
+      android: {
+         package: "mobiledarmasaba.app",
+         versionCode: 15,
+         adaptiveIcon: {
+            foregroundImage: "./assets/images/logo-icon-small.png",
+            backgroundColor: "#ffffff"
+         },
+         googleServicesFile: "./google-services.json",
+         permissions: [
+            "READ_EXTERNAL_STORAGE",
+            "WRITE_EXTERNAL_STORAGE",
+            "READ_MEDIA_IMAGES",   // Android 13+
+            "READ_MEDIA_VIDEO",    // Android 13+
+            "READ_MEDIA_AUDIO"     // Android 13+
+         ]
+      },
+      web: {
+         bundler: "metro",
+         output: "static",
+         favicon: "./assets/images/favicon.png"
+      },
+      plugins: [
+         "expo-router",
+         [
+            "expo-splash-screen",
+            {
+               image: "./assets/images/logo-icon-small.png",
+               imageWidth: 200,
+               resizeMode: "contain",
+               backgroundColor: "#ffffff"
+            }
+         ],
+         "expo-font",
+         "expo-image-picker",
+         "expo-web-browser",
+         [
+            "@react-native-firebase/app",
+            {
+               ios: {
+                  googleServicesFile: process.env.IOS_GOOGLE_SERVICES_FILE
+               }
+            }
+         ]
+      ],
+      experiments: {
+         typedRoutes: true
+      },
+      extra: {
+         router: {},
+         eas: {
+            projectId: "cfe34fb8-da8c-4004-b5c6-29d07df75cf2"
+         },
+         URL_API: process.env.URL_API,
+         URL_OTP: process.env.URL_OTP,
+         URL_STORAGE: process.env.URL_STORAGE,
+         URL_FIREBASE_DB: process.env.URL_FIREBASE_DB,
+         PASS_ENC: process.env.PASS_ENC,
+         WA_SERVER_TOKEN: process.env.WA_SERVER_TOKEN,
+      }
+   }
+};

app/(application)/_layout.tsx

@@ -1,5 +1,5 @@
 import HeaderRightAnnouncementList from "@/components/announcement/headerAnnouncementList";
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import HeaderDiscussionGeneral from "@/components/discussion_general/headerDiscussionGeneral";
 import HeaderRightDivisionList from "@/components/division/headerDivisionList";
 import HeaderRightGroupList from "@/components/group/headerGroupList";
@@ -8,13 +8,13 @@ import HeaderRightPositionList from "@/components/position/headerRightPositionLi
 import HeaderRightProjectList from "@/components/project/headerProjectList";
 import Text from "@/components/Text";
 import ToastCustom from "@/components/toastCustom";
-import { Headers } from "@/constants/Headers";
 import { apiReadOneNotification } from "@/lib/api";
 import { pushToPage } from "@/lib/pushToPage";
 import store from "@/lib/store";
 import { useAuthSession } from "@/providers/AuthProvider";
 import AsyncStorage from "@react-native-async-storage/async-storage";
-import firebase from '@react-native-firebase/app';
+import { getApp } from "@react-native-firebase/app";
+import { getMessaging, onMessage } from "@react-native-firebase/messaging";
 import { Redirect, router, Stack, usePathname } from "expo-router";
 import { StatusBar } from 'expo-status-bar';
 import { useEffect } from "react";
@@ -51,16 +51,18 @@ export default function RootLayout() {
    }, []);
 
    useEffect(() => {
-      const unsubscribe = firebase.app().messaging().onMessage(async remoteMessage => {
+      const mess = getMessaging(getApp());
+
+      const unsubscribe = onMessage(mess, async remoteMessage => {
          const id = remoteMessage?.data?.id;
          const category = remoteMessage?.data?.category;
          const content = remoteMessage?.data?.content;
          const title = remoteMessage?.notification?.title;
 
-         if (remoteMessage.notification != undefined && remoteMessage.notification.title != undefined && remoteMessage.notification.body != undefined) {
-            if (category == 'discussion-general' && pathname == '/discussion/' + content) {
-               return null
-            } else if (pathname != `/${category}/${content}`) {
+         if (remoteMessage.notification?.title && remoteMessage.notification?.body) {
+            if (category === 'discussion-general' && pathname === '/discussion/' + content) {
+               return null;
+            } else if (pathname !== `/${category}/${content}`) {
                Notifier.showNotification({
                   title: title,
                   description: remoteMessage.notification?.body,
@@ -88,64 +90,125 @@ export default function RootLayout() {
 
    return (
       <Provider store={store}>
-         <Stack screenOptions={Headers.shadow} >
+         <Stack screenOptions={{
+            headerShown: true,
+            animation: "slide_from_right",
+
+            // ⬇️ PENTING BANGET
+            animationTypeForReplace: "pop",
+            fullScreenGestureEnabled: true,
+            gestureEnabled: true,
+         }} >
             <Stack.Screen name="home" options={{ title: 'Home' }} />
             <Stack.Screen name="feature" options={{ title: 'Fitur' }} />
             <Stack.Screen name="search" options={{ title: 'Pencarian' }} />
             <Stack.Screen name="notification" options={{
                title: 'Notifikasi',
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Notifikasi',
-               headerTitleAlign: 'center'
+               headerTitleAlign: 'center',
+               header: () => (
+                  <AppHeader title="Notifikasi" showBack={true} onPressLeft={() => router.back()} />
+               )
             }} />
             <Stack.Screen name="profile" options={{ title: 'Profile' }} />
             <Stack.Screen name="member/index" options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Anggota',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderMemberList />
+               // headerRight: () => <HeaderMemberList />
+               header: () => (
+                  <AppHeader title="Anggota"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<HeaderMemberList />}
+                  />
+               )
             }} />
             <Stack.Screen name="discussion/index" options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Diskusi Umum',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderDiscussionGeneral />
+               // headerRight: () => <HeaderDiscussionGeneral />
+               header: () => (
+                  <AppHeader
+                     title="Diskusi Umum"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<HeaderDiscussionGeneral />}
+                  />
+               )
             }} />
             <Stack.Screen name="project/index" options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Kegiatan',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightProjectList />
+               // headerRight: () => <HeaderRightProjectList />
+               header: () => (
+                  <AppHeader title="Kegiatan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<HeaderRightProjectList />}
+                  />
+               )
             }} />
             <Stack.Screen name="division/index" options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Divisi',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightDivisionList />
+               // headerRight: () => <HeaderRightDivisionList />
+               header: () => (
+                  <AppHeader title="Divisi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<HeaderRightDivisionList />}
+                  />
+               )
             }} />
             <Stack.Screen name="division/[id]/(fitur-division)" options={{ headerShown: false }} />
             <Stack.Screen name="group/index" options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Lembaga Desa',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightGroupList />
+               // headerRight: () => <HeaderRightGroupList />
+               header: () => (
+                  <AppHeader title="Lembaga Desa"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<HeaderRightGroupList />}
+                  />
+               )
             }} />
             <Stack.Screen name="position/index" options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Jabatan',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightPositionList />
+               // headerRight: () => <HeaderRightPositionList />
+               header: () => (
+                  <AppHeader title="Jabatan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<HeaderRightPositionList />}
+                  />
+               )
             }} />
             <Stack.Screen name="announcement/index"
                options={{
-                  headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+                  // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                   headerTitle: 'Pengumuman',
                   headerTitleAlign: 'center',
-                  headerRight: () => <HeaderRightAnnouncementList />
+                  // headerRight: () => <HeaderRightAnnouncementList />
+                  header: () => (
+                     <AppHeader title="Pengumuman"
+                        showBack={true}
+                        onPressLeft={() => router.back()}
+                        right={<HeaderRightAnnouncementList />}
+                     />
+                  )
                }}
             />
          </Stack>
-         <StatusBar style="light" translucent={false} backgroundColor="black" />
+         <StatusBar style={'light'} translucent={false} backgroundColor="black" />
          <ToastCustom />
       </Provider>
    )

app/(application)/announcement/[id].tsx

@@ -1,43 +1,95 @@
 import HeaderRightAnnouncementDetail from "@/components/announcement/headerAnnouncementDetail";
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
+import BorderBottomItem from "@/components/borderBottomItem";
 import Skeleton from "@/components/skeleton";
 import Text from '@/components/Text';
+import { ConstEnv } from "@/constants/ConstEnv";
+import { isImageFile } from "@/constants/FileExtensions";
 import Styles from "@/constants/Styles";
 import { apiGetAnnouncementOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Entypo, MaterialIcons } from "@expo/vector-icons";
+import { Entypo, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
+import * as FileSystem from 'expo-file-system';
+import { startActivityAsync } from 'expo-intent-launcher';
 import { router, Stack, useLocalSearchParams } from "expo-router";
+import * as Sharing from 'expo-sharing';
 import React, { useEffect, useState } from "react";
-import { Dimensions, SafeAreaView, ScrollView, View } from "react-native";
+import { Dimensions, Platform, Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import ImageViewing from 'react-native-image-viewing';
+import * as mime from 'react-native-mime-types';
 import RenderHTML from 'react-native-render-html';
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
-type Props = {
-   id: string
-   title: string
-   desc: string
+// Define TypeScript interfaces for better type safety
+interface AnnouncementData {
+   id: string;
+   title: string;
+   desc: string;
+}
+
+interface FileData {
+   id: string;
+   idStorage: string;
+   name: string;
+   extension: string;
+}
+
+interface MemberData {
+   group: string;
+   division: string;
+}
+
+interface ApiResponse {
+   success: boolean;
+   data: AnnouncementData;
+   member: Record<string, MemberData[]>;
+   file: FileData[];
+   message: string;
 }
 
 export default function DetailAnnouncement() {
    const { id } = useLocalSearchParams<{ id: string }>();
    const { token, decryptToken } = useAuthSession()
-   const [data, setData] = useState<Props>({ id: '', title: '', desc: '' })
-   const [dataMember, setDataMember] = useState<any>({})
+   const [data, setData] = useState<AnnouncementData>({ id: '', title: '', desc: '' })
+   const [dataMember, setDataMember] = useState<Record<string, MemberData[]>>({})
+   const [dataFile, setDataFile] = useState<FileData[]>([])
    const update = useSelector((state: any) => state.announcementUpdate)
    const entityUser = useSelector((state: any) => state.user)
    const contentWidth = Dimensions.get('window').width
    const [loading, setLoading] = useState(true)
    const arrSkeleton = Array.from({ length: 2 }, (_, index) => index)
+   const [refreshing, setRefreshing] = useState(false)
+   const [loadingOpen, setLoadingOpen] = useState(false)
+   const [preview, setPreview] = useState(false)
+   const [chooseFile, setChooseFile] = useState<FileData>()
+
+   /**
+    * Opens the image preview modal for the selected image file
+    * @param item The file data object containing image information
+    */
+
+   function handleChooseFile(item: FileData) {
+      setChooseFile(item)
+      setPreview(true)
+   }
+
 
    async function handleLoad(loading: boolean) {
       try {
          setLoading(loading)
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiGetAnnouncementOne({ id: id, user: hasil })
-         setData(response.data)
-         setDataMember(response.member)
+         const response: ApiResponse = await apiGetAnnouncementOne({ id: id, user: hasil })
+         if (response.success) {
+            setData(response.data)
+            setDataMember(response.member)
+            setDataFile(response.file)
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Gagal mengambil data' })
       } finally {
          setLoading(false)
       }
@@ -51,23 +103,105 @@ export default function DetailAnnouncement() {
       handleLoad(true)
    }, [])
 
+   /**
+    * Checks if a string contains HTML tags
+    * @param text The text to check for HTML tags
+    * @returns True if the text contains HTML tags, false otherwise
+    */
    function hasHtmlTags(text: string) {
       const htmlRegex = /<[a-z][\s\S]*>/i;
       return htmlRegex.test(text);
+   }
+
+   /**
+    * Handles pull-to-refresh functionality
+    * Reloads the announcement data without showing loading indicators
+    */
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      // Simulate network request delay for better UX
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
+   const openFile = async (item: FileData) => {
+      try {
+         setLoadingOpen(true);
+         const remoteUrl = ConstEnv.url_storage + '/files/' + item.idStorage;
+         const fileName = item.name + '.' + item.extension;
+         const localPath = `${FileSystem.documentDirectory}/${fileName}`;
+         const mimeType = mime.lookup(fileName);
+
+         // Download the file
+         const downloadResult = await FileSystem.downloadAsync(remoteUrl, localPath);
+
+         if (downloadResult.status !== 200) {
+            throw new Error(`Download failed with status ${downloadResult.status}`);
+         }
+
+         const contentURL = await FileSystem.getContentUriAsync(downloadResult.uri);
+
+         try {
+            if (Platform.OS === 'android') {
+               await startActivityAsync(
+                  'android.intent.action.VIEW',
+                  {
+                     data: contentURL,
+                     flags: 1,
+                     type: mimeType as string,
+                  }
+               );
+            } else if (Platform.OS === 'ios') {
+               await Sharing.shareAsync(localPath);
+            }
+         } catch (openError) {
+            console.error('Error opening file:', openError);
+            Toast.show({
+               type: 'error',
+               text1: 'Tidak ada aplikasi yang dapat membuka file ini'
+            });
+         }
+      } catch (error) {
+         console.error('Error downloading or opening file:', error);
+         Toast.show({
+            type: 'error',
+            text1: 'Gagal membuka file',
+            text2: 'Silakan coba lagi nanti'
+         });
+      } finally {
+         setLoadingOpen(false);
+      }
    };
 
    return (
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Pengumuman',
                headerTitleAlign: 'center',
-               headerRight: () => entityUser.role != 'user' && entityUser.role != 'coadmin' ? <HeaderRightAnnouncementDetail id={id} /> : <></>,
+               // headerRight: () => entityUser.role != 'user' && entityUser.role != 'coadmin' ? <HeaderRightAnnouncementDetail id={id} /> : <></>,
+               header: () => (
+                  <AppHeader title="Pengumuman"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={entityUser.role != 'user' && entityUser.role != 'coadmin' ? <HeaderRightAnnouncementDetail id={id} /> : <></>}
+                  />
+               )
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15]}>
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={() => handleRefresh()}
+               />
+            }
+         >
+            <View style={[Styles.p15, Styles.mb50]}>
                <View style={[Styles.wrapPaper]}>
                   {
                      loading ?
@@ -84,9 +218,9 @@ export default function DetailAnnouncement() {
                         </View>
                         :
                         <>
-                           <View style={Styles.rowItemsCenter}>
-                              <MaterialIcons name="campaign" size={30} color="black" style={Styles.mr05} />
-                              <Text style={[Styles.textDefaultSemiBold]}>{data?.title}</Text>
+                           <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
+                              <MaterialIcons name="campaign" size={25} color="black" style={[Styles.mr05]} />
+                              <Text style={[Styles.textDefaultSemiBold, Styles.w90, Styles.mt02]}>{data?.title}</Text>
                            </View>
                            <View style={[Styles.mt10]}>
                               {
@@ -94,6 +228,7 @@ export default function DetailAnnouncement() {
                                     <RenderHTML
                                        contentWidth={contentWidth}
                                        source={{ html: data?.desc }}
+                                       baseStyle={{ color: 'black' }}
                                     />
                                     :
                                     <Text>{data?.desc}</Text>
@@ -103,7 +238,34 @@ export default function DetailAnnouncement() {
                   }
 
                </View>
-               <View style={[Styles.wrapPaper, Styles.mv15]}>
+               {
+                  dataFile.length > 0 && (
+                     <View style={[Styles.wrapPaper, Styles.mt10]}>
+                        <View style={[Styles.mb05]}>
+                           <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                        </View>
+                        {dataFile.map((item, index) => (
+                           <BorderBottomItem
+                              key={`${item.id}-${index}`}
+                              borderType="bottom"
+                              icon={<MaterialCommunityIcons
+                                 name={isImageFile(item.extension) ? "file-image-outline" : "file-document-outline"}
+                                 size={25}
+                                 color="black"
+                              />}
+                              title={item.name + '.' + item.extension}
+                              titleWeight="normal"
+                              onPress={() => {
+                                 isImageFile(item.extension) ?
+                                    handleChooseFile(item)
+                                    : openFile(item)
+                              }}
+                           />
+                        ))}
+                     </View>
+                  )
+               }
+               <View style={[Styles.wrapPaper, Styles.mt10]}>
                   {
                      loading ?
                         arrSkeleton.map((item, index) => {
@@ -138,6 +300,45 @@ export default function DetailAnnouncement() {
                </View>
             </View>
          </ScrollView>
+
+         <ImageViewing
+            images={[{ uri: `${ConstEnv.url_storage}/files/${chooseFile?.idStorage}` }]}
+            imageIndex={0}
+            visible={preview}
+            onRequestClose={() => setPreview(false)}
+            doubleTapToZoomEnabled
+            HeaderComponent={({ imageIndex }) => (
+               <View style={[Styles.headerModalViewImg]}>
+                  {/* CLOSE */}
+                  <Pressable
+                     onPress={() => setPreview(false)}
+                     accessibilityRole="button"
+                     accessibilityLabel="Close image viewer"
+                  >
+                     <Text style={{ color: 'white', fontSize: 26 }}>✕</Text>
+                  </Pressable>
+
+                  {/* MENU */}
+                  <Pressable
+                     onPress={() => chooseFile && openFile(chooseFile)}
+                     accessibilityRole="button"
+                     accessibilityLabel="Download or share image"
+                     disabled={loadingOpen}
+                  >
+                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 22 }}>⋯</Text>
+                  </Pressable>
+               </View>
+            )}
+            FooterComponent={({ imageIndex }) => (
+               <View style={{
+                  paddingBottom: 20,
+                  paddingHorizontal: 16,
+                  alignItems: 'center',
+               }}>
+                  <Text style={{ color: 'white', fontSize: 16 }}>{chooseFile?.name}.{chooseFile?.extension}</Text>
+               </View>
+            )}
+         />
       </SafeAreaView>
    )
 }

app/(application)/announcement/create.tsx

@@ -1,16 +1,21 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
+import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
+import LoadingOverlay from "@/components/loadingOverlay";
+import MenuItemRow from "@/components/menuItemRow";
 import ModalSelectMultiple from "@/components/modalSelectMultiple";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { setUpdateAnnouncement } from "@/lib/announcementUpdate";
 import { apiCreateAnnouncement } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Entypo } from "@expo/vector-icons";
+import { Entypo, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import * as DocumentPicker from "expo-document-picker";
 import { router, Stack } from "expo-router";
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, StyleSheet, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
@@ -23,6 +28,9 @@ export default function CreateAnnouncement() {
    const [modalDivisi, setModalDivisi] = useState(false);
    const [divisionMember, setDivisionMember] = useState<any>([])
    const [loading, setLoading] = useState(false)
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [isModalFile, setModalFile] = useState(false)
+   const [indexDelFile, setIndexDelFile] = useState<number>(0)
    const [dataForm, setDataForm] = useState({
       title: "",
       desc: "",
@@ -69,9 +77,26 @@ export default function CreateAnnouncement() {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiCreateAnnouncement({
-            data: { ...dataForm, user: hasil, groups: divisionMember },
-         });
+         const fd = new FormData()
+
+         for (let i = 0; i < fileForm.length; i++) {
+            fd.append(`file${i}`, {
+               uri: fileForm[i].uri,
+               type: 'application/octet-stream',
+               name: fileForm[i].name,
+            } as any);
+         }
+
+         fd.append("data", JSON.stringify(
+            { user: hasil, groups: divisionMember, ...dataForm }
+         ))
+
+         const response = await apiCreateAnnouncement(fd)
+
+         // const response = await apiCreateAnnouncement({
+         //    data: { ...dataForm, user: hasil, groups: divisionMember },
+         // });
+
          if (response.success) {
             dispatch(setUpdateAnnouncement(!update))
             Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
@@ -84,34 +109,75 @@ export default function CreateAnnouncement() {
       }
    }
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+   function deleteFile(index: number) {
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setModalFile(false)
+   }
+
    return (
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Pengumuman",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disableBtn || loading ? true : false}
-                     category="create"
-                     onPress={() => {
-                        divisionMember.length == 0
-                           ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
-                           : handleCreate();
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disableBtn || divisionMember.length == 0 || loading ? true : false}
+               //       category="create"
+               //       onPress={() => {
+               //          divisionMember.length == 0
+               //             ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
+               //             : handleCreate();
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Tambah Pengumuman"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                           <ButtonSaveHeader
+                              disable={disableBtn || divisionMember.length == 0 || loading ? true : false}
+                              category="create"
+                              onPress={() => {
+                                 divisionMember.length == 0
+                                    ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
+                                    : handleCreate();
+                              }}
+                           />
+                     }
                   />
-               ),
+               )
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <LoadingOverlay visible={loading} />
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                <InputForm
                   label="Judul"
                   type="default"
@@ -131,6 +197,27 @@ export default function CreateAnnouncement() {
                   onChange={(val) => validationForm("desc", val)}
                   multiline
                />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
+
                <ButtonSelect
                   value="Pilih divisi penerima pengumuman"
                   onPress={() => {
@@ -149,9 +236,9 @@ export default function CreateAnnouncement() {
                                  <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
                                  {
                                     item.Division.map((division: any, i: any) => (
-                                       <View key={i} style={[Styles.rowItemsCenter]}>
+                                       <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
                                           <Entypo name="dot-single" size={24} color="black" />
-                                          <Text style={[Styles.textDefault]}>{division.name}</Text>
+                                          <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
                                        </View>
                                     ))
                                  }
@@ -175,6 +262,16 @@ export default function CreateAnnouncement() {
                setModalDivisi(false)
             }}
          />
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile) }}
+               />
+            </View>
+         </DrawerBottom>
       </SafeAreaView>
    );
 }

app/(application)/announcement/edit/[id].tsx

@@ -1,14 +1,19 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
+import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
+import LoadingOverlay from "@/components/loadingOverlay";
+import MenuItemRow from "@/components/menuItemRow";
 import ModalSelectMultiple from "@/components/modalSelectMultiple";
 import Text from '@/components/Text';
 import Styles from "@/constants/Styles";
 import { setUpdateAnnouncement } from "@/lib/announcementUpdate";
 import { apiEditAnnouncement, apiGetAnnouncementOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Entypo } from "@expo/vector-icons";
+import { Entypo, Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import * as DocumentPicker from "expo-document-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -33,6 +38,10 @@ export default function EditAnnouncement() {
    const [modalDivisi, setModalDivisi] = useState(false);
    const [disableBtn, setDisableBtn] = useState(true);
    const [dataMember, setDataMember] = useState<any>([]);
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [dataFile, setDataFile] = useState<{ id: string; idStorage: string; name: string; extension: string; delete?: boolean }[]>([])
+   const [indexDelFile, setIndexDelFile] = useState<{ id: string | number; cat: "newFile" | "oldFile" }>({ id: "", cat: "newFile" })
+   const [isModalFile, setModalFile] = useState(false)
    const [loading, setLoading] = useState(false)
    const [dataForm, setDataForm] = useState({
       title: "",
@@ -66,6 +75,7 @@ export default function EditAnnouncement() {
             arrNew.push(newObject)
          })
          setDataMember(arrNew);
+         setDataFile(response.file);
       } catch (error) {
          console.error(error);
       }
@@ -112,9 +122,22 @@ export default function EditAnnouncement() {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiEditAnnouncement({
-            ...dataForm, user: hasil, groups: dataMember,
-         }, id);
+         const fd = new FormData()
+         for (let i = 0; i < fileForm.length; i++) {
+            fd.append(`file${i}`, {
+               uri: fileForm[i].uri,
+               type: 'application/octet-stream',
+               name: fileForm[i].name,
+            } as any);
+         }
+
+         fd.append("data", JSON.stringify(
+            {
+               ...dataForm, user: hasil, groups: dataMember, oldFile: dataFile
+            }
+         ))
+
+         const response = await apiEditAnnouncement(fd, id);
          if (response.success) {
             dispatch(setUpdateAnnouncement(!update))
             Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
@@ -127,34 +150,85 @@ export default function EditAnnouncement() {
       }
    }
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+   function deleteFile(index: number | string, cat: "newFile" | "oldFile" | null) {
+      if (cat == "newFile") {
+         setFileForm([...fileForm.filter((val, i) => i !== index)])
+      } else {
+         setDataFile(prev =>
+            prev.map(item =>
+               item.id === index
+                  ? { ...item, delete: true }
+                  : item
+            )
+         );
+      }
+      setModalFile(false)
+   }
+
    return (
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Pengumuman",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disableBtn || loading ? true : false}
-                     category="update"
-                     onPress={() => {
-                        dataMember.length == 0
-                           ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
-                           : handleEdit();
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disableBtn || loading ? true : false}
+               //       category="update"
+               //       onPress={() => {
+               //          dataMember.length == 0
+               //             ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
+               //             : handleEdit();
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Edit Pengumuman"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disableBtn || loading ? true : false}
+                           category="update"
+                           onPress={() => {
+                              dataMember.length == 0
+                                 ? Toast.show({ type: 'small', text1: "Anda belum memilih divisi", })
+                                 : handleEdit();
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <LoadingOverlay visible={loading} />
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                <InputForm
                   label="Judul"
                   type="default"
@@ -176,6 +250,38 @@ export default function EditAnnouncement() {
                   value={dataForm.desc}
                   multiline
                />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        dataFile.filter((val) => !val.delete).map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name + '.' + item.extension}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
                <ButtonSelect
                   value="Pilih divisi penerima pengumuman"
                   onPress={() => {
@@ -193,9 +299,9 @@ export default function EditAnnouncement() {
                                  <Text style={[Styles.textDefaultSemiBold]}>{item.name}</Text>
                                  {
                                     item.Division.map((division: any, i: any) => (
-                                       <View key={i} style={[Styles.rowItemsCenter]}>
+                                       <View key={i} style={[Styles.rowItemsCenter, Styles.w90]}>
                                           <Entypo name="dot-single" size={24} color="black" />
-                                          <Text style={[Styles.textDefault]}>{division.name}</Text>
+                                          <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode='tail'>{division.name}</Text>
                                        </View>
                                     ))
                                  }
@@ -220,6 +326,16 @@ export default function EditAnnouncement() {
             }}
             value={dataMember}
          />
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
+               />
+            </View>
+         </DrawerBottom>
       </SafeAreaView>
    );
 }

app/(application)/announcement/index.tsx

@@ -87,7 +87,7 @@ export default function Announcement() {
          <View>
             <InputSearch onChange={setSearch} />
          </View>
-         <View style={[{ flex: 2 }, Styles.mb50]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {
@@ -114,7 +114,7 @@ export default function Announcement() {
                                     </View>
                                  }
                                  title={item.title}
-                                 desc={item.desc.replace(/<[^>]*>?/gm, '')}
+                                 desc={item.desc.replace(/<[^>]*>?/gm, '').replace(/\r?\n|\r/g, ' ')}
                                  rightTopInfo={item.createdAt}
                               />
                            )

app/(application)/banner/[id].tsx

@@ -1,7 +1,8 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 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);
    };
@@ -114,22 +115,35 @@ export default function EditBanner() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Banner",
                headerTitleAlign: "center",
-               headerRight: () => <ButtonSaveHeader
-                  disable={title == "" || error || loading ? true : false}
-                  onPress={() => { handleUpdateEntity() }}
-                  category="update" />,
+               // headerRight: () => <ButtonSaveHeader
+               //    disable={title == "" || error || loading ? true : false}
+               //    onPress={() => { handleUpdateEntity() }}
+               //    category="update" />,
+               header: () => (
+                  <AppHeader
+                     title="Edit Banner"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={title == "" || error || loading ? true : false}
+                           onPress={() => { handleUpdateEntity() }}
+                           category="update" />
+                     }
+                  />
+               )
             }}
          />
-         <ScrollView>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15, Styles.mb100]}>
                <View style={[Styles.mb15]}>
                   {selectedImage != undefined ? (
@@ -153,7 +167,7 @@ export default function EditBanner() {
                         >
                            <Entypo name="image" size={50} color={"#aeaeae"} />
                            <Text style={[Styles.textInformation, Styles.mt05]}>
-                              Mohon unggah gambar dalam resolusi 1535 x 450 piksel untuk
+                              Mohon unggah gambar dalam resolusi 1650 x 720 pixel untuk
                               memastikan
                            </Text>
                         </View>

app/(application)/banner/create.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import Text from "@/components/Text";
@@ -97,28 +97,44 @@ export default function CreateBanner() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Banner",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={title == "" || selectedImage == undefined || error || loading ? true : false}
-                     category="create"
-                     onPress={() => {
-                        handleCreateEntity();
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={title == "" || selectedImage == undefined || error || loading ? true : false}
+               //       category="create"
+               //       onPress={() => {
+               //          handleCreateEntity();
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Fitur"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={title == "" || selectedImage == undefined || error || loading ? true : false}
+                           category="create"
+                           onPress={() => {
+                              handleCreateEntity();
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
+            <View style={[Styles.p15]}>
                <View style={[Styles.mb15]}>
                   {selectedImage != undefined ? (
                      <Pressable onPress={pickImageAsync}>
@@ -137,7 +153,7 @@ export default function CreateBanner() {
                         >
                            <Entypo name="image" size={50} color={"#aeaeae"} />
                            <Text style={[Styles.textInformation, Styles.mt05]}>
-                              Mohon unggah gambar dalam resolusi 1535 x 450 pixel untuk
+                              Mohon unggah gambar dalam resolusi 1650 x 720 pixel untuk
                               memastikan
                            </Text>
                         </View>

app/(application)/banner/index.tsx

@@ -1,10 +1,12 @@
 import AlertKonfirmasi from "@/components/alertKonfirmasi"
+import AppHeader from "@/components/AppHeader"
 import HeaderRightBannerList from "@/components/banner/headerBannerList"
 import BorderBottomItem from "@/components/borderBottomItem"
-import ButtonBackHeader from "@/components/buttonBackHeader"
 import DrawerBottom from "@/components/drawerBottom"
 import MenuItemRow from "@/components/menuItemRow"
 import ModalLoading from "@/components/modalLoading"
+import Text from "@/components/Text"
+import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteBanner, apiGetBanner } from "@/lib/api"
 import { setEntities } from "@/lib/bannerSlice"
@@ -16,11 +18,11 @@ import { router, Stack } from "expo-router"
 import * as Sharing from 'expo-sharing'
 import { useState } from "react"
 import { Alert, Image, Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
+import ImageViewing from 'react-native-image-viewing'
 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
@@ -37,6 +39,7 @@ export default function BannerList() {
    const dispatch = useDispatch()
    const [refreshing, setRefreshing] = useState(false)
    const [loadingOpen, setLoadingOpen] = useState(false)
+   const [viewImg, setViewImg] = useState(false)
 
    const handleDeleteEntity = async () => {
       try {
@@ -71,7 +74,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)
@@ -105,14 +108,24 @@ export default function BannerList() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Banner',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightBannerList />
+               // headerRight: () => <HeaderRightBannerList />
+               header: () => (
+                  <AppHeader
+                     title="Banner"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <HeaderRightBannerList />
+                     }
+                  />
+               )
             }}
          />
          <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
-         <ScrollView 
+         <ScrollView
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
@@ -121,26 +134,37 @@ export default function BannerList() {
             }
             style={[Styles.h100]}
          >
-            <View style={[Styles.p15, Styles.mb100]}>
-               {entities.map((index: any, key: number) => (
-                  <BorderBottomItem
-                     key={key}
-                     onPress={() => {
-                        setDataId(index.id)
-                        setSelectFile(index)
-                        setModal(true)
-                     }}
-                     borderType="all"
-                     icon={
-                        <Image
-                           source={{ uri: `https://wibu-storage.wibudev.com/api/files/${index.image}` }}
-                           style={[Styles.imgListBanner]}
+            {
+               entities.length > 0
+                  ?
+                  <View style={[Styles.p15, Styles.mb100]}>
+                     {entities.map((index: any, key: number) => (
+                        <BorderBottomItem
+                           key={key}
+                           onPress={() => {
+                              setDataId(index.id)
+                              setSelectFile(index)
+                              setModal(true)
+                           }}
+                           borderType="all"
+                           icon={
+                              <Image
+                                 source={{ uri: `${ConstEnv.url_storage}/files/${index.image}` }}
+                                 style={[Styles.imgListBanner]}
+                              />
+                           }
+                           title={index.title}
+                           width={65}
                         />
-                     }
-                     title={index.title}
-                  />
-               ))}
-            </View>
+                     ))}
+                  </View>
+                  :
+                  <View style={[Styles.p15, Styles.mb100]}>
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+                  </View>
+            }
+
+
          </ScrollView>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title="Menu">
@@ -155,8 +179,14 @@ export default function BannerList() {
                />
                <MenuItemRow
                   icon={<MaterialCommunityIcons name="file-eye" color="black" size={25} />}
-                  title="Lihat / Share"
-                  onPress={() => { openFile() }}
+                  title="Lihat"
+                  onPress={() => {
+                     setModal(false)
+                     setTimeout(() => {
+                        setViewImg(true);
+                     }, 1000);
+                     // openFile() 
+                  }}
                />
                <MenuItemRow
                   icon={<Ionicons name="trash" color="black" size={25} />}
@@ -172,6 +202,14 @@ export default function BannerList() {
                />
             </View>
          </DrawerBottom>
+
+         <ImageViewing
+            images={[{ uri: `${ConstEnv.url_storage}/files/${selectFile?.image}` }]}
+            imageIndex={0}
+            visible={viewImg}
+            onRequestClose={() => setViewImg(false)}
+            doubleTapToZoomEnabled
+         />
       </SafeAreaView>
    )
 }

app/(application)/discussion/[id].tsx

@@ -1,23 +1,31 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
+import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import BorderBottomItem2 from "@/components/borderBottomItem2";
 import HeaderRightDiscussionGeneralDetail from "@/components/discussion_general/headerDiscussionDetail";
+import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
 import LabelStatus from "@/components/labelStatus";
+import MenuItemRow from "@/components/menuItemRow";
 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 { regexOnlySpacesOrEnter } from "@/constants/OnlySpaceOrEnter";
 import Styles from "@/constants/Styles";
-import { apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar } from "@/lib/api";
+import { apiDeleteDiscussionGeneralCommentar, apiGetDiscussionGeneralOne, apiSendDiscussionGeneralCommentar, apiUpdateDiscussionGeneralCommentar } from "@/lib/api";
+import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Ionicons, MaterialIcons } from "@expo/vector-icons";
-import { firebase } from '@react-native-firebase/database';
-import { router, Stack, useLocalSearchParams } from "expo-router";
-import { useEffect, useState } from "react";
-import { KeyboardAvoidingView, Platform, Pressable, ScrollView, View } from "react-native";
-import { useSelector } from "react-redux";
+import { Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
+import { ref } from '@react-native-firebase/database';
 import { useHeaderHeight } from '@react-navigation/elements';
+import { router, Stack, useLocalSearchParams } from "expo-router";
+import React, { useEffect, useState } from "react";
+import { KeyboardAvoidingView, Platform, Pressable, RefreshControl, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
+import { useSelector } from "react-redux";
 
 type Props = {
    id: string
@@ -35,22 +43,42 @@ type PropsKomentar = {
    idUser: string
    img: string
    username: string
+   isEdited: boolean
+   updatedAt: string
+}
+
+type PropsFile = {
+   id: string;
+   idStorage: string;
+   name: string;
+   extension: string
 }
 
 export default function DetailDiscussionGeneral() {
    const { token, decryptToken } = useAuthSession()
    const entityUser = useSelector((state: any) => state.user)
+   const entities = useSelector((state: any) => state.entities)
    const { id } = useLocalSearchParams<{ id: string }>();
    const [data, setData] = useState<Props>()
    const [dataKomentar, setDataKomentar] = useState<PropsKomentar[]>([])
    const [memberDiscussion, setMemberDiscussion] = useState(false)
+   const [fileDiscussion, setFileDiscussion] = useState<PropsFile[]>([])
    const [komentar, setKomentar] = useState('')
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [loading, setLoading] = useState(true)
    const [loadingKomentar, setLoadingKomentar] = useState(true)
    const arrSkeleton = Array.from({ length: 3 }, (_, index) => index)
-   const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-general/${id}`);
+   const reference = ref(getDB(), `/discussion-general/${id}`);
    const headerHeight = useHeaderHeight();
+   const [detailMore, setDetailMore] = useState<any>([])
+   const [loadingSendKomentar, setLoadingSendKomentar] = useState(false)
+   const [isVisible, setVisible] = useState(false)
+   const [refreshing, setRefreshing] = useState(false)
+   const [selectKomentar, setSelectKomentar] = useState({
+      id: '',
+      comment: ''
+   })
+   const [viewEdit, setViewEdit] = useState(false)
 
    useEffect(() => {
       const onValueChange = reference.on('value', snapshot => {
@@ -72,7 +100,7 @@ export default function DetailDiscussionGeneral() {
    }
 
 
-   async function handleLoad(cat: 'detail' | 'komentar' | 'cek-anggota', loading: boolean) {
+   async function handleLoad(cat: 'detail' | 'komentar' | 'cek-anggota' | 'file', loading: boolean) {
       try {
          if (cat == "detail") {
             setLoading(loading)
@@ -89,6 +117,8 @@ export default function DetailDiscussionGeneral() {
             setDataKomentar(response.data)
          } else if (cat == 'cek-anggota') {
             setMemberDiscussion(response.data)
+         } else if (cat == 'file') {
+            setFileDiscussion(response.data)
          }
 
       } catch (error) {
@@ -103,49 +133,129 @@ export default function DetailDiscussionGeneral() {
       handleLoad('detail', false)
       handleLoad('komentar', false)
       handleLoad('cek-anggota', false)
+      handleLoad('file', false)
    }, [update]);
 
    useEffect(() => {
       handleLoad('detail', true)
       handleLoad('komentar', true)
       handleLoad('cek-anggota', true)
+      handleLoad('file', true)
    }, []);
 
    async function handleKomentar() {
       try {
+         setLoadingSendKomentar(true)
          if (komentar != '') {
             const hasil = await decryptToken(String(token?.current))
             const response = await apiSendDiscussionGeneralCommentar({ id: id, data: { desc: komentar, user: hasil } })
             if (response.success) {
                setKomentar('')
                updateTrigger()
+            } else {
+               Toast.show({ type: 'small', text1: response.message })
             }
          }
       } catch (error) {
          console.error(error)
+      } finally {
+         setLoadingSendKomentar(false)
       }
    }
 
+   async function handleEditKomentar() {
+      try {
+         setLoadingSendKomentar(true)
+         const hasil = await decryptToken(String(token?.current))
+         const response = await apiUpdateDiscussionGeneralCommentar({ id: selectKomentar.id, data: { desc: selectKomentar.comment, user: hasil } })
+         if (response.success) {
+            updateTrigger()
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
+      } catch (error) {
+         console.error(error)
+      } finally {
+         setLoadingSendKomentar(false)
+         handleViewEditKomentar()
+      }
+   }
+
+   async function handleDeleteKomentar() {
+      try {
+         setLoadingSendKomentar(true)
+         const hasil = await decryptToken(String(token?.current))
+         const response = await apiDeleteDiscussionGeneralCommentar({ id: selectKomentar.id, data: { user: hasil } })
+         if (response.success) {
+            updateTrigger()
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
+      } catch (error) {
+         console.error(error)
+      } finally {
+         setLoadingSendKomentar(false)
+         setVisible(false)
+      }
+   }
+
+   function handleMenuKomentar(id: string, comment: string) {
+      setSelectKomentar({ id, comment })
+      setVisible(true)
+   }
+
+   function handleViewEditKomentar() {
+      setVisible(false)
+      setViewEdit(!viewEdit)
+   }
+
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad('detail', false)
+      handleLoad('komentar', false)
+      handleLoad('cek-anggota', false)
+      handleLoad('file', false)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Diskusi',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightDiscussionGeneralDetail id={id} active={data?.isActive !== undefined ? data.isActive : false} status={data?.status !== undefined ? data.status : 0} />,
+               // headerRight: () => <HeaderRightDiscussionGeneralDetail id={id} active={data?.isActive !== undefined ? data.isActive : false} status={data?.status !== undefined ? data.status : 0} />,
+               header: () => (
+                  <AppHeader
+                     title="Diskusi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<HeaderRightDiscussionGeneralDetail id={id} active={data?.isActive !== undefined ? data.isActive : false} status={data?.status !== undefined ? data.status : 0} />}
+                  />
+               )
             }}
          />
          <View style={{ flex: 1 }}>
-            <ScrollView>
-               <View style={[Styles.p15, Styles.mb100]}>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+               style={[Styles.h100]}
+               refreshControl={
+                  <RefreshControl
+                     refreshing={refreshing}
+                     onRefresh={() => handleRefresh()}
+                  />
+               }
+            >
+               <View style={[Styles.p15]}>
                   {
                      loading ?
                         <SkeletonContent />
                         :
-                        <BorderBottomItem
+                        <BorderBottomItem2
+                           dataFile={fileDiscussion}
                            descEllipsize={false}
-                           width={55}
                            borderType="bottom"
                            icon={
                               <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
@@ -153,13 +263,13 @@ export default function DetailDiscussionGeneral() {
                               </View>
                            }
                            title={data?.title}
+                           titleShowAll={true}
                            subtitle={
                               !data?.isActive ?
                                  <LabelStatus category='warning' text='ARSIP' size="small" />
                                  :
                                  <LabelStatus category={data.status == 1 ? 'success' : 'error'} text={data.status == 1 ? 'BUKA' : 'TUTUP'} size="small" />
                            }
-                           rightTopInfo={data?.createdAt}
                            desc={data?.desc}
                            leftBottomInfo={
                               <View style={[Styles.rowItemsCenter]}>
@@ -167,6 +277,11 @@ export default function DetailDiscussionGeneral() {
                                  <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{dataKomentar.length} Komentar</Text>
                               </View>
                            }
+                           rightBottomInfo={
+                              <View style={[Styles.rowItemsCenter]}>
+                                 <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>{data?.createdAt}</Text>
+                              </View>
+                           }
                         />
                   }
                   <View style={[Styles.p15]}>
@@ -182,14 +297,28 @@ export default function DetailDiscussionGeneral() {
                               return (
                                  <BorderBottomItem
                                     key={i}
-                                    width={55}
                                     borderType="bottom"
+                                    colorPress
                                     icon={
-                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="xs" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
                                     }
                                     title={item.username}
                                     rightTopInfo={item.createdAt}
                                     desc={item.comment}
+                                    rightBottomInfo={item.isEdited ? "Edited" : ""}
+                                    descEllipsize={detailMore.includes(item.id) ? false : true}
+                                    onPress={() => {
+                                       setDetailMore((prev: any) => {
+                                          if (prev.includes(item.id)) {
+                                             return prev.filter((id: string) => id !== item.id)
+                                          } else {
+                                             return [...prev, item.id]
+                                          }
+                                       })
+                                    }}
+                                    onLongPress={() => {
+                                       item.idUser == entities.id && data?.status != 2 && data?.isActive && handleMenuKomentar(item.id, item.comment)
+                                    }}
                                  />
                               )
                            })
@@ -205,27 +334,106 @@ export default function DetailDiscussionGeneral() {
                   Styles.contentItemCenter,
                   Styles.w100,
                   { backgroundColor: "#f4f4f4" },
+                  viewEdit && Styles.borderTop
                ]}>
-                  <InputForm
-                     disable={(data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin")))}
-                     type="default"
-                     round
-                     placeholder="Kirim Komentar"
-                     bg="white"
-                     onChange={setKomentar}
-                     value={komentar}
-                     itemRight={
-                        <Pressable onPress={() => {
-                           (komentar != '' && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
-                              && handleKomentar()
-                        }}>
-                           <MaterialIcons name="send" size={25} style={(komentar == '' || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
-                        </Pressable>
-                     }
-                  />
+                  {
+                     viewEdit ?
+                        <>
+                           <View style={[Styles.w90, Styles.rowSpaceBetween, Styles.pv05]}>
+                              <View style={[Styles.rowItemsCenter]}>
+                                 <Feather name="edit-3" color="black" size={22} style={[Styles.mh05]} />
+                                 <Text style={[Styles.textMediumSemiBold]}>Edit Komentar</Text>
+                              </View>
+                              <Pressable onPress={() => handleViewEditKomentar()}>
+                                 <MaterialIcons name="close" color="black" size={22} />
+                              </Pressable>
+                           </View>
+                           <InputForm
+                              disable={(data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin")))}
+                              type="default"
+                              round
+                              placeholder="Kirim Komentar"
+                              bg="white"
+                              onChange={(val: string) => setSelectKomentar({ ...selectKomentar, comment: val })}
+                              value={selectKomentar.comment}
+                              multiline
+                              focus={viewEdit}
+                              itemRight={
+                                 <Pressable onPress={() => {
+                                    (!loadingSendKomentar && selectKomentar.comment != '' && !regexOnlySpacesOrEnter.test(selectKomentar.comment) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
+                                       && handleEditKomentar()
+                                 }}
+                                    style={[
+                                       Platform.OS == 'android' && Styles.mb12,
+                                    ]}
+                                 >
+                                    <MaterialIcons name="send" size={25} style={(loadingSendKomentar || selectKomentar.comment == '' || regexOnlySpacesOrEnter.test(selectKomentar.comment) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
+                                 </Pressable>
+                              }
+                           />
+                        </>
+                        :
+                        data?.status != 2 && data?.isActive && ((entityUser.role != "user" && entityUser.role != "coadmin") || memberDiscussion)
+                           ?
+                           <InputForm
+                              disable={(data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin")))}
+                              type="default"
+                              round
+                              placeholder="Kirim Komentar"
+                              bg="white"
+                              onChange={setKomentar}
+                              value={komentar}
+                              multiline
+                              focus={viewEdit}
+                              itemRight={
+                                 <Pressable onPress={() => {
+                                    (!loadingSendKomentar && komentar != '' && !regexOnlySpacesOrEnter.test(komentar) && data?.status === 1 && data?.isActive && (memberDiscussion || (entityUser.role != "user" && entityUser.role != "coadmin")))
+                                       && handleKomentar()
+                                 }}
+                                    style={[
+                                       Platform.OS == 'android' && Styles.mb12,
+                                    ]}
+                                 >
+                                    <MaterialIcons name="send" size={25} style={(loadingSendKomentar || komentar == '' || regexOnlySpacesOrEnter.test(komentar) || data?.status === 2 || !data?.isActive || (!memberDiscussion && (entityUser.role == "user" || entityUser.role == "coadmin"))) ? Styles.cGray : Styles.cDefault} />
+                                 </Pressable>
+                              }
+                           />
+                           :
+                           <View style={[Styles.pv20, { alignItems: 'center' }]}>
+                              <Text style={[Styles.textInformation, Styles.cGray]}>
+                                 {
+                                    data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota diskusi yang dapat memberikan komentar"
+                                 }
+                              </Text>
+                           </View>
+                  }
+
                </View>
             </KeyboardAvoidingView>
          </View >
+
+         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Komentar">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
+                  title="Edit"
+                  onPress={() => { handleViewEditKomentar() }}
+               />
+               <MenuItemRow
+                  icon={<MaterialIcons name="delete" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => {
+                     AlertKonfirmasi({
+                        title: 'Konfirmasi',
+                        desc: 'Apakah anda yakin ingin menghapus komentar?',
+                        onPress: () => {
+                           handleDeleteKomentar()
+                        }
+                     })
+                  }}
+               />
+            </View>
+         </DrawerBottom>
       </>
    )
 }

app/(application)/discussion/add-member/[id].tsx

@@ -1,9 +1,10 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 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";
@@ -94,16 +95,32 @@ export default function AddMemberDiscussionDetail() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Tambah Anggota Diskusi',
                headerTitleAlign: 'center',
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="update"
-                     disable={selectMember.length == 0 || loading ? true : false}
-                     onPress={() => {
-                        handleAddMember()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="update"
+               //       disable={selectMember.length == 0 || loading ? true : false}
+               //       onPress={() => {
+               //          handleAddMember()
+               //       }}
+               //    />
+               // )
+               header: () => (
+                  <AppHeader
+                     title="Tambah Anggota Diskusi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="update"
+                           disable={selectMember.length == 0 || loading ? true : false}
+                           onPress={() => {
+                              handleAddMember()
+                           }}
+                        />
+                     }
                   />
                )
             }}
@@ -115,13 +132,13 @@ export default function AddMemberDiscussionDetail() {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -132,7 +149,9 @@ export default function AddMemberDiscussionDetail() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -147,7 +166,7 @@ export default function AddMemberDiscussionDetail() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]}>{item.name}</Text>
                                     {
@@ -156,7 +175,7 @@ export default function AddMemberDiscussionDetail() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'}/>
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/discussion/create.tsx

@@ -1,17 +1,23 @@
+import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
-import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
+import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
+import LoadingOverlay from "@/components/loadingOverlay";
+import MenuItemRow from "@/components/menuItemRow";
 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";
 import { setMemberChoose } from "@/lib/memberChoose";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import * as DocumentPicker from "expo-document-picker";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -32,6 +38,9 @@ export default function CreateDiscussionGeneral() {
    const entitiesMember = useSelector((state: any) => state.memberChoose)
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [loading, setLoading] = useState(false)
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [isModalFile, setModalFile] = useState(false)
+   const [indexDelFile, setIndexDelFile] = useState<number>(0)
    const [dataForm, setDataForm] = useState({
       idGroup: "",
       title: "",
@@ -94,13 +103,49 @@ export default function CreateDiscussionGeneral() {
       router.back()
    }
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+   function deleteFile(index: number) {
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setModalFile(false)
+   }
+
    async function handleCreate() {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiCreateDiscussionGeneral({
-            data: { ...dataForm, user: hasil, member: entitiesMember },
-         })
+         const fd = new FormData()
+
+         for (let i = 0; i < fileForm.length; i++) {
+            fd.append(`file${i}`, {
+               uri: fileForm[i].uri,
+               type: 'application/octet-stream',
+               name: fileForm[i].name,
+            } as any);
+         }
+
+         fd.append("data", JSON.stringify(
+            { ...dataForm, user: hasil, member: entitiesMember }
+         ))
+
+         const response = await apiCreateDiscussionGeneral(fd)
+
+         // const response = await apiCreateDiscussionGeneral({
+         //    data: { ...dataForm, user: hasil, member: entitiesMember },
+         // })
+
          if (response.success) {
             dispatch(setMemberChoose([]))
             dispatch(setUpdateDiscussionGeneralDetail(!update))
@@ -121,27 +166,46 @@ export default function CreateDiscussionGeneral() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => { handleBack() }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => { handleBack() }}
+               //    />
+               // ),
                headerTitle: "Tambah Diskusi",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="create"
-                     disable={disableBtn || loading ? true : false}
-                     onPress={() => {
-                        entitiesMember.length == 0
-                           ? Toast.show({ type: 'small', text1: 'Anda belum memilih anggota', })
-                           : handleCreate()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="create"
+               //       disable={disableBtn || loading ? true : false}
+               //       onPress={() => {
+               //          entitiesMember.length == 0
+               //             ? Toast.show({ type: 'small', text1: 'Anda belum memilih anggota', })
+               //             : handleCreate()
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Tambah Diskusi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="create"
+                           disable={disableBtn || loading ? true : false}
+                           onPress={() => {
+                              entitiesMember.length == 0
+                                 ? Toast.show({ type: 'small', text1: 'Anda belum memilih anggota', })
+                                 : handleCreate()
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
-         <ScrollView>
+         <LoadingOverlay visible={loading} />
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15, Styles.mb100]}>
                {
                   (entityUser.role == "supadmin" ||
@@ -180,6 +244,26 @@ export default function CreateDiscussionGeneral() {
                   onChange={(val) => { validationForm("desc", val) }}
                   multiline
                />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
                <ButtonSelect
                   value="Pilih Anggota"
                   onPress={() => {
@@ -215,7 +299,7 @@ export default function CreateDiscussionGeneral() {
                                     key={index}
                                     borderType="bottom"
                                     icon={
-                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                     }
                                     title={item.name}
                                  />
@@ -239,6 +323,16 @@ export default function CreateDiscussionGeneral() {
             idParent={valSelect == "member" ? chooseGroup.val : ""}
             valChoose={valChoose}
          />
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile) }}
+               />
+            </View>
+         </DrawerBottom>
       </SafeAreaView>
    );
 }

app/(application)/discussion/edit/[id].tsx

@@ -1,10 +1,18 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
+import Text from "@/components/Text";
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ButtonSelect from "@/components/buttonSelect";
+import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
+import LoadingOverlay from "@/components/loadingOverlay";
+import MenuItemRow from "@/components/menuItemRow";
 import Styles from "@/constants/Styles";
 import { apiEditDiscussionGeneral, apiGetDiscussionGeneralOne } from "@/lib/api";
 import { setUpdateDiscussionGeneralDetail } from "@/lib/discussionGeneralDetail";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import * as DocumentPicker from "expo-document-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -17,6 +25,10 @@ export default function EditDiscussionGeneral() {
    const [disableBtn, setDisableBtn] = useState(false)
    const dispatch = useDispatch()
    const [loading, setLoading] = useState(false)
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [isModalFile, setModalFile] = useState(false)
+   const [indexDelFile, setIndexDelFile] = useState<{ id: string | number; cat: "newFile" | "oldFile" }>({ id: "", cat: "newFile" })
+   const [dataFile, setDataFile] = useState<{ id: string; idStorage: string; name: string; extension: string; delete?: boolean }[]>([])
    const update = useSelector((state: any) => state.discussionGeneralDetailUpdate)
    const [dataForm, setDataForm] = useState({
       title: "",
@@ -35,9 +47,17 @@ export default function EditDiscussionGeneral() {
             user: hasil,
             cat: "detail",
          });
+         const responseFile = await apiGetDiscussionGeneralOne({
+            id: id,
+            user: hasil,
+            cat: "file",
+         });
          if (response.success) {
             setDataForm(response.data);
          }
+         if (responseFile.success) {
+            setDataFile(responseFile.data);
+         }
       } catch (error) {
          console.error(error);
       }
@@ -78,12 +98,56 @@ export default function EditDiscussionGeneral() {
       checkForm()
    }, [error, dataForm])
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+   function deleteFile(index: number | string, cat: "newFile" | "oldFile" | null) {
+      if (cat == "newFile") {
+         setFileForm([...fileForm.filter((val, i) => i !== index)])
+      } else {
+         setDataFile(prev =>
+            prev.map(item =>
+               item.id === index
+                  ? { ...item, delete: true }
+                  : item
+            )
+         );
+      }
+      setModalFile(false)
+   }
+
 
    async function handleEdit() {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiEditDiscussionGeneral({ user: hasil, title: dataForm.title, desc: dataForm.desc }, id);
+         const fd = new FormData()
+         for (let i = 0; i < fileForm.length; i++) {
+            fd.append(`file${i}`, {
+               uri: fileForm[i].uri,
+               type: 'application/octet-stream',
+               name: fileForm[i].name,
+            } as any);
+         }
+
+         fd.append("data", JSON.stringify(
+            {
+               user: hasil, title: dataForm.title, desc: dataForm.desc, oldFile: dataFile
+            }
+         ))
+
+         const response = await apiEditDiscussionGeneral(fd, id);
          if (response.success) {
             dispatch(setUpdateDiscussionGeneralDetail(!update))
             Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
@@ -101,25 +165,40 @@ export default function EditDiscussionGeneral() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Diskusi",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disableBtn || loading ? true : false}
-                     category="update"
-                     onPress={() => { handleEdit() }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disableBtn || loading ? true : false}
+               //       category="update"
+               //       onPress={() => { handleEdit() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Edit Diskusi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disableBtn || loading ? true : false}
+                           category="update"
+                           onPress={() => { handleEdit() }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
-         <ScrollView>
+         <LoadingOverlay visible={loading} />
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15]}>
                <InputForm
                   label="Judul"
@@ -142,8 +221,50 @@ export default function EditDiscussionGeneral() {
                   onChange={(val) => validationForm("desc", val)}
                   multiline
                />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        dataFile.filter((val) => !val.delete).map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name + '.' + item.extension}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
             </View>
          </ScrollView>
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
+               />
+            </View>
+         </DrawerBottom>
       </SafeAreaView>
    );
 }

app/(application)/discussion/index.tsx

@@ -98,31 +98,36 @@ export default function Discussion() {
    return (
       <View style={[Styles.p15, { flex: 1 }]}>
          <View>
-            <View style={[Styles.wrapBtnTab]}>
-               <ButtonTab
-                  active={status == "false" ? "false" : "true"}
-                  value="true"
-                  onPress={() => { setStatus("true") }}
-                  label="Aktif"
-                  icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
-                  n={2} />
-               <ButtonTab
-                  active={status == "false" ? "false" : "true"}
-                  value="false"
-                  onPress={() => { setStatus("false") }}
-                  label="Arsip"
-                  icon={<AntDesign name="closecircleo" color={status == "true" ? 'black' : 'white'} size={20} />}
-                  n={2} />
-            </View>
+            {
+               entityUser.role != "user" && entityUser.role != "coadmin" &&
+               <View style={[Styles.wrapBtnTab]}>
+                  <ButtonTab
+                     active={status == "false" ? "false" : "true"}
+                     value="true"
+                     onPress={() => { setStatus("true") }}
+                     label="Aktif"
+                     icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
+                     n={2} />
+                  <ButtonTab
+                     active={status == "false" ? "false" : "true"}
+                     value="false"
+                     onPress={() => { setStatus("false") }}
+                     label="Arsip"
+                     icon={<AntDesign name="closecircleo" color={status == "true" ? 'black' : 'white'} size={20} />}
+                     n={2} />
+               </View>
+            }
+
             <InputSearch onChange={setSearch} />
             {
                (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-               <View style={[Styles.mv05]}>
-                  <Text>Filter : {nameGroup}</Text>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
+                  <Text>Filter :</Text>
+                  <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item: any, i: number) => {
@@ -153,7 +158,7 @@ export default function Discussion() {
                                     status != "false" && <LabelStatus category={item.status === 1 ? "success" : "error"} text={item.status === 1 ? "BUKA" : "TUTUP"} size="small" />
                                  }
                                  rightTopInfo={item.createdAt}
-                                 desc={item.desc}
+                                 desc={item.desc.replace(/<[^>]*>?/gm, ' ').replace(/\r?\n|\r/g, ' ')}
                                  leftBottomInfo={
                                     <View style={[Styles.rowItemsCenter]}>
                                        <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
@@ -176,34 +181,6 @@ export default function Discussion() {
                            />
                         }
                      />
-                     // data.map((item: any, i: number) => {
-                     //    return (
-                     //       <BorderBottomItem
-                     //          key={i}
-                     //          onPress={() => { router.push(`/discussion/${item.id}`) }}
-                     //          borderType="bottom"
-                     //          icon={
-                     //             <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                     //                <MaterialIcons name="chat" size={25} color={'#384288'} />
-                     //             </View>
-                     //          }
-                     //          title={item.title}
-                     //          subtitle={
-                     //             status != "false" && <LabelStatus category={item.status === 1 ? "success" : "error"} text={item.status === 1 ? "BUKA" : "TUTUP"} size="small" />
-                     //          }
-                     //          rightTopInfo={item.createdAt}
-                     //          desc={item.desc}
-                     //          leftBottomInfo={
-                     //             <View style={[Styles.rowItemsCenter]}>
-                     //                <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
-                     //                <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
-                     //             </View>
-                     //          }
-                     //          rightBottomInfo={`${item.total_komentar} Komentar`}
-
-                     //       />
-                     //    )
-                     // })
                      :
                      <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
             }

app/(application)/discussion/member/[id].tsx

@@ -1,12 +1,13 @@
 import AlertKonfirmasi from "@/components/alertKonfirmasi";
+import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
-import ButtonBackHeader from "@/components/buttonBackHeader";
 import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 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";
@@ -73,9 +74,16 @@ export default function MemberDiscussionDetail() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Anggota Diskusi',
                headerTitleAlign: 'center',
+               header: () => (
+                  <AppHeader
+                     title="Anggota Diskusi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                  />
+               )
             }}
          />
          <ScrollView>
@@ -109,7 +117,7 @@ export default function MemberDiscussionDetail() {
                                  key={index}
                                  borderType="bottom"
                                  icon={
-                                    <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                  }
                                  title={item.name}
                                  onPress={() => {
@@ -134,22 +142,25 @@ export default function MemberDiscussionDetail() {
                      router.push(`/member/${chooseUser.idUser}`)
                   }}
                />
+               {
+                  entityUser.role != "user" && entityUser.role != "coadmin" &&
+                  <MenuItemRow
+                     icon={<MaterialCommunityIcons name="account-remove" color="black" size={25} />}
+                     title="Keluarkan"
+                     onPress={() => {
+                        setModal(false)
+                        AlertKonfirmasi({
+                           title: 'Konfirmasi',
+                           desc: 'Apakah Anda yakin ingin mengeluarkan anggota?',
+                           onPress: () => {
+                              handleDeleteUser()
+                           }
+                        })
 
-               <MenuItemRow
-                  icon={<MaterialCommunityIcons name="account-remove" color="black" size={25} />}
-                  title="Keluarkan"
-                  onPress={() => {
-                     setModal(false)
-                     AlertKonfirmasi({
-                        title: 'Konfirmasi',
-                        desc: 'Apakah Anda yakin ingin mengeluarkan anggota?',
-                        onPress: () => {
-                           handleDeleteUser()
-                        }
-                     })
+                     }}
+                  />
+               }
 
-                  }}
-               />
             </View>
          </DrawerBottom>
       </SafeAreaView>

app/(application)/division/[id]/(fitur-division)/_layout.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader"
+import AppHeader from "@/components/AppHeader"
 import HeaderRightDiscussionList from "@/components/discussion/headerDiscussionList"
 import HeaderRightTaskList from "@/components/task/headerTaskList"
 import { Headers } from "@/constants/Headers"
@@ -9,22 +9,49 @@ export default function RootLayout() {
       <>
          <Stack screenOptions={Headers.shadow}>
             <Stack.Screen name="task/index" options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Tugas Divisi',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightTaskList />
+               // headerRight: () => <HeaderRightTaskList />
+               header: () => (
+                  <AppHeader
+                     title="Tugas Divisi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <HeaderRightTaskList />
+                     }
+                  />
+               )
             }} />
             <Stack.Screen name="discussion/index" options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                title: 'Diskusi Divisi',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightDiscussionList />
+               // headerRight: () => <HeaderRightDiscussionList />
+               header: () => (
+                  <AppHeader
+                     title="Diskusi Divisi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <HeaderRightDiscussionList />
+                     }
+                  />
+               )
             }} />
             <Stack.Screen name="calendar/history"
                options={{
-                  headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+                  // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                   headerTitle: 'Riwayat Acara',
                   headerTitleAlign: 'center',
+                  header: () => (
+                     <AppHeader
+                        title="Riwayat Acara"
+                        showBack={true}
+                        onPressLeft={() => router.back()}
+                     />
+                  )
                }}
             />
          </Stack>

app/(application)/division/[id]/(fitur-division)/calendar/[detail]/add-member.tsx

@@ -1,9 +1,10 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 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";
@@ -102,16 +103,32 @@ export default function AddMemberCalendarEvent() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Tambah Anggota',
                headerTitleAlign: 'center',
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="update"
-                     disable={selectMember.length == 0 || loading ? true : false}
-                     onPress={() => {
-                        handleAddMember()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="update"
+               //       disable={selectMember.length == 0 || loading ? true : false}
+               //       onPress={() => {
+               //          handleAddMember()
+               //       }}
+               //    />
+               // )
+               header: () => (
+                  <AppHeader
+                     title="Tambah Anggota"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="update"
+                           disable={selectMember.length == 0 || loading ? true : false}
+                           onPress={() => {
+                              handleAddMember()
+                           }}
+                        />
+                     }
                   />
                )
             }}
@@ -122,13 +139,13 @@ export default function AddMemberCalendarEvent() {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -139,7 +156,10 @@ export default function AddMemberCalendarEvent() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+               style={[Styles.h100]}
+            >
                {
                   data.length > 0 ?
                      data.map((item: any, index: any) => {
@@ -150,11 +170,10 @@ export default function AddMemberCalendarEvent() {
                               style={[Styles.itemSelectModal]}
                               onPress={() => {
                                  !found && onChoose(item.idUser, item.name, item.img)
-                                 onChoose(item.idUser, item.name, item.img)
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10, { width: '80%' }]}>
                                     <Text numberOfLines={1} ellipsizeMode="tail" style={[Styles.textDefault]}>{item.name}</Text>
                                     {
@@ -163,7 +182,7 @@ export default function AddMemberCalendarEvent() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'}/>
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/division/[id]/(fitur-division)/calendar/[detail]/edit.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader"
+import AppHeader from "@/components/AppHeader"
 import ButtonSaveHeader from "@/components/buttonSaveHeader"
 import { InputDate } from "@/components/inputDate"
 import { InputForm } from "@/components/inputForm"
@@ -9,10 +9,11 @@ import { valueTypeEventRepeat } from "@/constants/TypeEventRepeat"
 import { apiGetCalendarOne, apiUpdateCalendar } from "@/lib/api"
 import { stringToDateTime } from "@/lib/fun_stringToDate"
 import { useAuthSession } from "@/providers/AuthProvider"
+import { useHeaderHeight } from "@react-navigation/elements"
 import { Stack, router, useLocalSearchParams } from "expo-router"
 import moment from "moment"
 import { useEffect, useState } from "react"
-import { SafeAreaView, ScrollView, View } from "react-native"
+import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, View } from "react-native"
 import Toast from "react-native-toast-message"
 
 export default function EditEventCalendar() {
@@ -22,6 +23,7 @@ export default function EditEventCalendar() {
    const { id, detail } = useLocalSearchParams<{ id: string, detail: string }>()
    const [idCalendar, setIdCalendar] = useState('')
    const [loading, setLoading] = useState(false)
+   const headerHeight = useHeaderHeight()
 
    const [error, setError] = useState({
       title: false,
@@ -163,107 +165,129 @@ export default function EditEventCalendar() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Edit Acara',
                headerTitleAlign: 'center',
-               headerRight: () =>
-                  <ButtonSaveHeader
-                     disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventTyper == "" || loading}
-                     category="update-calendar"
-                     onPress={() => {
-                        handleUpdate()
-                     }}
+               // headerRight: () =>
+               //    <ButtonSaveHeader
+               //       disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventTyper == "" || loading}
+               //       category="update-calendar"
+               //       onPress={() => {
+               //          handleUpdate()
+               //       }}
+               //    />
+               header: () => (
+                  <AppHeader
+                     title="Edit Acara"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventTyper == "" || loading}
+                           category="update-calendar"
+                           onPress={() => {
+                              handleUpdate()
+                           }}
+                        />
+                     }
                   />
+               )
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
-               <InputForm
-                  label="Nama Acara"
-                  type="default"
-                  placeholder="Nama Acara"
-                  required
-                  bg="white"
-                  value={data.title}
-                  onChange={(val) => validationForm("title", val)}
-                  error={error.title}
-                  errorText="Nama acara tidak boleh kosong"
-               />
-               <InputDate
-                  onChange={(val) => validationForm("dateStart", val)}
-                  mode="date"
-                  value={data.dateStart}
-                  label="Tanggal Acara"
-                  required
-                  error={error.dateStart}
-                  errorText="Tanggal acara tidak boleh kosong"
-                  placeholder="Pilih Tanggal Acara"
-               />
-               <View style={[Styles.rowSpaceBetween, Styles.mv10]}>
-                  <View style={[{ width: "48%" }]}>
-                     <InputDate
-                        onChange={(val) => validationForm("timeStart", val)}
-                        mode="time"
-                        value={data.timeStart}
-                        label="Waktu Awal"
-                        required
-                        error={error.timeStart}
-                        errorText="Waktu awal tidak valid"
-                        placeholder="--:--"
-                     />
-                  </View>
-                  <View style={[{ width: "48%" }]}>
-                     <InputDate
-                        onChange={(val) => validationForm("timeEnd", val)}
-                        mode="time"
-                        value={data.timeEnd}
-                        label="Waktu Akhir"
-                        required
-                        error={error.timeEnd}
-                        errorText="Waktu akhir tidak valid"
-                        placeholder="--:--"
-                     />
+         <KeyboardAvoidingView
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView>
+               <View style={[Styles.p15]}>
+                  <InputForm
+                     label="Nama Acara"
+                     type="default"
+                     placeholder="Nama Acara"
+                     required
+                     bg="white"
+                     value={data.title}
+                     onChange={(val) => validationForm("title", val)}
+                     error={error.title}
+                     errorText="Nama acara tidak boleh kosong"
+                  />
+                  <InputDate
+                     onChange={(val) => validationForm("dateStart", val)}
+                     mode="date"
+                     value={data.dateStart}
+                     label="Tanggal Acara"
+                     required
+                     error={error.dateStart}
+                     errorText="Tanggal acara tidak boleh kosong"
+                     placeholder="Pilih Tanggal Acara"
+                  />
+                  <View style={[Styles.rowSpaceBetween, Styles.mv10]}>
+                     <View style={[{ width: "48%" }]}>
+                        <InputDate
+                           onChange={(val) => validationForm("timeStart", val)}
+                           mode="time"
+                           value={data.timeStart}
+                           label="Waktu Awal"
+                           required
+                           error={error.timeStart}
+                           errorText="Waktu awal tidak valid"
+                           placeholder="--:--"
+                        />
+                     </View>
+                     <View style={[{ width: "48%" }]}>
+                        <InputDate
+                           onChange={(val) => validationForm("timeEnd", val)}
+                           mode="time"
+                           value={data.timeEnd}
+                           label="Waktu Akhir"
+                           required
+                           error={error.timeEnd}
+                           errorText="Waktu akhir tidak valid"
+                           placeholder="--:--"
+                        />
+                     </View>
                   </View>
+                  <InputForm
+                     label="Link Meet"
+                     type="default"
+                     placeholder="Link Meet"
+                     bg="white"
+                     value={data.linkMeet}
+                     onChange={(val) => validationForm("linkMeet", val)}
+                  />
+                  <SelectForm
+                     bg="white"
+                     label="Ulangi Acara"
+                     placeholder="Ulangi Acara"
+                     value={choose.label}
+                     required
+                     onPress={() => { setSelect(true) }}
+                  />
+                  <InputForm
+                     label="Jumlah Pengulangan"
+                     type="numeric"
+                     placeholder="Jumlah Pengulangan"
+                     required
+                     bg="white"
+                     value={String(data.repeatValue)}
+                     onChange={(val) => validationForm("repeatValue", val)}
+                     error={error.repeatValue}
+                     errorText="Jumlah pengulangan tidak valid"
+                     disable={choose.val == "once"}
+                  />
+                  <InputForm
+                     label="Deskripsi"
+                     type="default"
+                     placeholder="Deskripsi"
+                     bg="white"
+                     value={data.desc}
+                     onChange={(val) => validationForm("desc", val)}
+                     multiline
+                  />
                </View>
-               <InputForm
-                  label="Link Meet"
-                  type="default"
-                  placeholder="Link Meet"
-                  bg="white"
-                  value={data.linkMeet}
-                  onChange={(val) => validationForm("linkMeet", val)}
-               />
-               <SelectForm
-                  bg="white"
-                  label="Ulangi Acara"
-                  placeholder="Ulangi Acara"
-                  value={choose.label}
-                  required
-                  onPress={() => { setSelect(true) }}
-               />
-               <InputForm
-                  label="Jumlah Pengulangan"
-                  type="numeric"
-                  placeholder="Jumlah Pengulangan"
-                  required
-                  bg="white"
-                  value={String(data.repeatValue)}
-                  onChange={(val) => validationForm("repeatValue", val)}
-                  error={error.repeatValue}
-                  errorText="Jumlah pengulangan tidak valid"
-                  disable={choose.val == "once"}
-               />
-               <InputForm
-                  label="Deskripsi"
-                  type="default"
-                  placeholder="Deskripsi"
-                  bg="white"
-                  value={data.desc}
-                  onChange={(val) => validationForm("desc", val)}
-                  multiline
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
+
 
          <ModalSelect
             category={"type-event-repeat"}

app/(application)/division/[id]/(fitur-division)/calendar/[detail]/index.tsx

@@ -1,4 +1,5 @@
 import AlertKonfirmasi from "@/components/alertKonfirmasi"
+import AppHeader from "@/components/AppHeader"
 import BorderBottomItem from "@/components/borderBottomItem"
 import ButtonBackHeader from "@/components/buttonBackHeader"
 import HeaderRightCalendarDetail from "@/components/calendar/headerCalendarDetail"
@@ -7,14 +8,16 @@ 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"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { MaterialCommunityIcons } from "@expo/vector-icons"
+import Clipboard from "@react-native-clipboard/clipboard"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
+import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
 
@@ -70,7 +73,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));
@@ -114,6 +117,11 @@ export default function DetailEventCalendar() {
       handleLoadMember();
    }, [update.member]);
 
+   const handleCopy = (text: string) => {
+      Clipboard.setString(text);
+      Toast.show({ type: 'small', text1: 'Berhasil menyalin link', })
+   };
+
    async function handleDeleteUser() {
       try {
          const hasil = await decryptToken(String(token?.current));
@@ -147,10 +155,20 @@ export default function DetailEventCalendar() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Detail Acara',
                headerTitleAlign: 'center',
-               headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
+               // headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
+               header:()=>(
+                  <AppHeader
+                     title="Detail Acara"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision ? <></> : <HeaderRightCalendarDetail id={String(data?.idCalendar)} idReminder={String(detail)} />
+                     }
+                  />
+               )
             }}
          />
          <ScrollView
@@ -164,12 +182,12 @@ export default function DetailEventCalendar() {
          >
             <View style={[Styles.p15]}>
                <View style={[Styles.wrapPaper, Styles.mb15]}>
-                  <View style={Styles.rowItemsCenter}>
+                  <View style={[Styles.rowItemsCenter, { alignItems: 'flex-start' }]}>
                      <MaterialCommunityIcons name="calendar-text" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
-                           : <Text style={[Styles.textDefault]}>{data?.title}</Text>
+                           : <Text style={[Styles.textDefault, Styles.w90]}>{data?.title}</Text>
                      }
 
                   </View>
@@ -215,16 +233,20 @@ export default function DetailEventCalendar() {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
                            :
-                           <Text style={[Styles.textDefault]}>{data?.linkMeet ? data.linkMeet : '-'}</Text>
+                           data?.linkMeet ?
+                              <Pressable onPress={() => { handleCopy(data.linkMeet) }}>
+                                 <Text style={[Styles.textDefault]}>{data.linkMeet}</Text>
+                              </Pressable>
+                              : <Text style={[Styles.textDefault]}>-</Text>
                      }
                   </View>
-                  <View style={[Styles.rowItemsCenter, Styles.mt10]}>
+                  <View style={[Styles.rowItemsCenter, Styles.mt10, { alignItems: 'flex-start' }]}>
                      <MaterialCommunityIcons name="card-text-outline" size={30} color="black" style={Styles.mr10} />
                      {
                         loading ?
                            <Skeleton width={80} height={10} borderRadius={10} widthType="percent" />
                            :
-                           <Text style={[Styles.textDefault]}>{data?.desc}</Text>
+                           <Text style={[Styles.textDefault, Styles.w90]}>{data?.desc}</Text>
                      }
                   </View>
                </View>
@@ -241,7 +263,7 @@ export default function DetailEventCalendar() {
                            <BorderBottomItem
                               key={index}
                               borderType="bottom"
-                              icon={<ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} />}
+                              icon={<ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} />}
                               title={item.name}
                               subtitle={item.email}
                               onPress={() => {

app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx

@@ -1,9 +1,10 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 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";
@@ -92,14 +93,28 @@ export default function CreateCalendarAddMember() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Pilih Anggota',
                headerTitleAlign: 'center',
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="create"
-                     disable={selectMember.length == 0 || loading ? true : false}
-                     onPress={() => { handleAddMember() }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="create"
+               //       disable={selectMember.length == 0 || loading ? true : false}
+               //       onPress={() => { handleAddMember() }}
+               //    />
+               // )
+               header: () => (
+                  <AppHeader
+                     title="Pilih Anggota"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="create"
+                           disable={selectMember.length == 0 || loading ? true : false}
+                           onPress={() => { handleAddMember() }}
+                        />
+                     }
                   />
                )
             }}
@@ -111,13 +126,13 @@ export default function CreateCalendarAddMember() {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -128,7 +143,10 @@ export default function CreateCalendarAddMember() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+               style={[Styles.h100]}
+            >
 
                {
                   data.length > 0 ?
@@ -140,13 +158,13 @@ export default function CreateCalendarAddMember() {
                               onPress={() => { onChoose(item.idUser, item.name, item.img) }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'}/>
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )

app/(application)/division/[id]/(fitur-division)/calendar/create.tsx

@@ -1,3 +1,4 @@
+import AppHeader from "@/components/AppHeader";
 import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonNextHeader from "@/components/buttonNextHeader";
 import { InputDate } from "@/components/inputDate";
@@ -7,6 +8,7 @@ import SelectForm from "@/components/selectForm";
 import Styles from "@/constants/Styles";
 import { setFormCreateCalendar } from "@/lib/calendarCreate";
 import { stringToDateTime } from "@/lib/fun_stringToDate";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { Stack, router, useLocalSearchParams } from "expo-router";
 import { useState } from "react";
 import {
@@ -17,7 +19,6 @@ import {
    View
 } from "react-native";
 import { useDispatch, useSelector } from "react-redux";
-import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function CalendarDivisionCreate() {
    const { id } = useLocalSearchParams<{ id: string }>()
@@ -128,28 +129,44 @@ export default function CalendarDivisionCreate() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Acara",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonNextHeader
-                     onPress={() => { handleSetData() }}
-                     disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventType == ""}
+               // headerRight: () => (
+               //    <ButtonNextHeader
+               //       onPress={() => { handleSetData() }}
+               //       disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventType == ""}
+               //    />
+               // ),
+               header:()=>(
+                  <AppHeader
+                     title="Tambah Acara"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonNextHeader
+                           onPress={() => { handleSetData() }}
+                           disable={Object.values(error).some((val) => val == true) || data.title == "" || data.dateStart == "" || data.timeStart == "" || data.timeEnd == "" || data.repeatEventType == ""}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <KeyboardAvoidingView
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
             keyboardVerticalOffset={headerHeight}
          >
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+               style={[Styles.h100]}
+            >
                <View style={[Styles.p15]}>
                   <InputForm
                      label="Nama Acara"

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

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import HeaderRightCalendarList from "@/components/calendar/headerCalendarList";
 import ItemDateCalendar from "@/components/calendar/itemDateCalendar";
 import EventItem from "@/components/eventItem";
@@ -8,7 +8,6 @@ import Styles from "@/constants/Styles";
 import { apiGetCalendarByDateDivision, apiGetIndicatorCalendar } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Feather } from "@expo/vector-icons";
-import dayjs from "dayjs";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import 'intl';
 import 'intl/locale-data/jsonp/id';
@@ -53,7 +52,7 @@ export default function CalendarDivision() {
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetCalendarByDateDivision({
             user: hasil,
-            date: dayjs(selected).format("YYYY-MM-DD"),
+            date: moment(selected).format("YYYY-MM-DD"),
             division: id,
          });
          setData(response.data);
@@ -71,7 +70,7 @@ export default function CalendarDivision() {
          const hasil = await decryptToken(String(token?.current));
          const response = await apiGetIndicatorCalendar({
             user: hasil,
-            date: dayjs(newDate).format("YYYY-MM-DD"),
+            date: moment(newDate).format("YYYY-MM-DD"),
             division: id,
          });
          setDataIndicator(response.data);
@@ -113,6 +112,7 @@ export default function CalendarDivision() {
                text={day.text}
                isSelected={day.isSelected}
                isSign={sign}
+               onPress={() => setSelected(new Date(today))}
             />
          );
       },
@@ -128,16 +128,24 @@ export default function CalendarDivision() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Kalender",
                headerTitleAlign: "center",
-               headerRight: () => <HeaderRightCalendarList />,
+               // headerRight: () => <HeaderRightCalendarList />,
+               header: () => (
+                  <AppHeader
+                     title="Kalender"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<HeaderRightCalendarList />}
+                  />
+               )
             }}
          />
          <ScrollView
@@ -156,7 +164,6 @@ export default function CalendarDivision() {
                      mode="single"
                      date={selected}
                      month={month}
-                     onChange={({ date }) => setSelected(date)}
                      onMonthChange={(month) => setMonth(month)}
                      styles={{
                         selected: Styles.selectedDate,

app/(application)/division/[id]/(fitur-division)/discussion/[detail]/edit.tsx

@@ -1,10 +1,18 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
+import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import ButtonSelect from "@/components/buttonSelect";
+import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
+import LoadingOverlay from "@/components/loadingOverlay";
+import MenuItemRow from "@/components/menuItemRow";
+import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiEditDiscussion, apiGetDiscussionOne } from "@/lib/api";
 import { setUpdateDiscussion } from "@/lib/discussionUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons";
+import * as DocumentPicker from "expo-document-picker";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
@@ -18,6 +26,11 @@ export default function DiscussionDivisionEdit() {
    const update = useSelector((state: any) => state.discussionUpdate);
    const dispatch = useDispatch();
    const [loading, setLoading] = useState(false)
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [isModalFile, setModalFile] = useState(false)
+   const [indexDelFile, setIndexDelFile] = useState<{ id: string | number; cat: "newFile" | "oldFile" }>({ id: "", cat: "newFile" })
+   const [dataFile, setDataFile] = useState<{ id: string; idStorage: string; name: string; extension: string; delete?: boolean }[]>([])
+
 
    async function handleLoad() {
       try {
@@ -27,6 +40,12 @@ export default function DiscussionDivisionEdit() {
             user: hasil,
             cat: "data",
          });
+         const response2 = await apiGetDiscussionOne({
+            id: detail,
+            user: hasil,
+            cat: "file",
+         });
+         setDataFile(response2.data);
          setData(response.data.desc);
       } catch (error) {
          console.error(error);
@@ -41,15 +60,31 @@ export default function DiscussionDivisionEdit() {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiEditDiscussion({
-            data: { user: hasil, desc: data },
-            id: detail,
-         });
+         const fd = new FormData()
+         for (let i = 0; i < fileForm.length; i++) {
+            fd.append(`file${i}`, {
+               uri: fileForm[i].uri,
+               type: 'application/octet-stream',
+               name: fileForm[i].name,
+            } as any);
+         }
+
+         fd.append("data", JSON.stringify(
+            {
+               user: hasil, desc: data, oldFile: dataFile
+            }
+         ))
+         const response = await apiEditDiscussion(fd, detail);
+
+         // const response = await apiEditDiscussion({
+         //    data: { user: hasil, desc: data },
+         //    id: detail,
+         // });
          if (response.success) {
             Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
             dispatch(setUpdateDiscussion({ ...update, data: !update.data }));
             router.back();
-         }else{
+         } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
       } catch (error) {
@@ -60,31 +95,79 @@ export default function DiscussionDivisionEdit() {
       }
    }
 
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+
+
+   function deleteFile(index: number | string, cat: "newFile" | "oldFile" | null) {
+      if (cat == "newFile") {
+         setFileForm([...fileForm.filter((val, i) => i !== index)])
+      } else {
+         setDataFile(prev =>
+            prev.map(item =>
+               item.id === index
+                  ? { ...item, delete: true }
+                  : item
+            )
+         );
+      }
+      setModalFile(false)
+   }
+
    return (
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Diskusi",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={data == "" || loading}
-                     category="update"
-                     onPress={() => {
-                        handleUpdate();
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={data == "" || loading}
+               //       category="update"
+               //       onPress={() => {
+               //          handleUpdate();
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Edit Diskusi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={data == "" || loading}
+                           category="update"
+                           onPress={() => {
+                              handleUpdate();
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
-         <ScrollView>
+         <LoadingOverlay visible={loading} />
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15]}>
                <InputForm
                   label="Diskusi"
@@ -93,9 +176,55 @@ export default function DiscussionDivisionEdit() {
                   required
                   value={data}
                   onChange={setData}
+                  multiline
                />
+
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        dataFile.filter((val) => !val.delete).map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={(fileForm.length + dataFile.length) > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name + '.' + item.extension}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
             </View>
          </ScrollView>
+
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile.id, indexDelFile.cat) }}
+               />
+            </View>
+         </DrawerBottom>
+
       </SafeAreaView>
    );
 }

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

@@ -1,26 +1,36 @@
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
+import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import BorderBottomItem2 from "@/components/borderBottomItem2";
 import HeaderRightDiscussionDetail from "@/components/discussion/headerDiscussionDetail";
+import DrawerBottom from "@/components/drawerBottom";
 import ImageUser from "@/components/imageNew";
 import { InputForm } from "@/components/inputForm";
 import LabelStatus from "@/components/labelStatus";
+import MenuItemRow from "@/components/menuItemRow";
 import Skeleton from "@/components/skeleton";
 import SkeletonContent from "@/components/skeletonContent";
 import Text from "@/components/Text";
+import { ConstEnv } from "@/constants/ConstEnv";
+import { regexOnlySpacesOrEnter } from "@/constants/OnlySpaceOrEnter";
 import Styles from "@/constants/Styles";
 import {
+   apiDeleteDiscussionCommentar,
+   apiEditDiscussionCommentar,
    apiGetDiscussionOne,
    apiGetDivisionOneFeature,
    apiSendDiscussionCommentar,
 } from "@/lib/api";
+import { getDB } from "@/lib/firebaseDatabase";
 import { useAuthSession } from "@/providers/AuthProvider";
-import { Ionicons, MaterialIcons } from "@expo/vector-icons";
-import { firebase } from "@react-native-firebase/database";
+import { Feather, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
+import { ref } from "@react-native-firebase/database";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { KeyboardAvoidingView, Platform, Pressable, RefreshControl, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
-import { useHeaderHeight } from '@react-navigation/elements';
 
 type Props = {
    id: string;
@@ -41,12 +51,23 @@ type PropsComment = {
    createdAt: string;
    username: string;
    img: string;
+   idUser: string;
+   isEdited: boolean;
+   updatedAt: string;
 };
 
+type PropsFile = {
+   id: string;
+   idStorage: string;
+   name: string;
+   extension: string
+}
+
 export default function DiscussionDetail() {
    const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
    const [data, setData] = useState<Props>();
    const [dataComment, setDataComment] = useState<PropsComment[]>([]);
+   const [fileDiscussion, setFileDiscussion] = useState<PropsFile[]>([])
    const { token, decryptToken } = useAuthSession();
    const [komentar, setKomentar] = useState("");
    const [loadingSend, setLoadingSend] = useState(false);
@@ -58,9 +79,18 @@ export default function DiscussionDetail() {
    const [loading, setLoading] = useState(true)
    const [loadingKomentar, setLoadingKomentar] = useState(true)
    const arrSkeleton = Array.from({ length: 3 })
-   const reference = firebase.app().database('https://mobile-darmasaba-default-rtdb.asia-southeast1.firebasedatabase.app').ref(`/discussion-division/${detail}`);
+   const reference = ref(getDB(), `/discussion-division/${detail}`);
    const [refreshing, setRefreshing] = useState(false)
    const headerHeight = useHeaderHeight();
+   const [detailMore, setDetailMore] = useState<any>([])
+   const entities = useSelector((state: any) => state.entities)
+   const [isVisible, setVisible] = useState(false)
+   const [selectKomentar, setSelectKomentar] = useState({
+      id: '',
+      comment: ''
+   })
+   const [viewEdit, setViewEdit] = useState(false)
+
 
 
    useEffect(() => {
@@ -92,7 +122,15 @@ export default function DiscussionDetail() {
             user: hasil,
             cat: "data",
          });
+
+         const responseFile = await apiGetDiscussionOne({
+            id: detail,
+            user: hasil,
+            cat: "file",
+         });
+
          setData(response.data);
+         setFileDiscussion(responseFile.data)
          setIsCreator(response.data.createdBy == hasil);
       } catch (error) {
          console.error(error);
@@ -168,6 +206,59 @@ export default function DiscussionDetail() {
       }
    }
 
+   async function handleEditKomentar() {
+      try {
+         setLoadingSend(true);
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiEditDiscussionCommentar({
+            id: selectKomentar.id,
+            data: { comment: selectKomentar.comment, user: hasil },
+         });
+         if (response.success) {
+            updateTrigger()
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
+      } catch (error) {
+         console.error(error);
+      } finally {
+         setLoadingSend(false);
+         handleViewEditKomentar()
+      }
+   }
+
+   async function handleDeleteKomentar() {
+      try {
+         setLoadingSend(true);
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiDeleteDiscussionCommentar({
+            id: selectKomentar.id,
+            data: { user: hasil },
+         });
+         if (response.success) {
+            updateTrigger()
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
+      } catch (error) {
+         console.error(error);
+      } finally {
+         setLoadingSend(false)
+         setVisible(false)
+      }
+   }
+
+   function handleMenuKomentar(id: string, comment: string) {
+      setSelectKomentar({ id, comment })
+      setVisible(true)
+   }
+
+
+   function handleViewEditKomentar() {
+      setVisible(false)
+      setViewEdit(!viewEdit)
+   }
+
 
    const handleRefresh = async () => {
       setRefreshing(true)
@@ -181,23 +272,38 @@ export default function DiscussionDetail() {
       <>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Diskusi",
                headerTitleAlign: "center",
-               headerRight: () =>
-                  (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision || isCreator ?
-                     <HeaderRightDiscussionDetail
-                        id={detail}
-                        status={data?.status}
-                        isActive={data?.isActive}
-                     /> : (<></>)
-               ,
+               // headerRight: () =>
+               //    (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision || isCreator ?
+               //       <HeaderRightDiscussionDetail
+               //          id={detail}
+               //          status={data?.status}
+               //          isActive={data?.isActive}
+               //       /> : (<></>)
+               // ,
+               header: () => (
+                  <AppHeader
+                     title="Diskusi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision || isCreator ?
+                           <HeaderRightDiscussionDetail
+                              id={detail}
+                              status={data?.status}
+                              isActive={data?.isActive}
+                           /> : (<></>)
+                     }
+                  />
+               )
             }}
          />
          <View style={{ flex: 1 }}>
@@ -214,13 +320,13 @@ export default function DiscussionDetail() {
                      loading ?
                         <SkeletonContent />
                         :
-                        <BorderBottomItem
+                        <BorderBottomItem2
+                           dataFile={fileDiscussion}
                            descEllipsize={false}
-                           width={55}
                            borderType="bottom"
                            icon={
                               <ImageUser
-                                 src={`https://wibu-storage.wibudev.com/api/files/${data?.user_img}`}
+                                 src={`${ConstEnv.url_storage}/files/${data?.user_img}`}
                                  size="sm"
                               />
                            }
@@ -264,18 +370,31 @@ export default function DiscussionDetail() {
                            dataComment.map((item, index) => (
                               <BorderBottomItem
                                  key={index}
-                                 width={55}
                                  borderType="bottom"
+                                 colorPress
                                  icon={
                                     <ImageUser
-                                       src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                       src={`${ConstEnv.url_storage}/files/${item.img}`}
                                        size="xs"
                                     />
                                  }
                                  title={item.username}
                                  rightTopInfo={item.createdAt}
                                  desc={item.comment}
-                                 descEllipsize={false}
+                                 rightBottomInfo={item.isEdited ? "Edited" : ""}
+                                 descEllipsize={detailMore.includes(item.id) ? false : true}
+                                 onPress={() => {
+                                    setDetailMore((prev: any) => {
+                                       if (prev.includes(item.id)) {
+                                          return prev.filter((id: string) => id !== item.id)
+                                       } else {
+                                          return [...prev, item.id]
+                                       }
+                                    })
+                                 }}
+                                 onLongPress={() => {
+                                    item.idUser == entities.id && data?.status != 2 && data?.isActive && handleMenuKomentar(item.id, item.comment)
+                                 }}
                               />
                            ))
                      }
@@ -292,60 +411,145 @@ export default function DiscussionDetail() {
                      Styles.contentItemCenter,
                      Styles.w100,
                      { backgroundColor: "#f4f4f4" },
+                     viewEdit && Styles.borderTop
                   ]}
                >
-                  <InputForm
-                     disable={
-                        data?.status == 2 ||
-                        data?.isActive == false ||
-                        ((entityUser.role == "user" || entityUser.role == "coadmin") &&
-                           !isMemberDivision)
-                     }
-                     bg="white"
-                     type="default"
-                     round
-                     placeholder="Kirim Komentar"
-                     onChange={setKomentar}
-                     value={komentar}
-                     itemRight={
-                        <Pressable
-                           onPress={() => {
-                              komentar != "" &&
-                                 !loadingSend &&
-                                 data?.status != 2 &&
-                                 data?.isActive &&
-                                 (((entityUser.role == "user" ||
-                                    entityUser.role == "coadmin") &&
-                                    isMemberDivision) ||
-                                    entityUser.role == "admin" ||
-                                    entityUser.role == "supadmin" ||
-                                    entityUser.role == "developer" ||
-                                    entityUser.role == "cosupadmin") &&
-                                 handleKomentar();
-                           }}
-                        >
-                           <MaterialIcons
-                              name="send"
-                              size={25}
-                              style={
-                                 komentar == "" ||
-                                    loadingSend ||
-                                    data?.status == 2 ||
-                                    data?.isActive == false ||
-                                    ((entityUser.role == "user" ||
-                                       entityUser.role == "coadmin") &&
-                                       !isMemberDivision)
-                                    ? Styles.cGray
-                                    : Styles.cDefault
+                  {
+                     viewEdit ?
+                        <>
+                           <View style={[Styles.w90, Styles.rowSpaceBetween, Styles.pv05]}>
+                              <View style={[Styles.rowItemsCenter]}>
+                                 <Feather name="edit-3" color="black" size={22} style={[Styles.mh05]} />
+                                 <Text style={[Styles.textMediumSemiBold]}>Edit Komentar</Text>
+                              </View>
+                              <Pressable onPress={() => handleViewEditKomentar()}>
+                                 <MaterialIcons name="close" color="black" size={22} />
+                              </Pressable>
+                           </View>
+                           <InputForm
+                              bg="white"
+                              type="default"
+                              round
+                              multiline
+                              placeholder="Kirim Komentar"
+                              onChange={(val: string) => setSelectKomentar({ ...selectKomentar, comment: val })}
+                              value={selectKomentar.comment}
+                              itemRight={
+                                 <Pressable
+                                    onPress={() => {
+                                       selectKomentar.comment != "" &&
+                                          !regexOnlySpacesOrEnter.test(selectKomentar.comment) &&
+                                          !loadingSend &&
+                                          data?.status != 2 &&
+                                          data?.isActive &&
+                                          (((entityUser.role == "user" ||
+                                             entityUser.role == "coadmin") &&
+                                             isMemberDivision) ||
+                                             entityUser.role == "admin" ||
+                                             entityUser.role == "supadmin" ||
+                                             entityUser.role == "developer" ||
+                                             entityUser.role == "cosupadmin") &&
+                                          handleEditKomentar();
+                                    }}
+                                    style={[
+                                       Platform.OS == 'android' && Styles.mb12,
+                                    ]}
+                                 >
+                                    <MaterialIcons
+                                       name="send"
+                                       size={25}
+                                       style={
+                                          [selectKomentar.comment == "" || regexOnlySpacesOrEnter.test(selectKomentar.comment) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
+                                             ? Styles.cGray
+                                             : Styles.cDefault,
+                                          ]
+                                       }
+                                    />
+                                 </Pressable>
                               }
                            />
-                        </Pressable>
-                     }
-                  />
+                        </>
+                        :
+                        data?.status != 2 && data?.isActive && ((entityUser.role != "user" && entityUser.role != "coadmin") ||
+                           isMemberDivision)
+                           ?
+                           <InputForm
+                              bg="white"
+                              type="default"
+                              round
+                              multiline
+                              placeholder="Kirim Komentar"
+                              onChange={setKomentar}
+                              value={komentar}
+                              itemRight={
+                                 <Pressable
+                                    onPress={() => {
+                                       komentar != "" &&
+                                          !regexOnlySpacesOrEnter.test(komentar) &&
+                                          !loadingSend &&
+                                          data?.status != 2 &&
+                                          data?.isActive &&
+                                          (((entityUser.role == "user" ||
+                                             entityUser.role == "coadmin") &&
+                                             isMemberDivision) ||
+                                             entityUser.role == "admin" ||
+                                             entityUser.role == "supadmin" ||
+                                             entityUser.role == "developer" ||
+                                             entityUser.role == "cosupadmin") &&
+                                          handleKomentar();
+                                    }}
+                                    style={[
+                                       Platform.OS == 'android' && Styles.mb12,
+                                    ]}
+                                 >
+                                    <MaterialIcons
+                                       name="send"
+                                       size={25}
+                                       style={
+                                          [komentar == "" || regexOnlySpacesOrEnter.test(komentar) || loadingSend || ((entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision)
+                                             ? Styles.cGray
+                                             : Styles.cDefault,
+                                          ]
+                                       }
+                                    />
+                                 </Pressable>
+                              }
+                           />
+                           :
+                           <View style={[Styles.pv20, { alignItems: 'center' }]}>
+                              <Text style={[Styles.textInformation, Styles.cGray]}>
+                                 {
+                                    data?.status == 2 ? "Diskusi telah ditutup" : data?.isActive == false ? "Diskusi telah diarsipkan" : "Hanya anggota divisi yang dapat memberikan komentar"
+                                 }
+                              </Text>
+                           </View>
+                  }
+
                </View>
             </KeyboardAvoidingView>
-
          </View>
+         <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Komentar">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<MaterialCommunityIcons name="pencil-outline" color="black" size={25} />}
+                  title="Edit"
+                  onPress={() => { handleViewEditKomentar() }}
+               />
+               <MenuItemRow
+                  icon={<MaterialIcons name="delete" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => {
+                     AlertKonfirmasi({
+                        title: 'Konfirmasi',
+                        desc: 'Apakah anda yakin ingin menghapus komentar?',
+                        onPress: () => {
+                           handleDeleteKomentar()
+                        }
+                     })
+                  }}
+               />
+            </View>
+         </DrawerBottom>
       </>
    );
 }

app/(application)/division/[id]/(fitur-division)/discussion/create.tsx

@@ -1,16 +1,25 @@
-import ButtonBackHeader from "@/components/buttonBackHeader"
+import AppHeader from "@/components/AppHeader"
+import BorderBottomItem from "@/components/borderBottomItem"
 import ButtonSaveHeader from "@/components/buttonSaveHeader"
+import ButtonSelect from "@/components/buttonSelect"
+import DrawerBottom from "@/components/drawerBottom"
 import { InputForm } from "@/components/inputForm"
+import LoadingOverlay from "@/components/loadingOverlay"
+import MenuItemRow from "@/components/menuItemRow"
+import Text from "@/components/Text"
 import Styles from "@/constants/Styles"
 import { apiCreateDiscussion } from "@/lib/api"
 import { setUpdateDiscussion } from "@/lib/discussionUpdate"
 import { useAuthSession } from "@/providers/AuthProvider"
+import { Ionicons, MaterialCommunityIcons } from "@expo/vector-icons"
+import * as DocumentPicker from "expo-document-picker"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useState } from "react"
 import { SafeAreaView, ScrollView, View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useDispatch, useSelector } from "react-redux"
 
+
 export default function CreateDiscussionDivision() {
    const { id } = useLocalSearchParams<{ id: string }>()
    const [desc, setDesc] = useState('')
@@ -18,12 +27,51 @@ export default function CreateDiscussionDivision() {
    const update = useSelector((state: any) => state.discussionUpdate)
    const dispatch = useDispatch();
    const [loading, setLoading] = useState(false)
+   const [fileForm, setFileForm] = useState<any[]>([])
+   const [isModalFile, setModalFile] = useState(false)
+   const [indexDelFile, setIndexDelFile] = useState<number>(0)
+
+   const pickDocumentAsync = async () => {
+      let result = await DocumentPicker.getDocumentAsync({
+         type: ["*/*"],
+         multiple: true
+      });
+      if (!result.canceled) {
+         for (let i = 0; i < result.assets?.length; i++) {
+            if (result.assets[i].uri) {
+               setFileForm((prev) => [...prev, result.assets[i]])
+            }
+         }
+      }
+   };
+
+   function deleteFile(index: number) {
+      setFileForm([...fileForm.filter((val, i) => i !== index)])
+      setModalFile(false)
+   }
+
 
    async function handleCreate() {
       try {
          setLoading(true)
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiCreateDiscussion({ data: { user: hasil, desc, idDivision: id } })
+         const fd = new FormData()
+
+         for (let i = 0; i < fileForm.length; i++) {
+            fd.append(`file${i}`, {
+               uri: fileForm[i].uri,
+               type: 'application/octet-stream',
+               name: fileForm[i].name,
+            } as any);
+         }
+
+         fd.append("data", JSON.stringify(
+            { user: hasil, desc, idDivision: id }
+         ))
+
+         const response = await apiCreateDiscussion(fd)
+
+         // const response = await apiCreateDiscussion({ data: { user: hasil, desc, idDivision: id } })
          if (response.success) {
             Toast.show({ type: 'small', text1: 'Berhasil menambahkan data', })
             dispatch(setUpdateDiscussion({ ...update, data: !update.data }));
@@ -43,22 +91,75 @@ export default function CreateDiscussionDivision() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Tambah Diskusi',
                headerTitleAlign: 'center',
-               headerRight: () => <ButtonSaveHeader
-                  disable={desc == "" || loading}
-                  category="create"
-                  onPress={() => {
-                     handleCreate()
-                  }} />
+               // headerRight: () => <ButtonSaveHeader
+               //    disable={desc == "" || loading}
+               //    category="create"
+               //    onPress={() => {
+               //       handleCreate()
+               //    }} />
+               header: () => (
+                  <AppHeader
+                     title="Tambah Diskusi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={desc == "" || loading}
+                           category="create"
+                           onPress={() => {
+                              handleCreate()
+                           }} />
+                     }
+                  />
+               )
             }}
          />
-         <ScrollView>
+         <LoadingOverlay visible={loading} />
+         <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
             <View style={[Styles.p15, Styles.mb100]}>
-               <InputForm label="Diskusi" type="default" placeholder="Hal yang didiskusikan" required onChange={setDesc} />
+               <InputForm
+                  label="Diskusi"
+                  type="default"
+                  placeholder="Hal yang didiskusikan"
+                  required
+                  onChange={setDesc}
+                  multiline
+               />
+               <ButtonSelect value="Upload File" onPress={pickDocumentAsync} />
+               {
+                  fileForm.length > 0
+                  &&
+                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                     <Text style={[Styles.textDefaultSemiBold]}>File</Text>
+                     {
+                        fileForm.map((item, index) => (
+                           <BorderBottomItem
+                              key={index}
+                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              icon={<MaterialCommunityIcons name="file-outline" size={25} color="black" />}
+                              title={item.name}
+                              titleWeight="normal"
+                              onPress={() => { setIndexDelFile(index); setModalFile(true) }}
+                           />
+                        ))
+                     }
+                  </View>
+               }
             </View>
          </ScrollView>
+
+         <DrawerBottom animation="slide" isVisible={isModalFile} setVisible={setModalFile} title="Menu">
+            <View style={Styles.rowItemsCenter}>
+               <MenuItemRow
+                  icon={<Ionicons name="trash" color="black" size={25} />}
+                  title="Hapus"
+                  onPress={() => { deleteFile(indexDelFile) }}
+               />
+            </View>
+         </DrawerBottom>
       </SafeAreaView>
    )
 }

app/(application)/division/[id]/(fitur-division)/discussion/index.tsx

@@ -5,8 +5,9 @@ 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 { apiGetDiscussion, apiGetDivisionOneFeature } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, Ionicons } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
@@ -40,6 +41,30 @@ export default function DiscussionDivision() {
    const [waiting, setWaiting] = useState(false)
    const [status, setStatus] = useState<'true' | 'false'>('true')
    const [refreshing, setRefreshing] = useState(false)
+   const [isMemberDivision, setIsMemberDivision] = useState(false)
+   const [isAdminDivision, setIsAdminDivision] = useState(false)
+   const entityUser = useSelector((state: any) => state.user)
+
+   async function handleCheckMember() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+
+         const response2 = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-admin",
+         });
+         setIsMemberDivision(response.data);
+         setIsAdminDivision(response2.data);
+      } catch (error) {
+         console.error(error);
+      }
+   }
 
    async function handleLoad(loading: boolean, thisPage: number) {
       try {
@@ -79,6 +104,10 @@ export default function DiscussionDivision() {
       }, 1000);
    }
 
+   useEffect(() => {
+      handleCheckMember()
+   }, [])
+
    const handleRefresh = async () => {
       setRefreshing(true)
       handleLoad(false, 1)
@@ -100,27 +129,31 @@ export default function DiscussionDivision() {
 
    return (
       <View style={[Styles.p15, { flex: 1 }]}>
-         <View>
-            <View style={[Styles.wrapBtnTab]}>
-               <ButtonTab
-                  active={status == "false" ? "false" : "true"}
-                  value="true"
-                  onPress={() => { setStatus("true") }}
-                  label="Aktif"
-                  icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
-                  n={2} />
-               <ButtonTab
-                  active={status == "false" ? "false" : "true"}
-                  value="false"
-                  onPress={() => { setStatus("false") }}
-                  label="Arsip"
-                  icon={<AntDesign name="closecircleo" color={status == "true" ? 'black' : 'white'} size={20} />}
-                  n={2} />
+         {
+            ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
+            <View>
+               <View style={[Styles.wrapBtnTab]}>
+                  <ButtonTab
+                     active={status == "false" ? "false" : "true"}
+                     value="true"
+                     onPress={() => { setStatus("true") }}
+                     label="Aktif"
+                     icon={<Feather name="check-circle" color={status == "false" ? 'black' : 'white'} size={20} />}
+                     n={2} />
+                  <ButtonTab
+                     active={status == "false" ? "false" : "true"}
+                     value="false"
+                     onPress={() => { setStatus("false") }}
+                     label="Arsip"
+                     icon={<AntDesign name="closecircleo" color={status == "true" ? 'black' : 'white'} size={20} />}
+                     n={2} />
+               </View>
+               <InputSearch onChange={setSearch} />
             </View>
-            <InputSearch onChange={setSearch} />
-         </View>
+         }
 
-         <View style={[{ flex: 2 }]}>
+
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item: any, i: number) => {
@@ -138,11 +171,10 @@ export default function DiscussionDivision() {
                            return (
                               <BorderBottomItem
                                  key={index}
-                                 width={55}
                                  onPress={() => { router.push(`./discussion/${item.id}`) }}
                                  borderType="bottom"
                                  icon={
-                                    <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                  }
                                  title={item.user_name}
                                  subtitle={
@@ -171,34 +203,8 @@ export default function DiscussionDivision() {
                            />
                         }
                      />
-                     // data.map((item, index) => (
-                     //    <BorderBottomItem
-                     //       key={index}
-                     //       width={55}
-                     //       onPress={() => { router.push(`./discussion/${item.id}`) }}
-                     //       borderType="bottom"
-                     //       icon={
-                     //          <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
-                     //       }
-                     //       title={item.user_name}
-                     //       subtitle={
-                     //          active == "true" ? item.status == 1 ? <LabelStatus category='success' text='BUKA' size="small" /> : <LabelStatus category='error' text='TUTUP' size="small" /> : <></>
-                     //       }
-                     //       rightTopInfo={item.createdAt}
-                     //       desc={item.desc}
-                     //       leftBottomInfo={
-                     //          <View style={[Styles.rowItemsCenter]}>
-                     //             <Ionicons name="chatbox-ellipses-outline" size={18} color="grey" style={Styles.mr05} />
-                     //             <Text style={[Styles.textInformation, Styles.cGray, Styles.mb05]}>Diskusikan</Text>
-                     //          </View>
-                     //       }
-                     //       rightBottomInfo={item.total_komentar + ' Komentar'}
-                     //    />
-                     // ))
                      :
-                     (
-                        <Text style={[Styles.textDefault, Styles.cGray, Styles.mv10, { textAlign: "center" }]}>Tidak ada diskusi</Text>
-                     )
+                     (<Text style={[Styles.textDefault, Styles.cGray, Styles.mv10, { textAlign: "center" }]}>Tidak ada diskusi</Text>)
             }
          </View>
       </View>

app/(application)/division/[id]/(fitur-division)/document/index.tsx

@@ -1,5 +1,5 @@
 import AlertKonfirmasi from "@/components/alertKonfirmasi";
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import { ButtonHeader } from "@/components/buttonHeader";
 import HeaderRightDocument from "@/components/document/headerDocument";
 import ItemFile from "@/components/document/itemFile";
@@ -13,10 +13,12 @@ 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,
    apiDocumentRename,
+   apiGetDivisionOneFeature,
    apiGetDocument,
    apiShareDocument,
 } from "@/lib/api";
@@ -64,6 +66,7 @@ type PropsPath = {
 };
 
 export default function DocumentDivision() {
+   const [loadingRename, setLoadingRename] = useState(false)
    const [isShare, setShare] = useState(false)
    const { token, decryptToken } = useAuthSession()
    const { id } = useLocalSearchParams<{ id: string }>()
@@ -83,6 +86,8 @@ export default function DocumentDivision() {
    const update = useSelector((state: any) => state.dokumenUpdate)
    const [refreshing, setRefreshing] = useState(false)
    const [loadingOpen, setLoadingOpen] = useState(false)
+   const [isMemberDivision, setIsMemberDivision] = useState(false)
+   const entityUser = useSelector((state: any) => state.user)
    const [bodyRename, setBodyRename] = useState({
       id: "",
       name: "",
@@ -91,6 +96,24 @@ export default function DocumentDivision() {
       extension: "",
    });
 
+   async function handleCheckMember() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+         setIsMemberDivision(response.data);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleCheckMember()
+   }, [id])
+
    async function handleLoad(loading: boolean) {
       try {
          setLoading(loading)
@@ -200,6 +223,7 @@ export default function DocumentDivision() {
 
    async function handleRename() {
       try {
+         setLoadingRename(true)
          const hasil = await decryptToken(String(token?.current));
          const response = await apiDocumentRename({ user: hasil, ...bodyRename });
          if (response.success) {
@@ -213,7 +237,8 @@ export default function DocumentDivision() {
          console.error(error);
          Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
       } finally {
-         setRename(false);
+         setLoadingRename(false)
+         setRename(false)
       }
    }
 
@@ -268,7 +293,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)
@@ -309,47 +334,81 @@ export default function DocumentDivision() {
    }, [path]);
 
    return (
-      <SafeAreaView>
+      <SafeAreaView style={{ flex: 1 }}>
          <Stack.Screen
             options={{
-               headerLeft: () =>
-                  selectedFiles.length > 0 || dariSelectAll ? (
-                     <ButtonHeader
-                        item={<MaterialIcons name="close" size={20} color="white" />}
-                        onPress={() => {
-                           handleBatal();
-                        }}
-                     />
-                  ) : (
-                     <ButtonBackHeader
-                        onPress={() => {
-                           router.back();
-                        }}
-                     />
-                  ),
+               // headerLeft: () =>
+               //    selectedFiles.length > 0 || dariSelectAll ? (
+               //       <ButtonHeader
+               //          item={<MaterialIcons name="close" size={20} color="white" />}
+               //          onPress={() => {
+               //             handleBatal();
+               //          }}
+               //       />
+               //    ) : (
+               //       <ButtonBackHeader
+               //          onPress={() => {
+               //             router.back();
+               //          }}
+               //       />
+               //    ),
                headerTitle:
                   selectedFiles.length > 0 || dariSelectAll
                      ? `${selectedFiles.length} item terpilih`
                      : "Dokumen Divisi",
                headerTitleAlign: "center",
-               headerRight: () =>
-                  selectedFiles.length > 0 || dariSelectAll ? (
-                     <ButtonHeader
-                        item={
-                           <MaterialIcons name="checklist-rtl" size={20} color="white" />
-                        }
-                        onPress={() => {
-                           handleSelectAll();
-                        }}
-                     />
-                  ) : (
-                     <HeaderRightDocument path={path} />
-                  ),
+               // headerRight: () =>
+               //    selectedFiles.length > 0 || dariSelectAll ? (
+               //       <ButtonHeader
+               //          item={
+               //             <MaterialIcons name="checklist-rtl" size={20} color="white" />
+               //          }
+               //          onPress={() => {
+               //             handleSelectAll();
+               //          }}
+               //       />
+               //    ) : (
+               //       <HeaderRightDocument path={path} isMember={isMemberDivision} />
+               //    ),
+               header: () => (
+                  <AppHeader
+                     title={
+                        selectedFiles.length > 0 || dariSelectAll
+                           ? `${selectedFiles.length} item terpilih`
+                           : "Dokumen Divisi"
+                     }
+                     showBack={(selectedFiles.length > 0 || dariSelectAll) ? false : true}
+                     left={
+                        <ButtonHeader
+                           item={<MaterialIcons name="close" size={20} color="white" />}
+                           onPress={() => {
+                              handleBatal();
+                           }}
+                        />
+                     }
+                     onPressLeft={() => {
+                        (selectedFiles.length > 0 || dariSelectAll) ? handleBatal() : router.back();
+                     }}
+                     right={
+                        selectedFiles.length > 0 || dariSelectAll ? (
+                           <ButtonHeader
+                              item={
+                                 <MaterialIcons name="checklist-rtl" size={20} color="white" />
+                              }
+                              onPress={() => {
+                                 handleSelectAll();
+                              }}
+                           />
+                        ) : (
+                           <HeaderRightDocument path={path} isMember={isMemberDivision} />
+                        )
+                     }
+                  />
+               )
             }}
          />
          <ModalLoading isVisible={loadingOpen} setVisible={setLoadingOpen} />
          <ScrollView
-            style={[Styles.h100]}
             refreshControl={
                <RefreshControl
                   refreshing={refreshing}
@@ -359,25 +418,20 @@ export default function DocumentDivision() {
             <View style={[Styles.p15, Styles.mb100]}>
                <View style={[Styles.rowItemsCenter]}>
                   {
-                     loading ?
-                        arrSkeleton.map((item, index) => (
-                           <Skeleton key={index} width={60} height={10} borderRadius={10} style={[Styles.mr05]} />
-                        ))
-                        :
-                        dataJalur.map((item, index) => (
-                           <Pressable
-                              key={index}
-                              style={[Styles.rowItemsCenter]}
-                              onPress={() => {
-                                 setPath(item.id);
-                              }}
-                           >
-                              {item.id != "home" && (
-                                 <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} color="black" />
-                              )}
-                              <Text> {item.name} </Text>
-                           </Pressable>
-                        ))
+                     dataJalur.map((item, index) => (
+                        <Pressable
+                           key={index}
+                           style={[Styles.rowItemsCenter]}
+                           onPress={() => {
+                              setPath(item.id);
+                           }}
+                        >
+                           {item.id != "home" && (
+                              <AntDesign name="right" style={[Styles.mh05, Styles.mt02]} color="black" />
+                           )}
+                           <Text> {item.name} </Text>
+                        </Pressable>
+                     ))
                   }
                </View>
                <View>
@@ -408,6 +462,7 @@ export default function DocumentDivision() {
                                           : `${item.name}.${item.extension}`
                                     }
                                     dateTime={item.createdAt}
+                                    canChecked={(entityUser.role != "user" && entityUser.role != "coadmin") || isMemberDivision}
                                     onChecked={() => {
                                        handleCheckboxChange(index);
                                     }}
@@ -440,20 +495,6 @@ export default function DocumentDivision() {
          {(selectedFiles.length > 0 || dariSelectAll) && (
             <View style={[ColorsStatus.primary, Styles.bottomMenuSelectDocument]}>
                <View style={[Styles.rowItemsCenter, { justifyContent: "center" }]}>
-                  {/* <MenuItemRow
-                     icon={
-                        <MaterialCommunityIcons
-                           name="download-outline"
-                           color="white"
-                           size={25}
-                        />
-                     }
-                     title="Unduh"
-                     onPress={() => { }}
-                     column="many"
-                     color="white"
-                     disabled={selectedFiles.length == 0 || !copyAllowed}
-                  /> */}
                   <MenuItemRow
                      icon={
                         <MaterialCommunityIcons
@@ -551,7 +592,7 @@ export default function DocumentDivision() {
             isVisible={isRename}
             setVisible={() => { setRename(false) }}
             onSubmit={() => { handleRename() }}
-            disableSubmit={bodyRename.name == ""}
+            disableSubmit={bodyRename.name == "" || loadingRename}
          >
             <View>
                <InputForm

app/(application)/division/[id]/(fitur-division)/task/[detail]/add-file.tsx

@@ -1,5 +1,5 @@
+import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
-import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
 import DrawerBottom from "@/components/drawerBottom";
@@ -130,22 +130,36 @@ export default function TaskDivisionAddFile() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah File",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="create"
-                     disable={fileForm.length == 0 || loading ? true : false}
-                     onPress={() => { handleAddFile() }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="create"
+               //       disable={fileForm.length == 0 || loading ? true : false}
+               //       onPress={() => { handleAddFile() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Tambah File"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="create"
+                           disable={fileForm.length == 0 || loading ? true : false}
+                           onPress={() => { handleAddFile() }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <ScrollView>

app/(application)/division/[id]/(fitur-division)/task/[detail]/add-member.tsx

@@ -1,9 +1,10 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 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 { apiAddMemberTask, apiGetDivisionMember, apiGetTaskOne } from "@/lib/api";
 import { setUpdateTask } from "@/lib/taskUpdate";
@@ -11,7 +12,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -93,37 +94,53 @@ export default function AddMemberTask() {
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Tambah Anggota Kegiatan',
                headerTitleAlign: 'center',
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="update"
-                     disable={selectMember.length == 0 || loading ? true : false}
-                     onPress={() => {
-                        handleAddMember()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="update"
+               //       disable={selectMember.length == 0 || loading ? true : false}
+               //       onPress={() => {
+               //          handleAddMember()
+               //       }}
+               //    />
+               // )
+               header: () => (
+                  <AppHeader
+                     title="Tambah Anggota Kegiatan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="update"
+                           disable={selectMember.length == 0 || loading ? true : false}
+                           onPress={() => {
+                              handleAddMember()
+                           }}
+                        />
+                     }
                   />
                )
             }}
          />
-         <View style={[Styles.p15, Styles.mb100]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -134,7 +151,9 @@ export default function AddMemberTask() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -149,7 +168,7 @@ export default function AddMemberTask() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w80]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
                                     {
@@ -158,7 +177,7 @@ export default function AddMemberTask() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'}/>
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
@@ -169,6 +188,6 @@ export default function AddMemberTask() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

app/(application)/division/[id]/(fitur-division)/task/[detail]/add-task.tsx

@@ -1,25 +1,28 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiCreateTaskTugas } from "@/lib/api";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import 'intl';
 import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
-   KeyboardAvoidingView, Platform, SafeAreaView,
+   KeyboardAvoidingView, Platform, Pressable, SafeAreaView,
    ScrollView,
    View
 } from "react-native";
 import Toast from "react-native-toast-message";
 import DateTimePicker, { DateType } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
-import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function TaskDivisionAddTask() {
    const { token, decryptToken } = useAuthSession();
@@ -38,12 +41,13 @@ export default function TaskDivisionAddTask() {
       endDate: false,
       title: false,
    });
-   const [title, setTitle] = useState("");
+   const [title, setTitle] = useState("")
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    function checkAll() {
       if (
@@ -72,21 +76,49 @@ export default function TaskDivisionAddTask() {
       }
    }
 
+
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll();
    }, [from, to, title, error]);
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    async function handleCreate() {
       try {
          setLoading(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
          const response = await apiCreateTaskTugas({
             data: {
                title,
-               dateStart: dayjs(range.startDate).format("YYYY-MM-DD"),
-               dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"),
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
                user: hasil,
                idDivision: id,
+               dataDetail: dataDetailFix,
             },
             id: detail,
          });
@@ -109,24 +141,40 @@ export default function TaskDivisionAddTask() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Tugas",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="create"
-                     disable={disable || loading}
-                     onPress={() => {
-                        handleCreate();
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="create"
+               //       disable={disable || loading}
+               //       onPress={() => {
+               //          handleCreate();
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Tambah Tugas"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="create"
+                           disable={disable || loading}
+                           onPress={() => {
+                              handleCreate();
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <KeyboardAvoidingView
@@ -177,6 +225,13 @@ export default function TaskDivisionAddTask() {
                      {
                         (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
@@ -194,7 +249,14 @@ export default function TaskDivisionAddTask() {
                </View>
             </ScrollView>
          </KeyboardAvoidingView>
-
+         <ModalAddDetailTugasTask
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

app/(application)/division/[id]/(fitur-division)/task/[detail]/cancel.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import Styles from "@/constants/Styles";
@@ -72,24 +72,40 @@ export default function TaskDivisionCancel() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Pembatalan Tugas",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disable || loading}
-                     category="cancel"
-                     onPress={() => {
-                        handleCancel();
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disable || loading}
+               //       category="cancel"
+               //       onPress={() => {
+               //          handleCancel();
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Pembatalan Tugas"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disable || loading}
+                           category="cancel"
+                           onPress={() => {
+                              handleCancel();
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <ScrollView>

app/(application)/division/[id]/(fitur-division)/task/[detail]/edit.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import Styles from "@/constants/Styles";
@@ -90,22 +90,35 @@ export default function TaskDivisionEdit() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Judul",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="update"
-                     disable={disable || loading}
-                     onPress={() => { handleUpdate() }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="update"
+               //       disable={disable || loading}
+               //       onPress={() => { handleUpdate() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader title="Tambah Kegiatan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="update"
+                           disable={disable || loading}
+                           onPress={() => { handleUpdate() }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <ScrollView>

app/(application)/division/[id]/(fitur-division)/task/[detail]/index.tsx

@@ -1,12 +1,14 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import SectionCancel from "@/components/sectionCancel";
 import SectionProgress from "@/components/sectionProgress";
 import HeaderRightTaskDetail from "@/components/task/headerTaskDetail";
 import SectionFileTask from "@/components/task/sectionFileTask";
+import SectionLinkTask from "@/components/task/sectionLinkTask";
 import SectionMemberTask from "@/components/task/sectionMemberTask";
+import SectionReportTask from "@/components/task/sectionReportTask";
 import SectionTanggalTugasTask from "@/components/task/sectionTanggalTugasTask";
 import Styles from "@/constants/Styles";
-import { apiGetTaskOne } from "@/lib/api";
+import { apiGetDivisionOneFeature, apiGetTaskOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -30,6 +32,35 @@ export default function DetailTaskDivision() {
    const [progress, setProgress] = useState(0)
    const update = useSelector((state: any) => state.taskUpdate)
    const [refreshing, setRefreshing] = useState(false)
+   const [isMemberDivision, setIsMemberDivision] = useState(false);
+   const [isAdminDivision, setIsAdminDivision] = useState(false);
+   const entityUser = useSelector((state: any) => state.user);
+
+   async function handleCheckMember() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+
+         setIsMemberDivision(response.data);
+
+         const response2 = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-admin",
+         });
+         setIsAdminDivision(response2.data);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleCheckMember()
+   }, [])
 
 
    async function handleLoad(cat: 'data' | 'progress') {
@@ -69,10 +100,24 @@ export default function DetailTaskDivision() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: loading ? 'Loading...                            ' : data?.title,
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightTaskDetail id={detail} division={id} status={data?.status} />,
+               // headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision
+               //    ? <></>
+               //    : <HeaderRightTaskDetail id={detail} division={id} status={data?.status} isAdminDivision={isAdminDivision} />,
+               header: () => (
+                  <AppHeader
+                     title={loading ? 'Loading...' : data ? data?.title : ''}
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        (entityUser.role == "user" || entityUser.role == "coadmin") && !isMemberDivision
+                           ? <></>
+                           : <HeaderRightTaskDetail id={detail} division={id} status={data?.status} isAdminDivision={isAdminDivision} />
+                     }
+                  />
+               )
             }}
          />
          <ScrollView
@@ -88,9 +133,11 @@ export default function DetailTaskDivision() {
                   data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
                }
                <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
-               <SectionTanggalTugasTask refreshing={refreshing}/>
-               <SectionFileTask refreshing={refreshing}/>
-               <SectionMemberTask refreshing={refreshing}/>
+               <SectionReportTask refreshing={refreshing} />
+               <SectionTanggalTugasTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionFileTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionLinkTask refreshing={refreshing} isMemberDivision={isMemberDivision} />
+               <SectionMemberTask refreshing={refreshing} isAdminDivision={isAdminDivision} />
             </View>
          </ScrollView>
       </SafeAreaView>

app/(application)/division/[id]/(fitur-division)/task/[detail]/report.tsx

@@ -0,0 +1,142 @@
+import AppHeader from "@/components/AppHeader";
+import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import { InputForm } from "@/components/inputForm";
+import Styles from "@/constants/Styles";
+import { apiGetTaskOne, apiReportTask } from "@/lib/api";
+import { setUpdateTask } from "@/lib/taskUpdate";
+import { useAuthSession } from "@/providers/AuthProvider";
+import { router, Stack, useLocalSearchParams } from "expo-router";
+import { useEffect, useState } from "react";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
+import { useDispatch, useSelector } from "react-redux";
+
+export default function TaskDivisionReport() {
+   const { id, detail } = useLocalSearchParams<{ id: string; detail: string }>();
+   const { token, decryptToken } = useAuthSession();
+   const [laporan, setLaporan] = useState("");
+   const [error, setError] = useState(false);
+   const [disable, setDisable] = useState(false);
+   const dispatch = useDispatch();
+   const update = useSelector((state: any) => state.taskUpdate);
+   const [loading, setLoading] = useState(false)
+
+   async function handleLoad() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetTaskOne({
+            user: hasil,
+            cat: "data",
+            id: detail,
+         });
+         setLaporan(response.data.report);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleLoad();
+   }, []);
+
+   function onValidation(val: string) {
+      setLaporan(val);
+      if (val == "" || val == "null") {
+         setError(true);
+      } else {
+         setError(false);
+      }
+   }
+
+   function checkAll() {
+      if (laporan == "" || laporan == "null" || laporan == undefined || laporan == null || error) {
+         setDisable(true);
+      } else {
+         setDisable(false);
+      }
+   }
+
+   useEffect(() => {
+      checkAll();
+   }, [laporan, error]);
+
+   async function handleUpdate() {
+      try {
+         setLoading(true)
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiReportTask(
+            {
+               report: laporan,
+               user: hasil,
+            },
+            detail
+         );
+         if (response.success) {
+            dispatch(setUpdateTask({ ...update, report: !update.report }));
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
+            router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
+      } catch (error) {
+         console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
+      }
+   }
+
+   return (
+      <SafeAreaView>
+         <Stack.Screen
+            options={{
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
+               headerTitle: "Laporan Kegiatan",
+               headerTitleAlign: "center",
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="update"
+               //       disable={disable || loading}
+               //       onPress={() => { handleUpdate() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader title="Laporan Kegiatan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="update"
+                           disable={disable || loading}
+                           onPress={() => { handleUpdate() }}
+                        />
+                     }
+                  />
+               )
+            }}
+         />
+         <ScrollView>
+            <View style={[Styles.p15, Styles.mb100]}>
+               <InputForm
+                  label="Laporan Kegiatan"
+                  type="default"
+                  placeholder="Laporan Kegiatan"
+                  required
+                  bg="white"
+                  value={laporan}
+                  onChange={(val) => { onValidation(val) }}
+                  error={error}
+                  errorText="Laporan kegiatan harus diisi"
+                  multiline
+               />
+            </View>
+         </ScrollView>
+      </SafeAreaView>
+   );
+}

app/(application)/division/[id]/(fitur-division)/task/create.tsx

@@ -1,5 +1,5 @@
+import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
-import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
 import DrawerBottom from "@/components/drawerBottom";
@@ -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";
@@ -115,22 +116,36 @@ export default function CreateTaskDivision() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        handleBack();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          handleBack();
+               //       }}
+               //    />
+               // ),
                headerTitle: `Tambah Tugas`,
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={title == "" || entitiesMember.length == 0 || taskCreate.length == 0 || loading}
-                     category="create"
-                     onPress={() => { handleCreate() }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={title == "" || entitiesMember.length == 0 || taskCreate.length == 0 || loading}
+               //       category="create"
+               //       onPress={() => { handleCreate() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Tambah Tugas"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={title == "" || entitiesMember.length == 0 || taskCreate.length == 0 || loading}
+                           category="create"
+                           onPress={() => { handleCreate() }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <ScrollView>
@@ -189,7 +204,7 @@ export default function CreateTaskDivision() {
                                     borderType="bottom"
                                     icon={
                                        <ImageUser
-                                          src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                          src={`${ConstEnv.url_storage}/files/${item.img}`}
                                           size="sm"
                                        />
                                     }

app/(application)/division/[id]/(fitur-division)/task/create/member.tsx

@@ -1,9 +1,10 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 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";
@@ -11,7 +12,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -63,37 +64,53 @@ export default function AddMemberCreateTask() {
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Pilih Anggota',
                headerTitleAlign: 'center',
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="create"
-                     disable={selectMember.length > 0 ? false : true}
-                     onPress={() => {
-                        handleAddMember()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="create"
+               //       disable={selectMember.length > 0 ? false : true}
+               //       onPress={() => {
+               //          handleAddMember()
+               //       }}
+               //    />
+               // )
+               header: () => (
+                  <AppHeader
+                     title="Pilih Anggota"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="create"
+                           disable={selectMember.length > 0 ? false : true}
+                           onPress={() => {
+                              handleAddMember()
+                           }}
+                        />
+                     }
                   />
                )
             }}
          />
-         <View style={[Styles.p15]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -104,7 +121,9 @@ export default function AddMemberCreateTask() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -118,13 +137,13 @@ export default function AddMemberCreateTask() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]}>{item.name}</Text>
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'}/>
+                                 selectMember.some((i: any) => i.idUser == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
@@ -135,6 +154,6 @@ export default function AddMemberCreateTask() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

app/(application)/division/[id]/(fitur-division)/task/create/task.tsx

@@ -1,17 +1,22 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setTaskCreate } from "@/lib/taskCreate";
-import dayjs from "dayjs";
+import { useHeaderHeight } from '@react-navigation/elements';
 import { router, Stack } from "expo-router";
 import 'intl';
 import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -20,7 +25,6 @@ import DateTimePicker, {
    DateType
 } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
-import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function CreateTaskAddTugas() {
    const headerHeight = useHeaderHeight();
@@ -37,11 +41,12 @@ export default function CreateTaskAddTugas() {
    })
    const [title, setTitle] = useState('');
    const taskCreate = useSelector((state: any) => state.taskCreate)
+   const [dsbButton, setDsbButton] = useState(true)
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate, "DD-MM-YYYY")
+   const to = formatDateOnly(range.endDate, "DD-MM-YYYY")
 
    function checkAll() {
       if (from == "" || to == "" || title == "" || title == "null" || error.startDate || error.endDate || error.title) {
@@ -62,19 +67,50 @@ export default function CreateTaskAddTugas() {
       }
    }
 
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll()
    }, [from, to, title, error])
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    async function handleCreate() {
       try {
-         dispatch(setTaskCreate([...taskCreate, {
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
+         const hasilOrder = [...taskCreate, {
             title: title,
             dateStart: from,
             dateEnd: to,
-            dateStartFix: dayjs(range.startDate).format("YYYY-MM-DD"),
-            dateEndFix: dayjs(range.endDate).format("YYYY-MM-DD"),
-         }]))
+            dateStartFix: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+            dateEndFix: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+            dataDetail: dataDetailFix
+         }].sort((a, b) => {
+            return new Date(a.dateStartFix).getTime() - new Date(b.dateStartFix).getTime();
+         });
+
+         dispatch(setTaskCreate(hasilOrder))
          router.back();
       } catch (error) {
          console.error(error);
@@ -85,22 +121,35 @@ export default function CreateTaskAddTugas() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Tugas",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disable}
-                     category="create"
-                     onPress={() => { handleCreate() }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disable}
+               //       category="create"
+               //       onPress={() => { handleCreate() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader title="Tambah Tugas"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disable}
+                           category="create"
+                           onPress={() => { handleCreate() }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <KeyboardAvoidingView
@@ -151,6 +200,13 @@ export default function CreateTaskAddTugas() {
                      {
                         (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
@@ -168,6 +224,14 @@ export default function CreateTaskAddTugas() {
                </View>
             </ScrollView>
          </KeyboardAvoidingView>
+         <ModalAddDetailTugasTask
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

app/(application)/division/[id]/(fitur-division)/task/index.tsx

@@ -31,7 +31,7 @@ type Props = {
 };
 
 export default function ListTask() {
-   const { id, status } = useLocalSearchParams<{ id: string; status: string }>()
+   const { id, status, year } = useLocalSearchParams<{ id: string; status: string; year: string }>()
    const [isList, setList] = useState(false)
    const { token, decryptToken } = useAuthSession()
    const [data, setData] = useState<Props[]>([])
@@ -43,6 +43,8 @@ export default function ListTask() {
    const [page, setPage] = useState(1)
    const [waiting, setWaiting] = useState(false)
    const [refreshing, setRefreshing] = useState(false)
+   const [isYear, setYear] = useState("")
+
 
    async function handleLoad(loading: boolean, thisPage: number) {
       try {
@@ -55,8 +57,12 @@ export default function ListTask() {
             division: id,
             status: statusFix,
             search,
-            page: thisPage
+            page: thisPage,
+            year
          });
+
+         setYear(response.tahun)
+
          if (thisPage == 1) {
             setData(response.data);
          } else if (thisPage > 1 && response.data.length > 0) {
@@ -106,7 +112,7 @@ export default function ListTask() {
    return (
       <View style={[Styles.p15, { flex: 1 }]}>
          <View>
-            <ScrollView horizontal style={[Styles.mb10]}>
+            <ScrollView horizontal style={[Styles.mb10]} showsHorizontalScrollIndicator={false}>
                <ButtonTab
                   active={statusFix}
                   value="0"
@@ -179,6 +185,12 @@ export default function ListTask() {
                </Pressable>
             </View>
          </View>
+         <View style={[Styles.mv05]}>
+            <View style={[Styles.rowOnly]}>
+               <Text style={[Styles.mr05]}>Filter :</Text>
+               <LabelStatus size="small" category="secondary" text={isYear} style={{ marginRight: 5 }} />
+            </View>
+         </View>
          <View style={[{ flex: 2 }]}>
             {
                loading ?

app/(application)/division/[id]/(fitur-division)/task/update/[detail].tsx

@@ -1,20 +1,24 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiEditTaskTugas, apiGetTaskTugas } from "@/lib/api";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateTask } from "@/lib/taskUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { useHeaderHeight } from '@react-navigation/elements';
-import dayjs from "dayjs";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import 'intl';
 import 'intl/locale-data/jsonp/id';
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -38,6 +42,9 @@ export default function UpdateProjectTaskDivision() {
    const [year, setYear] = useState<any>();
    const [loading, setLoading] = useState(true);
    const [disableBtn, setDisableBtn] = useState(false);
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
    const [title, setTitle] = useState("");
    const [error, setError] = useState({
       startDate: false,
@@ -45,10 +52,8 @@ export default function UpdateProjectTaskDivision() {
       title: false,
    });
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    async function handleLoad() {
       try {
@@ -65,6 +70,22 @@ export default function UpdateProjectTaskDivision() {
          });
          setMonth(new Date(response.data.dateStart).getMonth());
          setYear(new Date(response.data.dateStart).getFullYear());
+
+         const response2 = await apiGetTaskTugas({
+            user: hasil,
+            id: detail,
+            cat: "detailTask"
+         });
+         if (response2.data.length == 0) {
+            const datanya = getDatesInRange(response.data.dateStart, response.data.dateEnd)
+            setDataDetail(datanya.map((item: any) => ({
+               date: item,
+               timeStart: null,
+               timeEnd: null,
+            })))
+         } else {
+            setDataDetail(response2.data)
+         }
       } catch (error) {
          console.error(error);
       } finally {
@@ -79,8 +100,22 @@ export default function UpdateProjectTaskDivision() {
    async function handleEdit() {
       try {
          setLoadingSubmit(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiEditTaskTugas({ data: { title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id: detail });
+         const response = await apiEditTaskTugas({
+            data: {
+               title,
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+               user: hasil,
+               dataDetail: dataDetailFix
+            },
+            id: detail
+         });
          if (response.success) {
             dispatch(setUpdateTask({ ...update, task: !update.task }))
             Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
@@ -123,32 +158,71 @@ export default function UpdateProjectTaskDivision() {
       }
    }
 
+
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll();
    }, [from, to, title, error]);
 
+
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
    return (
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Tanggal dan Tugas",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disableBtn || loadingSubmit}
-                     category="update"
-                     onPress={() => {
-                        handleEdit()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disableBtn || loadingSubmit}
+               //       category="update"
+               //       onPress={() => {
+               //          handleEdit()
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Edit Tanggal dan Tugas"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disableBtn || loadingSubmit}
+                           category="update"
+                           onPress={() => {
+                              handleEdit()
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <KeyboardAvoidingView
@@ -205,6 +279,13 @@ export default function UpdateProjectTaskDivision() {
                            Tanggal tidak boleh kosong
                         </Text>
                      )}
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
@@ -222,7 +303,14 @@ export default function UpdateProjectTaskDivision() {
                </View>
             </ScrollView>
          </KeyboardAvoidingView>
-
+         <ModalAddDetailTugasTask
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

app/(application)/division/[id]/add-member.tsx

@@ -1,9 +1,10 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 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";
@@ -11,7 +12,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -44,6 +45,8 @@ export default function AddMemberDivision() {
          setData(responsemember.data.filter((i: any) => i.idUserRole != 'supadmin'))
       } catch (error) {
          console.error(error)
+      } finally {
+         setLoading(false)
       }
    }
 
@@ -94,37 +97,53 @@ export default function AddMemberDivision() {
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Tambah Anggota',
                headerTitleAlign: 'center',
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="update"
-                     disable={selectMember.length == 0 || loading ? true : false}
-                     onPress={() => {
-                        handleAddMember()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="update"
+               //       disable={selectMember.length == 0 || loading ? true : false}
+               //       onPress={() => {
+               //          handleAddMember()
+               //       }}
+               //    />
+               // )
+               header: () => (
+                  <AppHeader
+                     title="Tambah Anggota"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="update"
+                           disable={selectMember.length == 0 || loading ? true : false}
+                           onPress={() => {
+                              handleAddMember()
+                           }}
+                        />
+                     }
                   />
                )
             }}
          />
-         <View style={[Styles.p15]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => handleSearch(val)} value={search} />
 
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -135,7 +154,9 @@ export default function AddMemberDivision() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -150,7 +171,7 @@ export default function AddMemberDivision() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
@@ -159,7 +180,7 @@ export default function AddMemberDivision() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'}/>
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
@@ -170,6 +191,6 @@ export default function AddMemberDivision() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

app/(application)/division/[id]/edit.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import Styles from "@/constants/Styles";
@@ -66,22 +66,36 @@ export default function EditDivision() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Divisi",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={error.name || loading ? true : false}
-                     category="update"
-                     onPress={() => { handleEdit() }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={error.name || loading ? true : false}
+               //       category="update"
+               //       onPress={() => { handleEdit() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Edit Divisi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={error.name || loading ? true : false}
+                           category="update"
+                           onPress={() => { handleEdit() }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <ScrollView>

app/(application)/division/[id]/index.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader"
+import AppHeader from "@/components/AppHeader"
 import DiscussionDivisionDetail from "@/components/division/discussionDivisionDetail"
 import FileDivisionDetail from "@/components/division/fileDivisionDetail"
 import FiturDivisionDetail from "@/components/division/fiturDivisionDetail"
@@ -10,7 +10,7 @@ import { apiGetDivisionOneDetail } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
-import { SafeAreaView, ScrollView, View } from "react-native"
+import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
 
 type Props = {
    id: string,
@@ -26,11 +26,12 @@ export default function DetailDivisionFitur() {
    const { id } = useLocalSearchParams<{ id: string }>()
    const [data, setData] = useState<Props>()
    const [loading, setLoading] = useState(true)
+   const [refreshing, setRefreshing] = useState(false)
 
 
-   async function handleLoad() {
+   async function handleLoad(loading: boolean) {
       try {
-         setLoading(true)
+         setLoading(loading)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiGetDivisionOneDetail({ user: hasil, id })
          setData(response.data.division)
@@ -42,26 +43,49 @@ export default function DetailDivisionFitur() {
    }
 
    useEffect(() => {
-      handleLoad()
+      handleLoad(true)
    }, [])
 
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: loading ? 'Loading...                            ' : data?.name,
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightDivisionDetail id={id} />,
+               // headerRight: () => <HeaderRightDivisionDetail id={id} />,
+               header: () => (
+                  <AppHeader
+                     title={loading ? 'Loading...' : data?.name || ''}
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<HeaderRightDivisionDetail id={id} />}
+                  />
+               )
             }}
          />
-         <ScrollView>
-            <CaraouselHome />
+         <ScrollView
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+            showsVerticalScrollIndicator={false}
+         >
+            <CaraouselHome refreshing={refreshing} />
             <View style={[Styles.ph15, Styles.mb100]}>
-               <FiturDivisionDetail />
-               <TaskDivisionDetail />
-               <FileDivisionDetail />
-               <DiscussionDivisionDetail />
+               <FiturDivisionDetail refreshing={refreshing} />
+               <TaskDivisionDetail refreshing={refreshing} />
+               <FileDivisionDetail refreshing={refreshing} />
+               <DiscussionDivisionDetail refreshing={refreshing} />
             </View>
          </ScrollView>
       </SafeAreaView>

app/(application)/division/[id]/info.tsx

@@ -1,20 +1,22 @@
 import AlertKonfirmasi from "@/components/alertKonfirmasi"
+import AppHeader from "@/components/AppHeader"
 import BorderBottomItem from "@/components/borderBottomItem"
-import ButtonBackHeader from "@/components/buttonBackHeader"
 import HeaderRightDivisionInfo from "@/components/division/headerDivisionInfo"
 import DrawerBottom from "@/components/drawerBottom"
 import ImageUser from "@/components/imageNew"
 import SectionCancel from "@/components/sectionCancel"
 import Skeleton from "@/components/skeleton"
 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 { apiDeleteMemberDivision, apiGetDivisionOneDetail, apiUpdateStatusAdminDivision } from "@/lib/api"
+import { apiDeleteMemberDivision, apiGetDivisionOneDetail, apiGetDivisionOneFeature, apiUpdateStatusAdminDivision } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
 import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
-import { Pressable, SafeAreaView, ScrollView, Text, View } from "react-native"
+import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
 import Toast from "react-native-toast-message"
 import { useSelector } from "react-redux"
 
@@ -37,6 +39,8 @@ type PropsMember = {
 }
 
 export default function InformationDivision() {
+   const [refreshing, setRefreshing] = useState(false)
+   const entityUser = useSelector((state: any) => state.user)
    const { id } = useLocalSearchParams<{ id: string }>()
    const [isModal, setModal] = useState(false)
    const { token, decryptToken } = useAuthSession()
@@ -46,6 +50,8 @@ export default function InformationDivision() {
    const update = useSelector((state: any) => state.divisionUpdate)
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [loading, setLoading] = useState(true)
+   const [isMemberDivision, setIsMemberDivision] = useState(false)
+   const [isAdminDivision, setIsAdminDivision] = useState(false)
    const [dataMemberChoose, setDataMemberChoose] = useState({
       id: '',
       name: '',
@@ -111,12 +117,42 @@ export default function InformationDivision() {
       }
    }
 
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false)
+      handleCheckMember()
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
+   async function handleCheckMember() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-member",
+         });
+
+         const response2 = await apiGetDivisionOneFeature({
+            id,
+            user: hasil,
+            cat: "check-admin",
+         });
+         setIsMemberDivision(response.data);
+         setIsAdminDivision(response2.data);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
    useEffect(() => {
       handleLoad(false)
    }, [refresh, update])
 
    useEffect(() => {
       handleLoad(true)
+      handleCheckMember()
    }, [])
 
    function handleChooseMember(item: PropsMember) {
@@ -128,13 +164,31 @@ export default function InformationDivision() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Informasi Divisi',
                headerTitleAlign: 'center',
-               headerRight: () => <HeaderRightDivisionInfo id={id} active={dataDetail?.isActive} />,
+               // headerRight: () => ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) && <HeaderRightDivisionInfo id={id} active={dataDetail?.isActive} />,
+               header: () => (
+                  <AppHeader
+                     title="Informasi Divisi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) && <HeaderRightDivisionInfo id={id} active={dataDetail?.isActive} />
+                     }
+                  />
+               )
             }}
          />
-         <ScrollView style={[Styles.h100]}>
+         <ScrollView
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+            style={[Styles.h100]}
+         >
             <View style={[Styles.p15]}>
                {
                   dataDetail?.isActive == false && (
@@ -159,6 +213,7 @@ export default function InformationDivision() {
                   <Text style={[Styles.textDefault, Styles.mv05]}>{dataMember.length} Anggota</Text>
                   <View style={[Styles.wrapPaper]}>
                      {
+                        ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
                         dataDetail?.isActive && (
                            <BorderBottomItem
                               onPress={() => { router.push(`/division/${id}/add-member`) }}
@@ -184,12 +239,11 @@ export default function InformationDivision() {
                            dataMember.map((item, index) => {
                               return (
                                  <BorderBottomItem
-                                    width={55}
                                     key={index}
                                     borderType="bottom"
-                                    onPress={() => { dataDetail?.isActive && handleChooseMember(item) }}
+                                    onPress={() => { dataDetail?.isActive && (isAdminDivision || (entityUser.role != "user" && entityUser.role != "coadmin")) && handleChooseMember(item) }}
                                     icon={
-                                       <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} size="sm" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
                                     }
                                     title={item.name}
                                     rightTopInfo={item.isAdmin ? "Admin" : "Anggota"}

app/(application)/division/[id]/report.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader"
+import AppHeader from "@/components/AppHeader"
 import ReportChartDocument from "@/components/division/reportChartDocument"
 import ReportChartEvent from "@/components/division/reportChartEvent"
 import ReportChartProgress from "@/components/division/reportChartProgress"
@@ -107,9 +107,16 @@ export default function ReportDivision() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Laporan Divisi',
                headerTitleAlign: 'center',
+               header: () => (
+                  <AppHeader
+                     title="Laporan Divisi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                  />
+               )
             }}
          />
          <ScrollView>

app/(application)/division/create.tsx

@@ -1,22 +1,28 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AlertKonfirmasi from "@/components/alertKonfirmasi";
+import AppHeader from "@/components/AppHeader";
 import ButtonNextHeader from "@/components/buttonNextHeader";
 import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
 import SelectForm from "@/components/selectForm";
 import Styles from "@/constants/Styles";
+import { apiCheckDivisionName } from "@/lib/api";
 import { setFormCreateDivision } from "@/lib/divisionCreate";
+import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
 export default function CreateDivision() {
-   const [isSelect, setSelect] = useState(false);
-   const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" });
-   const dispatch = useDispatch();
-   const update = useSelector((state: any) => state.divisionCreate);
+   const { token, decryptToken } = useAuthSession()
+   const [isSelect, setSelect] = useState(false)
+   const [chooseGroup, setChooseGroup] = useState({ val: "", label: "" })
+   const dispatch = useDispatch()
+   const update = useSelector((state: any) => state.divisionCreate)
    const entityUser = useSelector((state: any) => state.user)
    const userLogin = useSelector((state: any) => state.entities)
+   const [loadingBtn, setLoadingBtn] = useState(false)
    const [error, setError] = useState({
       idGroup: false,
       name: false,
@@ -54,7 +60,34 @@ export default function CreateDivision() {
       }
    }
 
-   function handleSetData() {
+   async function handleCheckName() {
+      try {
+         setLoadingBtn(true)
+         const hasil = await decryptToken(String(token?.current))
+         const response = await apiCheckDivisionName({ data: { ...dataForm }, user: hasil })
+         if (response.success) {
+            if (!response.available) {
+               AlertKonfirmasi({
+                  title: 'Peringatan',
+                  category: 'warning',
+                  desc: 'Nama divisi sudah ada. Tidak dapat membuat divisi dengan nama yang sama',
+                  onPress: () => { }
+               })
+            } else {
+               handleSetData()
+            }
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
+      } catch (error) {
+         console.error(error)
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoadingBtn(false)
+      }
+   }
+
+   async function handleSetData() {
       dispatch(setFormCreateDivision({ ...update, data: dataForm }))
       router.push(`./create/add-member`)
    }
@@ -69,25 +102,38 @@ export default function CreateDivision() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Divisi",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonNextHeader
-                     onPress={() => { handleSetData() }}
-                     disable={error.idGroup || error.name || chooseGroup.val == "" || chooseGroup.val == "null" || dataForm.name == "" || dataForm.name == "null"}
+               // headerRight: () => (
+               //    <ButtonNextHeader
+               //       onPress={() => { handleCheckName() }}
+               //       disable={loadingBtn || error.idGroup || error.name || chooseGroup.val == "" || chooseGroup.val == "null" || dataForm.name == "" || dataForm.name == "null"}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader title="Tambah Divisi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<ButtonNextHeader
+                        onPress={() => { handleCheckName() }}
+                        disable={loadingBtn || error.idGroup || error.name || chooseGroup.val == "" || chooseGroup.val == "null" || dataForm.name == "" || dataForm.name == "null"}
+                     />}
                   />
-               ),
+               )
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                {
                   (entityUser.role == "supadmin" || entityUser.role == "developer") &&
                   (

app/(application)/division/create/add-admin-division.tsx

@@ -1,16 +1,18 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 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";
 import { setUpdateDivision } from "@/lib/divisionUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
+import { StackActions, useNavigation } from "@react-navigation/native";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -22,6 +24,7 @@ type Props = {
 
 export default function CreateDivisionAddAdmin() {
    const { token, decryptToken } = useAuthSession()
+   const navigation = useNavigation()
    const { id } = useLocalSearchParams<{ id: string }>()
    const [dataOld, setDataOld] = useState<Props[]>([])
    const [data, setData] = useState<Props[]>([])
@@ -50,14 +53,14 @@ export default function CreateDivisionAddAdmin() {
    async function handleAddMember() {
       try {
          setLoading(true)
-         dispatch(setFormCreateDivision({ ...update, admin: selectMember }))
          const hasil = await decryptToken(String(token?.current))
-         const response = await apiCreateDivision({ ...update, user: hasil })
+         const response = await apiCreateDivision({ ...update, admin: selectMember, user: hasil })
          if (response.success) {
             Toast.show({ type: 'small', text1: 'Berhasil membuat divisi', })
             dispatch(setFormCreateDivision({ admin: [], member: [], data: { idGroup: '', name: '', desc: '' } }))
             dispatch(setUpdateDivision(!updateDivision))
-            router.replace(`/division/`)
+            navigation.dispatch(StackActions.pop(3))
+            // router.replace(`/division/`)
          } else {
             Toast.show({ type: 'small', text1: response.message, })
          }
@@ -71,24 +74,37 @@ export default function CreateDivisionAddAdmin() {
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Pilih Admin Divisi',
                headerTitleAlign: 'center',
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="create"
-                     disable={selectMember.length == 0 || loading ? true : false}
-                     onPress={() => {
-                        handleAddMember()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="create"
+               //       disable={selectMember.length == 0 || loading ? true : false}
+               //       onPress={() => {
+               //          handleAddMember()
+               //       }}
+               //    />
+               // )
+               header: () => (
+                  <AppHeader title="Pilih Admin Divisi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<ButtonSaveHeader
+                        category="create"
+                        disable={selectMember.length == 0 || loading ? true : false}
+                        onPress={() => {
+                           handleAddMember()
+                        }}
+                     />}
                   />
                )
             }}
          />
-         <View style={[Styles.p15]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <ScrollView>
                {
                   data.length > 0 ?
@@ -103,7 +119,7 @@ export default function CreateDivisionAddAdmin() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
@@ -112,7 +128,7 @@ export default function CreateDivisionAddAdmin() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i == item.idUser) && <AntDesign name="check" size={20} color={'black'}/>
+                                 selectMember.some((i: any) => i == item.idUser) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
@@ -123,6 +139,6 @@ export default function CreateDivisionAddAdmin() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

app/(application)/division/create/add-member.tsx

@@ -1,9 +1,10 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonNextHeader from "@/components/buttonNextHeader";
 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";
@@ -11,7 +12,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -59,34 +60,44 @@ export default function CreateDivisionAddMember() {
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Pilih Anggota',
                headerTitleAlign: 'center',
-               headerRight: () => (
-                  <ButtonNextHeader
-                     disable={selectMember.length > 0 ? false : true}
-                     onPress={() => { handleAddMember() }}
+               // headerRight: () => (
+               //    <ButtonNextHeader
+               //       disable={selectMember.length > 0 ? false : true}
+               //       onPress={() => { handleAddMember() }}
+               //    />
+               // )
+               header: () => (
+                  <AppHeader title="Pilih Anggota"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={<ButtonNextHeader
+                        disable={selectMember.length > 0 ? false : true}
+                        onPress={() => { handleAddMember() }}
+                     />}
                   />
                )
             }}
          />
-         <View style={[Styles.p15]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -97,7 +108,9 @@ export default function CreateDivisionAddMember() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -112,7 +125,7 @@ export default function CreateDivisionAddMember() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{item.name}</Text>
                                     {
@@ -121,7 +134,7 @@ export default function CreateDivisionAddMember() {
                                  </View>
                               </View>
                               {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'}/>
+                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                               }
                            </Pressable>
                         )
@@ -132,6 +145,6 @@ export default function CreateDivisionAddMember() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

app/(application)/division/index.tsx

@@ -1,6 +1,7 @@
 import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonTab from "@/components/buttonTab";
 import InputSearch from "@/components/inputSearch";
+import LabelStatus from "@/components/labelStatus";
 import PaperGridContent from "@/components/paperGridContent";
 import Skeleton from "@/components/skeleton";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
@@ -180,7 +181,7 @@ export default function ListDivision() {
                   </View>
             }
 
-            <View style={[Styles.rowSpaceBetween]}>
+            <View style={[Styles.rowSpaceBetween, { alignItems: 'center' }]}>
                <InputSearch width={68} onChange={setSearch} />
                <Pressable
                   onPress={() => {
@@ -195,12 +196,13 @@ export default function ListDivision() {
                </Pressable>
             </View>
             {(entityUser.role == "supadmin" || entityUser.role == "developer") && (
-               <View style={[Styles.mv05]}>
-                  <Text>Filter : {nameGroup}</Text>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
+                  <Text>Filter :</Text>
+                  <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             )}
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   isList ?

app/(application)/division/report.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ReportChartDocument from "@/components/division/reportChartDocument";
 import ReportChartEvent from "@/components/division/reportChartEvent";
 import ReportChartProgress from "@/components/division/reportChartProgress";
@@ -125,19 +125,28 @@ export default function Report() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Laporan Divisi",
                headerTitleAlign: "center",
+               header: () => (
+                  <AppHeader title="Laporan Divisi"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                  />
+               )
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15, Styles.mb50]}>
                <SelectForm
                   bg="white"
                   label="Lembaga Desa"

app/(application)/edit-profile.tsx

@@ -4,16 +4,21 @@ 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";
+import { validateName } from "@/lib/fun_validateName";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
+import { useHeaderHeight } from "@react-navigation/elements";
 import * as ImagePicker from "expo-image-picker";
 import { router, Stack } from "expo-router";
 import { useEffect, useState } from "react";
 import {
    Image,
+   KeyboardAvoidingView,
+   Platform,
    Pressable,
    SafeAreaView,
    ScrollView,
@@ -36,6 +41,7 @@ type Props = {
 };
 
 export default function EditProfile() {
+   const headerHeight = useHeaderHeight()
    const dispatch = useDispatch()
    const entities = useSelector((state: any) => state.entities)
    const { token, decryptToken } = useAuthSession()
@@ -104,7 +110,7 @@ export default function EditProfile() {
          }
       } else if (cat == "name") {
          setData({ ...data, name: val });
-         if (val == "") {
+         if (!validateName(val)) {
             setError({ ...error, name: true });
          } else {
             setError({ ...error, name: false });
@@ -121,7 +127,7 @@ export default function EditProfile() {
          }
       } else if (cat == "phone") {
          setData({ ...data, phone: val });
-         if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+         if (val == "" || !(val.length >= 9 && val.length <= 16)) {
             setError({ ...error, phone: true });
          } else {
             setError({ ...error, phone: false });
@@ -159,8 +165,8 @@ export default function EditProfile() {
          if (imgForm != undefined) {
             fd.append("file", {
                uri: imgForm.uri,
-               type: imgForm.mimeType,
-               name: imgForm.fileName,
+               type: imgForm.mimeType || "image/jpeg",
+               name: imgForm.fileName || "image.jpg",
             } as any);
          } else {
             fd.append("file", "undefined",);
@@ -192,9 +198,9 @@ export default function EditProfile() {
    const pickImageAsync = async () => {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
-         allowsEditing: false,
-         quality: 1,
-         aspect: [1, 1],
+         allowsEditing: true,
+         quality: 0.9,
+         aspect: [1, 1]
       });
 
       if (!result.canceled) {
@@ -230,116 +236,122 @@ export default function EditProfile() {
                ),
             }}
          />
-         <ScrollView style={[Styles.h100]}>
-            <View style={[Styles.p15]}>
-               <View style={{ justifyContent: "center", alignItems: "center" }}>
-                  {
-                     selectedImage != undefined ? (
-                        <Pressable onPress={pickImageAsync}>
-                           <Image
-                              src={
-                                 typeof selectedImage === "string"
-                                    ? selectedImage
-                                    : selectedImage.uri
-                              }
-                              style={[Styles.userProfileBig]}
-                              onError={() => { setErrorImg(true) }}
-                           />
-                           <View style={[Styles.absoluteIconPicker]}>
-                              <MaterialCommunityIcons name="image" color={'white'} size={15} />
-                           </View>
-                        </Pressable>
-                     ) : (
-                        <Pressable onPress={pickImageAsync}>
-                           <Image
-                              source={errorImg ? require("../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${data?.img}` }}
-                              style={[Styles.userProfileBig]}
-                              onError={() => { setErrorImg(true) }}
-                           />
-                           <View style={[Styles.absoluteIconPicker]}>
-                              <MaterialCommunityIcons name="image" color={'white'} size={15} />
-                           </View>
-                        </Pressable>
-                     )
-                  }
+         <KeyboardAvoidingView
+            style={[Styles.h100]}
+            behavior={Platform.OS === 'ios' ? 'padding' : undefined}
+            keyboardVerticalOffset={headerHeight}
+         >
+            <ScrollView showsVerticalScrollIndicator={false}>
+               <View style={[Styles.p15]}>
+                  <View style={{ justifyContent: "center", alignItems: "center" }}>
+                     {
+                        selectedImage != undefined ? (
+                           <Pressable onPress={pickImageAsync}>
+                              <Image
+                                 src={
+                                    typeof selectedImage === "string"
+                                       ? selectedImage
+                                       : selectedImage.uri
+                                 }
+                                 style={[Styles.userProfileBig]}
+                                 onError={() => { setErrorImg(true) }}
+                              />
+                              <View style={[Styles.absoluteIconPicker]}>
+                                 <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                              </View>
+                           </Pressable>
+                        ) : (
+                           <Pressable onPress={pickImageAsync}>
+                              <Image
+                                 source={errorImg ? require("../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${data?.img}` }}
+                                 style={[Styles.userProfileBig]}
+                                 onError={() => { setErrorImg(true) }}
+                              />
+                              <View style={[Styles.absoluteIconPicker]}>
+                                 <MaterialCommunityIcons name="image" color={'white'} size={15} />
+                              </View>
+                           </Pressable>
+                        )
+                     }
+                  </View>
+                  <SelectForm
+                     label="Jabatan"
+                     placeholder="Pilih Jabatan"
+                     value={choosePosition.label}
+                     required
+                     onPress={() => {
+                        setValChoose(choosePosition.val);
+                        setValSelect("position");
+                        setSelect(true);
+                     }}
+                     error={error.position}
+                     errorText="Jabatan tidak boleh kosong"
+                  />
+                  <InputForm
+                     label="NIK"
+                     type="numeric"
+                     placeholder="NIK"
+                     required
+                     value={data?.nik}
+                     error={error.nik}
+                     errorText="NIK Harus 16 Karakter"
+                     onChange={val => {
+                        validationForm("nik", val)
+                     }}
+                  />
+                  <InputForm
+                     label="Nama"
+                     type="default"
+                     placeholder="Nama"
+                     required
+                     value={data?.name}
+                     error={error.name}
+                     errorText="Nama harus 3–50 karakter (huruf, angka, spasi, dan simbol ringan (. , ' _ -))"
+                     onChange={val => {
+                        validationForm("name", val)
+                     }}
+                  />
+                  <InputForm
+                     label="Email"
+                     type="default"
+                     placeholder="Email"
+                     required
+                     value={data?.email}
+                     error={error.email}
+                     errorText="Email tidak valid"
+                     onChange={val => {
+                        validationForm("email", val)
+                     }}
+                  />
+                  <InputForm
+                     label="Nomor Telepon"
+                     type="numeric"
+                     placeholder="8XX-XXX-XXX"
+                     required
+                     itemLeft={<Text style={[Platform.OS === 'ios' && Styles.mt02]}>+62</Text>}
+                     value={data?.phone}
+                     error={error.phone}
+                     errorText="Nomor Telepon tidak valid"
+                     onChange={val => {
+                        validationForm("phone", val)
+                     }}
+                  />
+                  <SelectForm
+                     label="Jenis Kelamin"
+                     placeholder="Pilih Jenis Kelamin"
+                     value={chooseGender.label}
+                     required
+                     onPress={() => {
+                        setValChoose(chooseGender.val);
+                        setValSelect("gender");
+                        setSelect(true);
+                     }}
+                     error={error.gender}
+                     errorText="Jenis Kelamin tidak boleh kosong"
+                  />
                </View>
-               <SelectForm
-                  label="Jabatan"
-                  placeholder="Pilih Jabatan"
-                  value={choosePosition.label}
-                  required
-                  onPress={() => {
-                     setValChoose(choosePosition.val);
-                     setValSelect("position");
-                     setSelect(true);
-                  }}
-                  error={error.position}
-                  errorText="Jabatan tidak boleh kosong"
-               />
-               <InputForm
-                  label="NIK"
-                  type="numeric"
-                  placeholder="NIK"
-                  required
-                  value={data?.nik}
-                  error={error.nik}
-                  errorText="NIK Harus 16 Karakter"
-                  onChange={val => {
-                     validationForm("nik", val)
-                  }}
-               />
-               <InputForm
-                  label="Nama"
-                  type="default"
-                  placeholder="Nama"
-                  required
-                  value={data?.name}
-                  error={error.name}
-                  errorText="Nama tidak boleh kosong"
-                  onChange={val => {
-                     validationForm("name", val)
-                  }}
-               />
-               <InputForm
-                  label="Email"
-                  type="default"
-                  placeholder="Email"
-                  required
-                  value={data?.email}
-                  error={error.email}
-                  errorText="Email tidak valid"
-                  onChange={val => {
-                     validationForm("email", val)
-                  }}
-               />
-               <InputForm
-                  label="Nomor Telepon"
-                  type="numeric"
-                  placeholder="8XX-XXX-XXX"
-                  required
-                  itemLeft={<Text>+62</Text>}
-                  value={data?.phone}
-                  error={error.phone}
-                  errorText="Nomor Telepon tidak valid"
-                  onChange={val => {
-                     validationForm("phone", val)
-                  }}
-               />
-               <SelectForm
-                  label="Jenis Kelamin"
-                  placeholder="Pilih Jenis Kelamin"
-                  value={chooseGender.label}
-                  required
-                  onPress={() => {
-                     setValChoose(chooseGender.val);
-                     setValSelect("gender");
-                     setSelect(true);
-                  }}
-                  error={error.gender}
-                  errorText="Jenis Kelamin tidak boleh kosong"
-               />
-            </View>
-         </ScrollView>
+            </ScrollView>
+         </KeyboardAvoidingView>
 
          <ModalSelect
             category={valSelect}

app/(application)/feature.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import { ButtonFiturMenu } from "@/components/buttonFiturMenu";
 import Styles from "@/constants/Styles";
 import { AntDesign, Entypo, Ionicons, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons";
@@ -13,9 +13,11 @@ export default function Feature() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Fitur',
-               headerTitleAlign: 'center'
+               headerTitleAlign: 'center',
+               header: () => (
+                  <AppHeader title="Fitur" showBack={true} onPressLeft={() => router.back()} />
+               )
             }}
          />
          <View style={[Styles.p15]}>

app/(application)/group/index.tsx

@@ -15,7 +15,7 @@ import { setUpdateGroup } from "@/lib/groupSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -34,7 +34,7 @@ export default function Index() {
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [loading, setLoading] = useState(true)
    const [status, setStatus] = useState<'true' | 'false'>('true')
-
+   const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [idChoose, setIdChoose] = useState('')
    const [activeChoose, setActiveChoose] = useState(true)
    const [titleChoose, setTitleChoose] = useState('')
@@ -49,12 +49,14 @@ export default function Index() {
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditGroup({ user: hasil, name: titleChoose }, idChoose)
          dispatch(setUpdateGroup(!update))
       } catch (error) {
          console.error(error)
       } finally {
+         setLoadingSubmit(false)
          setVisibleEdit(false)
          setModal(false)
          Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
@@ -116,9 +118,17 @@ export default function Index() {
    }
 
 
+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      name: data[index].name,
+      isActive: data[index].isActive,
+   });
+
+
+
    return (
-      <SafeAreaView>
-         <View style={[Styles.p15]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
+         <View style={[Styles.mb10]}>
             <View style={[Styles.wrapBtnTab]}>
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
@@ -136,51 +146,53 @@ export default function Index() {
                   n={2} />
             </View>
             <InputSearch onChange={setSearch} />
-            <ScrollView
-               refreshControl={
-                  <RefreshControl
-                     refreshing={refreshing}
-                     onRefresh={handleRefresh}
-                  />
-               }
-               style={[Styles.h100]}
-            >
-               <View>
-                  {
-
-                     loading ?
-                        arrSkeleton.map((item, index) => {
+         </View>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
+            {
+               loading ?
+                  arrSkeleton.map((item, index) => {
+                     return (
+                        <SkeletonTwoItem key={index} />
+                     )
+                  })
+                  :
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
                            return (
-                              <SkeletonTwoItem key={index} />
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => {
+                                    setIdChoose(item.id)
+                                    setActiveChoose(item.isActive)
+                                    setTitleChoose(item.name)
+                                    setModal(true)
+                                 }}
+                                 borderType="all"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.name}
+                              />
                            )
-                        })
-                        :
-                        data.length > 0 ?
-                           data.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    onPress={() => {
-                                       setIdChoose(item.id)
-                                       setActiveChoose(item.isActive)
-                                       setTitleChoose(item.name)
-                                       setModal(true)
-                                    }}
-                                    borderType="all"
-                                    icon={
-                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <MaterialCommunityIcons name="office-building-outline" size={25} color={'#384288'} />
-                                       </View>
-                                    }
-                                    title={item.name}
-                                 />
-                              )
-                           })
-                           :
-                           <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  }
-               </View>
-            </ScrollView>
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
          </View>
 
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={titleChoose}>
@@ -224,12 +236,11 @@ export default function Index() {
                      onChange={(val) => { validationForm(val, 'title') }} />
                </View>
                <View>
-                  <ButtonForm text="SIMPAN" disabled={Object.values(error).some((v) => v == true) || titleChoose == ""} onPress={() => { handleEdit() }} />
+                  <ButtonForm text="SIMPAN" disabled={Object.values(error).some((v) => v == true) || titleChoose == "" || loadingSubmit} onPress={() => { handleEdit() }} />
                </View>
             </View>
          </DrawerBottom>
+      </View >
 
-
-      </SafeAreaView>
    )
 }

app/(application)/home.tsx

@@ -13,8 +13,8 @@ import { apiGetProfile } from "@/lib/api";
 import { setEntities } from "@/lib/entitiesSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Stack } from "expo-router";
-import { useEffect } from "react";
-import { Platform, SafeAreaView, ScrollView, View } from "react-native";
+import { useEffect, useState } from "react";
+import { Platform, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -22,8 +22,9 @@ import { useDispatch, useSelector } from "react-redux";
 export default function Home() {
    const entities = useSelector((state: any) => state.entities)
    const dispatch = useDispatch()
-   const { token, decryptToken } = useAuthSession()
-   const insets = useSafeAreaInsets();
+   const { token, decryptToken, signOut } = useAuthSession()
+   const insets = useSafeAreaInsets()
+   const [refreshing, setRefreshing] = useState(false)
 
    useEffect(() => {
       handleUserLogin()
@@ -31,9 +32,20 @@ export default function Home() {
 
    async function handleUserLogin() {
       const hasil = await decryptToken(String(token?.current))
-      apiGetProfile({ id: hasil }).then((data) => dispatch(setEntities(data.data)));
+      apiGetProfile({ id: hasil })
+         .then((data) => dispatch(setEntities(data.data)))
+         .catch((error) => {
+            signOut()
+         });
    }
 
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleUserLogin()
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
+
    return (
       <SafeAreaView>
          <Stack.Screen
@@ -48,16 +60,24 @@ export default function Home() {
                ),
             }}
          />
-         <ScrollView>
-            <CaraouselHome />
+         <ScrollView
+            refreshControl={
+               <RefreshControl
+                  refreshing={refreshing}
+                  onRefresh={handleRefresh}
+               />
+            }
+            showsVerticalScrollIndicator={false}
+         >
+            <CaraouselHome refreshing={refreshing}/>
             <View style={[Styles.ph15, Styles.mb100]}>
                <FiturHome />
-               <ProjectHome />
-               <DivisionHome />
-               <ChartProgresHome />
-               <ChartDokumenHome />
-               <EventHome />
-               <DisccussionHome />
+               <ProjectHome refreshing={refreshing}/>
+               <DivisionHome refreshing={refreshing}/>
+               <ChartProgresHome refreshing={refreshing}/>
+               <ChartDokumenHome refreshing={refreshing}/>
+               <EventHome refreshing={refreshing}/>
+               <DisccussionHome refreshing={refreshing}/>
             </View>
          </ScrollView>
       </SafeAreaView>

app/(application)/member/[id].tsx

@@ -1,16 +1,20 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ImageUser from "@/components/imageNew";
 import ItemDetailMember from "@/components/itemDetailMember";
 import LabelStatus from "@/components/labelStatus";
 import HeaderRightMemberDetail from "@/components/member/headerMemberDetail";
 import Skeleton from "@/components/skeleton";
 import Text from "@/components/Text";
+import { assetUserImage } from "@/constants/AssetsError";
+import { ConstEnv } from "@/constants/ConstEnv";
 import { valueRoleUser } from "@/constants/RoleUser";
 import Styles from "@/constants/Styles";
 import { apiGetProfile } from "@/lib/api";
 import { router, Stack, useLocalSearchParams } from "expo-router";
-import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import React, { useEffect, useState } from "react";
+import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import ImageViewing from 'react-native-image-viewing';
+import Toast from "react-native-toast-message";
 import { useSelector } from "react-redux";
 
 type Props = {
@@ -30,21 +34,27 @@ type Props = {
 export default function MemberDetail() {
    const { id } = useLocalSearchParams<{ id: string }>();
    const [data, setData] = useState<Props>()
-   const [error, setError] = useState(false)
+   const [errorImg, setErrorImg] = useState(false)
    const entityUser = useSelector((state: any) => state.user)
    const [isEdit, setEdit] = useState(true)
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const [loading, setLoading] = useState(true)
    const [refreshing, setRefreshing] = useState(false)
+   const [preview, setPreview] = useState(false)
 
    async function handleLoad(loading: boolean) {
       try {
          setLoading(loading)
          const response = await apiGetProfile({ id: id })
-         setData(response.data)
-         setEdit(valueRoleUser.filter((v) => v.login == entityUser.role)[0]?.data.some((i: any) => i.id == response.data.idUserRole))
+         if (response.success) {
+            setData(response.data)
+            setEdit(valueRoleUser.filter((v) => v.login == entityUser.role)[0]?.data.some((i: any) => i.id == response.data.idUserRole))
+         } else {
+            Toast.show({ type: 'small', text1: response.message })
+         }
       } catch (error) {
          console.error(error)
+         Toast.show({ type: 'small', text1: 'Gagal mengambil data' })
       } finally {
          setLoading(false)
       }
@@ -67,11 +77,19 @@ export default function MemberDetail() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Anggota',
                headerTitleAlign: 'center',
-               headerRight: () => (entityUser.role != "user") && isEdit ? <HeaderRightMemberDetail active={data?.isActive} id={id} /> : <></>,
-               headerShadowVisible: false
+               // headerRight: () => (entityUser.role != "user") && isEdit ? <HeaderRightMemberDetail active={data?.isActive} id={id} /> : <></>,
+               header: () => (
+                  <AppHeader title="Anggota"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        (entityUser.role != "user") && isEdit ? <HeaderRightMemberDetail active={data?.isActive} id={id} /> : <></>
+                     }
+                  />
+               )
             }}
          />
          <ScrollView
@@ -83,7 +101,7 @@ export default function MemberDetail() {
                />
             }
          >
-            <View style={[Styles.wrapHeadViewMember,]}>
+            <View style={[Styles.wrapHeadViewMember]}>
                {
                   loading ?
                      <>
@@ -93,8 +111,10 @@ export default function MemberDetail() {
                      </>
                      :
                      <>
-                        <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${data?.img}`} size="lg" />
-                        <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10]}>{data?.name}</Text>
+                        <Pressable onPress={() => setPreview(true)}>
+                           <ImageUser src={`${ConstEnv.url_storage}/files/${data?.img}`} size="lg" onError={setErrorImg} />
+                        </Pressable>
+                        <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10, { textAlign: 'center' }]}>{data?.name}</Text>
                         <Text style={[Styles.textMediumNormal, Styles.cWhite]}>{data?.role}</Text>
                      </>
 
@@ -129,6 +149,14 @@ export default function MemberDetail() {
 
             </View>
          </ScrollView>
+
+         <ImageViewing
+            images={[{ uri: errorImg ? assetUserImage.uri : `${ConstEnv.url_storage}/files/${data?.img}` }]}
+            imageIndex={0}
+            visible={preview}
+            onRequestClose={() => setPreview(false)}
+            doubleTapToZoomEnabled
+         />
       </SafeAreaView>
    )
 }

app/(application)/member/create.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import ModalSelect from "@/components/modalSelect";
@@ -7,6 +7,7 @@ import Text from "@/components/Text";
 import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiCreateUser } from "@/lib/api";
+import { validateName } from "@/lib/fun_validateName";
 import { setUpdateMember } from "@/lib/memberSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
@@ -100,7 +101,7 @@ export default function CreateMember() {
          }
       } else if (cat == "name") {
          setDataForm({ ...dataForm, name: val });
-         if (val == "") {
+         if (!validateName(val)) {
             setError({ ...error, name: true });
          } else {
             setError({ ...error, name: false });
@@ -117,7 +118,7 @@ export default function CreateMember() {
          }
       } else if (cat == "phone") {
          setDataForm({ ...dataForm, phone: val });
-         if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+         if (val == "" || !(val.length >= 9 && val.length <= 16)) {
             setError({ ...error, phone: true });
          } else {
             setError({ ...error, phone: false });
@@ -166,8 +167,8 @@ export default function CreateMember() {
          if (imgForm != undefined) {
             fd.append("file", {
                uri: imgForm.uri,
-               type: imgForm.mimeType,
-               name: imgForm.fileName,
+               type: imgForm.mimeType || "image/jpeg",
+               name: imgForm.fileName || "image.jpg",
             } as any)
          } else {
             fd.append("file", "undefined")
@@ -193,9 +194,9 @@ export default function CreateMember() {
    const pickImageAsync = async () => {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
-         allowsEditing: false,
-         quality: 1,
-         aspect: [1, 1],
+         allowsEditing: true,
+         quality: 0.9,
+         aspect: [1, 1]
       });
 
       if (!result.canceled) {
@@ -208,22 +209,35 @@ export default function CreateMember() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Anggota",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disableBtn || loading}
-                     category="create"
-                     onPress={() => { handleCreate() }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disableBtn || loading}
+               //       category="create"
+               //       onPress={() => { handleCreate() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader title="Anggota"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disableBtn || loading}
+                           category="create"
+                           onPress={() => { handleCreate() }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <KeyboardAvoidingView
@@ -231,7 +245,7 @@ export default function CreateMember() {
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
             keyboardVerticalOffset={headerHeight}
          >
-            <ScrollView>
+            <ScrollView showsVerticalScrollIndicator={false}>
                <View style={[Styles.p15]}>
                   <View style={{ justifyContent: "center", alignItems: "center" }}>
                      {selectedImage != undefined ? (
@@ -309,7 +323,7 @@ export default function CreateMember() {
                      placeholder="Nama"
                      required
                      error={error.name}
-                     errorText="Nama tidak boleh kosong"
+                     errorText="Nama harus 3–50 karakter (huruf, angka, spasi, dan simbol ringan (. , ' _ -))"
                      onChange={val => {
                         validationForm("name", val)
                      }}
@@ -330,7 +344,7 @@ export default function CreateMember() {
                      type="numeric"
                      placeholder="8XX-XXX-XXX"
                      required
-                     itemLeft={<Text>+62</Text>}
+                     itemLeft={<Text style={[Platform.OS === 'ios' && Styles.mt02]}>+62</Text>}
                      error={error.phone}
                      errorText="Nomor Telepon tidak valid"
                      onChange={val => {

app/(application)/member/edit/[id].tsx

@@ -1,11 +1,13 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 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 { validateName } from "@/lib/fun_validateName";
 import { setUpdateMember } from "@/lib/memberSlice";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { MaterialCommunityIcons } from "@expo/vector-icons";
@@ -83,7 +85,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,
@@ -131,7 +133,7 @@ export default function EditMember() {
          }
       } else if (cat == "name") {
          setData({ ...data, name: val });
-         if (val == "") {
+         if (!validateName(val)) {
             setError({ ...error, name: true });
          } else {
             setError({ ...error, name: false });
@@ -148,7 +150,7 @@ export default function EditMember() {
          }
       } else if (cat == "phone") {
          setData({ ...data, phone: val });
-         if (val == "" || !(val.length >= 10 && val.length <= 15)) {
+         if (val == "" || !(val.length >= 9 && val.length <= 16)) {
             setError({ ...error, phone: true });
          } else {
             setError({ ...error, phone: false });
@@ -186,8 +188,8 @@ export default function EditMember() {
          if (imgForm != undefined) {
             fd.append("file", {
                uri: imgForm.uri,
-               type: imgForm.mimeType,
-               name: imgForm.fileName,
+               type: imgForm.mimeType || "image/jpeg",
+               name: imgForm.fileName || "image.jpg",
             } as any);
          } else {
             fd.append("file", "undefined",);
@@ -219,9 +221,9 @@ export default function EditMember() {
    const pickImageAsync = async () => {
       let result = await ImagePicker.launchImageLibraryAsync({
          mediaTypes: ["images"],
-         allowsEditing: false,
-         quality: 1,
-         aspect: [1, 1],
+         allowsEditing: true,
+         quality: 0.9,
+         aspect: [1, 1]
       });
 
       if (!result.canceled) {
@@ -237,24 +239,40 @@ export default function EditMember() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Anggota",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disableBtn || loading}
-                     category="update"
-                     onPress={() => {
-                        handleEdit()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disableBtn || loading}
+               //       category="update"
+               //       onPress={() => {
+               //          handleEdit()
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Edit Anggota"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disableBtn || loading}
+                           category="update"
+                           onPress={() => {
+                              handleEdit()
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
 
@@ -263,14 +281,14 @@ export default function EditMember() {
             behavior={Platform.OS === 'ios' ? 'padding' : undefined}
             keyboardVerticalOffset={headerHeight}
          >
-            <ScrollView>
-               <View style={[Styles.p15, Styles.mb100]}>
+            <ScrollView showsVerticalScrollIndicator={false} style={[Styles.h100]}>
+               <View style={[Styles.p15]}>
                   <View style={{ justifyContent: "center", alignItems: "center" }}>
                      {
                         errorImg ?
                            <Pressable onPress={pickImageAsync}>
                               <Image
-                                 source={errorImg ? require("../../../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${data?.img}` }}
+                                 source={errorImg ? require("../../../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${data?.img}` }}
                                  style={[Styles.userProfileBig]}
                                  onError={() => { setErrorImg(true) }}
                               />
@@ -347,7 +365,7 @@ export default function EditMember() {
                      required
                      value={data?.name}
                      error={error.name}
-                     errorText="Nama tidak boleh kosong"
+                     errorText="Nama harus 3–50 karakter (huruf, angka, spasi, dan simbol ringan (. , ' _ -))"
                      onChange={val => {
                         validationForm("name", val)
                      }}
@@ -369,7 +387,7 @@ export default function EditMember() {
                      type="numeric"
                      placeholder="8XX-XXX-XXX"
                      required
-                     itemLeft={<Text>+62</Text>}
+                     itemLeft={<Text style={[Platform.OS === 'ios' && Styles.mt02]}>+62</Text>}
                      value={data?.phone}
                      error={error.phone}
                      errorText="Nomor Telepon tidak valid"

app/(application)/member/index.tsx

@@ -2,8 +2,10 @@ import BorderBottomItem from "@/components/borderBottomItem";
 import ButtonTab from "@/components/buttonTab";
 import ImageUser from "@/components/imageNew";
 import InputSearch from "@/components/inputSearch";
+import LabelStatus from "@/components/labelStatus";
 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";
@@ -123,12 +125,13 @@ export default function Index() {
             <InputSearch onChange={setSearch} />
             {
                (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-               <View style={[Styles.mv05]}>
-                  <Text>Filter : {nameGroup}</Text>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
+                  <Text>Filter :</Text>
+                  <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             }
          </View>
-         <View style={[{ flex: 2 }]}>
+         <View style={[{ flex: 2 }, Styles.mt05]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => {
@@ -150,7 +153,7 @@ export default function Index() {
                                  onPress={() => { router.push(`/member/${item.id}`) }}
                                  borderType="all"
                                  icon={
-                                    <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} />
+                                    <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} />
                                  }
                                  title={item.name}
                                  subtitle={`${item.group} - ${item.position}`}

app/(application)/notification.tsx

@@ -9,7 +9,7 @@ import { pushToPage } from "@/lib/pushToPage";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { Feather } from "@expo/vector-icons";
 import { useEffect, useState } from "react";
-import { SafeAreaView, View, VirtualizedList } from "react-native";
+import { RefreshControl, SafeAreaView, View, VirtualizedList } from "react-native";
 import { useDispatch, useSelector } from "react-redux";
 
 type Props = {
@@ -31,6 +31,7 @@ export default function Notification() {
    const arrSkeleton = Array.from({ length: 5 }, (_, index) => index)
    const dispatch = useDispatch()
    const updateNotification = useSelector((state: any) => state.notificationUpdate)
+   const [refreshing, setRefreshing] = useState(false)
 
    async function handleLoad(loading: boolean, thisPage: number) {
       try {
@@ -88,33 +89,12 @@ export default function Notification() {
       }
    }
 
-   // function pushToPage(category: string, idContent: string) {
-   //    const cat = category.split('/')
-   //    if (cat.length > 1) {
-   //       if (cat[2] == 'calendar') {
-   //          router.push(`/division/${cat[1]}/calendar/${idContent}`)
-   //       } else if (cat[2] == 'discussion') {
-   //          router.push(`/division/${cat[1]}/discussion/${idContent}`)
-   //       } else if (cat[2] == 'document') {
-   //          router.push(`/division/${cat[1]}/document/${idContent}`)
-   //       } else if (cat[2] == 'task') {
-   //          router.push(`/division/${cat[1]}/task/${idContent}`)
-   //       }
-   //    } else {
-   //       if (cat[0] == 'announcement') {
-   //          router.push(`/announcement/${idContent}`)
-   //       } else if (cat[0] == 'discussion-general') {
-   //          router.push(`/discussion/${idContent}`)
-   //       } else if (cat[0] == 'division') {
-   //          router.push(`/division/${idContent}`)
-   //       } else if (cat[0] == 'member') {
-   //          router.push(`/member/${idContent}`)
-   //       } else if (cat[0] == 'project') {
-   //          router.push(`/project/${idContent}`)
-   //       }
-   //    }
-   // }
-
+   const handleRefresh = async () => {
+      setRefreshing(true)
+      handleLoad(false, 1)
+      await new Promise(resolve => setTimeout(resolve, 2000));
+      setRefreshing(false)
+   };
 
    return (
       <SafeAreaView>
@@ -136,7 +116,6 @@ export default function Notification() {
                            return (
                               <BorderBottomItem
                                  borderType="bottom"
-                                 width={55}
                                  icon={
                                     <View style={[Styles.iconContent, item.isRead ? ColorsStatus.secondary : ColorsStatus.primary]}>
                                        <Feather name="bell" size={25} color="white" />
@@ -157,6 +136,12 @@ export default function Notification() {
                         onEndReached={loadMoreData}
                         onEndReachedThreshold={0.5}
                         showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
                      />
                      :
                      <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>

app/(application)/position/index.tsx

@@ -5,6 +5,7 @@ import ButtonTab from "@/components/buttonTab";
 import DrawerBottom from "@/components/drawerBottom";
 import { InputForm } from "@/components/inputForm";
 import InputSearch from "@/components/inputSearch";
+import LabelStatus from "@/components/labelStatus";
 import MenuItemRow from "@/components/menuItemRow";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
@@ -16,7 +17,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign, Feather, MaterialCommunityIcons } from "@expo/vector-icons";
 import { useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
+import { RefreshControl, View, VirtualizedList } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -40,6 +41,7 @@ export default function Index() {
    const [data, setData] = useState<Props[]>([])
    const [search, setSearch] = useState('')
    const [nameGroup, setNameGroup] = useState('')
+   const [loadingSubmit, setLoadingSubmit] = useState(false)
    const [chooseData, setChooseData] = useState({ name: '', id: '', active: false, idGroup: '' })
    const [error, setError] = useState({
       name: false,
@@ -94,15 +96,20 @@ export default function Index() {
 
    async function handleEdit() {
       try {
+         setLoadingSubmit(true)
          const hasil = await decryptToken(String(token?.current))
          const response = await apiEditPosition({ user: hasil, name: chooseData.name, idGroup: chooseData.idGroup }, chooseData.id)
-         dispatch(setUpdatePosition(!update))
+         if (response.success) {
+            dispatch(setUpdatePosition(!update))
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
       } catch (error) {
          console.error(error)
       } finally {
+         setLoadingSubmit(false)
          setVisibleEdit(false)
          setModal(false)
-         Toast.show({ type: 'small', text1: 'Berhasil mengupdate data', })
       }
 
    }
@@ -129,9 +136,18 @@ export default function Index() {
       setRefreshing(false)
    };
 
+
+   const getItem = (_data: unknown, index: number): Props => ({
+      id: data[index].id,
+      name: data[index].name,
+      idGroup: data[index].idGroup,
+      group: data[index].group,
+      isActive: data[index].isActive,
+   });
+
    return (
-      <SafeAreaView>
-         <View style={[Styles.p15]}>
+      <View style={[Styles.p15, { flex: 1 }]}>
+         <View>
             <View style={[Styles.wrapBtnTab]}>
                <ButtonTab
                   active={status == "false" ? "false" : "true"}
@@ -151,51 +167,58 @@ export default function Index() {
             <InputSearch onChange={setSearch} />
             {
                (entityUser.role == "supadmin" || entityUser.role == "developer") &&
-               <View style={[Styles.mv05]}>
-                  <Text>Filter : {nameGroup}</Text>
+               <View style={[Styles.mv05, Styles.rowOnly]}>
+                  <Text>Filter :</Text>
+                  <LabelStatus size="small" category="secondary" text={nameGroup} style={[Styles.mh05]} />
                </View>
             }
-            <ScrollView
-               style={[Styles.h100]}
-               refreshControl={
-                  <RefreshControl
-                     refreshing={refreshing}
-                     onRefresh={handleRefresh}
-                  />
-               }>
-               <View>
-                  {
-                     loading ?
-                        arrSkeleton.map((item, index) => {
-                           return (
-                              <SkeletonTwoItem key={index} />
-                           )
-                        })
-                        :
-                        data.length > 0 ?
-                           data.map((item, index) => {
-                              return (
-                                 <BorderBottomItem
-                                    key={index}
-                                    onPress={() => { handleChooseData(item.id, item.name, item.isActive, item.idGroup) }}
-                                    borderType="all"
-                                    icon={
-                                       <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                          <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
-                                       </View>
-                                    }
-                                    title={item.name}
-                                    subtitle={item.group}
-                                 />
-                              )
-                           })
-                           :
-                           <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
-                  }
-               </View>
-            </ScrollView>
          </View>
-
+         <View style={[{ flex: 2 }, Styles.mt05]}>
+            {
+               loading ?
+                  arrSkeleton.map((item, index) => {
+                     return (
+                        <SkeletonTwoItem key={index} />
+                     )
+                  })
+                  :
+                  data.length > 0 ?
+                     <VirtualizedList
+                        data={data}
+                        getItemCount={() => data.length}
+                        getItem={getItem}
+                        renderItem={({ item, index }: { item: Props, index: number }) => {
+                           return (
+                              <BorderBottomItem
+                                 key={index}
+                                 onPress={() => {
+                                    entityUser.role != "user" &&
+                                       handleChooseData(item.id, item.name, item.isActive, item.idGroup)
+                                 }}
+                                 borderType="all"
+                                 icon={
+                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
+                                       <MaterialCommunityIcons name="account-tie" size={25} color={'#384288'} />
+                                    </View>
+                                 }
+                                 title={item.name}
+                                 subtitle={item.group}
+                              />
+                           )
+                        }}
+                        keyExtractor={(item, index) => String(index)}
+                        showsVerticalScrollIndicator={false}
+                        refreshControl={
+                           <RefreshControl
+                              refreshing={refreshing}
+                              onRefresh={handleRefresh}
+                           />
+                        }
+                     />
+                     :
+                     <Text style={[Styles.textDefault, Styles.cGray, { textAlign: 'center' }]}>Tidak ada data</Text>
+            }
+         </View>
          <DrawerBottom animation="slide" isVisible={isModal} setVisible={() => setModal(false)} title={chooseData.name}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
@@ -239,11 +262,10 @@ export default function Index() {
                   />
                </View>
                <View style={Styles.mb30}>
-                  <ButtonForm text="SIMPAN" onPress={() => { checkForm() }} />
+                  <ButtonForm text="SIMPAN" onPress={() => { handleEdit() }} disabled={Object.values(error).some((v) => v == true) || chooseData.name == "" || loadingSubmit} />
                </View>
             </View>
          </DrawerBottom>
-
-      </SafeAreaView>
+      </View>
    )
 }

app/(application)/profile.tsx

@@ -1,50 +1,73 @@
 import AlertKonfirmasi from "@/components/alertKonfirmasi";
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import { ButtonHeader } from "@/components/buttonHeader";
 import ItemDetailMember from "@/components/itemDetailMember";
 import Text from "@/components/Text";
+import { assetUserImage } from "@/constants/AssetsError";
+import { ConstEnv } from "@/constants/ConstEnv";
 import Styles from "@/constants/Styles";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack } from "expo-router";
 import { useState } from "react";
-import { Image, SafeAreaView, ScrollView, View } from "react-native";
+import { Image, Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import ImageViewing from 'react-native-image-viewing';
 import { useSelector } from 'react-redux';
 
 export default function Profile() {
    const { signOut } = useAuthSession()
    const entities = useSelector((state: any) => state.entities)
    const [error, setError] = useState(false)
+   const [preview, setPreview] = useState(false)
 
 
    return (
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Profile',
                headerTitleAlign: 'center',
-               headerShadowVisible: false,
-               headerRight: () => <ButtonHeader
-                  item={<AntDesign name="logout" size={20} color="white" />}
-                  onPress={() => {
-                     AlertKonfirmasi({
-                        title: 'Keluar',
-                        desc: 'Apakah anda yakin ingin keluar?',
-                        onPress: () => { signOut() }
-                     })
-                  }}
-               />
+               header: () => (
+                  <AppHeader
+                     title="Profile"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonHeader
+                           item={<AntDesign name="logout" size={20} color="white" />}
+                           onPress={() => {
+                              AlertKonfirmasi({
+                                 title: 'Keluar',
+                                 desc: 'Apakah anda yakin ingin keluar?',
+                                 onPress: () => { signOut() }
+                              })
+                           }}
+                        />
+                     }
+                  />
+               )
+               // headerRight: () => <ButtonHeader
+               //    item={<AntDesign name="logout" size={20} color="white" />}
+               //    onPress={() => {
+               //       AlertKonfirmasi({
+               //          title: 'Keluar',
+               //          desc: 'Apakah anda yakin ingin keluar?',
+               //          onPress: () => { signOut() }
+               //       })
+               //    }}
+               // />
             }}
          />
-         <ScrollView>
+         <ScrollView style={[Styles.h100]}>
             <View style={{ flexDirection: 'column' }}>
                <View style={[Styles.wrapHeadViewMember]}>
-                  <Image
-                     source={error ? require("../../assets/images/user.jpg") : { uri: `https://wibu-storage.wibudev.com/api/files/${entities.img}` }}
-                     onError={() => { setError(true) }}
-                     style={[Styles.userProfileBig]}
-                  />
+                  <Pressable onPress={() => setPreview(true)}>
+                     <Image
+                        source={error ? require("../../assets/images/user.jpg") : { uri: `${ConstEnv.url_storage}/files/${entities.img}` }}
+                        onError={() => { setError(true) }}
+                        style={[Styles.userProfileBig]}
+                     />
+                  </Pressable>
                   <Text style={[Styles.textSubtitle, Styles.cWhite, Styles.mt10]}>{entities.name}</Text>
                   <Text style={[Styles.textMediumNormal, Styles.cWhite]}>{entities.role}</Text>
                </View>
@@ -64,6 +87,13 @@ export default function Profile() {
                </View>
             </View>
          </ScrollView>
+         <ImageViewing
+            images={[{ uri: error ? assetUserImage.uri : `${ConstEnv.url_storage}/files/${entities.img}` }]}
+            imageIndex={0}
+            visible={preview}
+            onRequestClose={() => setPreview(false)}
+            doubleTapToZoomEnabled
+         />
       </SafeAreaView>
    )
 }

app/(application)/project/[id]/add-file.tsx

@@ -1,5 +1,5 @@
+import AppHeader from "@/components/AppHeader"
 import BorderBottomItem from "@/components/borderBottomItem"
-import ButtonBackHeader from "@/components/buttonBackHeader"
 import ButtonSaveHeader from "@/components/buttonSaveHeader"
 import ButtonSelect from "@/components/buttonSelect"
 import DrawerBottom from "@/components/drawerBottom"
@@ -130,13 +130,27 @@ export default function ProjectAddFile() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Tambah File',
                headerTitleAlign: 'center',
-               headerRight: () => <ButtonSaveHeader
-                  disable={fileForm.length == 0 || loading ? true : false}
-                  category="create"
-                  onPress={() => { handleAddFile() }} />
+               // headerRight: () => <ButtonSaveHeader
+               //    disable={fileForm.length == 0 || loading ? true : false}
+               //    category="create"
+               //    onPress={() => { handleAddFile() }} />
+               header: () => (
+                  <AppHeader
+                     title="Tambah File"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={fileForm.length == 0 || loading ? true : false}
+                           category="create"
+                           onPress={() => { handleAddFile() }}
+                        />
+                     }
+                  />
+               )
             }}
          />
          <ScrollView>

app/(application)/project/[id]/add-member.tsx

@@ -1,9 +1,10 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 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";
@@ -11,7 +12,7 @@ import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -93,36 +94,52 @@ export default function AddMemberProject() {
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Tambah Anggota Kegiatan',
                headerTitleAlign: 'center',
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="update"
-                     disable={selectMember.length == 0 || loading ? true : false}
-                     onPress={() => {
-                        handleAddMember()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="update"
+               //       disable={selectMember.length == 0 || loading ? true : false}
+               //       onPress={() => {
+               //          handleAddMember()
+               //       }}
+               //    />
+               // )
+               header: () => (
+                  <AppHeader
+                     title="Tambah Anggota Kegiatan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="update"
+                           disable={selectMember.length == 0 || loading ? true : false}
+                           onPress={() => {
+                              handleAddMember()
+                           }}
+                        />
+                     }
                   />
                )
             }}
          />
-         <View style={[Styles.p15, Styles.mb100]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => handleSearch(val)} value={search} />
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -133,40 +150,48 @@ export default function AddMemberProject() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+               style={[Styles.h100]}
+            >
                {
                   data.length > 0 ?
-                     data.map((item: any, index: any) => {
-                        const found = dataOld.some((i: any) => i.idUser == item.id)
-                        return (
-                           <Pressable
-                              key={index}
-                              style={[Styles.itemSelectModal]}
-                              onPress={() => {
-                                 !found && onChoose(item.id, item.name, item.img)
-                              }}
-                           >
-                              <View style={[Styles.rowItemsCenter, Styles.w80]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
-                                 <View style={[Styles.ml10]}>
-                                    <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
+                     <View style={[Styles.mb100]}>
+                        {
+                           data.map((item: any, index: any) => {
+                              const found = dataOld.some((i: any) => i.idUser == item.id)
+                              return (
+                                 <Pressable
+                                    key={index}
+                                    style={[Styles.itemSelectModal]}
+                                    onPress={() => {
+                                       !found && onChoose(item.id, item.name, item.img)
+                                    }}
+                                 >
+                                    <View style={[Styles.rowItemsCenter, Styles.w80]}>
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
+                                       <View style={[Styles.ml10]}>
+                                          <Text style={[Styles.textDefault]} numberOfLines={1}>{item.name}</Text>
+                                          {
+                                             found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
+                                          }
+                                       </View>
+                                    </View>
                                     {
-                                       found && <Text style={[Styles.textInformation, Styles.cGray]}>sudah menjadi anggota</Text>
+                                       selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'} />
                                     }
-                                 </View>
-                              </View>
-                              {
-                                 selectMember.some((i: any) => i.idUser == item.id) && <AntDesign name="check" size={20} color={'black'}/>
-                              }
-                           </Pressable>
-                        )
-                     }
-                     )
+                                 </Pressable>
+                              )
+                           }
+                           )
+                        }
+                     </View>
+
                      :
                      <Text style={[Styles.textDefault, { textAlign: 'center' }]}>Tidak ada data</Text>
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }

app/(application)/project/[id]/add-task.tsx

@@ -1,19 +1,24 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
+import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
 import Text from "@/components/Text";
 import Styles from "@/constants/Styles";
 import { apiCreateProjectTask } from "@/lib/api";
+import { formatDateOnly } from "@/lib/fun_formatDateOnly";
+import { getDatesInRange } from "@/lib/fun_getDatesInRange";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { useHeaderHeight } from '@react-navigation/elements';
+import { router, Stack, useLocalSearchParams } from "expo-router";
 import 'intl';
 import 'intl/locale-data/jsonp/id';
-import dayjs from "dayjs";
-import { router, Stack, useLocalSearchParams } from "expo-router";
+import moment from "moment";
 import { useEffect, useState } from "react";
 import {
    KeyboardAvoidingView,
    Platform,
+   Pressable,
    SafeAreaView,
    ScrollView,
    View
@@ -23,13 +28,14 @@ import DateTimePicker, {
    DateType
 } from "react-native-ui-datepicker";
 import { useDispatch, useSelector } from "react-redux";
-import { useHeaderHeight } from '@react-navigation/elements';
 
 export default function ProjectAddTask() {
    const headerHeight = useHeaderHeight();
    const { token, decryptToken } = useAuthSession()
    const dispatch = useDispatch()
    const update = useSelector((state: any) => state.projectUpdate)
+   const [dataDetail, setDataDetail] = useState<any>([])
+   const [modalDetail, setModalDetail] = useState(false)
    const { id } = useLocalSearchParams<{ id: string }>();
    const [disable, setDisable] = useState(true);
    const [range, setRange] = useState<{
@@ -43,11 +49,10 @@ export default function ProjectAddTask() {
    })
    const [title, setTitle] = useState('');
    const [loading, setLoading] = useState(false)
+   const [dsbButton, setDsbButton] = useState(true)
 
-   const from = range.startDate
-      ? dayjs(range.startDate).format("DD-MM-YYYY")
-      : "";
-   const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
+   const from = formatDateOnly(range.startDate);
+   const to = formatDateOnly(range.endDate);
 
    function checkAll() {
       if (from == "" || to == "" || title == "" || title == "null" || error.startDate || error.endDate || error.title) {
@@ -68,15 +73,50 @@ export default function ProjectAddTask() {
       }
    }
 
+   function checkButton() {
+      if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
+         setDsbButton(true)
+         setDataDetail([])
+      } else {
+         setDsbButton(false)
+         const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
+         const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
+         const datanya = getDatesInRange(awal, akhir)
+         setDataDetail(datanya.map((item: any) => ({
+            date: item,
+            timeStart: null,
+            timeEnd: null,
+         })))
+      }
+   }
+
    useEffect(() => {
       checkAll()
    }, [from, to, title, error])
 
+   useEffect(() => {
+      checkButton()
+   }, [range])
+
+
    async function handleCreate() {
       try {
          setLoading(true)
+         const dataDetailFix = dataDetail.map((item: any) => ({
+            date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
+            timeStart: item.timeStart,
+            timeEnd: item.timeEnd,
+         }))
          const hasil = await decryptToken(String(token?.current));
-         const response = await apiCreateProjectTask({ data: { name: title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id });
+         const response = await apiCreateProjectTask({
+            data: {
+               name: title,
+               dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
+               dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
+               user: hasil,
+               dataDetail: dataDetailFix
+            }, id
+         });
          if (response.success) {
             dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress }))
             Toast.show({ type: 'small', text1: 'Berhasil menambah data', })
@@ -96,22 +136,36 @@ export default function ProjectAddTask() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Tugas",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disable || loading}
-                     category="create"
-                     onPress={() => { handleCreate() }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disable || loading}
+               //       category="create"
+               //       onPress={() => { handleCreate() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Tambah Tugas"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                           <ButtonSaveHeader
+                              disable={disable || loading}
+                              category="create"
+                              onPress={() => { handleCreate() }}
+                           />
+                     }
                   />
-               ),
+               )
             }}
          />
          <KeyboardAvoidingView
@@ -125,7 +179,7 @@ export default function ProjectAddTask() {
                         mode="range"
                         startDate={range.startDate}
                         endDate={range.endDate}
-                        onChange={(param) => setRange(param)}
+                        onChange={(param) => { setRange(param) }}
                         styles={{
                            selected: Styles.selectedDate,
                            selected_label: Styles.cWhite,
@@ -162,6 +216,13 @@ export default function ProjectAddTask() {
                      {
                         (error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
                      }
+                     <Pressable
+                        style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
+                        disabled={dsbButton}
+                        onPress={() => { setModalDetail(true) }}
+                     >
+                        <Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
+                     </Pressable>
                   </View>
                   <InputForm
                      label="Judul Tugas"
@@ -179,6 +240,14 @@ export default function ProjectAddTask() {
                </View>
             </ScrollView>
          </KeyboardAvoidingView>
+         <ModalAddDetailTugasProject
+            isVisible={modalDetail}
+            setVisible={setModalDetail}
+            dataTanggal={dataDetail}
+            onSubmit={(data) => {
+               setDataDetail(data)
+            }}
+         />
       </SafeAreaView>
    );
 }

app/(application)/project/[id]/cancel.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import Styles from "@/constants/Styles";
@@ -6,7 +6,7 @@ import { apiCancelProject } from "@/lib/api";
 import { setUpdateProject } from "@/lib/projectUpdate";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { SafeAreaView, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
@@ -68,28 +68,47 @@ export default function ProjectCancel() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Pembatalan Kegiatan",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disable || loading}
-                     category="cancel"
-                     onPress={() => {
-                        handleCancel();
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disable || loading}
+               //       category="cancel"
+               //       onPress={() => {
+               //          handleCancel();
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Pembatalan Kegiatan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disable || loading}
+                           category="cancel"
+                           onPress={() => {
+                              handleCancel();
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                <InputForm
                   label="Alasan Pembatalan"
                   type="default"
@@ -99,6 +118,7 @@ export default function ProjectCancel() {
                   error={error}
                   errorText="Alasan pembatalan harus diisi"
                   onChange={(val) => onValidation(val)}
+                  multiline
                />
             </View>
          </ScrollView>

app/(application)/project/[id]/edit.tsx

@@ -1,4 +1,4 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import Styles from "@/constants/Styles";
@@ -43,6 +43,8 @@ export default function EditProject() {
       setJudul(val)
       if (val == "" || val == "null") {
          setError(true)
+      } else {
+         setError(false)
       }
    }
 
@@ -87,22 +89,36 @@ export default function EditProject() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        router.back();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Edit Judul Kegiatan",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disable || loading}
-                     category="update"
-                     onPress={() => { handleUpdate() }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disable || loading}
+               //       category="update"
+               //       onPress={() => { handleUpdate() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Edit Judul Kegiatan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disable || loading}
+                           category="update"
+                           onPress={() => { handleUpdate() }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
          <ScrollView>

app/(application)/project/[id]/index.tsx

@@ -1,7 +1,9 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import HeaderRightProjectDetail from "@/components/project/headerProjectDetail";
 import SectionFile from "@/components/project/sectionFile";
+import SectionLink from "@/components/project/sectionLink";
 import SectionMember from "@/components/project/sectionMember";
+import SectionReportProject from "@/components/project/sectionReportProject";
 import SectionTanggalTugasProject from "@/components/project/sectionTanggalTugas";
 import SectionCancel from "@/components/sectionCancel";
 import SectionProgress from "@/components/sectionProgress";
@@ -9,7 +11,7 @@ import Styles from "@/constants/Styles";
 import { apiGetProjectOne } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { router, Stack, useLocalSearchParams } from "expo-router";
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { RefreshControl, SafeAreaView, ScrollView, View } from "react-native";
 import { useSelector } from "react-redux";
 
@@ -92,10 +94,20 @@ export default function DetailProject() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: loading ? 'Loading...                            ' : data?.title,
                headerTitleAlign: 'center',
-               headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMember ? null : <HeaderRightProjectDetail id={id} status={data?.status} />,
+               // headerRight: () => (entityUser.role == "user" || entityUser.role == "coadmin") && !isMember ? null : <HeaderRightProjectDetail id={id} status={data?.status} />,
+               header: () => (
+                  <AppHeader
+                     title={loading ? 'Loading...' : data && data?.title || ''}
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        (entityUser.role == "user" || entityUser.role == "coadmin") && !isMember ? null : <HeaderRightProjectDetail id={id} status={data?.status} />
+                     }
+                  />
+               )
             }}
          />
          <ScrollView
@@ -111,8 +123,10 @@ export default function DetailProject() {
                   data?.reason != null && data?.reason != "" && <SectionCancel text={data?.reason} />
                }
                <SectionProgress text={`Kemajuan Kegiatan ${progress}%`} progress={progress} />
-               <SectionTanggalTugasProject status={data?.status} member={isMember} refreshing={refreshing}/>
+               <SectionReportProject refreshing={refreshing} />
+               <SectionTanggalTugasProject status={data?.status} member={isMember} refreshing={refreshing} />
                <SectionFile status={data?.status} member={isMember} refreshing={refreshing} />
+               <SectionLink status={data?.status} member={isMember} refreshing={refreshing} />
                <SectionMember status={data?.status} refreshing={refreshing} />
             </View>
          </ScrollView>

app/(application)/project/[id]/report.tsx

@@ -0,0 +1,145 @@
+import AppHeader from "@/components/AppHeader";
+import ButtonSaveHeader from "@/components/buttonSaveHeader";
+import { InputForm } from "@/components/inputForm";
+import Styles from "@/constants/Styles";
+import { apiGetProjectOne, apiReportProject } from "@/lib/api";
+import { setUpdateProject } from "@/lib/projectUpdate";
+import { useAuthSession } from "@/providers/AuthProvider";
+import { router, Stack, useLocalSearchParams } from "expo-router";
+import { useEffect, useState } from "react";
+import { SafeAreaView, ScrollView, View } from "react-native";
+import Toast from "react-native-toast-message";
+import { useDispatch, useSelector } from "react-redux";
+
+export default function ReportProject() {
+   const { token, decryptToken } = useAuthSession();
+   const { id } = useLocalSearchParams<{ id: string }>();
+   const dispatch = useDispatch()
+   const update = useSelector((state: any) => state.projectUpdate)
+   const [laporan, setLaporan] = useState("");
+   const [error, setError] = useState(false);
+   const [disable, setDisable] = useState(false);
+   const [loading, setLoading] = useState(false)
+
+   async function handleLoad() {
+      try {
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiGetProjectOne({
+            user: hasil,
+            cat: "data",
+            id: id,
+         });
+         setLaporan(response.data.report);
+      } catch (error) {
+         console.error(error);
+      }
+   }
+
+   useEffect(() => {
+      handleLoad();
+   }, []);
+
+   function onValidation(val: string) {
+      setLaporan(val)
+      if (val == "" || val == "null") {
+         setError(true)
+      } else {
+         setError(false)
+      }
+   }
+
+   function checkAll() {
+      if (laporan == "" || laporan == "null" || laporan == null || laporan == undefined || error) {
+         setDisable(true)
+      } else {
+         setDisable(false)
+      }
+   }
+
+   useEffect(() => {
+      checkAll()
+   }, [laporan, error]);
+
+   async function handleUpdate() {
+      try {
+         setLoading(true)
+         const hasil = await decryptToken(String(token?.current));
+         const response = await apiReportProject({
+            report: laporan,
+            user: hasil,
+         }, id);
+         if (response.success) {
+            dispatch(setUpdateProject({ ...update, report: !update.report }))
+            Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
+            router.back();
+         } else {
+            Toast.show({ type: 'small', text1: response.message, })
+         }
+      } catch (error) {
+         console.error(error);
+         Toast.show({ type: 'small', text1: 'Terjadi kesalahan', })
+      } finally {
+         setLoading(false)
+      }
+   }
+
+
+
+   return (
+      <SafeAreaView>
+         <Stack.Screen
+            options={{
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          router.back();
+               //       }}
+               //    />
+               // ),
+               headerTitle: "Laporan Kegiatan",
+               headerTitleAlign: "center",
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disable || loading}
+               //       category="update"
+               //       onPress={() => { handleUpdate() }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader
+                     title="Laporan Kegiatan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disable || loading}
+                           category="update"
+                           onPress={() => { handleUpdate() }}
+                        />
+                     }
+                  />
+               )
+            }}
+         />
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
+               <InputForm
+                  label="Laporan Kegiatan"
+                  type="default"
+                  placeholder="Laporan Kegiatan"
+                  required
+                  bg="white"
+                  value={laporan}
+                  onChange={(val) => { onValidation(val) }}
+                  error={error}
+                  errorText="Judul Kegiatan harus diisi"
+                  multiline
+               />
+            </View>
+         </ScrollView>
+      </SafeAreaView>
+   );
+}

app/(application)/project/create.tsx

@@ -1,5 +1,5 @@
+import AppHeader from "@/components/AppHeader";
 import BorderBottomItem from "@/components/borderBottomItem";
-import ButtonBackHeader from "@/components/buttonBackHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import ButtonSelect from "@/components/buttonSelect";
 import DrawerBottom from "@/components/drawerBottom";
@@ -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";
@@ -41,6 +42,7 @@ export default function CreateProject() {
    const taskCreate = useSelector((state: any) => state.taskCreate);
    const update = useSelector((state: any) => state.projectUpdate)
    const entityUser = useSelector((state: any) => state.user);
+   const userLogin = useSelector((state: any) => state.entities)
    const [fileForm, setFileForm] = useState<any[]>([])
    const [indexDelFile, setIndexDelFile] = useState<number>(0)
    const [disableBtn, setDisableBtn] = useState(true)
@@ -85,7 +87,7 @@ export default function CreateProject() {
          } else {
             setError(error => ({ ...error, title: false }))
          }
-      } else if (cat == "task" && hitung > 1) {
+      } else if (cat == "task" && hitung > 2) {
          if (taskCreate.length == 0) {
             setError(error => ({ ...error, task: true }))
          } else {
@@ -113,6 +115,13 @@ export default function CreateProject() {
       validationForm('task', '');
    }, [taskCreate]);
 
+
+   useEffect(() => {
+      if (entityUser.role != "supadmin" && entityUser.role != "developer") {
+         validationForm('group', userLogin.idGroup, userLogin.group);
+      }
+   }, []);
+
    async function handleCreate() {
       try {
          setLoading(true)
@@ -184,28 +193,46 @@ export default function CreateProject() {
       <SafeAreaView>
          <Stack.Screen
             options={{
-               headerLeft: () => (
-                  <ButtonBackHeader
-                     onPress={() => {
-                        handleBack();
-                     }}
-                  />
-               ),
+               // headerLeft: () => (
+               //    <ButtonBackHeader
+               //       onPress={() => {
+               //          handleBack();
+               //       }}
+               //    />
+               // ),
                headerTitle: "Tambah Kegiatan",
                headerTitleAlign: "center",
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     disable={disableBtn || loading}
-                     category="create"
-                     onPress={() => {
-                        handleCreate()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       disable={disableBtn || loading}
+               //       category="create"
+               //       onPress={() => {
+               //          handleCreate()
+               //       }}
+               //    />
+               // ),
+               header: () => (
+                  <AppHeader title="Tambah Kegiatan"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           disable={disableBtn || loading}
+                           category="create"
+                           onPress={() => {
+                              handleCreate()
+                           }}
+                        />
+                     }
                   />
-               ),
+               )
             }}
          />
-         <ScrollView>
-            <View style={[Styles.p15, Styles.mb100]}>
+         <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={[Styles.h100]}
+         >
+            <View style={[Styles.p15]}>
                {
                   (entityUser.role == "supadmin" || entityUser.role == "developer")
                   &&
@@ -251,18 +278,12 @@ export default function CreateProject() {
                   onPress={() => {
                      if (entityUser.role == "supadmin" || entityUser.role == "developer") {
                         if (chooseGroup.val != "") {
-                           // setSelect(true);
-                           // setValSelect("member");
                            router.push(`/project/create/member`);
                         } else {
                            Toast.show({ type: 'small', text1: "Pilih Lembaga Desa terlebih dahulu", })
                         }
                      } else {
                         router.push(`/project/create/member`);
-                        // validationForm('group', userLogin.idGroup, userLogin.group);
-                        // setValChoose(userLogin.idGroup)
-                        // setSelect(true);
-                        // setValSelect("member");
                      }
                   }}
                   error={error.member}
@@ -306,7 +327,7 @@ export default function CreateProject() {
                                     borderType="bottom"
                                     icon={
                                        <ImageUser
-                                          src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                          src={`${ConstEnv.url_storage}/files/${item.img}`}
                                           size="sm"
                                        />
                                     }

app/(application)/project/create/member.tsx

@@ -1,17 +1,18 @@
-import ButtonBackHeader from "@/components/buttonBackHeader";
+import AppHeader from "@/components/AppHeader";
 import ButtonSaveHeader from "@/components/buttonSaveHeader";
 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";
 import { useAuthSession } from "@/providers/AuthProvider";
 import { AntDesign } from "@expo/vector-icons";
 import { router, Stack } from "expo-router";
-import { useEffect, useState } from "react";
-import { Pressable, SafeAreaView, ScrollView, View } from "react-native";
+import React, { useEffect, useState } from "react";
+import { Pressable, ScrollView, View } from "react-native";
 import Toast from "react-native-toast-message";
 import { useDispatch, useSelector } from "react-redux";
 
@@ -70,37 +71,52 @@ export default function AddMemberCreateProject() {
 
 
    return (
-      <SafeAreaView>
+      <>
          <Stack.Screen
             options={{
-               headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
+               // headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Pilih Anggota',
                headerTitleAlign: 'center',
-               headerRight: () => (
-                  <ButtonSaveHeader
-                     category="create"
-                     disable={selectMember.length > 0 ? false : true}
-                     onPress={() => {
-                        handleAddMember()
-                     }}
+               // headerRight: () => (
+               //    <ButtonSaveHeader
+               //       category="create"
+               //       disable={selectMember.length > 0 ? false : true}
+               //       onPress={() => {
+               //          handleAddMember()
+               //       }}
+               //    />
+               // )
+               header: () => (
+                  <AppHeader title="Pilih Anggota"
+                     showBack={true}
+                     onPressLeft={() => router.back()}
+                     right={
+                        <ButtonSaveHeader
+                           category="create"
+                           disable={selectMember.length > 0 ? false : true}
+                           onPress={() => {
+                              handleAddMember()
+                           }}
+                        />
+                     }
                   />
                )
             }}
          />
-         <View style={[Styles.p15]}>
+         <View style={[Styles.p15, { flex: 1 }]}>
             <InputSearch onChange={(val) => setSearch(val)} value={search} />
 
             {
                selectMember.length > 0
                   ?
                   <View>
-                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]}>
+                     <ScrollView horizontal style={[Styles.mb10, Styles.pv10]} showsHorizontalScrollIndicator={false}>
                         {
                            selectMember.map((item: any, index: any) => (
                               <ImageWithLabel
                                  key={index}
                                  label={item.name}
-                                 src={`https://wibu-storage.wibudev.com/api/files/${item.img}`}
+                                 src={`${ConstEnv.url_storage}/files/${item.img}`}
                                  onClick={() => onChoose(item.idUser, item.name, item.img)}
                               />
                            ))
@@ -111,7 +127,9 @@ export default function AddMemberCreateProject() {
                   :
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.pv05, { textAlign: 'center' }]}>Tidak ada member yang dipilih</Text>
             }
-            <ScrollView>
+            <ScrollView
+               showsVerticalScrollIndicator={false}
+            >
 
                {
                   data.length > 0 ?
@@ -125,7 +143,7 @@ export default function AddMemberCreateProject() {
                               }}
                            >
                               <View style={[Styles.rowItemsCenter]}>
-                                 <ImageUser src={`https://wibu-storage.wibudev.com/api/files/${item.img}`} border />
+                                 <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} border />
                                  <View style={[Styles.ml10]}>
                                     <Text style={[Styles.textDefault]}>{item.name}</Text>
                                  </View>
@@ -142,6 +160,6 @@ export default function AddMemberCreateProject() {
                }
             </ScrollView>
          </View>
-      </SafeAreaView>
+      </>
    )
 }