From 12be9851e14de6a4403a92fbab473272d16bff1e Mon Sep 17 00:00:00 2001 From: Luke Vella Date: Tue, 4 Apr 2023 08:24:55 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Use=20named=20exports=20fo?= =?UTF-8?q?r=20icons=20(#647)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/next.config.js | 2 +- apps/web/src/components/admin-control.tsx | 4 +- apps/web/src/components/button.tsx | 2 +- apps/web/src/components/crisp-chat.tsx | 4 +- .../src/components/discussion/discussion.tsx | 7 ++-- apps/web/src/components/error-page.tsx | 4 +- apps/web/src/components/feedback.tsx | 7 ++-- .../date-navigation-toolbar.tsx | 7 ++-- .../month-calendar/month-calendar.tsx | 38 ++++++++++--------- .../month-calendar/time-picker.tsx | 4 +- .../poll-options-form/poll-options-form.tsx | 7 ++-- apps/web/src/components/full-page-loader.tsx | 4 +- apps/web/src/components/home/bonus.tsx | 10 ++--- apps/web/src/components/home/features.tsx | 13 +++---- .../src/components/layouts/page-layout.tsx | 7 ++-- .../components/layouts/page-layout/footer.tsx | 18 +++++---- .../standard-layout/mobile-navigation.tsx | 38 +++++++++++-------- .../layouts/standard-layout/user-dropdown.tsx | 28 ++++++++------ apps/web/src/components/maintenance.tsx | 4 -- apps/web/src/components/modal/modal.tsx | 4 +- .../src/components/participant-dropdown.tsx | 18 +++++---- apps/web/src/components/poll-context.tsx | 4 +- apps/web/src/components/poll.tsx | 7 ++-- apps/web/src/components/poll/desktop-poll.tsx | 7 ++-- .../src/components/poll/language-selector.tsx | 4 +- .../components/poll/legacy-poll-notice.tsx | 4 +- apps/web/src/components/poll/manage-poll.tsx | 30 ++++++++------- .../poll/manage-poll/delete-poll-form.tsx | 4 +- apps/web/src/components/poll/mobile-poll.tsx | 7 ++-- .../poll/mobile-poll/poll-option.tsx | 4 +- .../poll/mobile-poll/time-slot-option.tsx | 4 +- .../components/poll/notifications-toggle.tsx | 5 +-- .../web/src/components/poll/score-summary.tsx | 4 +- apps/web/src/components/poll/vote-icon.tsx | 13 +++---- apps/web/src/components/profile.tsx | 20 +++++----- apps/web/src/components/spinner.tsx | 4 +- .../time-zone-picker/time-zone-picker.tsx | 4 +- apps/web/src/pages/404.tsx | 4 +- apps/web/src/pages/_app.tsx | 3 -- .../src/pages/auth/disable-notifications.tsx | 4 +- apps/web/src/pages/auth/login.tsx | 6 +-- packages/icons/adjustments.svg | 3 -- packages/icons/annotation.svg | 3 -- packages/icons/arrow-left.svg | 3 -- packages/icons/arrow-right.svg | 3 -- packages/icons/ban.svg | 3 -- packages/icons/beaker.svg | 3 -- packages/icons/calendar.svg | 3 -- packages/icons/cash.svg | 3 -- packages/icons/chat.svg | 3 -- packages/icons/check.svg | 3 -- packages/icons/chevron-down.svg | 3 -- packages/icons/chevron-left.svg | 3 -- packages/icons/chevron-right.svg | 3 -- packages/icons/clock.svg | 3 -- packages/icons/code.svg | 3 -- packages/icons/cog.svg | 3 -- packages/icons/currency-dollar.svg | 3 -- packages/icons/cursor-click.svg | 3 -- packages/icons/custom.d.ts | 4 ++ packages/icons/device-mobile.svg | 3 -- packages/icons/document-search.svg | 3 -- packages/icons/document.svg | 3 -- packages/icons/dots-horizontal.svg | 3 -- packages/icons/dots-vertical.svg | 3 -- packages/icons/duplicate.svg | 4 -- packages/icons/emoji-sad.svg | 3 -- packages/icons/exclamation.svg | 3 -- packages/icons/fire.svg | 3 -- packages/icons/graph1.svg | 3 -- packages/icons/hand.svg | 3 -- packages/icons/home.svg | 3 -- packages/icons/index.ts | 2 - packages/icons/information-circle.svg | 3 -- packages/icons/key.svg | 3 -- packages/icons/location-marker.svg | 3 -- packages/icons/lock-closed.svg | 3 -- packages/icons/lock-open.svg | 3 -- packages/icons/login.svg | 3 -- packages/icons/logout.svg | 3 -- packages/icons/magic.svg | 3 -- packages/icons/menu.svg | 3 -- packages/icons/newspaper.svg | 3 -- packages/icons/package.json | 7 +++- packages/icons/pencil-alt.svg | 3 -- packages/icons/pencil.svg | 4 -- packages/icons/plus-circle.svg | 3 -- packages/icons/plus-sm.svg | 3 -- packages/icons/question-mark-circle.svg | 3 -- packages/icons/refresh.svg | 3 -- packages/icons/save.svg | 3 -- packages/icons/server.svg | 3 -- packages/icons/share.svg | 3 -- packages/icons/smile.svg | 3 -- packages/icons/speakerphone.svg | 3 -- .../{ => src/custom-icons}/bell-crossed.svg | 0 .../icons/{ => src/custom-icons}/bell.svg | 0 .../icons/{ => src/custom-icons}/discord.svg | 0 .../icons/{ => src/custom-icons}/github.svg | 0 .../{ => src/custom-icons}/if-need-be.svg | 0 .../{x-circle.svg => src/custom-icons/no.svg} | 0 .../custom-icons/pending.svg} | 0 .../icons/{ => src/custom-icons}/spinner.svg | 0 .../icons/{ => src/custom-icons}/twitter.svg | 0 .../custom-icons/yes.svg} | 0 packages/icons/src/index.ts | 11 ++++++ packages/icons/star.svg | 3 -- packages/icons/support.svg | 3 -- packages/icons/table.svg | 3 -- packages/icons/tag.svg | 3 -- packages/icons/translate.svg | 3 -- packages/icons/trash.svg | 3 -- packages/icons/tsconfig.json | 5 +++ packages/icons/user-circle.svg | 3 -- packages/icons/user-solid.svg | 3 -- packages/icons/user.svg | 3 -- packages/icons/x.svg | 3 -- yarn.lock | 5 +++ 118 files changed, 216 insertions(+), 375 deletions(-) delete mode 100644 packages/icons/adjustments.svg delete mode 100644 packages/icons/annotation.svg delete mode 100644 packages/icons/arrow-left.svg delete mode 100644 packages/icons/arrow-right.svg delete mode 100644 packages/icons/ban.svg delete mode 100644 packages/icons/beaker.svg delete mode 100644 packages/icons/calendar.svg delete mode 100644 packages/icons/cash.svg delete mode 100644 packages/icons/chat.svg delete mode 100644 packages/icons/check.svg delete mode 100644 packages/icons/chevron-down.svg delete mode 100644 packages/icons/chevron-left.svg delete mode 100644 packages/icons/chevron-right.svg delete mode 100644 packages/icons/clock.svg delete mode 100644 packages/icons/code.svg delete mode 100644 packages/icons/cog.svg delete mode 100644 packages/icons/currency-dollar.svg delete mode 100644 packages/icons/cursor-click.svg create mode 100644 packages/icons/custom.d.ts delete mode 100644 packages/icons/device-mobile.svg delete mode 100644 packages/icons/document-search.svg delete mode 100644 packages/icons/document.svg delete mode 100644 packages/icons/dots-horizontal.svg delete mode 100644 packages/icons/dots-vertical.svg delete mode 100644 packages/icons/duplicate.svg delete mode 100644 packages/icons/emoji-sad.svg delete mode 100644 packages/icons/exclamation.svg delete mode 100644 packages/icons/fire.svg delete mode 100644 packages/icons/graph1.svg delete mode 100644 packages/icons/hand.svg delete mode 100644 packages/icons/home.svg delete mode 100644 packages/icons/index.ts delete mode 100644 packages/icons/information-circle.svg delete mode 100644 packages/icons/key.svg delete mode 100644 packages/icons/location-marker.svg delete mode 100644 packages/icons/lock-closed.svg delete mode 100644 packages/icons/lock-open.svg delete mode 100644 packages/icons/login.svg delete mode 100644 packages/icons/logout.svg delete mode 100644 packages/icons/magic.svg delete mode 100644 packages/icons/menu.svg delete mode 100644 packages/icons/newspaper.svg delete mode 100644 packages/icons/pencil-alt.svg delete mode 100644 packages/icons/pencil.svg delete mode 100644 packages/icons/plus-circle.svg delete mode 100644 packages/icons/plus-sm.svg delete mode 100644 packages/icons/question-mark-circle.svg delete mode 100644 packages/icons/refresh.svg delete mode 100644 packages/icons/save.svg delete mode 100644 packages/icons/server.svg delete mode 100644 packages/icons/share.svg delete mode 100644 packages/icons/smile.svg delete mode 100644 packages/icons/speakerphone.svg rename packages/icons/{ => src/custom-icons}/bell-crossed.svg (100%) rename packages/icons/{ => src/custom-icons}/bell.svg (100%) rename packages/icons/{ => src/custom-icons}/discord.svg (100%) rename packages/icons/{ => src/custom-icons}/github.svg (100%) rename packages/icons/{ => src/custom-icons}/if-need-be.svg (100%) rename packages/icons/{x-circle.svg => src/custom-icons/no.svg} (100%) rename packages/icons/{question-mark.svg => src/custom-icons/pending.svg} (100%) rename packages/icons/{ => src/custom-icons}/spinner.svg (100%) rename packages/icons/{ => src/custom-icons}/twitter.svg (100%) rename packages/icons/{check-circle.svg => src/custom-icons/yes.svg} (100%) create mode 100644 packages/icons/src/index.ts delete mode 100644 packages/icons/star.svg delete mode 100644 packages/icons/support.svg delete mode 100644 packages/icons/table.svg delete mode 100644 packages/icons/tag.svg delete mode 100644 packages/icons/translate.svg delete mode 100644 packages/icons/trash.svg create mode 100644 packages/icons/tsconfig.json delete mode 100644 packages/icons/user-circle.svg delete mode 100644 packages/icons/user-solid.svg delete mode 100644 packages/icons/user.svg delete mode 100644 packages/icons/x.svg diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 4fe56c8a9..2346abf68 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -13,7 +13,7 @@ const nextConfig = { i18n: i18n, productionBrowserSourceMaps: true, output: "standalone", - transpilePackages: ["@rallly/backend"], + transpilePackages: ["@rallly/backend", "@rallly/icons"], webpack(config) { config.module.rules.push({ test: /\.svg$/, diff --git a/apps/web/src/components/admin-control.tsx b/apps/web/src/components/admin-control.tsx index ffe1a411a..501a75fcc 100644 --- a/apps/web/src/components/admin-control.tsx +++ b/apps/web/src/components/admin-control.tsx @@ -1,4 +1,4 @@ -import Share from "@rallly/icons/share.svg"; +import { ShareIcon } from "@rallly/icons"; import { AnimatePresence, m } from "framer-motion"; import { useTranslation } from "next-i18next"; import React from "react"; @@ -27,7 +27,7 @@ export const AdminControls = (props: { children?: React.ReactNode }) => { ); diff --git a/apps/web/src/components/discussion/discussion.tsx b/apps/web/src/components/discussion/discussion.tsx index db6196ca7..dbf7fa2b5 100644 --- a/apps/web/src/components/discussion/discussion.tsx +++ b/apps/web/src/components/discussion/discussion.tsx @@ -1,6 +1,5 @@ import { trpc } from "@rallly/backend"; -import DotsHorizontal from "@rallly/icons/dots-horizontal.svg"; -import Trash from "@rallly/icons/trash.svg"; +import { DotsHorizontalIcon, TrashIcon } from "@rallly/icons"; import clsx from "clsx"; import { useTranslation } from "next-i18next"; import * as React from "react"; @@ -110,10 +109,10 @@ const Discussion: React.FunctionComponent = () => { {canDelete && ( } + trigger={} > { deleteComment.mutate({ diff --git a/apps/web/src/components/error-page.tsx b/apps/web/src/components/error-page.tsx index d6c0e5692..8a198eaf1 100644 --- a/apps/web/src/components/error-page.tsx +++ b/apps/web/src/components/error-page.tsx @@ -1,4 +1,4 @@ -import EmojiSad from "@rallly/icons/emoji-sad.svg"; +import { EmojiSadIcon } from "@rallly/icons"; import Head from "next/head"; import Link from "next/link"; import { useTranslation } from "next-i18next"; @@ -11,7 +11,7 @@ export interface ComponentProps { } const ErrorPage: React.FunctionComponent = ({ - icon: Icon = EmojiSad, + icon: Icon = EmojiSadIcon, title, description, }) => { diff --git a/apps/web/src/components/feedback.tsx b/apps/web/src/components/feedback.tsx index 0f5045d27..96b800469 100644 --- a/apps/web/src/components/feedback.tsx +++ b/apps/web/src/components/feedback.tsx @@ -1,6 +1,5 @@ import { trpc } from "@rallly/backend"; -import CheckCircle from "@rallly/icons/check-circle.svg"; -import Speakerphone from "@rallly/icons/speakerphone.svg"; +import { CheckCircleIcon, SpeakerphoneIcon } from "@rallly/icons"; import Link from "next/link"; import { Trans, useTranslation } from "next-i18next"; import { useForm } from "react-hook-form"; @@ -25,7 +24,7 @@ const FeedbackForm = (props: { onClose: () => void }) => { {formState.isSubmitted ? (
- +
{t("feedbackSent")}
); diff --git a/apps/web/src/components/forms/poll-options-form/date-navigation-toolbar.tsx b/apps/web/src/components/forms/poll-options-form/date-navigation-toolbar.tsx index e936b9ba5..634a74e0b 100644 --- a/apps/web/src/components/forms/poll-options-form/date-navigation-toolbar.tsx +++ b/apps/web/src/components/forms/poll-options-form/date-navigation-toolbar.tsx @@ -1,5 +1,4 @@ -import ChevronLeft from "@rallly/icons/chevron-left.svg"; -import ChevronRight from "@rallly/icons/chevron-right.svg"; +import { ChevronLeftIcon, ChevronRightIcon } from "@rallly/icons"; import { useTranslation } from "next-i18next"; import * as React from "react"; @@ -24,13 +23,13 @@ const DateNavigationToolbar: React.FunctionComponent<
diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx index 7e46af929..072c74743 100644 --- a/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx +++ b/apps/web/src/components/forms/poll-options-form/month-calendar/month-calendar.tsx @@ -1,11 +1,13 @@ -import Calendar from "@rallly/icons/calendar.svg"; -import ChevronLeft from "@rallly/icons/chevron-left.svg"; -import ChevronRight from "@rallly/icons/chevron-right.svg"; -import DotsHorizontal from "@rallly/icons/dots-horizontal.svg"; -import Magic from "@rallly/icons/magic.svg"; -import PlusSm from "@rallly/icons/plus-sm.svg"; -import Trash from "@rallly/icons/trash.svg"; -import X from "@rallly/icons/x.svg"; +import { + CalendarIcon, + ChevronLeftIcon, + ChevronRightIcon, + DotsHorizontalIcon, + PlusSmIcon, + SparklesIcon, + TrashIcon, + XIcon, +} from "@rallly/icons"; import clsx from "clsx"; import { useTranslation } from "next-i18next"; import * as React from "react"; @@ -86,7 +88,7 @@ const MonthCalendar: React.FunctionComponent = ({
@@ -305,7 +307,7 @@ const MonthCalendar: React.FunctionComponent = ({ }} /> { onChange([ ...options.slice(0, index), @@ -318,7 +320,7 @@ const MonthCalendar: React.FunctionComponent = ({ })}
} + trigger={ + + } placement="bottom-start" > { @@ -393,7 +397,7 @@ const MonthCalendar: React.FunctionComponent = ({ /> { onChange( removeAllOptionsForDay( @@ -421,7 +425,7 @@ const MonthCalendar: React.FunctionComponent = ({ {...getDateProps(selectedDate)} annotation={ { // TODO (Luke Vella) [2022-03-19]: Find cleaner way to manage this state // Quite tedious right now to remove a single element @@ -438,7 +442,7 @@ const MonthCalendar: React.FunctionComponent = ({ ) : (
- +
{t("noDatesSelected")}
diff --git a/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx b/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx index ad015a940..ec562cf7d 100644 --- a/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx +++ b/apps/web/src/components/forms/poll-options-form/month-calendar/time-picker.tsx @@ -6,7 +6,7 @@ import { useFloating, } from "@floating-ui/react-dom-interactions"; import { Listbox } from "@headlessui/react"; -import ChevronDown from "@rallly/icons/chevron-down.svg"; +import { ChevronDownIcon } from "@rallly/icons"; import clsx from "clsx"; import * as React from "react"; @@ -88,7 +88,7 @@ const TimePicker: React.FunctionComponent = ({ {dayjs(value).format("LT")} - +
diff --git a/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx b/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx index 652ad80b0..25704821d 100644 --- a/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx +++ b/apps/web/src/components/forms/poll-options-form/poll-options-form.tsx @@ -1,5 +1,4 @@ -import Calendar from "@rallly/icons/calendar.svg"; -import Table from "@rallly/icons/table.svg"; +import { CalendarIcon, TableIcon } from "@rallly/icons"; import clsx from "clsx"; import { useTranslation } from "next-i18next"; import * as React from "react"; @@ -171,7 +170,7 @@ const PollOptionsForm: React.FunctionComponent< }} type="button" > - {t("monthView")} + {t("monthView")}