refactor(icons): use internal library

co-authored-by: chris <christoph.hohnerlein@digitalservice.bund.de>
digitalservicebund · Jan 5, 2024 · 5c23e6d · 5c23e6d
1 parent c6e69dd
commit 5c23e6d
Show file tree

Hide file tree

Showing 16 changed files with 144 additions and 515 deletions.
diff --git a/app/components/Alert.tsx b/app/components/Alert.tsx
@@ -1,7 +1,7 @@
 import { z } from "zod";
 import Heading, { HeadingPropsSchema } from "./Heading";
 import RichText from "./RichText";
-import NotificationsNoneIcon from "@mui/icons-material/NotificationsNone";
+import NotificationsNoneIcon from "@digitalservicebund/icons/NotificationsNone";
 
 const AlertPropsSchema = z.object({
   identifier: z.string().optional(),

diff --git a/app/components/Breadcrumbs.tsx b/app/components/Breadcrumbs.tsx
@@ -1,4 +1,4 @@
-import HomeOutlinedIcon from "@mui/icons-material/HomeOutlined";
+import HomeOutlinedIcon from "@digitalservicebund/icons/HomeOutlined";
 
 type Breadcrumb = {
   url: string;

diff --git a/app/components/FlowNavigation.tsx b/app/components/FlowNavigation.tsx
@@ -1,6 +1,6 @@
-import CheckCircleOutlineIcon from "@mui/icons-material/CheckCircleOutline";
-import CircleOutlinedIcon from "@mui/icons-material/CircleOutlined";
-import RadioButtonCheckedOutlinedIcon from "@mui/icons-material/RadioButtonCheckedOutlined";
+import CheckCircleOutlineIcon from "@digitalservicebund/icons/CheckCircleOutline";
+import CircleOutlinedIcon from "@digitalservicebund/icons/CircleOutlined";
+import RadioButtonCheckedOutlinedIcon from "@digitalservicebund/icons/RadioButtonCheckedOutlined";
 import { NavState } from "~/services/flowNavigation";
 
 export type NavItem = {

diff --git a/app/components/LinkListBox.tsx b/app/components/LinkListBox.tsx
@@ -3,7 +3,7 @@ import Heading, { HeadingPropsSchema } from "./Heading";
 import Button, { ButtonPropsSchema } from "./Button";
 import { Link } from "@remix-run/react";
 import ButtonContainer from "./ButtonContainer";
-import ArrowDownward from "@mui/icons-material/ArrowDownward";
+import ArrowDownward from "@digitalservicebund/icons/ArrowDownward";
 
 export const LinkListBoxPropsSchema = z.object({
   identifier: z.string().optional(),

diff --git a/app/components/UserFeedback/FeedbackFormBox.tsx b/app/components/UserFeedback/FeedbackFormBox.tsx
@@ -1,8 +1,8 @@
 import { z } from "zod";
 import { withZod } from "@remix-validated-form/with-zod";
 import { ValidatedForm } from "remix-validated-form";
-import CloseIcon from "@mui/icons-material/CloseOutlined";
-import SendIcon from "@mui/icons-material/SendOutlined";
+import CloseIcon from "@digitalservicebund/icons/CloseOutlined";
+import SendIcon from "@digitalservicebund/icons/SendOutlined";
 import Button from "../Button";
 import ButtonContainer from "../ButtonContainer";
 import Heading from "../Heading";

diff --git a/app/components/UserFeedback/RatingBox.tsx b/app/components/UserFeedback/RatingBox.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
 import { useFetcher } from "@remix-run/react";
-import ThumbDownIcon from "@mui/icons-material/ThumbDownOutlined";
-import ThumbUpIcon from "@mui/icons-material/ThumbUpOutlined";
+import ThumbDownIcon from "@digitalservicebund/icons/ThumbDownOutlined";
+import ThumbUpIcon from "@digitalservicebund/icons/ThumbUpOutlined";
 import Button from "../Button";
 import ButtonContainer from "../ButtonContainer";
 import Heading from "../Heading";

diff --git a/app/components/inputs/InputError.tsx b/app/components/inputs/InputError.tsx
@@ -1,4 +1,4 @@
-import ErrorOutline from "@mui/icons-material/ErrorOutline";
+import ErrorOutline from "@digitalservicebund/icons/ErrorOutline";
 import type { PropsWithChildren } from "react";
 
 type InputErrorProps = PropsWithChildren<{

diff --git a/app/routes/geld-einklagen.vorabcheck.partnergericht.ergebnis.$.tsx b/app/routes/geld-einklagen.vorabcheck.partnergericht.ergebnis.$.tsx
@@ -6,8 +6,8 @@ import Background from "~/components/Background";
 import Container from "~/components/Container";
 import CourtDetails from "~/components/CourtDetails";
 import PageContent from "~/components/PageContent";
-import CheckCircleOutline from "@mui/icons-material/CheckCircleOutline";
-import HighlightOff from "@mui/icons-material/HighlightOff";
+import CheckCircleOutline from "@digitalservicebund/icons/CheckCircleOutline";
+import HighlightOff from "@digitalservicebund/icons/HighlightOff";
 import {
   fetchCollectionEntry,
   fetchSingleEntry,

diff --git a/app/routes/kitchensink.buttons.tsx b/app/routes/kitchensink.buttons.tsx
@@ -1,5 +1,5 @@
 import Button from "~/components/Button";
-import Close from "@mui/icons-material/Close";
+import Close from "@digitalservicebund/icons/Close";
 import { throw404OnProduction } from "../services/errorPages/throw404";
 
 export const loader = () => {

diff --git a/app/routes/shared/result.tsx b/app/routes/shared/result.tsx
@@ -15,9 +15,9 @@ import {
   splatFromParams,
 } from "./flowSpecifics";
 import { type ReactElement } from "react";
-import CheckCircleOutline from "@mui/icons-material/CheckCircleOutline";
-import HighlightOff from "@mui/icons-material/HighlightOff";
-import WarningAmber from "@mui/icons-material/WarningAmber";
+import CheckCircleOutline from "@digitalservicebund/icons/CheckCircleOutline";
+import HighlightOff from "@digitalservicebund/icons/HighlightOff";
+import WarningAmber from "@digitalservicebund/icons/WarningAmber";
 import type { StrapiResultPageType } from "~/services/cms/models/StrapiResultPageType";
 import Container from "~/components/Container";
 import Heading from "~/components/Heading";

diff --git a/app/services/openSourceLicenses/opensource-licenses.json b/app/services/openSourceLicenses/opensource-licenses.json
@@ -14,35 +14,13 @@
     "licenseFile": "a2j-rechtsantragstelle/node_modules/@digitalservice4germany/style-dictionary/LICENSE",
     "direct": true
   },
-  "@emotion/react": {
+  "@digitalservicebund/icons": {
     "licenses": "MIT",
-    "repository": "https://github.com/emotion-js/emotion.git#main",
-    "publisher": "Emotion Contributors",
-    "path": "a2j-rechtsantragstelle/node_modules/@emotion/react",
-    "licenseFile": "a2j-rechtsantragstelle/node_modules/@emotion/react/LICENSE",
-    "direct": true
-  },
-  "@emotion/styled": {
-    "licenses": "MIT",
-    "repository": "https://github.com/emotion-js/emotion.git#main",
-    "path": "a2j-rechtsantragstelle/node_modules/@emotion/styled",
-    "licenseFile": "a2j-rechtsantragstelle/node_modules/@emotion/styled/LICENSE",
-    "direct": true
-  },
-  "@mui/icons-material": {
-    "licenses": "MIT",
-    "repository": "https://github.com/mui/material-ui",
-    "publisher": "MUI Team",
-    "path": "a2j-rechtsantragstelle/node_modules/@mui/icons-material",
-    "licenseFile": "a2j-rechtsantragstelle/node_modules/@mui/icons-material/LICENSE",
-    "direct": true
-  },
-  "@mui/material": {
-    "licenses": "MIT",
-    "repository": "https://github.com/mui/material-ui",
-    "publisher": "MUI Team",
-    "path": "a2j-rechtsantragstelle/node_modules/@mui/material",
-    "licenseFile": "a2j-rechtsantragstelle/node_modules/@mui/material/LICENSE",
+    "repository": "https://github.com/digitalservicebund/icons",
+    "publisher": "Joschka de Cuveland",
+    "email": "joschka.decuveland@digitalservice.bund.de",
+    "path": "a2j-rechtsantragstelle/node_modules/@digitalservicebund/icons",
+    "licenseFile": "a2j-rechtsantragstelle/node_modules/@digitalservicebund/icons/README.md",
     "direct": true
   },
   "@react-pdf/renderer": {

diff --git a/app/styles.css b/app/styles.css
@@ -33,6 +33,10 @@ a {
   color: currentcolor;
 }
 
+svg {
+  fill: currentColor;
+}
+
 /* TODO: needs to be fixed in Angie */
 .ds-textarea.has-error {
   box-shadow: inset 0 0 0 2px #b0243f;