From 3d68c2fb5d60004878c9e4d313ec523270fbb19b Mon Sep 17 00:00:00 2001 From: Eddie Jaoude Date: Sun, 5 Feb 2023 07:32:20 +0700 Subject: [PATCH 1/4] fix: refactor badges to component --- components/Badge.js | 51 +++++++++++++++++++++++++++++++++++++ components/hint/HintIcon.js | 24 ----------------- pages/events.js | 14 +++++----- 3 files changed, 59 insertions(+), 30 deletions(-) create mode 100644 components/Badge.js delete mode 100644 components/hint/HintIcon.js diff --git a/components/Badge.js b/components/Badge.js new file mode 100644 index 00000000000..c0c03986d37 --- /dev/null +++ b/components/Badge.js @@ -0,0 +1,51 @@ +// profile photo numbers/stats +// QR code? +// discover tag +// user card + +import Link from "./Link"; + +export default function Badge({ title, content, path, position, children }) { + let css = ""; + const cssTopRight = "top-0 right-0 bottom-auto left-auto"; + const cssTopLeft = "top-0 left-0 bottom-auto right-auto"; + const cssBottomRight = "bottom-0 right-0 top-auto left-auto"; + const cssBottomLeft = "bottom-0 left-0 top-auto right-auto"; + switch (position) { + case "top-right": + css = cssTopRight; + break; + case "top-left": + css = cssTopLeft; + break; + case "bottom-right": + css = cssBottomRight; + break; + case "bottom-left": + css = cssBottomLeft; + break; + default: + css = cssTopRight; + } + console.log(position, css); + const badge = ( +
+ {content} +
+ ); + + let clickable; + if (path) { + clickable = {badge}; + } + + return ( +
+ {children} + {clickable ? clickable : badge} +
+ ); +} diff --git a/components/hint/HintIcon.js b/components/hint/HintIcon.js deleted file mode 100644 index c60df71bf03..00000000000 --- a/components/hint/HintIcon.js +++ /dev/null @@ -1,24 +0,0 @@ -import Link from "next/link" -// import Image from "next/image" -// import { FaQuestionCircle } from "react-icons"; -import { FaQuestionCircle } from "react-icons/fa"; -import { IconContext } from "react-icons"; - - -export default function HintIcon({ path, placeholderText }) { - return ( - - - - - - ) -} diff --git a/pages/events.js b/pages/events.js index dc492693290..15b75bcefab 100644 --- a/pages/events.js +++ b/pages/events.js @@ -6,7 +6,7 @@ import EventCard from "../components/event/EventCard"; import Page from "../components/Page"; import { EventTabs } from "../components/event/EventTabs"; import PageHead from "../components/PageHead"; -import HintIcon from '../components/hint/HintIcon' +import Badge from "../components/Badge"; export async function getServerSideProps(context) { let events = []; @@ -74,11 +74,13 @@ export default function Events({ events }) {
-

Community events

- + +

Community events

+
Date: Sun, 5 Feb 2023 10:22:57 +0700 Subject: [PATCH 2/4] fix: refactored search to use new badge component --- components/Badge.js | 16 ++++++++++++---- components/Tag.js | 16 +++------------- pages/search.js | 17 +++++++++-------- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/components/Badge.js b/components/Badge.js index c0c03986d37..d83a591162d 100644 --- a/components/Badge.js +++ b/components/Badge.js @@ -5,7 +5,15 @@ import Link from "./Link"; -export default function Badge({ title, content, path, position, children }) { +export default function Badge({ + title, + content, + path, + position, + className, + children, + display = true, +}) { let css = ""; const cssTopRight = "top-0 right-0 bottom-auto left-auto"; const cssTopLeft = "top-0 left-0 bottom-auto right-auto"; @@ -27,7 +35,7 @@ export default function Badge({ title, content, path, position, children }) { default: css = cssTopRight; } - console.log(position, css); + const badge = (
+
{children} - {clickable ? clickable : badge} + {display && (clickable ? clickable : badge)}
); } diff --git a/components/Tag.js b/components/Tag.js index 5d9545b9583..61276f33ce8 100644 --- a/components/Tag.js +++ b/components/Tag.js @@ -1,8 +1,9 @@ import { abbreviateNumber } from "../services/utils/abbreviateNumbers"; +import Badge from "./Badge"; export default function Tag({ name, total, selected, onClick }) { return ( -
+
{name}
- {total && ( -
- {abbreviateNumber(total)} -
- )} -
+ ); } diff --git a/pages/search.js b/pages/search.js index 1ba46bf0ac6..2ab8dd7c378 100755 --- a/pages/search.js +++ b/pages/search.js @@ -6,6 +6,7 @@ import Alert from "../components/Alert"; import Page from "../components/Page"; import PageHead from "../components/PageHead"; import Tag from "../components/Tag"; +import Badge from "../components/Badge"; export async function getServerSideProps(context) { let data = { @@ -134,14 +135,19 @@ export default function Search({ data }) { name={tag.name} total={tag.total} selected={inputValue - .toLowerCase().split(',') + .toLowerCase() + .split(",") .includes(tag.name.toLowerCase())} onClick={() => search(tag.name)} /> ))}
-
+ setInputValue(e.target.value)} /> - {filteredUsers && ( -
- {filteredUsers.length} -
- )} -
+ {notFound && } From 843411a223baa4aaae4fe9563cb8832c45412340 Mon Sep 17 00:00:00 2001 From: Eddie Jaoude Date: Sat, 11 Feb 2023 15:11:36 +0700 Subject: [PATCH 3/4] feat: profile use badge component --- components/Badge.js | 8 ++++---- components/user/UserProfile.js | 17 ++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/components/Badge.js b/components/Badge.js index d83a591162d..9543eb1bd75 100644 --- a/components/Badge.js +++ b/components/Badge.js @@ -1,7 +1,4 @@ -// profile photo numbers/stats // QR code? -// discover tag -// user card import Link from "./Link"; @@ -11,8 +8,10 @@ export default function Badge({ path, position, className, + badgeClassName, children, display = true, + onClick, }) { let css = ""; const cssTopRight = "top-0 right-0 bottom-auto left-auto"; @@ -39,7 +38,8 @@ export default function Badge({ const badge = (
(onClick ? onClick() : null)} > {content}
diff --git a/components/user/UserProfile.js b/components/user/UserProfile.js index 9ea87e225a5..02fa905a1ee 100644 --- a/components/user/UserProfile.js +++ b/components/user/UserProfile.js @@ -6,8 +6,8 @@ import { QRCodeSVG } from "qrcode.react"; import FallbackImage from "../FallbackImage"; import UserSocial from "./UserSocials"; import Tag from "../Tag"; -import { abbreviateNumber } from "../../services/utils/abbreviateNumbers"; import Link from "../Link"; +import Badge from "../Badge"; export default function UserProfile({ BASE_URL, data }) { const [qrShow, setQrShow] = useState(false); @@ -15,7 +15,12 @@ export default function UserProfile({ BASE_URL, data }) { return ( <>
-
+ } + position="bottom-left" + badgeClassName="animate-bounce cursor-pointer" + onClick={() => (qrShow ? setQrShow(false) : setQrShow(true))} + > -
(qrShow ? setQrShow(false) : setQrShow(true))} - > - -
-
+

{data.name}

From 7dd6105ec98aeed79656241fb3ccf8b95f4865ed Mon Sep 17 00:00:00 2001 From: Eddie Jaoude Date: Sat, 11 Feb 2023 15:12:35 +0700 Subject: [PATCH 4/4] fix: remove comment --- components/Badge.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/Badge.js b/components/Badge.js index 9543eb1bd75..d4c6a6e5636 100644 --- a/components/Badge.js +++ b/components/Badge.js @@ -1,5 +1,3 @@ -// QR code? - import Link from "./Link"; export default function Badge({