From aa28e1a8a72c172f9ae509b83aacc537dde6da38 Mon Sep 17 00:00:00 2001 From: Daniel Kluge Date: Thu, 20 Oct 2022 14:58:13 +0200 Subject: [PATCH] No more phosphor-react --- components/Blog/Navigation.tsx | 11 +-- components/Blog/ThemeSwitch.tsx | 9 +-- package-lock.json | 105 +++++++++++++++++----------- package.json | 4 +- pages/terminal.tsx | 18 +++-- public/{ => img}/icon.png | Bin styles/Terminal/Terminal.module.css | 5 +- 7 files changed, 90 insertions(+), 62 deletions(-) rename public/{ => img}/icon.png (100%) diff --git a/components/Blog/Navigation.tsx b/components/Blog/Navigation.tsx index 596cb2c..8c33ce9 100644 --- a/components/Blog/Navigation.tsx +++ b/components/Blog/Navigation.tsx @@ -2,11 +2,12 @@ import type { NextPage } from "next"; import Link from "next/link"; import Image from "next/image"; -import { TerminalWindow, House, User } from "phosphor-react"; +import Icon from "@mdi/react"; +import { mdiConsole, mdiAccount, mdiHome } from "@mdi/js"; import ThemeSwitch from "./ThemeSwitch"; import styles from "../../styles/Blog/Navigation.module.scss"; -import logo from "../../public/icon.png"; +import logo from "../../public/img/icon.png"; const Navigation: NextPage<{}> = () => { return ; }; diff --git a/components/Blog/ThemeSwitch.tsx b/components/Blog/ThemeSwitch.tsx index 8b18d68..b5d0ff3 100644 --- a/components/Blog/ThemeSwitch.tsx +++ b/components/Blog/ThemeSwitch.tsx @@ -1,7 +1,8 @@ import type { NextPage } from "next"; import { useEffect, useState } from "react"; import { useTheme } from "next-themes"; -import { Sun, Moon, FileJs } from "phosphor-react"; +import Icon from "@mdi/react"; +import { mdiWhiteBalanceSunny, mdiWeatherNight, mdiLanguageJavascript } from "@mdi/js"; import styles from "../../styles/Blog/ThemeSwitch.module.scss"; @@ -35,7 +36,7 @@ const ThemeSwitch: NextPage<{ size?: string }> = ({ size }) => { if (!mounted) { return
- +
; } @@ -43,8 +44,8 @@ const ThemeSwitch: NextPage<{ size?: string }> = ({ size }) => { const moonClasses = fadeProps.moon || (theme === "light" ? styles.selected : undefined); return
- switchTheme("light")} /> - switchTheme("dark")} /> +
switchTheme("light")}>
+
switchTheme("dark")}>
; }; diff --git a/package-lock.json b/package-lock.json index afa7b7d..6720e3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,6 +6,9 @@ "": { "name": "c0ntroller.de", "dependencies": { + "@icons-pack/react-simple-icons": "^5.10.0", + "@mdi/js": "^7.0.96", + "@mdi/react": "^1.6.1", "asciidoctor": "^2.2.5", "color": "^4.2.3", "highlight.js": "^11.5.1", @@ -13,7 +16,6 @@ "next": "12.1.0", "next-themes": "^0.2.1", "node-fetch": "^3.2.0", - "phosphor-react": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2" }, @@ -167,9 +169,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.17.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz", - "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz", + "integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==", "dev": true, "dependencies": { "regenerator-runtime": "^0.13.4" @@ -231,6 +233,14 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "node_modules/@icons-pack/react-simple-icons": { + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/@icons-pack/react-simple-icons/-/react-simple-icons-5.10.0.tgz", + "integrity": "sha512-I93VYZJS6EQjiQr1k+FxNQv5xVWJIu222BoiSwb6CPTwAEtrCJXVZ9vygzdAOx5CnchKEIg7OcRHrx8o74uyoA==", + "peerDependencies": { + "react": "^16.13 || ^17 || ^18" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", @@ -295,6 +305,19 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@mdi/js": { + "version": "7.0.96", + "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.0.96.tgz", + "integrity": "sha512-lNqhkV3cpPfYb/Avh+vXLFukUTbHbyHoFo4Jdc7Oc9UvURGVhamFIpgOVvEf2bNA78zvjXTZeVWExUTR+DLBfQ==" + }, + "node_modules/@mdi/react": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdi/react/-/react-1.6.1.tgz", + "integrity": "sha512-4qZeDcluDFGFTWkHs86VOlHkm6gnKaMql13/gpIcUQ8kzxHgpj31NuCkD8abECVfbULJ3shc7Yt4HJ6Wu6SN4w==", + "dependencies": { + "prop-types": "^15.7.2" + } + }, "node_modules/@next/env": { "version": "12.1.0", "resolved": "https://registry.npmjs.org/@next/env/-/env-12.1.0.tgz", @@ -626,9 +649,9 @@ "dev": true }, "node_modules/@types/prop-types": { - "version": "15.7.4", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz", - "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==", + "version": "15.7.5", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", + "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", "dev": true }, "node_modules/@types/react": { @@ -1524,9 +1547,9 @@ "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" }, "node_modules/csstype": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz", - "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", + "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==", "dev": true }, "node_modules/damerau-levenshtein": { @@ -3702,17 +3725,6 @@ "node": ">=8" } }, - "node_modules/phosphor-react": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/phosphor-react/-/phosphor-react-1.4.1.tgz", - "integrity": "sha512-gO5j7U0xZrdglTAYDYPACU4xDOFBTJmptrrB/GeR+tHhCZF3nUMyGmV/0hnloKjuTrOmpSFlbfOY78H39rgjUQ==", - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "react": ">=16" - } - }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", @@ -3769,7 +3781,6 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "dev": true, "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -3872,8 +3883,7 @@ "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/readdirp": { "version": "3.6.0", @@ -5064,9 +5074,9 @@ } }, "@babel/runtime": { - "version": "7.17.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz", - "integrity": "sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz", + "integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==", "dev": true, "requires": { "regenerator-runtime": "^0.13.4" @@ -5116,6 +5126,12 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, + "@icons-pack/react-simple-icons": { + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/@icons-pack/react-simple-icons/-/react-simple-icons-5.10.0.tgz", + "integrity": "sha512-I93VYZJS6EQjiQr1k+FxNQv5xVWJIu222BoiSwb6CPTwAEtrCJXVZ9vygzdAOx5CnchKEIg7OcRHrx8o74uyoA==", + "requires": {} + }, "@jridgewell/gen-mapping": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", @@ -5171,6 +5187,19 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "@mdi/js": { + "version": "7.0.96", + "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.0.96.tgz", + "integrity": "sha512-lNqhkV3cpPfYb/Avh+vXLFukUTbHbyHoFo4Jdc7Oc9UvURGVhamFIpgOVvEf2bNA78zvjXTZeVWExUTR+DLBfQ==" + }, + "@mdi/react": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/@mdi/react/-/react-1.6.1.tgz", + "integrity": "sha512-4qZeDcluDFGFTWkHs86VOlHkm6gnKaMql13/gpIcUQ8kzxHgpj31NuCkD8abECVfbULJ3shc7Yt4HJ6Wu6SN4w==", + "requires": { + "prop-types": "^15.7.2" + } + }, "@next/env": { "version": "12.1.0", "resolved": "https://registry.npmjs.org/@next/env/-/env-12.1.0.tgz", @@ -5387,9 +5416,9 @@ "dev": true }, "@types/prop-types": { - "version": "15.7.4", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz", - "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==", + "version": "15.7.5", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", + "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==", "dev": true }, "@types/react": { @@ -6073,9 +6102,9 @@ } }, "csstype": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.11.tgz", - "integrity": "sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", + "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==", "dev": true }, "damerau-levenshtein": { @@ -7679,12 +7708,6 @@ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true }, - "phosphor-react": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/phosphor-react/-/phosphor-react-1.4.1.tgz", - "integrity": "sha512-gO5j7U0xZrdglTAYDYPACU4xDOFBTJmptrrB/GeR+tHhCZF3nUMyGmV/0hnloKjuTrOmpSFlbfOY78H39rgjUQ==", - "requires": {} - }, "picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", @@ -7722,7 +7745,6 @@ "version": "15.8.1", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "dev": true, "requires": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -7792,8 +7814,7 @@ "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "dev": true + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "readdirp": { "version": "3.6.0", diff --git a/package.json b/package.json index 4bd21ea..6fe7a39 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,9 @@ "lint": "npx next lint" }, "dependencies": { + "@icons-pack/react-simple-icons": "^5.10.0", + "@mdi/js": "^7.0.96", + "@mdi/react": "^1.6.1", "asciidoctor": "^2.2.5", "color": "^4.2.3", "highlight.js": "^11.5.1", @@ -15,7 +18,6 @@ "next": "12.1.0", "next-themes": "^0.2.1", "node-fetch": "^3.2.0", - "phosphor-react": "^1.3.1", "react": "17.0.2", "react-dom": "17.0.2" }, diff --git a/pages/terminal.tsx b/pages/terminal.tsx index f1d0c9b..1fdc4f4 100644 --- a/pages/terminal.tsx +++ b/pages/terminal.tsx @@ -1,6 +1,8 @@ import type { NextPage, GetStaticProps } from "next"; import Head from "next/head"; -import { GithubLogo, InstagramLogo, DiscordLogo, GameController, Envelope } from "phosphor-react"; +import Icon from "@mdi/react"; +import { mdiEmail } from "@mdi/js"; +import { Discord, Github, Instagram, Steam } from "@icons-pack/react-simple-icons"; import { useEffect, useRef,useCallback } from "react"; import { useCommands } from "../lib/commands/ContextProvider"; import { useModalFunctions } from "../components/Terminal/contexts/ModalFunctions"; @@ -49,6 +51,8 @@ const Home: NextPage<{ buildTime: string }> = ({ buildTime }) => { } }, [router]); + const iconSize = "1.3em"; + return (
c0ntroller.de @@ -61,17 +65,17 @@ const Home: NextPage<{ buildTime: string }> = ({ buildTime }) => { | Bug? | - + | - + | - + | - + | - + - + C0ntroller_Z#3883 diff --git a/public/icon.png b/public/img/icon.png similarity index 100% rename from public/icon.png rename to public/img/icon.png diff --git a/styles/Terminal/Terminal.module.css b/styles/Terminal/Terminal.module.css index c801599..166a179 100644 --- a/styles/Terminal/Terminal.module.css +++ b/styles/Terminal/Terminal.module.css @@ -45,9 +45,8 @@ } .iconLink { - cursor: pointer; - font-size: 1.6em; - padding-top: 0.3em; + height: 1.15em; + width: 1.6em; } .tooltip {