diff --git a/apps/landing/next.config.js b/apps/landing/next.config.js index 5619bb649..d76e9b76e 100644 --- a/apps/landing/next.config.js +++ b/apps/landing/next.config.js @@ -13,7 +13,6 @@ const nextConfig = { productionBrowserSourceMaps: true, output: "standalone", transpilePackages: [ - "@rallly/icons", "@rallly/ui", "@rallly/tailwind-config", "@rallly/utils", diff --git a/apps/landing/package.json b/apps/landing/package.json index f79356c04..81782847e 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -15,7 +15,6 @@ "@prisma/client": "^6.4.1", "@rallly/billing": "workspace:*", "@rallly/database": "workspace:*", - "@rallly/icons": "workspace:*", "@rallly/languages": "workspace:*", "@rallly/tailwind-config": "workspace:*", "@rallly/ui": "workspace:*", diff --git a/apps/landing/src/app/[locale]/footer.tsx b/apps/landing/src/app/[locale]/footer.tsx index c1ccb4cd4..450ee6bc0 100644 --- a/apps/landing/src/app/[locale]/footer.tsx +++ b/apps/landing/src/app/[locale]/footer.tsx @@ -1,6 +1,5 @@ "use client"; -import { DiscordIcon } from "@rallly/icons"; import languages, { supportedLngs } from "@rallly/languages"; import { Button } from "@rallly/ui/button"; import { @@ -10,17 +9,16 @@ import { SelectTrigger, SelectValue, } from "@rallly/ui/select"; -import { - GithubIcon, - LanguagesIcon, - LinkedinIcon, - TwitterIcon, -} from "lucide-react"; +import { LanguagesIcon } from "lucide-react"; import Image from "next/image"; import Link from "next/link"; import { usePathname, useRouter } from "next/navigation"; import * as React from "react"; +import DiscordIcon from "@/assets/discord.svg"; +import GithubIcon from "@/assets/github.svg"; +import LinkedinIcon from "@/assets/linkedin.svg"; +import TwitterIcon from "@/assets/twitter.svg"; import { Trans } from "@/i18n/client/trans"; import { useTranslation } from "@/i18n/client/use-translation"; diff --git a/packages/icons/src/custom-icons/discord.svg b/apps/landing/src/assets/discord.svg similarity index 100% rename from packages/icons/src/custom-icons/discord.svg rename to apps/landing/src/assets/discord.svg diff --git a/apps/landing/src/assets/github.svg b/apps/landing/src/assets/github.svg new file mode 100644 index 000000000..0c6582125 --- /dev/null +++ b/apps/landing/src/assets/github.svg @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/apps/landing/src/assets/linkedin.svg b/apps/landing/src/assets/linkedin.svg new file mode 100644 index 000000000..7debd6f5a --- /dev/null +++ b/apps/landing/src/assets/linkedin.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/apps/landing/src/assets/twitter.svg b/apps/landing/src/assets/twitter.svg new file mode 100644 index 000000000..5e6423fa8 --- /dev/null +++ b/apps/landing/src/assets/twitter.svg @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 08bf1ecae..f9475605b 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -15,7 +15,6 @@ const nextConfig = { productionBrowserSourceMaps: true, transpilePackages: [ "@rallly/database", - "@rallly/icons", "@rallly/ui", "@rallly/tailwind-config", "@rallly/posthog", diff --git a/apps/web/package.json b/apps/web/package.json index 69c48b68b..684669cd3 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -33,7 +33,6 @@ "@rallly/billing": "workspace:*", "@rallly/database": "workspace:*", "@rallly/emails": "workspace:*", - "@rallly/icons": "workspace:*", "@rallly/languages": "workspace:*", "@rallly/posthog": "workspace:*", "@rallly/tailwind-config": "workspace:*", diff --git a/apps/web/src/assets/if-need-be.svg b/apps/web/src/assets/if-need-be.svg new file mode 100644 index 000000000..7f31cbb4a --- /dev/null +++ b/apps/web/src/assets/if-need-be.svg @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/apps/web/src/assets/no.svg b/apps/web/src/assets/no.svg new file mode 100644 index 000000000..237f14f95 --- /dev/null +++ b/apps/web/src/assets/no.svg @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/apps/web/src/assets/pending.svg b/apps/web/src/assets/pending.svg new file mode 100644 index 000000000..d7e8644cc --- /dev/null +++ b/apps/web/src/assets/pending.svg @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/apps/web/src/assets/yes.svg b/apps/web/src/assets/yes.svg new file mode 100644 index 000000000..daea7e740 --- /dev/null +++ b/apps/web/src/assets/yes.svg @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/apps/web/src/components/poll/vote-icon.tsx b/apps/web/src/components/poll/vote-icon.tsx index d063d8ff5..d480682fc 100644 --- a/apps/web/src/components/poll/vote-icon.tsx +++ b/apps/web/src/components/poll/vote-icon.tsx @@ -1,52 +1,41 @@ import type { VoteType } from "@rallly/database"; -import { IfNeedBeIcon, NoIcon, PendingIcon, YesIcon } from "@rallly/icons"; -import { cn } from "@rallly/ui"; -import * as React from "react"; +import React from "react"; +import YesIcon from "@/assets/yes.svg"; +import IfNeedBeIcon from "@/assets/if-need-be.svg"; +import NoIcon from "@/assets/no.svg"; +import PendingIcon from "@/assets/pending.svg"; -const VoteIcon: React.FunctionComponent<{ +const VoteIcon = ({ + type, + size = "md", + className, +}: { type?: VoteType; size?: "sm" | "md"; className?: string; -}> = ({ type, className, size = "md" }) => { +}) => { + const iconSize = size === "md" ? 20 : 14; switch (type) { case "yes": return ( - + ); - case "ifNeedBe": return ( ); - case "no": return ( - + ); default: return ( - + ); } }; diff --git a/packages/icons/.eslintrc.js b/packages/icons/.eslintrc.js deleted file mode 100644 index 3d9be6e61..000000000 --- a/packages/icons/.eslintrc.js +++ /dev/null @@ -1,4 +0,0 @@ -/** @type {import("eslint").Linter.Config} */ -module.exports = { - ...require("@rallly/eslint-config")(__dirname), -}; diff --git a/packages/icons/custom.d.ts b/packages/icons/custom.d.ts deleted file mode 100644 index 2ff147833..000000000 --- a/packages/icons/custom.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -declare module "*.svg" { - const content: React.FunctionComponent>; - export default content; -} diff --git a/packages/icons/package.json b/packages/icons/package.json deleted file mode 100644 index b069993cc..000000000 --- a/packages/icons/package.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "@rallly/icons", - "version": "0.0.0", - "private": true, - "main": "src/index.ts", - "types": "src/index.ts", - "dependencies": { - "@heroicons/react": "^1.0.6", - "lucide-react": "^0.479.0" - }, - "peerDependencies": { - "react": "^18.2.0", - "react-dom": "^18.2.0" - } -} diff --git a/packages/icons/src/custom-icons/bell-crossed.svg b/packages/icons/src/custom-icons/bell-crossed.svg deleted file mode 100644 index dad4d6b3c..000000000 --- a/packages/icons/src/custom-icons/bell-crossed.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/packages/icons/src/custom-icons/bell.svg b/packages/icons/src/custom-icons/bell.svg deleted file mode 100644 index 558888298..000000000 --- a/packages/icons/src/custom-icons/bell.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/packages/icons/src/custom-icons/github.svg b/packages/icons/src/custom-icons/github.svg deleted file mode 100644 index ca0d774c0..000000000 --- a/packages/icons/src/custom-icons/github.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/icons/src/custom-icons/if-need-be.svg b/packages/icons/src/custom-icons/if-need-be.svg deleted file mode 100644 index 0f3e869bb..000000000 --- a/packages/icons/src/custom-icons/if-need-be.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/icons/src/custom-icons/no.svg b/packages/icons/src/custom-icons/no.svg deleted file mode 100644 index 3994ade8b..000000000 --- a/packages/icons/src/custom-icons/no.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/icons/src/custom-icons/pending.svg b/packages/icons/src/custom-icons/pending.svg deleted file mode 100644 index 8f631c188..000000000 --- a/packages/icons/src/custom-icons/pending.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/icons/src/custom-icons/spinner.svg b/packages/icons/src/custom-icons/spinner.svg deleted file mode 100644 index 1172b8f0e..000000000 --- a/packages/icons/src/custom-icons/spinner.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/packages/icons/src/custom-icons/twitter.svg b/packages/icons/src/custom-icons/twitter.svg deleted file mode 100644 index e989f34fb..000000000 --- a/packages/icons/src/custom-icons/twitter.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/icons/src/custom-icons/yes.svg b/packages/icons/src/custom-icons/yes.svg deleted file mode 100644 index ef32bece6..000000000 --- a/packages/icons/src/custom-icons/yes.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/packages/icons/src/index.ts b/packages/icons/src/index.ts deleted file mode 100644 index ffb46bfee..000000000 --- a/packages/icons/src/index.ts +++ /dev/null @@ -1,10 +0,0 @@ -export { default as BellOnIcon } from "./custom-icons/bell.svg"; -export { default as BellCrossedIcon } from "./custom-icons/bell-crossed.svg"; -export { default as DiscordIcon } from "./custom-icons/discord.svg"; -export { default as GithubIcon } from "./custom-icons/github.svg"; -export { default as IfNeedBeIcon } from "./custom-icons/if-need-be.svg"; -export { default as NoIcon } from "./custom-icons/no.svg"; -export { default as PendingIcon } from "./custom-icons/pending.svg"; -export { default as SpinnerIcon } from "./custom-icons/spinner.svg"; -export { default as TwitterIcon } from "./custom-icons/twitter.svg"; -export { default as YesIcon } from "./custom-icons/yes.svg"; diff --git a/packages/icons/tsconfig.json b/packages/icons/tsconfig.json deleted file mode 100644 index 42e5369c0..000000000 --- a/packages/icons/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "@rallly/tsconfig/next.json", - "include": ["**/*.ts", "**/*.tsx"], - "exclude": ["node_modules"] -} diff --git a/packages/ui/package.json b/packages/ui/package.json index c898a4fb4..826b91ae6 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -34,7 +34,6 @@ "@radix-ui/react-tabs": "^1.0.4", "@radix-ui/react-toast": "^1.1.4", "@radix-ui/react-tooltip": "^1.1.8", - "@rallly/icons": "workspace:*", "@rallly/languages": "workspace:*", "@rallly/tailwind-config": "workspace:*", "class-variance-authority": "^0.7.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8809a49fc..84256875b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -53,9 +53,6 @@ importers: '@rallly/database': specifier: workspace:* version: link:../../packages/database - '@rallly/icons': - specifier: workspace:* - version: link:../../packages/icons '@rallly/languages': specifier: workspace:* version: link:../../packages/languages @@ -207,9 +204,6 @@ importers: '@rallly/emails': specifier: workspace:* version: link:../../packages/emails - '@rallly/icons': - specifier: workspace:* - version: link:../../packages/icons '@rallly/languages': specifier: workspace:* version: link:../../packages/languages @@ -227,7 +221,7 @@ importers: version: link:../../packages/utils '@sentry/nextjs': specifier: ^8.49.0 - version: 8.55.0(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(next@14.2.28(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)(webpack@5.99.7) + version: 8.55.0(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(next@14.2.28(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)(webpack@5.99.7(esbuild@0.25.3)) '@svgr/webpack': specifier: ^6.5.1 version: 6.5.1 @@ -575,21 +569,6 @@ importers: specifier: ^7.0.0 version: 7.0.0(eslint@8.57.1) - packages/icons: - dependencies: - '@heroicons/react': - specifier: ^1.0.6 - version: 1.0.6(react@18.3.1) - lucide-react: - specifier: ^0.479.0 - version: 0.479.0(react@18.3.1) - react: - specifier: ^18.2.0 - version: 18.3.1 - react-dom: - specifier: ^18.2.0 - version: 18.3.1(react@18.3.1) - packages/languages: dependencies: '@formatjs/intl-localematcher': @@ -712,9 +691,6 @@ importers: '@radix-ui/react-tooltip': specifier: ^1.1.8 version: 1.2.4(@types/react-dom@18.3.6(@types/react@18.3.20))(@types/react@18.3.20)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@rallly/icons': - specifier: workspace:* - version: link:../icons '@rallly/languages': specifier: workspace:* version: link:../languages @@ -2060,11 +2036,6 @@ packages: resolution: {integrity: sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==} engines: {node: '>=10.13.0'} - '@heroicons/react@1.0.6': - resolution: {integrity: sha512-JJCXydOFWMDpCP4q13iEplA503MQO3xLoZiKum+955ZCtHINWnx26CUxVxxFQu/uLb4LW3ge15ZpzIkXKkJ8oQ==} - peerDependencies: - react: '>= 16' - '@hookform/resolvers@3.10.0': resolution: {integrity: sha512-79Dv+3mDF7i+2ajj7SkypSKHhl1cbln1OGavqrsF7p6mbUv11xpqpacPsGDCTRvCSjEEIez2ef1NveSVL3b0Ag==} peerDependencies: @@ -10056,10 +10027,6 @@ snapshots: dependencies: is-negated-glob: 1.0.0 - '@heroicons/react@1.0.6(react@18.3.1)': - dependencies: - react: 18.3.1 - '@hookform/resolvers@3.10.0(react-hook-form@7.56.1(react@18.3.1))': dependencies: react-hook-form: 7.56.1(react@18.3.1) @@ -11808,7 +11775,7 @@ snapshots: '@sentry/core@8.55.0': {} - '@sentry/nextjs@8.55.0(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(next@14.2.28(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)(webpack@5.99.7)': + '@sentry/nextjs@8.55.0(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(next@14.2.28(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)(webpack@5.99.7(esbuild@0.25.3))': dependencies: '@opentelemetry/api': 1.9.0 '@opentelemetry/semantic-conventions': 1.32.0 @@ -11819,7 +11786,7 @@ snapshots: '@sentry/opentelemetry': 8.55.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.32.0) '@sentry/react': 8.55.0(react@18.3.1) '@sentry/vercel-edge': 8.55.0 - '@sentry/webpack-plugin': 2.22.7(webpack@5.99.7) + '@sentry/webpack-plugin': 2.22.7(webpack@5.99.7(esbuild@0.25.3)) chalk: 3.0.0 next: 14.2.28(@babel/core@7.26.10)(@opentelemetry/api@1.9.0)(@playwright/test@1.52.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) resolve: 1.22.8 @@ -11897,12 +11864,12 @@ snapshots: '@opentelemetry/api': 1.9.0 '@sentry/core': 8.55.0 - '@sentry/webpack-plugin@2.22.7(webpack@5.99.7)': + '@sentry/webpack-plugin@2.22.7(webpack@5.99.7(esbuild@0.25.3))': dependencies: '@sentry/bundler-plugin-core': 2.22.7 unplugin: 1.0.1 uuid: 9.0.1 - webpack: 5.99.7 + webpack: 5.99.7(esbuild@0.25.3) transitivePeerDependencies: - encoding - supports-color @@ -16791,14 +16758,16 @@ snapshots: dependencies: streamx: 2.22.0 - terser-webpack-plugin@5.3.14(webpack@5.99.7): + terser-webpack-plugin@5.3.14(esbuild@0.25.3)(webpack@5.99.7(esbuild@0.25.3)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 4.3.2 serialize-javascript: 6.0.2 terser: 5.39.0 - webpack: 5.99.7 + webpack: 5.99.7(esbuild@0.25.3) + optionalDependencies: + esbuild: 0.25.3 terser@5.39.0: dependencies: @@ -17288,7 +17257,7 @@ snapshots: webpack-virtual-modules@0.5.0: {} - webpack@5.99.7: + webpack@5.99.7(esbuild@0.25.3): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.7 @@ -17311,7 +17280,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 4.3.2 tapable: 2.2.1 - terser-webpack-plugin: 5.3.14(webpack@5.99.7) + terser-webpack-plugin: 5.3.14(esbuild@0.25.3)(webpack@5.99.7(esbuild@0.25.3)) watchpack: 2.4.2 webpack-sources: 3.2.3 transitivePeerDependencies: