[mant] Merge all current conflicta

src/components/DropdownComponent.tsx

@@ -4,30 +4,24 @@ import {
   IonItem,
   IonLabel,
 } from "@ionic/react";
-import ListComponent from "../components/ListComponent";
-import { Category } from "../types";
+import { PropsWithChildren } from "react";
 import "./DropdownComponent.css";
 
-const DropdownComponent: React.FC<{
-  category: Category[];
-}> = (props) => {
-  const category = props.category;
+const DropdownComponent: React.FC<
+  {
+    name: string;
+  } & PropsWithChildren
+> = ({ name, children }) => {
   return (
     <IonAccordionGroup>
-      {category.map((catItem: Category, index) => {
-        return (
-          <IonAccordion value={`${index}`}>
-            <IonItem slot="header" color="light">
-              <IonLabel>{catItem.name}</IonLabel>
-            </IonItem>
-            <IonItem slot="content">
-              <div className="accordion-list-container">
-                <ListComponent items={catItem.listItems} />
-              </div>
-            </IonItem>
-          </IonAccordion>
-        );
-      })}
+      <IonAccordion value={name}>
+        <IonItem slot="header" color="light">
+          <IonLabel>{name}</IonLabel>
+        </IonItem>
+        <IonItem slot="content">
+          <div className="accordion-list-container">{children}</div>
+        </IonItem>
+      </IonAccordion>
     </IonAccordionGroup>
   );
 };

src/components/TopicList.tsx

@@ -1,4 +1,10 @@
-import { IonContent, IonItem, IonLabel, IonListHeader } from "@ionic/react";
+import {
+  IonContent,
+  IonItem,
+  IonLabel,
+  IonList,
+  IonListHeader,
+} from "@ionic/react";
 import { Topic } from "../types";
 import SkeletonText from "./SkeletonText";
 import "../components/TopicList.css";
@@ -27,7 +33,7 @@ const TopicList: React.FC<{
   loading?: boolean;
 }> = ({ title, topics, loading }) => {
   return (
-    <IonContent>
+    <IonList>
       {title ? (
         <IonListHeader>
           <IonLabel>{title}</IonLabel>
@@ -47,7 +53,7 @@ const TopicList: React.FC<{
             </IonItem>
           );
         })}
-    </IonContent>
+    </IonList>
   );
 };
 export default TopicList;

src/pages/AdviceListPage.tsx

@@ -8,6 +8,7 @@ import {
 } from "@ionic/react";
 import { alertCircleOutline } from "ionicons/icons";
 import useSWR from "swr";
+import DropdownComponent from "../components/DropdownComponent";
 import TopicList from "../components/TopicList";
 import { fetcher } from "../lib/api";
 import { Topic } from "../types";
@@ -32,7 +33,12 @@ const AdviceListPage: React.FC = () => {
             <IonTitle size="large">Advice</IonTitle>
           </IonToolbar>
         </IonHeader>
-        {data && <TopicList loading={isLoading} topics={data as Topic[]} />}
+        <DropdownComponent name="Parentesco">
+          <TopicList
+            loading={isLoading}
+            topics={data ? (data as Topic[]) : []}
+          />
+        </DropdownComponent>
         <IonToast
           icon={alertCircleOutline}
           color="danger"

src/pages/ArticlePage.tsx

@@ -17,7 +17,6 @@ import { NotionRenderer } from "react-notion-x";
 import { fetcher } from "../lib/api";
 import useSWR from "swr";
 import { formatDate, getBlockTitle, getPageProperty } from "notion-utils";
-import omit from "lodash/omit";
 import SkeletonText from "../components/SkeletonText";
 
 const ArticlePage: React.FC<RouteComponentProps<{ articleId: string }>> = ({

src/pages/LawListPage.tsx

@@ -33,7 +33,7 @@ const LawListPage: React.FC = () => {
             <IonTitle size="large">Leyes</IonTitle>
           </IonToolbar>
         </IonHeader>
-        {data && <TopicList loading={isLoading} topics={data as Topic[]} />}
+        <TopicList loading={isLoading} topics={data ? (data as Topic[]) : []} />
         <IonToast
           icon={alertCircleOutline}
           color="danger"