Merge pull request #261 from bipproduction/lukman/26-september-2024

style : update style
This commit is contained in:
Amalia
2024-09-26 15:28:50 +08:00
committed by GitHub
7 changed files with 70 additions and 63 deletions

View File

@@ -71,11 +71,11 @@ export default function ListDocumentOnDetailDivision() {
<Carousel.Slide key={v.id}> <Carousel.Slide key={v.id}>
<UnstyledButton onClick={() => router.push(`/division/${param.id}/document`)}> <UnstyledButton onClick={() => router.push(`/division/${param.id}/document`)}>
<Stack gap={0} w={isMobile ? 100 : 170}> <Stack gap={0} w={isMobile ? 100 : 170}>
<Paper withBorder shadow="sm" radius={12} > <Box bg={"white"} style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }} >
<Center p={"md"}> <Center p={"md"}>
<Image w={isMobile ? 50 : 75} src={(v.extension == "pdf") ? iconContainer(ICON.PDF) : iconContainer(ICON.IMAGE)} alt="image" /> <Image w={isMobile ? 50 : 75} src={(v.extension == "pdf") ? iconContainer(ICON.PDF) : iconContainer(ICON.IMAGE)} alt="image" />
</Center> </Center>
</Paper> </Box>
<Box> <Box>
<Text c={"dimmed"} ta={"center"} lineClamp={1} fz={isMobile ? 14 : 16}>{v.name + '.' + v.extension}</Text> <Text c={"dimmed"} ta={"center"} lineClamp={1} fz={isMobile ? 14 : 16}>{v.name + '.' + v.extension}</Text>
</Box> </Box>

View File

@@ -72,10 +72,10 @@ export default function ListTaskOnDetailDivision() {
<Box p={20} w={{ <Box p={20} w={{
base: isMobile ? 230 : 300, base: isMobile ? 230 : 300,
md: 400 md: 400
}} onClick={() => router.push(`/task/${v.id}`)} bg={tema.get().utama} style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}> }} onClick={() => router.push(`/task/${v.id}`)} bg={"white"} style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}>
<Text fw={'bold'} c={tema.get().bgUtama} lineClamp={1}>{_.startCase(v.title)}</Text> <Text fw={'bold'} c={tema.get().utama} lineClamp={1}>{_.startCase(v.title)}</Text>
<Group justify="space-between" mt={20}> <Group justify="space-between" mt={20}>
<Group gap={5} align="center" c={"#CFCDCD"}> <Group gap={5} align="center">
<CiClock2 size={18} /> <CiClock2 size={18} />
<Text fz={13}>{v.dateStart}</Text> <Text fz={13}>{v.dateStart}</Text>
</Group > </Group >

View File

@@ -526,19 +526,15 @@ export default function NavbarDocumentDivision() {
> >
{dataJalur.slice(0, 3).map((v, i) => { {dataJalur.slice(0, 3).map((v, i) => {
return ( return (
<Box p={5}>
<Text <Text
onClick={() => router.push("?path=" + v.id)} onClick={() => router.push("?path=" + v.id)}
key={i} key={i}
style={{ truncate="end"
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
maxWidth: "100%",
}}
truncate={"end"}
> >
{v.name} {v.name}
</Text> </Text>
</Box>
); );
})} })}
{dataJalur.length > 3 && ( {dataJalur.length > 3 && (
@@ -575,6 +571,7 @@ export default function NavbarDocumentDivision() {
> >
{dataJalur.slice(0, 4).map((v, i) => { {dataJalur.slice(0, 4).map((v, i) => {
return ( return (
<Box p={5}>
<Text <Text
onClick={() => router.push("?path=" + v.id)} onClick={() => router.push("?path=" + v.id)}
key={i} key={i}
@@ -582,6 +579,7 @@ export default function NavbarDocumentDivision() {
> >
{v.name} {v.name}
</Text> </Text>
</Box>
); );
})} })}
{dataJalur.length > 4 && ( {dataJalur.length > 4 && (

View File

@@ -76,7 +76,8 @@ export default function ProgressDetailProject() {
return ( return (
<> <>
<Box mt={10}> <Box mt={10}>
{reason !== null ? {loading ? "" :
reason !== null ?
( (
<Box mb={10}> <Box mb={10}>
<Box p={15} bg={"#FFF2CD"} style={{ <Box p={15} bg={"#FFF2CD"} style={{

View File

@@ -131,14 +131,17 @@ export default function ListFileDetailTask() {
}} }}
> >
<Grid gutter={"sm"} justify='flex-start' align='flex-start'> <Grid gutter={"sm"} justify='flex-start' align='flex-start'>
<Grid.Col span={"auto"}> <Grid.Col span={2}>
<Center > <Center >
{item.extension == "pdf" && <BsFiletypePdf size={25} />} {item.extension == "pdf" && <BsFiletypePdf size={30} />}
{item.extension == "csv" && <BsFiletypeCsv size={25} />} {item.extension == "csv" && <BsFiletypeCsv size={30} />}
{item.extension == "png" && <BsFiletypePng size={25} />} {item.extension == "png" && <BsFiletypePng size={30} />}
{item.extension == "jpg" && <BsFiletypeJpg size={25} />} {item.extension == "jpg" && <BsFiletypeJpg size={30} />}
{item.extension == "jpeg" && <BsFiletypeJpg size={25} />} {item.extension == "jpeg" && <BsFiletypeJpg size={30} />}
{item.extension == "heic" && <BsFiletypeHeic size={25} />} {item.extension == "PNG" && <BsFiletypePng size={30} />}
{item.extension == "JPG" && <BsFiletypeJpg size={30} />}
{item.extension == "JPEG" && <BsFiletypeJpg size={30} />}
{item.extension == "heic" && <BsFiletypeHeic size={30} />}
</Center> </Center>
</Grid.Col> </Grid.Col>
<Grid.Col span={10}> <Grid.Col span={10}>
@@ -155,7 +158,7 @@ export default function ListFileDetailTask() {
<LayoutDrawer opened={openDrawer} title={<Text lineClamp={1}>{nameData}</Text>} onClose={() => setOpenDrawer(false)}> <LayoutDrawer opened={openDrawer} title={<Text truncate={'end'}>{nameData}</Text>} onClose={() => setOpenDrawer(false)}>
<Box> <Box>
<Stack pt={10}> <Stack pt={10}>
<SimpleGrid <SimpleGrid

View File

@@ -78,7 +78,8 @@ export default function ProgressDetailTask() {
return ( return (
<Box mt={10}> <Box mt={10}>
{reason !== null ? {loading ? "" :
reason !== null ?
( (
<Box mb={10}> <Box mb={10}>
<Box p={15} bg={"#FFF2CD"} style={{ <Box p={15} bg={"#FFF2CD"} style={{

View File

@@ -16,12 +16,16 @@ export default function ResultsFile({ name, extension }: IListFileTask) {
{extension == "pdf" && <BsFiletypePdf size={30} />} {extension == "pdf" && <BsFiletypePdf size={30} />}
{extension == "csv" && <BsFiletypeCsv size={30} />} {extension == "csv" && <BsFiletypeCsv size={30} />}
{extension == "png" && <BsFiletypePng size={30} />} {extension == "png" && <BsFiletypePng size={30} />}
{extension == "jpg" || extension == "jpeg" && <BsFiletypeJpg size={30} />} {extension == "jpg" && <BsFiletypeJpg size={30} />}
{extension == "jpeg" && <BsFiletypeJpg size={30} />}
{extension == "PNG" && <BsFiletypePng size={30} />}
{extension == "JPG" && <BsFiletypeJpg size={30} />}
{extension == "JPEG" && <BsFiletypeJpg size={30} />}
{extension == "heic" && <BsFiletypeHeic size={30} />} {extension == "heic" && <BsFiletypeHeic size={30} />}
</Center> </Center>
</Grid.Col> </Grid.Col>
<Grid.Col span={10}> <Grid.Col span={10}>
<Text>{name}</Text> <Text truncate={'end'}>{name}</Text>
</Grid.Col> </Grid.Col>
</Grid> </Grid>
<Group> <Group>