Skip to content

Commit

Permalink
individual groups page ui bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
SilveerDusk committed Jun 4, 2024
1 parent 33d381c commit 69d1e32
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 25 deletions.
34 changes: 16 additions & 18 deletions frontend/src/components/Basket.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ const BasketComp = ({
? "missing"
: basketObj?.description}
</Text>
<Text
<Text
display={multiMemberView ? "auto" : "none"}
marginBottom={multiMemberView ? "10px" : "none"}
>
Expand All @@ -165,28 +165,26 @@ const BasketComp = ({
width="100%"
justifyContent={"space-around"}
padding="5px"
flexDir={
{
xl: "row",
base: "column",
}
}
flexDir={{
xl: "row",
base: "column",
}}
>
{isOwnerOfBasket ? (
<AddFriendToBasket
basketId={basketId.toString()}
groupMembers={groupMembers}
basketMemberIds={basketObj?.members}
currentUserId={LoggedInUser?._id.toString()}
/>
<AddFriendToBasket
basketId={basketId.toString()}
groupMembers={groupMembers}
basketMemberIds={basketObj?.members}
currentUserId={LoggedInUser?._id.toString()}
/>
) : (
<></>
<></>
)}
{isMemberOfBasket ? (
<EditBasket
groupId={groupId}
basketId={basketId.toString()}
/>
<EditBasket
groupId={groupId}
basketId={basketId.toString()}
/>
) : (
<></>
)}
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/components/BasketItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ const BasketItem = ({ itemId, bid, basketMemberView }: Props) => {
padding={`${basketMemberView ? "0px" : "10px"} 2%`}
borderRadius="20px"
>
<Box
<Box
width={{ base: "40%", md: "25%" }}
margin={{ base: "10px", md: "0px" }}
textAlign={{ base: "center", md: "left" }}
>
{item?.name}
</Box>
<Box
flexGrow="6"
<Box
flexGrow="6"
display={{ base: "none", md: "block" }}
textAlign="center"
>
Expand Down
5 changes: 1 addition & 4 deletions frontend/src/pages/IndividualGroupPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,7 @@ const IndividualGroupPage: React.FC<Props> = ({
justifyContent={"space-between"}
alignItems={"center"}
>
<Heading
paddingLeft={"10px"}
paddingTop={"10px"}
>
<Heading paddingLeft={"10px"} paddingTop={"10px"}>
Baskets
</Heading>
<Box
Expand Down

0 comments on commit 69d1e32

Please sign in to comment.