wibu/hipmi-mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'QC: Inno dan Pak Jun' (#21) from qc/1-dec-25 into main

Browse Source 
Reviewed-on: http://wibugit.wibudev.com/wibu/hipmi-mobile/pulls/21
This commit is contained in:
bagasbanuna
2025-12-01 17:45:26 +08:00
parent 19814315a4 98aaa126a1
commit 249ada221b
14 changed files with 81 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/(application)/(user)/collaboration/create.tsx
View File

@@ -155,7 +155,7 @@ export default function CollaborationCreate() {
<TextAreaCustom
required
label="Keuntungan Proyek"
placeholder="Masukan keuntungan proyek"
placeholder="Masukan keuntungan proyek, contoh: Meningkatkan relasi bisnis , menjamin kualitas produk, meningkatkan kinerja dan lain lain"
showCount
maxLength={1000}
value={data?.benefit}

6
app/(application)/(user)/event/[id]/edit.tsx
View File

@@ -18,7 +18,7 @@ import {
import { apiMasterEventType } from "@/service/api-client/api-master";
import { DateTimePickerEvent } from "@react-native-community/datetimepicker";
import { router, useFocusEffect, useLocalSearchParams } from "expo-router";
import React, { useCallback, useEffect, useState } from "react";
import { useCallback, useEffect, useState } from "react";
import Toast from "react-native-toast-message";
export default function EventEdit() {
@@ -55,6 +55,7 @@ export default function EventEdit() {
try {
setIsLoadData(true);
const response = await apiEventGetOne({ id: id as string });
console.log("[DATA BY ID]", JSON.stringify(response, null, 2));
if (response.success) {
setData(response.data);
setSelectedDate(new Date(response.data.tanggal));
@@ -209,7 +210,7 @@ export default function EventEdit() {
minimumDate={new Date(Date.now())}
label="Tanggal & Waktu Mulai"
required
value={selectedDate as any}
value={selectedDate}
onChange={(date: any) => {
setSelectedDate(date as any);
}}
@@ -254,7 +255,6 @@ export default function EventEdit() {
placeholder="Masukkan deskripsi event"
required
showCount
maxLength={100}
value={data?.deskripsi}
onChangeText={(value) => setData({ ...data, deskripsi: value })}
/>

5
app/(application)/(user)/event/create.tsx
View File

@@ -110,7 +110,7 @@ export default function EventCreate() {
const response = await apiEventCreate(newData);
console.log("Response", JSON.stringify(response, null, 2));
router.navigate("/event/status");
router.replace("/event/status");
} catch (error) {
console.log(error);
} finally {
@@ -118,6 +118,7 @@ export default function EventCreate() {
}
};
const buttonSubmit = (
<ButtonCustom
isLoading={isLoading}
@@ -191,7 +192,7 @@ export default function EventCreate() {
placeholder="Masukkan deskripsi event"
required
showCount
maxLength={1000}
value={data?.deskripsi || ""}
onChangeText={(value: any) =>
setData({ ...data, deskripsi: value })
}

2
app/(application)/(user)/profile/[id]/blocked-list.tsx
View File

@@ -121,7 +121,7 @@ export default function ProfileBlockedList() {
return (
<>
<NewWrapper
headerComponent={renderHeader()}
// headerComponent={renderHeader()}
listData={listData}
renderItem={renderItem}
onEndReached={loadMore}

20
app/(application)/(user)/profile/[id]/index.tsx
View File

@@ -64,14 +64,18 @@ export default function Profile() {
};
const onLoadPortofolio = async (id: string) => {
const response = await apiGetPortofolio({ id: id });
const lastTwoByDate = response.data
.sort(
(a: any, b: any) =>
new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
) // urut desc
.slice(0, 2);
setListPortofolio(lastTwoByDate);
try {
const response = await apiGetPortofolio({ id: id });
const lastTwoByDate = response.data
.sort(
(a: any, b: any) =>
new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
) // urut desc
.slice(0, 2);
setListPortofolio(lastTwoByDate);
} catch (error) {
console.log("[ERROR]", error);
}
};
return (

2
app/(application)/(user)/voting/[id]/[status]/detail.tsx
View File

@@ -134,7 +134,7 @@ export default function VotingDetailStatus() {
{data &&
data?.catatan &&
(status === "draft" || status === "rejected") && (
(status === "draft" || status === "reject") && (
<ReportBox text={data?.catatan} />
)}

5
components/Button/FloatingButton.tsx
View File

@@ -32,9 +32,10 @@ const FloatingButton: React.FC<FloatingButtonProps> = ({
const styles = StyleSheet.create({
fab: {
position: "absolute",
margin: 16,
margin: "auto",
right: 0,
bottom: 0,
// bottom: 10,
top: -20,
backgroundColor: AccentColor.softblue, // Warna Twitter biru
borderRadius: 50,
borderColor: AccentColor.blue,

9
components/TextArea/TextAreaCustom.tsx
View File

@@ -1,3 +1,4 @@
import { AccentColor, MainColor } from "@/constants/color-palet";
import { GStyles } from "@/styles/global-styles";
import React, { useEffect, useState } from "react";
import {
@@ -6,7 +7,9 @@ import {
Text,
View,
ViewStyle,
useColorScheme,
} from "react-native";
import { PlaceholderColor } from "@/constants/color-palet";
type IconType = React.ReactNode | string;
@@ -48,7 +51,7 @@ const TextAreaCustom: React.FC<TextAreaCustomProps> = ({
minRows = 4,
maxRows = 6,
showCount = false,
maxLength,
maxLength = 1000,
value,
onChangeText,
height = 100,
@@ -78,6 +81,9 @@ const TextAreaCustom: React.FC<TextAreaCustomProps> = ({
);
};
const colorScheme = useColorScheme();
const theme = PlaceholderColor[colorScheme || "light"];
return (
<View style={[GStyles.inputContainerArea]}>
{label && (
@@ -109,6 +115,7 @@ const TextAreaCustom: React.FC<TextAreaCustomProps> = ({
GStyles.textAreaInput,
{ color: fontColor },
]}
placeholderTextColor={theme.placeholder}
editable={!disabled}
value={value as string}
onChangeText={onChangeText}

8
components/TextInput/TextInputCustom.tsx
View File

@@ -1,3 +1,4 @@
import { PlaceholderColor } from "@/constants/color-palet";
import { GStyles } from "@/styles/global-styles";
import Ionicons from "@expo/vector-icons/Ionicons";
import React, { useState } from "react";
@@ -8,8 +9,10 @@ import {
TouchableOpacity,
View,
ViewStyle,
useColorScheme
} from "react-native";
type IconType = React.ReactNode | string;
type Props = {
@@ -74,6 +77,9 @@ const TextInputCustom = ({
}
};
const colorScheme = useColorScheme();
const theme = PlaceholderColor[colorScheme || "light"];
return (
<View style={[GStyles.inputContainerArea, containerStyle]}>
{label && (
@@ -100,12 +106,14 @@ const TextInputCustom = ({
{ color: fontColor },
disabled && GStyles.inputPlaceholderDisabled, // <-- placeholder saat disabled
]}
placeholderTextColor={theme.placeholder}
editable={!disabled}
secureTextEntry={secureTextEntry && !isPasswordVisible}
keyboardType={keyboardType}
onChangeText={handleTextChange}
maxLength={maxLength}
{...rest}
/>
{secureTextEntry && (
<TouchableOpacity

20
constants/color-palet.ts
View File

@@ -45,3 +45,23 @@ export const AdminColor = {
// Warna Asli: #002e59
// Warna Lebih Gelap: #001f3b
// Warna Tergelap: #001323
export const PlaceholderColor = {
light: {
text: "#000",
placeholder: "#666",
border: "#ccc",
background: "#fff",
error: "#d00",
icon: "#555",
},
dark: {
text: "#fff",
placeholder: "#aaa",
border: "#444",
background: "#1a1a1a",
error: "#ff4d4d",
icon: "#ccc",
},
};

7
screens/Authentication/LoginView.tsx
View File

@@ -65,10 +65,15 @@ export default function LoginView() {
const isValid = await validateData();
if (!isValid) return;
// const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
// const fixNumber = inputValue.replace(/\s+/g, "");
const callingCode = selectedCountry?.callingCode.replace(/^\+/, "") || "";
const fixNumber = inputValue.replace(/\s+/g, "");
let fixNumber = inputValue.replace(/\s+/g, "").replace(/^0+/, "");
const realNumber = callingCode + fixNumber;
console.log("[REALNUMBER]", realNumber);
try {
setLoading(true);
// const response = await apiLogin({ nomor: realNumber });

2
screens/Home/topFeatureSection.tsx
View File

@@ -15,7 +15,7 @@ export default function Home_FeatureSection() {
name: "Collaboration",
icon: <Ionicons name="share" size={48} color="gray" />,
onPress: () => router.push("/(application)/(user)/collaboration/(tabs)"),
status: "inactive",
status: "active",
},
{
name: "Voting",

20
screens/Portofolio/SocialMediaSection.tsx
View File

@@ -5,16 +5,6 @@ import { Ionicons } from "@expo/vector-icons";
export default function Portofolio_SocialMediaSection({ data }: { data: any }) {
const listData = [
{
label: data && data?.facebook ? data.facebook : "-",
icon: (
<Ionicons
name="logo-facebook"
size={ICON_SIZE_SMALL}
color={MainColor.white}
/>
),
},
{
label: data && data?.tiktok ? data.tiktok : "-",
icon: (
@@ -35,6 +25,16 @@ export default function Portofolio_SocialMediaSection({ data }: { data: any }) {
/>
),
},
{
label: data && data?.facebook ? data.facebook : "-",
icon: (
<Ionicons
name="logo-facebook"
size={ICON_SIZE_SMALL}
color={MainColor.white}
/>
),
},
{
label: data && data?.twitter ? data.twitter : "-",
icon: (

6
screens/Voting/BoxDetailHasilVotingSection.tsx
View File

@@ -22,9 +22,11 @@ export default function Voting_BoxDetailHasilVotingSection({
<Grid>
{listData?.map((item: any, i: number) => (
<Grid.Col span={12 / listData?.length} style={{ alignItems: "center" }} key={i}>
<StackCustom>
<StackCustom style={{
alignItems: "center",
}}>
<CircleContainer value={item?.jumlah} />
<TextCustom align="center" size="small">{item?.value}</TextCustom>
<TextCustom truncate={2} align="center" size="small">{item?.value}</TextCustom>
</StackCustom>
</Grid.Col>
))}