Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Gather307/Gather
Browse files Browse the repository at this point in the history
  • Loading branch information
SilveerDusk committed Jun 4, 2024
2 parents 755c071 + 9ecc37c commit 20e34a9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
12 changes: 1 addition & 11 deletions frontend/src/pages/IndividualGroupPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ import {
Button,
VStack,
HStack,
Input,
InputGroup,
InputLeftElement,
Divider,
Avatar,
} from "@chakra-ui/react";
import { IoArrowBack, IoSearch } from "react-icons/io5";
import { IoArrowBack } from "react-icons/io5";
import { IGroup } from "../../../backend/models/groupSchema";
import { IUser } from "../../../backend/models/userSchema";
import { IBasket } from "../../../backend/models/basketSchema";
Expand Down Expand Up @@ -176,13 +173,6 @@ const IndividualGroupPage: React.FC<Props> = ({
friends={friends}
members={members ?? []}
/>
<InputGroup width={{ base: "100%", md: "300px" }}>
<InputLeftElement pointerEvents="none" children={<IoSearch />} />
<Input
placeholder="Search in group"
backgroundColor="rgba(255, 255, 255, 0.8)"
/>
</InputGroup>
</Flex>
</Flex>

Expand Down
6 changes: 0 additions & 6 deletions frontend/src/pages/ItemsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { IUser } from "../../../backend/models/userSchema";
import { IGroup } from "../../../backend/models/groupSchema";
import { fetchUserGroupsByUser } from "../../lib/fetches";
import { IoIosSwap } from "react-icons/io";
import SearchBar from "../components/SearchBar";

type Props = {
stateVariable: {
Expand Down Expand Up @@ -99,11 +98,6 @@ const ItemsPage: React.FC<Props> = ({
</Link>
</Flex>
</Box>
<SearchBar
onSearch={() => console.log("Absolutely not implemented yet.")}
placeholder="search for groups"
width="500px"
/>
</HStack>
{/* Solid line b/t Header & Grid */}
<Box
Expand Down

0 comments on commit 20e34a9

Please sign in to comment.