From 9853c960cbda3834bb587bbb0ba3f2d41ff54469 Mon Sep 17 00:00:00 2001 From: Benzenism Date: Mon, 29 Sep 2025 00:57:22 +0900 Subject: [PATCH] Issue105 --- package.json | 2 +- src/components/navbar/Navbar.tsx | 4 ++-- src/components/pagination/Pagination.tsx | 10 +++++----- src/components/select/Select.tsx | 4 ++-- src/pages/createGroup/components/MemberCard.tsx | 4 ++-- src/pages/detail/tabs/members/GroupMembersTab.tsx | 4 ++-- src/pages/main/GroupItem.tsx | 10 ++++------ src/pages/manage/ManageLayout.tsx | 4 ++-- .../sections/memberManagement/MemberTableRow.tsx | 2 +- yarn.lock | 12 ++++++------ 10 files changed, 27 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index c8ce71a..810faed 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "framer-motion": "^11.5.6", "i18next": "^23.7.16", "i18next-browser-languagedetector": "^7.2.0", - "iconoir-react": "^7.10.1", + "iconoir-react": "^7.11.0", "lottie-react": "^2.4.0", "notion-client": "^6.16.0", "openid-client": "^6.5.0", diff --git a/src/components/navbar/Navbar.tsx b/src/components/navbar/Navbar.tsx index be21ced..048295e 100644 --- a/src/components/navbar/Navbar.tsx +++ b/src/components/navbar/Navbar.tsx @@ -1,5 +1,5 @@ import { generateLoginURLHandler, generateOAuthLoginURL } from "@/apis/auth"; -import AccountIcon from "@/assets/icons/account.svg?react"; +import { ProfileCircle } from 'iconoir-react'; import GroupsCompactLogoDark from "@/assets/logos/groups-compact-dark.svg?react"; import GroupsCompactLogo from "@/assets/logos/groups-compact.svg?react"; import GroupsLogoDark from "@/assets/logos/groups-dark.svg?react"; @@ -61,7 +61,7 @@ const Navbar = () => { onClick={() => generateLoginURLHandler(location.pathname)} className="hidden items-center justify-center gap-2 md:flex" > - +
{userInfo?.name ?? t("navbar.login")}
diff --git a/src/components/pagination/Pagination.tsx b/src/components/pagination/Pagination.tsx index 17613ec..ab7e8d1 100644 --- a/src/components/pagination/Pagination.tsx +++ b/src/components/pagination/Pagination.tsx @@ -2,7 +2,7 @@ import { useCallback, useEffect } from "react"; -import ArrowRightIcon from "@/assets/icons/arrow-right.svg?react"; +import { NavArrowRight } from 'iconoir-react'; import { Link, useNavigate, useSearchParams } from "react-router-dom"; import Button from "../button/Button"; @@ -52,23 +52,23 @@ const Pagination = ({ items, itemsPerPage, page }: PaginationProps) => { {page !== 0 ? ( ) : ( )} {page + 1 !== pages ? ( ) : ( )} diff --git a/src/components/select/Select.tsx b/src/components/select/Select.tsx index b158dc4..8cc005e 100644 --- a/src/components/select/Select.tsx +++ b/src/components/select/Select.tsx @@ -1,4 +1,4 @@ -import ArrowRight from "@/assets/icons/arrow-right.svg?react"; +import { NavArrowRight } from 'iconoir-react'; import Check from "@/assets/icons/check.svg?react"; import useClickOutside from "@/hooks/useClickOutside"; import { cn } from "@/utils/clsx"; @@ -97,7 +97,7 @@ const Select = ({ > {selectedValue.value} - + {isOpen && (
    - + ); }; diff --git a/src/pages/detail/tabs/members/GroupMembersTab.tsx b/src/pages/detail/tabs/members/GroupMembersTab.tsx index fccd1f4..3e7069e 100644 --- a/src/pages/detail/tabs/members/GroupMembersTab.tsx +++ b/src/pages/detail/tabs/members/GroupMembersTab.tsx @@ -3,7 +3,7 @@ import useSWR from "swr"; import { getGroupMembers } from "@/apis/group"; import { useOutletContext, useParams } from "react-router-dom"; -import UserCircle from "@/assets/icons/user-circle.svg?react"; +import { UserCircle } from 'iconoir-react'; import { useTranslation } from "react-i18next"; import { GroupDetailContext } from "../../DetailPageLayout"; @@ -31,7 +31,7 @@ const GroupMembersTab = () => { return (
    - +
    {t("group.memberCount", { count: group.memberCount })}
    diff --git a/src/pages/main/GroupItem.tsx b/src/pages/main/GroupItem.tsx index 881a6b0..3762cae 100644 --- a/src/pages/main/GroupItem.tsx +++ b/src/pages/main/GroupItem.tsx @@ -1,8 +1,6 @@ import { GroupInfoWithPresidentUuid } from "src/types/interfaces"; -import ArrowRight from "@/assets/icons/arrow-right.svg?react"; -import Crown from "@/assets/icons/crown.svg?react"; -import Settings from "@/assets/icons/settings.svg?react"; +import { NavArrowRight, Settings, Crown } from 'iconoir-react'; import GroupProfileDefault from "@/assets/icons/group-profile-default.webp"; import Card from "@/components/card/Card"; import { Link } from "react-router-dom"; @@ -42,18 +40,18 @@ const GroupItem = ({

    {isAdmin && ( - + )}
    {isAdmin && ( - + )} - + ); diff --git a/src/pages/manage/ManageLayout.tsx b/src/pages/manage/ManageLayout.tsx index 622ccf0..93b75f2 100644 --- a/src/pages/manage/ManageLayout.tsx +++ b/src/pages/manage/ManageLayout.tsx @@ -1,4 +1,4 @@ -import ArrowRight from "@/assets/icons/arrow-right.svg?react"; +import { NavArrowRight } from 'iconoir-react'; import { Outlet, useParams, useNavigate } from "react-router-dom"; import { getGroup, getUserRole } from "@/apis/group"; import { @@ -62,7 +62,7 @@ const ManageLayout = () => {
    - +

    {t("manageGroup.goBack")}

    diff --git a/src/pages/manage/pages/members/sections/memberManagement/MemberTableRow.tsx b/src/pages/manage/pages/members/sections/memberManagement/MemberTableRow.tsx index f2cfdbe..9058bdf 100644 --- a/src/pages/manage/pages/members/sections/memberManagement/MemberTableRow.tsx +++ b/src/pages/manage/pages/members/sections/memberManagement/MemberTableRow.tsx @@ -63,7 +63,7 @@ const MemberTableRow = ({ {/* 이름 */}
    - {member.name} {isThisMemberPresident && } + {member.name} {isThisMemberPresident && }
    {/* 이메일 */} diff --git a/yarn.lock b/yarn.lock index 2970885..275a58f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6225,12 +6225,12 @@ __metadata: languageName: node linkType: hard -"iconoir-react@npm:^7.10.1": - version: 7.10.1 - resolution: "iconoir-react@npm:7.10.1" +"iconoir-react@npm:^7.11.0": + version: 7.11.0 + resolution: "iconoir-react@npm:7.11.0" peerDependencies: - react: ^16.8.6 || ^17 || ^18 - checksum: 10389400a67c55e9ab86ef3d1a753d043e3091a017c22a2fecf9663c0648a865c604a490620668a2699f3f5fb13e57759caf652f3ded250c3d27bdd934942a52 + react: 18 || 19 + checksum: ac0607a33da9050f01a2621d9e2f02b5c72bdc6d297eeec2d9872579ba00ad7e5a215c26a9b5dcf881f1f97a7481fb85ba040528ebc058f1f6d24ed25f4f111b languageName: node linkType: hard @@ -9373,7 +9373,7 @@ __metadata: framer-motion: ^11.5.6 i18next: ^23.7.16 i18next-browser-languagedetector: ^7.2.0 - iconoir-react: ^7.10.1 + iconoir-react: ^7.11.0 lottie-react: ^2.4.0 notion-client: ^6.16.0 openid-client: ^6.5.0