diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000000..fa64f2c609 --- /dev/null +++ b/.npmrc @@ -0,0 +1,3 @@ +@awesome.me:registry=https://npm.fontawesome.com/ +@fortawesome:registry=https://npm.fontawesome.com/ +//npm.fontawesome.com/:_authToken=104779DB-FD41-4BEA-BDB4-B1845D758A79 \ No newline at end of file diff --git a/app/modules/LowerPanel/LowerPanel.tsx b/app/modules/LowerPanel/LowerPanel.tsx index 78987d2190..dd04237b5e 100644 --- a/app/modules/LowerPanel/LowerPanel.tsx +++ b/app/modules/LowerPanel/LowerPanel.tsx @@ -1,12 +1,4 @@ -import { Fragment, useState } from 'react' -import { Dialog, Transition } from '@headlessui/react' -import { - faXmark, - faTimeline, -} from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; - -import { Button } from '~/components/Button'; +import { useState } from 'react' interface LowerPanelPropsI{ children: React.ReactNode; diff --git a/app/modules/SidePanel/SidePanel.tsx b/app/modules/SidePanel/SidePanel.tsx index 4ae06616a4..085700f34f 100644 --- a/app/modules/SidePanel/SidePanel.tsx +++ b/app/modules/SidePanel/SidePanel.tsx @@ -5,7 +5,7 @@ import { import { Dialog, Transition } from '@headlessui/react' import { faGears, -} from '@fortawesome/free-solid-svg-icons'; +} from '@fortawesome/pro-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Button } from '~/components/Button'; diff --git a/app/modules/SidePanel/SidePanelInner.tsx b/app/modules/SidePanel/SidePanelInner.tsx index 775abbe38c..35ffa8eb76 100644 --- a/app/modules/SidePanel/SidePanelInner.tsx +++ b/app/modules/SidePanel/SidePanelInner.tsx @@ -7,7 +7,7 @@ import { Dialog } from '@headlessui/react' import { faXmark, -} from '@fortawesome/free-solid-svg-icons'; +} from '@-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { TOP_BAR_HEIGHT } from '~/constants'; diff --git a/app/modules/TopBar/TopBar.tsx b/app/modules/TopBar/TopBar.tsx index fa32368e4e..0e7b0bca10 100644 --- a/app/modules/TopBar/TopBar.tsx +++ b/app/modules/TopBar/TopBar.tsx @@ -1,7 +1,7 @@ import { useContext } from 'react'; import { Button } from '~/components/Button' -import { faRightToBracket } from '@fortawesome/free-solid-svg-icons' +import { faRightToBracket } from '@fortawesome/pro-solid-svg-icons' import { TopBarInnerContext } from '~/contexts/TopBarInner'; export const TopBar = () => { diff --git a/app/pages/PageCube/PageCube.tsx b/app/pages/PageCube/PageCube.tsx index d01f6a03ff..5af0a80204 100644 --- a/app/pages/PageCube/PageCube.tsx +++ b/app/pages/PageCube/PageCube.tsx @@ -8,7 +8,7 @@ import { import { faChevronLeft -} from "@fortawesome/free-solid-svg-icons"; +} from "@fortawesome/pro-solid-svg-icons"; import { Button } from '~/components/Button'; import { ButtonLink } from '~/components/ButtonLink'; diff --git a/app/pages/PageEnigma/PageEnigma.tsx b/app/pages/PageEnigma/PageEnigma.tsx index 96f71054dc..7836d9930a 100644 --- a/app/pages/PageEnigma/PageEnigma.tsx +++ b/app/pages/PageEnigma/PageEnigma.tsx @@ -7,7 +7,7 @@ import { import { faChevronLeft, faWandSparkles, -} from "@fortawesome/free-solid-svg-icons"; +} from "@fortawesome/pro-solid-svg-icons"; import { diff --git a/app/pages/PageEnigma/comps/Controls3D/Controls3D.tsx b/app/pages/PageEnigma/comps/Controls3D/Controls3D.tsx index 4913cc9be6..b4f2166fe4 100644 --- a/app/pages/PageEnigma/comps/Controls3D/Controls3D.tsx +++ b/app/pages/PageEnigma/comps/Controls3D/Controls3D.tsx @@ -1,9 +1,16 @@ + import { faArrowsRotate, faArrowsUpDownLeftRight, faPlus, faUpRightAndDownLeftFromCenter, -} from '@fortawesome/free-solid-svg-icons'; +} from '@fortawesome/pro-solid-svg-icons'; +import { + fa3dCylinder, + fa3dTorus, + fa3dSphere, +} from '@awesome.me/kit-fde2be5eb0/icons/kit/custom'; + import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; export const Controls3D = ()=>{ @@ -15,9 +22,9 @@ export const Controls3D = ()=>{
- make torus - make cynlinder - make sphere + + + diff --git a/app/pages/PageEnigma/comps/ControlsVideo/ControlsVideo.tsx b/app/pages/PageEnigma/comps/ControlsVideo/ControlsVideo.tsx index ed33ed0f5f..00401e32e2 100644 --- a/app/pages/PageEnigma/comps/ControlsVideo/ControlsVideo.tsx +++ b/app/pages/PageEnigma/comps/ControlsVideo/ControlsVideo.tsx @@ -4,7 +4,7 @@ import { faForwardFast, faForwardStep, faPlay, -} from '@fortawesome/free-solid-svg-icons'; +} from '@fortawesome/pro-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; export const ControlsVideo = ()=>{ diff --git a/package-lock.json b/package-lock.json index b70a8a2463..08b673ca0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,11 +6,12 @@ "": { "name": "gottagofast_v0.0.0", "dependencies": { + "@awesome.me/kit-fde2be5eb0": "^1.0.7", "@ffmpeg/core": "0.11.0", "@ffmpeg/ffmpeg": "0.11.6", "@ffmpeg/util": "0.12.0", "@fortawesome/fontawesome-svg-core": "^6.5.1", - "@fortawesome/free-solid-svg-icons": "^6.5.1", + "@fortawesome/pro-solid-svg-icons": "^6.5.1", "@fortawesome/react-fontawesome": "^0.2.0", "@headlessui/react": "^1.7.18", "@netlify/edge-functions": "^2.3.1", @@ -92,6 +93,17 @@ "node": ">=6.0.0" } }, + "node_modules/@awesome.me/kit-fde2be5eb0": { + "version": "1.0.10", + "resolved": "https://npm.fontawesome.com/@awesome.me/kit-fde2be5eb0/-/1.0.10/kit-fde2be5eb0-1.0.10.tgz", + "integrity": "sha512-LeQbF6+QyYmY+aAg0R9p5RjMcWcVp8wmZlcRUC1V3jRYWP/dsKZ/hBU+FlXGEBAb3WFBCGJjtE82ig71ZyqZSA==", + "dependencies": { + "@fortawesome/fontawesome-common-types": "^6.5.1" + }, + "engines": { + "node": ">=16" + } + }, "node_modules/@babel/code-frame": { "version": "7.23.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", @@ -1333,11 +1345,10 @@ "node": ">=6" } }, - "node_modules/@fortawesome/free-solid-svg-icons": { + "node_modules/@fortawesome/pro-solid-svg-icons": { "version": "6.5.1", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.1.tgz", - "integrity": "sha512-S1PPfU3mIJa59biTtXJz1oI0+KAXW6bkAb31XKhxdxtuXDiUIFsih4JR1v5BbxY7hVHsD1RKq+jRkVRaf773NQ==", - "hasInstallScript": true, + "resolved": "https://npm.fontawesome.com/@fortawesome/pro-solid-svg-icons/-/6.5.1/pro-solid-svg-icons-6.5.1.tgz", + "integrity": "sha512-UnJzqw7w+RVtEnQ2Bqg09bGYkJEZRkTnbgweZDTznHjtxsJzQdJkD3hJPL6N00c8GbWpRYslNDnTNDGVSd94cQ==", "dependencies": { "@fortawesome/fontawesome-common-types": "6.5.1" }, diff --git a/package.json b/package.json index c78df3a41b..648b3fd799 100644 --- a/package.json +++ b/package.json @@ -8,14 +8,16 @@ "dev": "remix vite:dev", "lint": "eslint --ignore-path .gitignore --cache --cache-location ./node_modules/.cache/eslint .", "start": "netlify serve", - "typecheck": "tsc" + "typecheck": "tsc", + "update:icons": "npm update @awesome.me/kit-fde2be5eb0" }, "dependencies": { + "@awesome.me/kit-fde2be5eb0": "^1.0.7", "@ffmpeg/core": "0.11.0", "@ffmpeg/ffmpeg": "0.11.6", "@ffmpeg/util": "0.12.0", "@fortawesome/fontawesome-svg-core": "^6.5.1", - "@fortawesome/free-solid-svg-icons": "^6.5.1", + "@fortawesome/pro-solid-svg-icons": "^6.5.1", "@fortawesome/react-fontawesome": "^0.2.0", "@headlessui/react": "^1.7.18", "@netlify/edge-functions": "^2.3.1", diff --git a/public/resources/svgs/cylinder.svg b/public/resources/svgs/cylinder.svg deleted file mode 100644 index c411bd6a41..0000000000 --- a/public/resources/svgs/cylinder.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/public/resources/svgs/sphere.svg b/public/resources/svgs/sphere.svg deleted file mode 100644 index 7c948a1948..0000000000 --- a/public/resources/svgs/sphere.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/public/resources/svgs/torus.svg b/public/resources/svgs/torus.svg deleted file mode 100644 index 7cd4b8bd06..0000000000 --- a/public/resources/svgs/torus.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - -