🐢 update other components to use new props fmt for keyword+button

devsoc-unsw · Dec 10, 2024 · 908ef04 · 908ef04
1 parent 27d1c26
commit 908ef04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/frontend/src/EventDetails/EventDetails.tsx b/frontend/src/EventDetails/EventDetails.tsx
@@ -1,5 +1,5 @@
 import classes from "./EventDetails.module.css";
-import Button, { ButtonOptions } from "../Button/Button";
+import Button from "../Button/Button";
 import {
   ArrowTopRightOnSquareIcon,
   CalendarIcon,
@@ -8,8 +8,9 @@ import {
   MapPinIcon,
   UserIcon,
 } from "@heroicons/react/24/outline";
-import { Keyword, KeywordOptions } from "../Keyword/Keyword";
+import Keyword from "../Keyword/Keyword";
 import ShareButton from "../ShareButton/ShareButton";
+import { ButtonIcons, ButtonVariants } from "../Button/ButtonTypes";
 
 type EventDetailsProps = {
   image: string;
@@ -73,7 +74,8 @@ function EventDetails(props: EventDetailsProps) {
           <div className={classes.actions}>
             <Button
               type={"button"}
-              variant={ButtonOptions.Bookmark}
+              variant={ButtonVariants.Primary}
+              icon={ButtonIcons.Bookmark}
               className={classes.actionIcon}
             ></Button>
             <ShareButton className={classes.actionIcon}></ShareButton>
@@ -85,7 +87,7 @@ function EventDetails(props: EventDetailsProps) {
           {props.keywords && (
             <div className={classes.keywords}>
               {props.keywords?.map((keyword) => (
-                <Keyword type={KeywordOptions.None}>{keyword}</Keyword>
+                <Keyword>{keyword}</Keyword>
               ))}
             </div>
           )}

diff --git a/frontend/src/Keyword/Keyword.tsx b/frontend/src/Keyword/Keyword.tsx
@@ -7,7 +7,7 @@ type KeywordProps = {
   type?: KeywordOptions;
 };
 
-export function Keyword(props: KeywordProps) {
+export default function Keyword(props: KeywordProps) {
   return (
     <div
       className={`${classes.keyword} ${