diff --git a/src/app/GlobalHeader.js b/src/app/GlobalHeader.js index e6260040..4b6e66d8 100644 --- a/src/app/GlobalHeader.js +++ b/src/app/GlobalHeader.js @@ -13,11 +13,10 @@ import { HamburgerIcon } from "@chakra-ui/icons"; import { Link, useLocation } from "react-router-dom"; import { useAuth0 } from "@auth0/auth0-react"; import { ChevronLeftIcon } from "@chakra-ui/icons"; +import Image from "next/image"; import useCurrentUser from "./components/useCurrentUser"; - import HomeLinkIcon from "./images/home-link-icon.png"; -import HomeLinkIcon2x from "./images/home-link-icon@2x.png"; function GlobalHeader() { return ( @@ -69,16 +68,15 @@ function HomeLink(props) { > - + + + } /> @@ -621,33 +621,19 @@ function FeedbackFormSection() { flex="0 0 auto" marginTop="4" > - - - } - > + diff --git a/src/app/WardrobePage/PosePicker.js b/src/app/WardrobePage/PosePicker.js index 8d79b426..7d8d2931 100644 --- a/src/app/WardrobePage/PosePicker.js +++ b/src/app/WardrobePage/PosePicker.js @@ -17,6 +17,7 @@ import { useToast, } from "@chakra-ui/react"; import { loadable } from "../util"; +import Image from "next/image"; import { petAppearanceFragment } from "../components/useOutfitAppearance"; import getVisibleLayers from "../../shared/getVisibleLayers"; @@ -493,7 +494,7 @@ function PoseOption({ ) : ( - + )} @@ -512,8 +513,16 @@ function PoseOption({ ); } -function EmojiImage({ src, alt, boxSize = "16px" }) { - return {alt}; +function EmojiImage({ src, alt, boxSize = 16 }) { + return ( + {alt} + ); } function usePoses(speciesId, colorId, selectedPose) { diff --git a/src/app/components/WIPCallout.js b/src/app/components/WIPCallout.js index 2a9adb9d..a95ba8cb 100644 --- a/src/app/components/WIPCallout.js +++ b/src/app/components/WIPCallout.js @@ -1,10 +1,8 @@ -import React from "react"; import { Box, Flex, Tooltip } from "@chakra-ui/react"; +import Image from "next/image"; import { useCommonStyles } from "../util"; - import WIPXweeImg from "../images/wip-xwee.png"; -import WIPXweeImg2x from "../images/wip-xwee@2x.png"; function WIPCallout({ children, @@ -30,14 +28,18 @@ function WIPCallout({ fontSize={size === "sm" ? "xs" : "sm"} > + > + Curious blue Xweetok, tilted head + {children || ( <> diff --git a/src/app/images/error-grundo-2-0.png b/src/app/images/error-grundo-2-0.png deleted file mode 100644 index 738744e7..00000000 Binary files a/src/app/images/error-grundo-2-0.png and /dev/null differ diff --git a/src/app/images/error-grundo-2-1.png b/src/app/images/error-grundo-2-1.png deleted file mode 100644 index 73329bc9..00000000 Binary files a/src/app/images/error-grundo-2-1.png and /dev/null differ diff --git a/src/app/images/error-grundo.png b/src/app/images/error-grundo.png old mode 100755 new mode 100644 index 0fb32ca6..a24c0a10 Binary files a/src/app/images/error-grundo.png and b/src/app/images/error-grundo.png differ diff --git a/src/app/images/error-grundo@2x.png b/src/app/images/error-grundo@2x.png deleted file mode 100644 index a24c0a10..00000000 Binary files a/src/app/images/error-grundo@2x.png and /dev/null differ diff --git a/src/app/images/feedback-xwee.png b/src/app/images/feedback-xwee.png index 1f0c376b..e1e4c2b0 100644 Binary files a/src/app/images/feedback-xwee.png and b/src/app/images/feedback-xwee.png differ diff --git a/src/app/images/feedback-xwee@2x.png b/src/app/images/feedback-xwee@2x.png deleted file mode 100644 index e1e4c2b0..00000000 Binary files a/src/app/images/feedback-xwee@2x.png and /dev/null differ diff --git a/src/app/images/home-link-icon.png b/src/app/images/home-link-icon.png index 16023780..43766148 100644 Binary files a/src/app/images/home-link-icon.png and b/src/app/images/home-link-icon.png differ diff --git a/src/app/images/home-link-icon@2x.png b/src/app/images/home-link-icon@2x.png deleted file mode 100644 index 43766148..00000000 Binary files a/src/app/images/home-link-icon@2x.png and /dev/null differ diff --git a/src/app/images/homepage-splash.png b/src/app/images/homepage-splash.png index 2510cd90..9c05073c 100644 Binary files a/src/app/images/homepage-splash.png and b/src/app/images/homepage-splash.png differ diff --git a/src/app/images/homepage-splash@2x.png b/src/app/images/homepage-splash@2x.png deleted file mode 100644 index 9c05073c..00000000 Binary files a/src/app/images/homepage-splash@2x.png and /dev/null differ diff --git a/src/app/images/wip-xwee.png b/src/app/images/wip-xwee.png index d25be735..2c4136b2 100644 Binary files a/src/app/images/wip-xwee.png and b/src/app/images/wip-xwee.png differ diff --git a/src/app/images/wip-xwee@2x.png b/src/app/images/wip-xwee@2x.png deleted file mode 100644 index 2c4136b2..00000000 Binary files a/src/app/images/wip-xwee@2x.png and /dev/null differ diff --git a/src/app/util.js b/src/app/util.js index f4caaacf..d875538e 100644 --- a/src/app/util.js +++ b/src/app/util.js @@ -9,10 +9,10 @@ import { } from "@chakra-ui/react"; import loadableLibrary from "@loadable/component"; import * as Sentry from "@sentry/react"; +import { WarningIcon } from "@chakra-ui/icons"; +import NextImage from "next/image"; import ErrorGrundoImg from "./images/error-grundo.png"; -import ErrorGrundoImg2x from "./images/error-grundo@2x.png"; -import { WarningIcon } from "@chakra-ui/icons"; /** * Delay hides its content at first, then shows it after the given delay. @@ -451,15 +451,20 @@ export function MajorErrorMessage({ error = null, variant = "unexpected" }) { > + > + + {variant === "unexpected" && <>Ah dang, I broke it 😖}