feat(deps): Update to phosphor-react@1.3.1 and add icon entries

package.json

@@ -1,6 +1,6 @@
 {
   "name": "phosphor-home",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "license": "MIT",
   "homepage": "https://phosphoricons.com",
   "author": {
@@ -21,13 +21,10 @@
   "repository": "github:phosphor-icons/phosphor-home",
   "private": true,
   "dependencies": {
-    "@types/braintree-web-drop-in": "^1.22.3",
-    "axios": "^0.21.1",
-    "braintree-web-drop-in": "^1.30.1",
     "file-saver": "^2.0.2",
     "framer-motion": "^3.10.0",
     "fuse.js": "^6.4.1",
-    "phosphor-react": "^1.2.1",
+    "phosphor-react": "^1.3.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-dropdown-select": "^4.4.2",

src/components/App/App.css

@@ -49,7 +49,6 @@ button {
   justify-content: flex-start;
 }
 
-input.main-button,
 button.main-button {
   height: 64px;
   padding: 0 48px 0 40px;
@@ -73,29 +72,19 @@ button.main-button {
   margin: 0 24px 24px 0;
 }
 
-input.main-button:active,
 button.main-button:active {
   transform: translate(4px, 4px);
   box-shadow: 0 0 0 0 black;
 }
 
-input.main-button:focus,
 button.main-button:focus {
   outline: none;
 }
 
-input.main-button:disabled,
-button.main-button:disabled {
-  border: 2px solid gray;
-  box-shadow: 4px 4px 0 0 gray;
-  cursor: not-allowed;
-}
-
 /* button.main-button:not(:last-child) {
   margin: 0 24px 24px 0;
 } */
 
-input.main-button,
 button.main-button svg {
   margin-right: 12px;
 }
@@ -125,55 +114,3 @@ a.main-link:after {
 a.main-link:hover:after {
   width: 0%;
 }
-
-button.text-button {
-  display: flex;
-  align-items: center;
-  padding: 8px;
-  background-color: transparent;
-  font-size: 16px;
-  cursor: pointer;
-  border-radius: 8px;
-}
-
-button.text-button svg {
-  margin: 8px;
-}
-
-.radio-group {
-  display: flex;
-  flex-flow: row wrap;
-  justify-content: space-around;
-  row-gap: 8px;
-}
-
-.radio-button input[type="radio"] {
-  display: none;
-}
-
-.radio-button label {
-  display: inline-block;
-  padding: 8px;
-  min-width: 50px;
-  background-color: white;
-  border-radius: 8px;
-  border: 2px solid black;
-  font-weight: bold;
-  cursor: pointer;
-  text-align: center;
-  user-select: none;
-}
-
-.radio-button label:hover {
-  background-color: #E0E0E0;
-}
-
-.radio-button input[type="radio"]:checked + label {
-  color: white;
-  background-color: black;
-
-}
-
-.radio-button label input {
-  margin-left: 8px;
-}

src/components/App/App.tsx

@@ -1,19 +1,15 @@
 import React, { Suspense } from "react";
 
-import Header from "components/Header";
-import Modal from "components/Modal";
-import Toolbar from "components/Toolbar";
-import IconGrid from "components/IconGrid";
-import Footer from "components/Footer";
-import ErrorBoundary from "components/ErrorBoundary";
-import Notice from "components/Notice";
-
-import useIconParameters from "hooks/useIconParameters";
-
 import "./App.css";
+import Header from "../Header/Header";
+import Toolbar from "../Toolbar/Toolbar";
+import IconGrid from "../IconGrid/IconGrid";
+import Footer from "../Footer/Footer";
+import ErrorBoundary from "../ErrorBoundary/ErrorBoundary";
+import Notice from "../Notice/Notice";
+import useIconParameters from "../../hooks/useIconParameters";
 
 const errorFallback = <Notice message="Search error" />;
-const paymentFallback = <Notice message="Could not connect to payments" />;
 const waitingFallback = <Notice type="none" message="" />;
 
 const App: React.FC<any> = () => {
@@ -30,9 +26,6 @@ const App: React.FC<any> = () => {
           </Suspense>
         </ErrorBoundary>
       </main>
-      <Suspense fallback={paymentFallback}>
-        <Modal />
-      </Suspense>
       <Footer />
     </React.StrictMode>
   );

src/components/App/index.ts

@@ -1,2 +0,0 @@
-import App from "./App";
-export default App;

src/components/ColorInput/ColorInput.tsx

@@ -1,10 +1,9 @@
 import React, { useCallback } from "react";
 import { useRecoilState, useRecoilValue } from "recoil";
 
-import { iconColorAtom } from "state/atoms";
+import { iconColorAtom } from "../../state/atoms";
-import { isDarkThemeSelector } from "state/selectors";
+import { isDarkThemeSelector } from "../../state/selectors";
-import useThrottled from "hooks/useThrottled";
+import useThrottled from "../../hooks/useThrottled";
-
 import "./ColorInput.css";
 
 type ColorInputProps = {};

src/components/ColorInput/index.ts

@@ -1,2 +0,0 @@
-import ColorInput from "./ColorInput";
-export default ColorInput;

src/components/ErrorBoundary/index.ts

@@ -1,2 +0,0 @@
-import ErrorBoundary from "./ErrorBoundary";
-export default ErrorBoundary;

src/components/Footer/Footer.tsx

@@ -1,12 +1,10 @@
 import React from "react";
 import { Coffee, Heart } from "phosphor-react";
 
-import uArrowUpLeft from "assets/u-arrow-up-left.svg";
+import uArrowUpLeft from "../../assets/u-arrow-up-left.svg";
-import markerGreen from "assets/marker-green.svg";
+import markerGreen from "../../assets/marker-green.svg";
-import postIt from "assets/footer-mobile.svg";
+import postIt from "../../assets/footer-mobile.svg";
-
+import Links from "../Links/Links";
-import Links from "components/Links";
-
 import "./Footer.css";
 
 type FooterProps = {};
@@ -36,8 +34,8 @@ const Footer: React.FC<FooterProps> = () => {
             a little quirky, too.
           </p>
           <p>
-            We're thankful for the tools we've benefited from and this is our
+            We're thankful for the tools we've benefited from and
-            contribution towards a collaborative community.
+            this is our contribution towards a collaborative community.
           </p>
           <p>
             Phosphor is free and open-source, licensed under{" "}

src/components/Footer/index.ts

@@ -1,2 +0,0 @@
-import Footer from "./Footer";
-export default Footer;

src/components/Header/Header.tsx

@@ -1,24 +1,22 @@
 import React from "react";
 import { ArrowCircleUpRight, ArrowCircleDown } from "phosphor-react";
 
-import markerPurple from "assets/marker-purple.svg";
+import markerPurple from "../../assets/marker-purple.svg";
-import paperclips from "assets/paperclips-header-mobile.svg";
+import paperclips from "../../assets/paperclips-header-mobile.svg";
-import paperclipsThree from "assets/paperclips-header.svg";
+import paperclipsThree from "../../assets/paperclips-header.svg";
-import tablet from "assets/tablet.svg";
+import tablet from "../../assets/tablet.svg";
-import tabletSpec from "assets/tablet-spec.svg";
+import tabletSpec from "../../assets/tablet-spec.svg";
-import billiardBall from "assets/billiard-ball.svg";
+import billiardBall from "../../assets/billiard-ball.svg";
-import billiardBallSpec from "assets/billiard-ball-spec.svg";
+import billiardBallSpec from "../../assets/billiard-ball-spec.svg";
-import warning from "assets/warning.svg";
+import warning from "../../assets/warning.svg";
-import warningSpec from "assets/warning-spec.svg";
+import warningSpec from "../../assets/warning-spec.svg";
-import cuttingMat from "assets/cutting-mat.svg";
+import cuttingMat from "../../assets/cutting-mat.svg";
-import cuttingMatSpec from "assets/cutting-mat-spec.svg";
+import cuttingMatSpec from "../../assets/cutting-mat-spec.svg";
-import receipt from "assets/receipt.svg";
+import receipt from "../../assets/receipt.svg";
-import receiptSpec from "assets/receipt-spec.svg";
+import receiptSpec from "../../assets/receipt-spec.svg";
-import calculator from "assets/calculator.svg";
+import calculator from "../../assets/calculator.svg";
-import calculatorSpec from "assets/calculator-spec.svg";
+import calculatorSpec from "../../assets/calculator-spec.svg";
-
+import Links from "../Links/Links";
-import Links from "components/Links";
-
 import "./Header.css";
 
 type HeaderProps = {};

src/components/Header/index.ts

@@ -1,2 +0,0 @@
-import Header from "./Header";
-export default Header;

src/components/IconGrid/DetailsPanel.tsx

@@ -3,19 +3,18 @@ import { useRecoilValue, useSetRecoilState } from "recoil";
 import { motion } from "framer-motion";
 import { Svg2Png } from "svg2png-converter";
 import { saveAs } from "file-saver";
-import ReactGA from "react-ga";
 import { Copy, X, CheckCircle, Download } from "phosphor-react";
+import ReactGA from "react-ga";
 
 import {
   iconWeightAtom,
   iconSizeAtom,
   iconColorAtom,
   iconPreviewOpenAtom,
-} from "state/atoms";
+} from "../../state/atoms";
-import { IconEntry } from "lib";
+import useTransientState from "../../hooks/useTransientState";
-import useTransientState from "hooks/useTransientState";
-
 import TagCloud from "./TagCloud";
+import { IconEntry } from "../../lib";
 
 const panelVariants = {
   open: {

src/components/IconGrid/IconGrid.tsx

@@ -3,27 +3,18 @@ import { useRecoilValue } from "recoil";
 import { motion, useAnimation } from "framer-motion";
 import { IconContext } from "phosphor-react";
 
-import { iconWeightAtom, iconSizeAtom, iconColorAtom } from "state/atoms";
+import { iconWeightAtom, iconSizeAtom, iconColorAtom } from "../../state/atoms";
 import {
   filteredQueryResultsSelector,
   isDarkThemeSelector,
-} from "state/selectors";
+} from "../../state/selectors";
-import useGridSpans from "hooks/useGridSpans";
+import useGridSpans from "../../hooks/useGridSpans";
-
 import IconGridItem from "./IconGridItem";
 import TagCloud from "./TagCloud";
-import Notice from "components/Notice";
+import Notice from "../Notice/Notice";
-
 import "./IconGrid.css";
 
-const defaultSearchTags = [
+const defaultSearchTags = ["*new*", "communication", "editor", "emoji", "maps", "weather"];
-  "*new*",
-  "communication",
-  "editor",
-  "emoji",
-  "maps",
-  "weather",
-];
 
 type IconGridProps = {};
 

src/components/IconGrid/IconGridItem.tsx

@@ -7,9 +7,9 @@ import React, {
 import { useRecoilState } from "recoil";
 import { motion, AnimatePresence } from "framer-motion";
 
-import { IconEntry } from "lib";
+import { iconPreviewOpenAtom } from "../../state/atoms";
-import { iconPreviewOpenAtom } from "state/atoms";
 import DetailsPanel from "./DetailsPanel";
+import { IconEntry } from "../../lib";
 
 interface IconGridItemProps {
   index: number;

src/components/IconGrid/TagCloud.tsx

@@ -1,8 +1,7 @@
 import React, { useCallback } from "react";
 import { useSetRecoilState } from "recoil";
 
-import { searchQueryAtom } from "state/atoms";
+import { searchQueryAtom } from "../../state/atoms";
-
 import "./TagCloud.css";
 
 interface TagCloudProps {

src/components/IconGrid/index.ts

@@ -1,2 +0,0 @@
-import IconGrid from "./IconGrid";
-export default IconGrid;

src/components/Links/Links.css

@@ -20,14 +20,13 @@
   margin-right: 12px;
 }
 
-.nav-link {
+a.nav-link {
   text-decoration: none;
   position: relative;
   color: black;
-  cursor: pointer;
 }
 
-.nav-link:after {
+a.nav-link:after {
   content: "";
   position: absolute;
   bottom: -2px;
@@ -37,6 +36,6 @@
   transition: 0.2s;
 }
 
-.nav-link:hover:after {
+a.nav-link:hover:after {
   width: 100%;
 }

src/components/Links/Links.tsx

@@ -1,22 +1,14 @@
 import React from "react";
 import { OutboundLink } from "react-ga";
-import { useSetRecoilState } from "recoil";
 import { ArrowElbowDownRight } from "phosphor-react";
 
-import { iconCount } from "lib/icons";
+import { iconCount } from "../../lib/icons";
-import { modalSelector } from "state/selectors";
-import DonationModal from "components/Modal/DonationModal";
 
 import "./Links.css";
 
 interface LinksProps {}
 
 const Links: React.FC<LinksProps> = () => {
-  const openModal = useSetRecoilState(modalSelector);
-  const openDonationModal = () => openModal({ type: DonationModal });
-
-  const delayedOpenDonationModal = () => setTimeout(openDonationModal, 2000);
-
   return (
     <div className="links">
       <div>
@@ -27,7 +19,6 @@ const Links: React.FC<LinksProps> = () => {
           eventLabel="Download all"
           download
           type="application/zip"
-          onClick={delayedOpenDonationModal}
         >
           Download all ({iconCount})
         </OutboundLink>
@@ -61,11 +52,23 @@ const Links: React.FC<LinksProps> = () => {
           Request an icon
         </a>
       </div>
+      {/* <div>
+        <ArrowElbowDownRight size={24} />
+        <span>
+          <a className="nav-link" href="https://paypal.me/minoraxis">
+            Donate on PayPal
+          </a>
+          {" / "}
+          <a className="nav-link" href="https://patreon.com/phosphoricons">
+            Patreon
+          </a>
+        </span>
+      </div> */}
       <div>
         <ArrowElbowDownRight size={24} />
-        <span className="nav-link" onClick={openDonationModal}>
+        <a className="nav-link" href="https://paypal.me/minoraxis">
-          Donate
+          Donate on PayPal
-        </span>
+        </a>
       </div>
       <div>
         <ArrowElbowDownRight size={24} />

src/components/Links/index.ts

@@ -1,2 +0,0 @@
-import Links from "./Links";
-export default Links;

src/components/Modal/DonationModal/DonationModal.tsx

@@ -1,91 +0,0 @@
-import React, { useState } from "react";
-
-import { ModalInstance } from "../Modal";
-import DonationStepMethod from "./DonationStepMethod";
-import DonationStepDropin from "./DonationStepDropin";
-import DonationStepThanks from "./DonationStepThanks";
-
-const routes = [DonationStepMethod, DonationStepDropin, DonationStepThanks];
-
-export enum DonationType {
-  FIVE_DOLLARS = 5,
-  TEN_DOLLARS = 10,
-  TWENTY_DOLLARS = 20,
-  FIFTY_DOLLARS = 50,
-  ONE_HUNDRED_DOLLARS = 100,
-  CUSTOM = -1,
-}
-
-interface RouteProps {
-  donationType: DonationType | undefined;
-  setDonationType: React.Dispatch<
-    React.SetStateAction<DonationType | undefined>
-  >;
-  donationAmount: number;
-  setDonationAmount: React.Dispatch<React.SetStateAction<number>>;
-}
-
-export interface StepProps {
-  previousStep: () => void;
-  nextStep: () => void;
-  close: () => void;
-  routeProps: RouteProps;
-}
-
-interface StepperProps {
-  routes: Array<React.FC<StepProps>>;
-  routeProps: RouteProps;
-  close: () => void;
-}
-
-const Stepper: React.FC<StepperProps> = ({ routes, routeProps, close }) => {
-  const [currentStep, setCurrentStep] = useState<number>(0);
-
-  const previousStep = () => {
-    if (currentStep <= 0) return;
-    setTimeout(() => setCurrentStep((c) => c - 1), 500);
-  };
-
-  const nextStep = () => {
-    if (currentStep >= routes.length - 1) return;
-    setTimeout(() => setCurrentStep((c) => c + 1), 500);
-  };
-
-  const Component = routes[currentStep];
-
-  return (
-    <>
-      <Component
-        previousStep={previousStep}
-        nextStep={nextStep}
-        close={close}
-        routeProps={routeProps}
-      />
-    </>
-  );
-};
-
-const DonationModal = ({ close }: ModalInstance): JSX.Element => {
-  const [donationType, setDonationType] = useState<DonationType | undefined>();
-  const [donationAmount, setDonationAmount] = useState<number>(0);
-
-  return (
-    <>
-      <div className="modal-titlebar">
-        <h2>Donate</h2>
-      </div>
-      <Stepper
-        routes={routes}
-        routeProps={{
-          donationType,
-          setDonationType,
-          donationAmount,
-          setDonationAmount,
-        }}
-        close={close}
-      />
-    </>
-  );
-};
-
-export default DonationModal;

src/components/Modal/DonationModal/DonationStepDropin.tsx

@@ -1,128 +0,0 @@
-import React, { useRef, useState, useEffect } from "react";
-import dropin, { Dropin } from "braintree-web-drop-in";
-import axios from "axios";
-import { CurrencyCircleDollar } from "phosphor-react";
-
-import { StepProps } from "./DonationModal";
-
-const PaymentServer = axios.create({
-  baseURL: "https://us-central1-phosphor-14c61.cloudfunctions.net/paymentsApi",
-});
-
-const BT_PAYMENT_FIELDS = {
-  number: {
-    placeholder: "4111 1111 1111 1111",
-  },
-  cvv: {
-    placeholder: "123",
-  },
-  expirationDate: {
-    placeholder: "10/22",
-  },
-  cardholderName: {
-    placeholder: "Person McFace",
-  },
-};
-
-const PaymentModal: React.FC<StepProps> = ({
-  nextStep,
-  previousStep,
-  routeProps,
-}) => {
-  const instance = useRef<Dropin>();
-  const [isValid, setIsValid] = useState<boolean>(false);
-  const [isLoading, setLoading] = useState<boolean>(false);
-
-  const { donationAmount } = routeProps;
-
-  const submit = async () => {
-    if (!instance.current) return;
-
-    setLoading(true);
-
-    try {
-      const payload = await instance.current.requestPaymentMethod();
-      console.log({ ...payload, donationAmount });
-      const response = await PaymentServer.post("/", {
-        ...payload,
-        donationAmount,
-      });
-
-      console.log({ response });
-      if (!!response.data?.success) {
-        nextStep();
-      } else {
-        setIsValid(false);
-      }
-    } catch (_e) {
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  useEffect(() => {
-    const initializePayments = async () => {
-      try {
-        instance.current = await dropin.create({
-          authorization: "sandbox_246jdjxq_8h7hm5rvngkykjds",
-          container: "#braintree-dropin",
-          card: {
-            cardholderName: {
-              required: true,
-            },
-            overrides: {
-              fields: BT_PAYMENT_FIELDS,
-            },
-          },
-          paypal: {
-            flow: "checkout",
-            amount: donationAmount.toFixed(2).toString(),
-            currency: "USD",
-            commit: false,
-          },
-          paypalCredit: {
-            flow: "checkout",
-            amount: donationAmount.toFixed(2).toString(),
-            currency: "USD",
-            commit: false,
-          },
-          venmo: { allowNewBrowserTab: false },
-        });
-        instance.current.on("paymentMethodRequestable", () => setIsValid(true));
-        instance.current.on("noPaymentMethodRequestable", () =>
-          setIsValid(false)
-        );
-      } catch (err) {
-        console.error(err);
-      }
-    };
-
-    initializePayments();
-  }, [donationAmount]);
-
-  return (
-    <>
-      <div id="braintree-dropin"></div>
-      <div className="donation-details">
-        <CurrencyCircleDollar size={64} weight="duotone" />
-        <span>
-          Preparing your ${routeProps.donationAmount.toFixed(2)} donation...
-        </span>
-      </div>
-      <div className="step-button-container">
-        <button className="main-button" onClick={previousStep}>
-          Back
-        </button>
-        <button
-          className="main-button"
-          onClick={submit}
-          disabled={isLoading || !isValid}
-        >
-          {isLoading ? "Processing..." : "Donate"}
-        </button>
-      </div>
-    </>
-  );
-};
-
-export default PaymentModal;

src/components/Modal/DonationModal/DonationStepMethod.tsx

@@ -1,123 +0,0 @@
-import React from "react";
-
-import { StepProps, DonationType } from "./DonationModal";
-
-const DonationStepMethod: React.FC<StepProps> = ({
-  previousStep,
-  nextStep,
-  close,
-  routeProps,
-}) => {
-  const { donationType, donationAmount, setDonationType, setDonationAmount } =
-    routeProps;
-
-  const onDonationChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setDonationType(+e.target.value as DonationType);
-    if (!(+e.target.value === DonationType.CUSTOM))
-      setDonationAmount(+e.target.value);
-  };
-
-  void previousStep;
-
-  return (
-    <>
-      <h3>
-        Thanks for using Phosphor! Would you like to make a donation to help
-        support our work?
-      </h3>
-      <div className="radio-group">
-        <div className="radio-button">
-          <input
-            type="radio"
-            id="donate-5"
-            name="donation-type"
-            value={DonationType.FIVE_DOLLARS}
-            checked={donationType === DonationType.FIVE_DOLLARS}
-            onChange={onDonationChange}
-          />
-          <label htmlFor="donate-5">$5</label>
-        </div>
-        <div className="radio-button">
-          <input
-            type="radio"
-            id="donate-10"
-            name="donation-type"
-            value={DonationType.TEN_DOLLARS}
-            checked={donationType === DonationType.TEN_DOLLARS}
-            onChange={onDonationChange}
-          />
-          <label htmlFor="donate-10">$10</label>
-        </div>
-        <div className="radio-button">
-          <input
-            type="radio"
-            id="donate-20"
-            name="donation-type"
-            value={DonationType.TWENTY_DOLLARS}
-            checked={donationType === DonationType.TWENTY_DOLLARS}
-            onChange={onDonationChange}
-          />
-          <label htmlFor="donate-20">$20</label>
-        </div>
-        <div className="radio-button">
-          <input
-            type="radio"
-            id="donate-50"
-            name="donation-type"
-            value={DonationType.FIFTY_DOLLARS}
-            checked={donationType === DonationType.FIFTY_DOLLARS}
-            onChange={onDonationChange}
-          />
-          <label htmlFor="donate-50">$50</label>
-        </div>
-        <div className="radio-button">
-          <input
-            type="radio"
-            id="donate-100"
-            name="donation-type"
-            value={DonationType.ONE_HUNDRED_DOLLARS}
-            checked={donationType === DonationType.ONE_HUNDRED_DOLLARS}
-            onChange={onDonationChange}
-          />
-          <label htmlFor="donate-100">$100</label>
-        </div>
-        <div className="radio-button">
-          <input
-            type="radio"
-            id="donate-custom"
-            name="donation-type"
-            value={DonationType.CUSTOM}
-            checked={donationType === DonationType.CUSTOM}
-            onChange={onDonationChange}
-          />
-          <label htmlFor="donate-custom">
-            Other: $
-            <input
-              type="number"
-              min={2}
-              max={1000000}
-              id="donate-custom"
-              value={donationAmount}
-              disabled={donationType !== DonationType.CUSTOM}
-              onChange={(e) => setDonationAmount(+e.target.value)}
-            />
-          </label>
-        </div>
-      </div>
-      <div className="step-button-container">
-        <button className="main-button" onClick={close}>
-          No thanks
-        </button>
-        <button
-          className="main-button"
-          onClick={nextStep}
-          disabled={!(donationType && donationAmount)}
-        >
-          Next
-        </button>
-      </div>
-    </>
-  );
-};
-
-export default DonationStepMethod;

src/components/Modal/DonationModal/DonationStepThanks.tsx

@@ -1,7 +0,0 @@
-import React from "react";
-
-const DonationStepThanks: React.FC<{}> = () => {
-  return null;
-};
-
-export default DonationStepThanks;

src/components/Modal/DonationModal/index.ts

@@ -1,2 +0,0 @@
-import DonationModal from "./DonationModal";
-export default DonationModal;

src/components/Modal/Modal.css

@@ -1,85 +0,0 @@
-.modal-container {
-  position: fixed;
-  display: grid;
-  place-items: center;
-  inset: 0;
-  background-color: rgba(0, 0, 0, 0.4);
-  z-index: 10;
-}
-
-.modal-content {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  width: 400px;
-  min-height: 600px;
-  background-color: white;
-  border-radius: 8px;
-  border: 2px solid black;
-  padding: 24px;
-}
-
-@media screen and (max-width: 480px) {
-  .modal-content {
-    position: fixed;
-    inset: 0;
-    width: unset;
-    min-height: unset;
-    border: none;
-    border-radius: 0;
-  }
-}
-
-.step-button-container {
-  flex: 1;
-  display: flex;
-  flex-direction: row;
-  align-items: flex-end;
-  justify-content: center;
-}
-
-.donation-details {
-  display: grid;
-  place-items: center;
-  padding: 32px;
-}
-
-button.modal-close-button {
-  position: absolute;
-  top: 24px;
-  right: 24px;
-  background: transparent;
-  padding: 0;
-  cursor: pointer;
-  box-sizing: content-box;
-  z-index: 1;
-}
-
-.modal-titlebar {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.modal-titlebar > * {
-  margin: 0;
-}
-
-.payment-methods {
-  display: grid;
-  gap: 16px;
-  grid-template-rows: repeat(2, 1fr);
-  grid-template-columns: repeat(2, 1fr);
-}
-
-.payment-methods button {
-  margin: 0;
-  padding: 0;
-  justify-content: center;
-  height: 96px;
-}
-
-.payment-methods button > svg {
-  margin: 0;
-}

src/components/Modal/Modal.tsx

@@ -1,38 +0,0 @@
-import React from "react";
-import { useRecoilState, useRecoilValue } from "recoil";
-import { useLockBodyScroll } from "react-use";
-import { useHotkeys } from "react-hotkeys-hook";
-import { X } from "phosphor-react";
-
-import { modalAtom, modalOpenAtom } from "state/atoms";
-
-import "./Modal.css";
-
-export interface ModalInstance {
-  close: () => void;
-  children?: JSX.Element;
-}
-
-const Modal = (): JSX.Element | null => {
-  const Instance = useRecoilValue(modalAtom);
-  const [isModalOpen, setModalOpen] = useRecoilState(modalOpenAtom);
-  useHotkeys("esc", () => isModalOpen && setModalOpen(false), [isModalOpen]);
-  useLockBodyScroll(isModalOpen);
-
-  const close = () => setModalOpen(false);
-
-  if (!Instance || !isModalOpen) return null;
-
-  return (
-    <div className="modal-container">
-      <div className="modal-content">
-        <button className="modal-close-button" onClick={close}>
-          <X size={32} />
-        </button>
-        <Instance close={close} />
-      </div>
-    </div>
-  );
-};
-
-export default Modal;

src/components/Modal/index.ts

@@ -1,3 +0,0 @@
-import Modal from "./Modal";
-export default Modal;
-

src/components/Notice/Notice.tsx

@@ -1,21 +1,17 @@
 import React from "react";
 import { motion } from "framer-motion";
 import { useRecoilValue } from "recoil";
-import { HourglassMedium, Question, SmileyXEyes } from "phosphor-react";
 
-import { isDarkThemeSelector } from "state/selectors";
+import { isDarkThemeSelector } from "../../state/selectors";
-import { searchQueryAtom } from "state/atoms";
+import { searchQueryAtom } from "../../state/atoms";
+import { HourglassMedium, Question, SmileyXEyes } from "phosphor-react";
 
 interface NoticeProps {
   message?: string;
   type?: "wait" | "help" | "warn" | "none";
 }
 
-const Notice: React.FC<NoticeProps> = ({
+const Notice: React.FC<NoticeProps> = ({ message, type = "warn", children }) => {
-  message,
-  type = "warn",
-  children,
-}) => {
   const isDark = useRecoilValue(isDarkThemeSelector);
   const query = useRecoilValue(searchQueryAtom);
 

src/components/Notice/index.ts

@@ -1,2 +0,0 @@
-import Notice from "./Notice";
-export default Notice;

src/components/SearchInput/SearchInput.tsx

@@ -5,8 +5,7 @@ import { useHotkeys } from "react-hotkeys-hook";
 import { Command, MagnifyingGlass, X, HourglassHigh } from "phosphor-react";
 import ReactGA from "react-ga";
 
-import { searchQueryAtom } from "state/atoms";
+import { searchQueryAtom } from "../../state/atoms";
-
 import "./SearchInput.css";
 
 const apple = /iPhone|iPod|iPad|Macintosh|MacIntel|MacPPC/i;
@@ -20,8 +19,7 @@ type SearchInputProps = {};
 const SearchInput: React.FC<SearchInputProps> = () => {
   const [value, setValue] = useState<string>("");
   const [query, setQuery] = useRecoilState(searchQueryAtom);
-  const inputRef =
+  const inputRef = useRef<HTMLInputElement>() as MutableRefObject<HTMLInputElement>;
-    useRef<HTMLInputElement>() as MutableRefObject<HTMLInputElement>;
 
   useHotkeys("ctrl+k,cmd+k", (e) => {
     e.preventDefault();

src/components/SearchInput/index.ts

@@ -1,2 +0,0 @@
-import SearchInput from "./SearchInput";
-export default SearchInput;

src/components/SizeInput/SizeInput.tsx

@@ -1,8 +1,7 @@
 import React, { useCallback } from "react";
 import { useRecoilState } from "recoil";
 
-import { iconSizeAtom } from "state/atoms";
+import { iconSizeAtom } from "../../state/atoms";
-
 import "./SizeInput.css";
 
 type SizeInputProps = {};

src/components/SizeInput/index.ts

@@ -1,2 +0,0 @@
-import SizeInput from "./SizeInput";
-export default SizeInput;

src/components/StyleInput/StyleInput.tsx

@@ -3,9 +3,8 @@ import { useRecoilState } from "recoil";
 import Select from "react-dropdown-select";
 import { PencilLine } from "phosphor-react";
 
-import { iconWeightAtom } from "state/atoms";
+import { iconWeightAtom } from "../../state/atoms";
-import { IconStyle } from "lib";
+import { IconStyle } from "../../lib";
-
 import "./StyleInput.css";
 
 type WeightOption = { key: string; value: IconStyle; icon: JSX.Element };

src/components/StyleInput/index.ts

@@ -1,2 +0,0 @@
-import StyleInput from "./StyleInput";
-export default StyleInput;

src/components/Toolbar/Toolbar.tsx

@@ -1,11 +1,10 @@
 import React from "react";
 
-import StyleInput from "components/StyleInput";
-import SearchInput from "components/SearchInput";
-import SizeInput from "components/SizeInput";
-import ColorInput from "components/ColorInput";
-
 import "./Toolbar.css";
+import StyleInput from "../StyleInput/StyleInput";
+import SearchInput from "../SearchInput/SearchInput";
+import SizeInput from "../SizeInput/SizeInput";
+import ColorInput from "../ColorInput/ColorInput";
 
 type ToolbarProps = {};
 

src/components/Toolbar/index.ts

@@ -1,2 +0,0 @@
-import Toolbar from "./Toolbar";
-export default Toolbar;

src/hooks/index.ts

@@ -1,8 +0,0 @@
-export { default as useDebounce } from "./useDebounce";
-export { default as useGridSpans } from "./useGridSpans";
-export { default as useIconParameters } from "./useIconParameters";
-export { default as useThrottle } from "./useThrottle";
-export { default as useThrottled } from "./useThrottled";
-export { default as useTimeoutFn } from "./useTimeoutFn";
-export { default as useTransientState } from "./useTransientState";
-export { default as useUnmount } from "./useUnmount";

src/index.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import ReactDOM from "react-dom";
 import { RecoilRoot } from "recoil";
 import * as serviceWorker from "./serviceWorker";
-import App from "./components/App";
+import App from "./components/App/App";
 import ReactGA from "react-ga";
 
 ReactGA.initialize("UA-179205759-1", { titleCase: false });
@@ -22,8 +22,8 @@ ReactDOM.render(
 // Learn more about service workers: https://bit.ly/CRA-PWA
 serviceWorker.unregister();
 
-// prettier-ignore
 console.log(`
+
 %c  sphorphosphor  %co%cspho
 %c  s%cphorphosphor  %co%csphorpho%cs
 %c o %cp%chorphosphor  %co%csphorphosph%co

src/state/atoms.ts

@@ -1,5 +1,4 @@
 import { atom } from "recoil";
-import { ModalInstance } from "../components/Modal/Modal";
 import { IconStyle } from "../lib";
 
 export const searchQueryAtom = atom<string>({
@@ -26,13 +25,3 @@ export const iconPreviewOpenAtom = atom<string | false>({
   key: "iconPreviewOpenAtom",
   default: false,
 });
-
-export const modalAtom = atom<((props: ModalInstance) => JSX.Element) | null>({
-  key: "modalAtom",
-  default: null,
-});
-
-export const modalOpenAtom = atom<boolean>({
-  key: "modalOpenAtom",
-  default: false,
-});

src/state/selectors.ts

@@ -1,16 +1,10 @@
-import { DefaultValue, selector, selectorFamily } from "recoil";
+import { selector, selectorFamily } from "recoil";
 import TinyColor from "tinycolor2";
 import Fuse from "fuse.js";
 
-import {
+import { searchQueryAtom, iconColorAtom } from "./atoms";
-  searchQueryAtom,
-  iconColorAtom,
-  modalAtom,
-  modalOpenAtom,
-} from "./atoms";
 import { IconEntry, IconCategory } from "../lib";
 import { icons } from "../lib/icons";
-import { ModalInstance } from "../components/Modal/Modal";
 
 const fuse = new Fuse(icons, {
   keys: [{ name: "name", weight: 4 }, "tags", "categories"],
@@ -58,9 +52,7 @@ export const singleCategoryQueryResultsSelector = selectorFamily<
   IconCategory
 >({
   key: "singleCategoryQueryResultsSelector",
-  get:
+  get: (category: IconCategory) => ({ get }) => {
-    (category: IconCategory) =>
-    ({ get }) => {
     const filteredResults = get(filteredQueryResultsSelector);
     return new Promise((resolve) =>
       resolve(
@@ -74,24 +66,3 @@ export const isDarkThemeSelector = selector<boolean>({
   key: "isDarkThemeSelector",
   get: ({ get }) => TinyColor(get(iconColorAtom)).isLight(),
 });
-
-export const modalSelector = selector<{
-  type: (props: ModalInstance) => JSX.Element;
-} | null>({
-  key: "openModalSelector",
-  set: ({ set }, instance) => {
-    if (instance instanceof DefaultValue || instance === null) {
-      set(modalAtom, null);
-      set(modalOpenAtom, false);
-      return;
-    }
-
-    set(modalAtom, () => instance.type!!);
-    set(modalOpenAtom, true);
-  },
-  get: ({ get }) => {
-    const currentModal = get(modalAtom);
-    if (!currentModal) return null;
-    return { type: currentModal };
-  },
-});

tsconfig.json

@@ -1,27 +1,36 @@
 {
   "compilerOptions": {
+    "target": "es5",
+    "lib": [
+      "es6",
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
-    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true,
-    "baseUrl": "./src/",
-    "declaration": true,
     "esModuleInterop": true,
-    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "strict": true,
     "forceConsistentCasingInFileNames": true,
-    "isolatedModules": true,
-    "jsx": "react",
-    "lib": ["es6", "dom", "dom.iterable", "esnext"],
     "module": "esnext",
     "moduleResolution": "node",
-    "noEmit": true,
+    "resolveJsonModule": true,
-    "noFallthroughCasesInSwitch": true,
+    "isolatedModules": true,
+    "jsx": "react",
+    "sourceMap": true,
+    "declaration": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "resolveJsonModule": true,
+    "experimentalDecorators": true,
-    "skipLibCheck": true,
+    "noFallthroughCasesInSwitch": true,
-    "sourceMap": true,
+    "noEmit": true
-    "strict": true,
-    "target": "es5"
   },
-  "include": ["src"],
+  "include": [
-  "exclude": ["node_modules", "build"]
+    "src"
+  ],
+  "exclude": [
+    "node_modules",
+    "build"
+  ]
 }