Skip to content

Commit

Permalink
fix: resolve merge conflict in list page
Browse files Browse the repository at this point in the history
  • Loading branch information
eternalmaha committed Oct 18, 2024
1 parent 6d8843b commit d1a41de
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/views/authenticated/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,12 @@ export function List({ data: unfilteredListItems, listPath }: Props) {
<header>
<h2 className="ListName p-1 m-2 mt-2">{listName}</h2>
</header>
<section className="AddItemForm">
<AddItemForm listPath={listPath} data={unfilteredListItems || []} />
</section>

<section className="AddItemForm">
<section />
<AddItemForm listPath={listPath} data={unfilteredListItems || []} />
</section>

<section className="list-functions mt-3 d-flex sticky-top align-items-center justify-content-center">
{unfilteredListItems.length > 0 && (
<FilterListInput
Expand All @@ -93,7 +96,6 @@ export function List({ data: unfilteredListItems, listPath }: Props) {
</section>

<section ref={viewListRef}>

<section className="ListItemCheckBox">
{filteredListItems.map((item) => (
<ListItemCheckBox key={item.id} item={item} listPath={listPath} />
Expand All @@ -102,12 +104,10 @@ export function List({ data: unfilteredListItems, listPath }: Props) {
</section>
</div>


<ShareListForm listPath={listPath} />
<Button className="d-md-none mt-3" onClick={scrollToViewList}>
{"View List"}
</Button>
</Container>

);
}

0 comments on commit d1a41de

Please sign in to comment.