diff --git a/src/equicordplugins/ignoreCalls/index.tsx b/src/equicordplugins/ignoreCalls/index.tsx index 952fb4273..b9e287be3 100644 --- a/src/equicordplugins/ignoreCalls/index.tsx +++ b/src/equicordplugins/ignoreCalls/index.tsx @@ -9,7 +9,7 @@ import "./styles.css"; import { NavContextMenuPatchCallback } from "@api/ContextMenu"; import { definePluginSettings } from "@api/Settings"; import { Button } from "@components/Button"; -import { ErrorBoundary } from "@components/index"; +import ErrorBoundary from "@components/ErrorBoundary"; import { Devs, EquicordDevs } from "@utils/constants"; import { classNameFactory } from "@utils/css"; import definePlugin, { OptionType } from "@utils/types"; @@ -142,7 +142,7 @@ export default definePlugin({ )} - + ); } }); diff --git a/src/equicordplugins/profileSets/components/confirmModal.tsx b/src/equicordplugins/profileSets/components/confirmModal.tsx index 3dfa02f1e..76da537d0 100644 --- a/src/equicordplugins/profileSets/components/confirmModal.tsx +++ b/src/equicordplugins/profileSets/components/confirmModal.tsx @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +import { Button } from "@components/Button"; import { Heading } from "@components/Heading"; -import { Button } from "@components/index"; import { Paragraph } from "@components/Paragraph"; import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot } from "@utils/modal"; interface ConfirmModalProps extends ModalProps { diff --git a/src/equicordplugins/profileSets/components/presetManager.tsx b/src/equicordplugins/profileSets/components/presetManager.tsx index 1f07da8f5..b50090720 100644 --- a/src/equicordplugins/profileSets/components/presetManager.tsx +++ b/src/equicordplugins/profileSets/components/presetManager.tsx @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +import { Button } from "@components/Button"; import { Heading } from "@components/Heading"; -import { Button } from "@components/index"; import { classes } from "@utils/misc"; import { openModal } from "@utils/modal"; import { React, SelectedGuildStore, TextInput, useStateFromStores } from "@webpack/common"; diff --git a/src/equicordplugins/questify/index.tsx b/src/equicordplugins/questify/index.tsx index 645f56598..c850b285c 100644 --- a/src/equicordplugins/questify/index.tsx +++ b/src/equicordplugins/questify/index.tsx @@ -10,7 +10,8 @@ import { showNotification } from "@api/Notifications"; import { plugins } from "@api/PluginManager"; import { addServerListElement, removeServerListElement, ServerListRenderPosition } from "@api/ServerList"; import { migratePluginToSettings, Settings } from "@api/Settings"; -import { ErrorBoundary, openPluginModal } from "@components/index"; +import ErrorBoundary from "@components/ErrorBoundary"; +import { openPluginModal } from "@components/settings"; import { EquicordDevs } from "@utils/constants"; import { copyToClipboard } from "@utils/index"; import definePlugin, { PluginNative, StartAt } from "@utils/types"; diff --git a/src/equicordplugins/questify/settings.tsx b/src/equicordplugins/questify/settings.tsx index 2169ed01f..529f9192c 100644 --- a/src/equicordplugins/questify/settings.tsx +++ b/src/equicordplugins/questify/settings.tsx @@ -6,7 +6,10 @@ import { defaultAudioNames, playAudio } from "@api/AudioPlayer"; import { definePluginSettings } from "@api/Settings"; -import { Divider, ErrorBoundary, Heading, Paragraph } from "@components/index"; +import { Divider } from "@components/Divider"; +import ErrorBoundary from "@components/ErrorBoundary"; +import { Heading } from "@components/Heading"; +import { Paragraph } from "@components/Paragraph"; import { Logger } from "@utils/Logger"; import { makeRange, OptionType } from "@utils/types"; import { Button, ColorPicker, ContextMenuApi, Menu, Select, Slider, TextInput, useEffect, useRef, useState } from "@webpack/common"; diff --git a/src/equicordplugins/questify/utils/components.tsx b/src/equicordplugins/questify/utils/components.tsx index 73b265d54..100bfc5cb 100644 --- a/src/equicordplugins/questify/utils/components.tsx +++ b/src/equicordplugins/questify/utils/components.tsx @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -import { ErrorBoundary } from "@components/index"; +import ErrorBoundary from "@components/ErrorBoundary"; import { findComponentByCodeLazy } from "@webpack"; import { SearchableSelect, useState } from "@webpack/common"; import { JSX } from "react"; diff --git a/src/equicordplugins/themeLibrary/components/LikesComponent.tsx b/src/equicordplugins/themeLibrary/components/LikesComponent.tsx index 0692bfe46..d639d0b79 100644 --- a/src/equicordplugins/themeLibrary/components/LikesComponent.tsx +++ b/src/equicordplugins/themeLibrary/components/LikesComponent.tsx @@ -5,10 +5,12 @@ */ import * as DataStore from "@api/DataStore"; +import { Button } from "@components/Button"; +import { Margins } from "@components/margins"; import type { Theme, ThemeLikeProps } from "@equicordplugins/themeLibrary/types"; import { isAuthorized } from "@equicordplugins/themeLibrary/utils/auth"; import { LikeIcon } from "@equicordplugins/themeLibrary/utils/Icons"; -import { Button, useEffect, useRef, useState } from "@webpack/common"; +import { useEffect, useRef, useState } from "@webpack/common"; import { logger, themeRequest } from "./ThemeTab"; @@ -78,16 +80,13 @@ export const LikesComponent = ({ themeId, likedThemes: initialLikedThemes }: { t const hasLiked = likedThemes?.likes.some(like => like.themeId === themeId as unknown as Number && like?.hasLiked === true) ?? false; return ( -
- -
+ ); }; diff --git a/src/equicordplugins/themeLibrary/components/ThemeCard.tsx b/src/equicordplugins/themeLibrary/components/ThemeCard.tsx index a1ee47071..218c14de5 100644 --- a/src/equicordplugins/themeLibrary/components/ThemeCard.tsx +++ b/src/equicordplugins/themeLibrary/components/ThemeCard.tsx @@ -6,16 +6,16 @@ import { generateId } from "@api/Commands"; import { Settings } from "@api/Settings"; +import { Button } from "@components/Button"; import { Card } from "@components/Card"; import { HeadingPrimary, HeadingTertiary } from "@components/Heading"; -import { OpenExternalIcon } from "@components/Icons"; import { Paragraph } from "@components/Paragraph"; import type { Theme, ThemeLikeProps } from "@equicordplugins/themeLibrary/types"; import { proxyLazy } from "@utils/lazy"; import { Margins } from "@utils/margins"; import { ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal"; import { User } from "@vencord/discord-types"; -import { Button, FluxDispatcher, Parser, React, UserStore, UserUtils } from "@webpack/common"; +import { FluxDispatcher, Parser, React, UserStore, UserUtils } from "@webpack/common"; import { Constructor } from "type-fest"; import { LikesComponent } from "./LikesComponent"; @@ -77,8 +77,7 @@ export const ThemeCard: React.FC = ({ theme, themeLinks, likedTh )} diff --git a/src/equicordplugins/themeLibrary/components/ThemeTab.tsx b/src/equicordplugins/themeLibrary/components/ThemeTab.tsx index cf3a06ee8..0888d806d 100644 --- a/src/equicordplugins/themeLibrary/components/ThemeTab.tsx +++ b/src/equicordplugins/themeLibrary/components/ThemeTab.tsx @@ -13,12 +13,12 @@ import { HeadingPrimary, HeadingTertiary } from "@components/Heading"; import { OpenExternalIcon } from "@components/Icons"; import { Paragraph } from "@components/Paragraph"; import { SettingsTab, wrapTab } from "@components/settings"; -import { SearchStatus, TabItem, Theme, ThemeLikeProps } from "@equicordplugins/themeLibrary/types"; +import { SearchStatus, Theme, ThemeLikeProps } from "@equicordplugins/themeLibrary/types"; import { Logger } from "@utils/Logger"; import { Margins } from "@utils/margins"; import { classes } from "@utils/misc"; import { findCssClassesLazy } from "@webpack"; -import { Button, React, SearchableSelect, TabBar, TextInput, useEffect, useState } from "@webpack/common"; +import { Button, React, SearchableSelect, TextInput, useEffect, useState } from "@webpack/common"; import { ThemeCard } from "./ThemeCard"; @@ -262,63 +262,10 @@ function ThemeTab() { ); } -// rework this! -function SubmitThemes() { - return ( -
-

- This tab was replaced in favour of the new website: - {" "} - - themes.equicord.org - -

-

- Thank you for your understanding! -

-
- ); -} - function ThemeLibrary() { - const [currentTab, setCurrentTab] = useState(TabItem.THEMES); - return ( - - - Themes - - - Submit Theme - - - - {currentTab === TabItem.THEMES ? : } + ); } diff --git a/src/equicordplugins/themeLibrary/components/styles.css b/src/equicordplugins/themeLibrary/components/styles.css index df32df117..25fddace6 100644 --- a/src/equicordplugins/themeLibrary/components/styles.css +++ b/src/equicordplugins/themeLibrary/components/styles.css @@ -28,8 +28,15 @@ object-fit: cover; } -.vce-theme-text { +.vce-theme-text-title { padding: 0.5rem; + padding-bottom: 0; +} + +.vce-theme-text-description { + padding: 0.5rem; + padding-top: 0; + padding-bottom: 0.25rem; } .vce-theme-info-tag { diff --git a/src/plugins/_api/badges/modals.tsx b/src/plugins/_api/badges/modals.tsx index 8890f86f7..275023666 100644 --- a/src/plugins/_api/badges/modals.tsx +++ b/src/plugins/_api/badges/modals.tsx @@ -4,9 +4,12 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +import ErrorBoundary from "@components/ErrorBoundary"; import { Flex } from "@components/Flex"; +import { HeadingPrimary } from "@components/Heading"; import { Heart } from "@components/Heart"; -import { DonateButton, ErrorBoundary, HeadingPrimary, Paragraph } from "@components/index"; +import { Paragraph } from "@components/Paragraph"; +import { DonateButton } from "@components/settings"; import { Margins } from "@utils/margins"; import { closeModal, ModalContent, ModalFooter, ModalHeader, ModalRoot, openModal } from "@utils/modal"; diff --git a/src/plugins/crashHandler/index.ts b/src/plugins/crashHandler/index.ts index d43594d96..89457c306 100644 --- a/src/plugins/crashHandler/index.ts +++ b/src/plugins/crashHandler/index.ts @@ -19,12 +19,13 @@ import { showNotification } from "@api/Notifications"; import { definePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; +import { openInviteModal } from "@utils/discord"; import { Logger } from "@utils/Logger"; import { closeAllModals } from "@utils/modal"; import definePlugin, { OptionType } from "@utils/types"; import { maybePromptToUpdate } from "@utils/updater"; import { filters, findBulk, proxyLazyWebpack } from "@webpack"; -import { DraftType, ExpressionPickerStore, FluxDispatcher, NavigationRouter, SelectedChannelStore } from "@webpack/common"; +import { DraftType, ExpressionPickerStore, FluxDispatcher, NavigationRouter, SelectedChannelStore, showToast } from "@webpack/common"; const CrashHandlerLogger = new Logger("CrashHandler"); @@ -98,8 +99,11 @@ export default definePlugin({ showNotification({ color: "#eed202", title: "Discord has crashed!", - body: "Awn :( Discord has crashed two times rapidly, not attempting to recover.", - noPersist: true + body: "Awn :( Discord has crashed two times rapidly, not attempting to recover. Click here to join our support server!", + noPersist: true, + onClick: () => openInviteModal("wKgT9j2xfN").catch(() => + showToast("Invalid or expired invite"), + ) }); } catch { } @@ -133,8 +137,11 @@ export default definePlugin({ showNotification({ color: "#eed202", title: "Discord has crashed!", - body: "Attempting to recover...", - noPersist: true + body: "Attempting to recover... Click here to join our support server!", + noPersist: true, + onClick: () => openInviteModal("wKgT9j2xfN").catch(() => + showToast("Invalid or expired invite"), + ) }); } catch { } diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx index 83502998c..b3dd75307 100644 --- a/src/plugins/showMeYourName/index.tsx +++ b/src/plugins/showMeYourName/index.tsx @@ -10,7 +10,9 @@ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/Co import { DataStore } from "@api/index"; import { isPluginEnabled } from "@api/PluginManager"; import { definePluginSettings } from "@api/Settings"; -import { Button, ErrorBoundary, Heading, TextButton } from "@components/index"; +import { Button, TextButton } from "@components/Button"; +import ErrorBoundary from "@components/ErrorBoundary"; +import { Heading } from "@components/Heading"; import mentionAvatars from "@plugins/mentionAvatars"; import { Devs, EquicordDevs } from "@utils/constants"; import { classNameFactory, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, openModal } from "@utils/index"; diff --git a/src/plugins/silentTyping/index.tsx b/src/plugins/silentTyping/index.tsx index e1514c489..e84edcb85 100644 --- a/src/plugins/silentTyping/index.tsx +++ b/src/plugins/silentTyping/index.tsx @@ -21,7 +21,7 @@ import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu"; import { plugins } from "@api/PluginManager"; import { definePluginSettings } from "@api/Settings"; -import { openPluginModal } from "@components/index"; +import { openPluginModal } from "@components/settings"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; import { Channel } from "@vencord/discord-types";