Merge pull request 'amalia/26-feb-26' (#32) from amalia/26-feb-26 into join

Reviewed-on: #32
This commit is contained in:
2026-02-26 17:48:06 +08:00
5 changed files with 2609 additions and 24 deletions

2587
bun.lock Normal file

File diff suppressed because it is too large Load Diff

BIN
bun.lockb

Binary file not shown.

View File

@@ -1,6 +1,7 @@
import Styles from "@/constants/Styles";
import { apiGetDataHome } from "@/lib/api";
import { useAuthSession } from "@/providers/AuthProvider";
import { useTheme } from "@/providers/ThemeProvider";
import { router } from "expo-router";
import React, { useEffect, useState } from "react";
import { Dimensions, View } from "react-native";
@@ -10,7 +11,6 @@ import PaperGridContent from "../paperGridContent";
import ProgressBar from "../progressBar";
import Skeleton from "../skeleton";
import Text from "../Text";
import { useTheme } from "@/providers/ThemeProvider";
type Props = {
id: string
@@ -52,7 +52,7 @@ export default function ProjectHome({ refreshing }: { refreshing: boolean }) {
}, []);
return (
<View style={[Styles.mb15]}>
<View style={[Styles.mb05]}>
<Text style={[Styles.textDefaultSemiBold, Styles.mb10]}>Kegiatan Terupdate</Text>
{
loading ? (<Skeleton width={100} height={150} borderRadius={10} widthType="percent" />)
@@ -62,7 +62,7 @@ export default function ProjectHome({ refreshing }: { refreshing: boolean }) {
ref={ref}
style={{ width: "100%" }}
width={width * 0.8}
height={235}
height={220}
data={data}
loop={false}
autoPlay={false}

View File

@@ -22,7 +22,7 @@ export default function PaperGridContent({ content, children, title, headerColor
const bgSource = activeTheme === 'light' ? bgLight : bgDark;
return (
<Pressable onPress={onPress}>
<View style={[content == 'carousel' ? Styles.wrapGridCaraousel : Styles.wrapGridContent]}>
<View style={[content == 'carousel' ? Styles.wrapGridCaraousel : Styles.wrapGridContent, { backgroundColor: colors.card }]}>
{
headerColor == 'warning' ? (
<View style={[Styles.headerPaperGrid, ColorsStatus.warning]}>
@@ -41,7 +41,6 @@ export default function PaperGridContent({ content, children, title, headerColor
}
<View style={[
contentPosition && contentPosition == 'top' ? Styles.contentPaperGrid2 : Styles.contentPaperGrid,
{ backgroundColor: colors.card },
height ? { height: height } : {}
]}>
{children}

View File

@@ -392,10 +392,10 @@ const Styles = StyleSheet.create({
},
wrapGridContent: {
shadowColor: '#171717',
shadowOffset: { width: 0, height: 4 },
shadowOffset: { width: 0, height: 0 },
shadowOpacity: 0.1,
shadowRadius: 10,
elevation: 5,
shadowRadius: 5,
elevation: 2,
borderRadius: 5,
marginBottom: 15
},
@@ -403,12 +403,13 @@ const Styles = StyleSheet.create({
width: '95%',
height: 200,
shadowColor: '#171717',
shadowOffset: { width: 0, height: 4 },
shadowOffset: { width: 0, height: 0 },
shadowOpacity: 0.1,
shadowRadius: 4,
elevation: 5,
shadowRadius: 5,
elevation: 2,
borderRadius: 5,
marginLeft: 5
marginLeft: 5,
display: 'flex',
},
headerPaperGrid: {
paddingVertical: 25,
@@ -418,15 +419,13 @@ const Styles = StyleSheet.create({
borderTopEndRadius: 5
},
contentPaperGrid: {
backgroundColor: 'white',
height: 150,
height: 125,
borderBottomEndRadius: 5,
borderBottomStartRadius: 5,
paddingHorizontal: 20,
justifyContent: 'space-evenly'
},
contentPaperGrid2: {
backgroundColor: 'white',
height: 100,
borderBottomEndRadius: 5,
borderBottomStartRadius: 5,
@@ -455,8 +454,8 @@ const Styles = StyleSheet.create({
shadowColor: '#171717',
shadowOffset: { width: 0, height: 0 },
shadowOpacity: 0.1,
shadowRadius: 4,
elevation: 5,
shadowRadius: 5,
elevation: 2,
},
noShadow: {
shadowColor: 'transparent',
@@ -469,8 +468,8 @@ const Styles = StyleSheet.create({
shadowColor: '#171717',
shadowOffset: { width: 0, height: 0 },
shadowOpacity: 0.1,
shadowRadius: 4,
elevation: 5,
shadowRadius: 5,
elevation: 2,
},
contentItemCenter: {
justifyContent: 'center',
@@ -749,10 +748,10 @@ const Styles = StyleSheet.create({
},
wrapHomeCarousel: {
shadowColor: '#171717',
shadowOffset: { width: 0, height: 5 },
shadowOpacity: 0.2,
shadowRadius: 5,
elevation: 50,
shadowOffset: { width: 0, height: 4 },
shadowOpacity: 0.15,
shadowRadius: 8,
elevation: 5,
},
modalOverlay: {
flex: 1,
@@ -764,7 +763,7 @@ const Styles = StyleSheet.create({
width: '80%',
borderRadius: 14,
overflow: 'hidden',
elevation: 5,
elevation: 2,
shadowColor: '#000',
shadowOffset: { width: 0, height: 2 },
shadowOpacity: 0.25,