diff --git a/.github/workflows/gatsby.yml b/.github/workflows/gatsby.yml index b6a8776..a401b0c 100644 --- a/.github/workflows/gatsby.yml +++ b/.github/workflows/gatsby.yml @@ -75,7 +75,11 @@ jobs: key: ${{ runner.os }}-gatsby-build-${{ hashFiles('public') }} restore-keys: | ${{ runner.os }}-gatsby-build- + - name: Restore .npmrc + run: cp .npmrc.ci .npmrc - name: Install dependencies + env: + FONTAWESOME_PACKAGE_TOKEN: ${{ secrets.FONTAWESOME_PACKAGE_TOKEN }} run: ${{ steps.detect-package-manager.outputs.manager }} ${{ steps.detect-package-manager.outputs.command }} - name: Build with Gatsby env: diff --git a/.npmrc.ci b/.npmrc.ci new file mode 100644 index 0000000..08824f4 --- /dev/null +++ b/.npmrc.ci @@ -0,0 +1,2 @@ +@fortawesome:registry=https://npm.fontawesome.com/ +//npm.fontawesome.com/:_authToken=${FONTAWESOME_PACKAGE_TOKEN} diff --git a/package-lock.json b/package-lock.json index 17cfa78..f055ec3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "@fortawesome/fontawesome-svg-core": "^6.5.2", "@fortawesome/free-brands-svg-icons": "^6.5.2", "@fortawesome/free-solid-svg-icons": "^6.5.2", + "@fortawesome/pro-solid-svg-icons": "^6.5.2", "@fortawesome/react-fontawesome": "^0.2.2", "@mdx-js/react": "^2.3.0", "@react-spring/web": "^9.7.3", @@ -2308,6 +2309,17 @@ "node": ">=6" } }, + "node_modules/@fortawesome/pro-solid-svg-icons": { + "version": "6.5.2", + "resolved": "https://npm.fontawesome.com/@fortawesome/pro-solid-svg-icons/-/6.5.2/pro-solid-svg-icons-6.5.2.tgz", + "integrity": "sha512-yhKyRyLDJoTSUN8h+oBl+yspfE6ARPRRbLWbWN4qEiOEcULKTtCTqsqovrnLsCB7qbllRwC50ai+RZ7bC1OPaA==", + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.5.2" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@fortawesome/react-fontawesome": { "version": "0.2.2", "resolved": "https://npm.fontawesome.com/@fortawesome/react-fontawesome/-/0.2.2/react-fontawesome-0.2.2.tgz", diff --git a/package.json b/package.json index 079131f..472436a 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "@fortawesome/fontawesome-svg-core": "^6.5.2", "@fortawesome/free-brands-svg-icons": "^6.5.2", "@fortawesome/free-solid-svg-icons": "^6.5.2", + "@fortawesome/pro-solid-svg-icons": "^6.5.2", "@fortawesome/react-fontawesome": "^0.2.2", "@mdx-js/react": "^2.3.0", "@react-spring/web": "^9.7.3", diff --git a/src/components/header.js b/src/components/header.js index ddc8044..6f89d17 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -8,12 +8,12 @@ import { faMoon, faNewspaper, faSwatchbook, - faRectangleList, faMaximize, faSun, faTable, faWrench } from '@fortawesome/free-solid-svg-icons'; +import { faGameBoard, faGrid } from '@fortawesome/pro-solid-svg-icons'; import NavLink from 'components/nav/link'; import NavDropdown from 'components/nav/dropdown'; @@ -75,12 +75,8 @@ export default function Header() { /> - - + + -

Sudoku

+

+ Sudoku +

{mode === 'timed' && ( diff --git a/src/pages/games/mahjong.js b/src/pages/games/mahjong.js index 1d87a44..b15621e 100644 --- a/src/pages/games/mahjong.js +++ b/src/pages/games/mahjong.js @@ -1,6 +1,8 @@ import PropTypes from 'prop-types'; import { graphql } from 'gatsby'; import { Container, Row, Col } from 'react-bootstrap'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { faGameBoard } from '@fortawesome/pro-solid-svg-icons'; import Layout from 'components/layout'; import MahjongBoard from 'components/mahjong/board'; @@ -13,7 +15,9 @@ export default function MahjongPage({ data }) { -

Mahjong

+

+ Mahjong +

diff --git a/src/pages/utilities/scale-converter.js b/src/pages/utilities/scale-converter.js index 0d2a65e..53d4974 100644 --- a/src/pages/utilities/scale-converter.js +++ b/src/pages/utilities/scale-converter.js @@ -1,5 +1,8 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { faArrowRightLong } from '@fortawesome/free-solid-svg-icons'; +import { + faArrowRightLong, + faMaximize +} from '@fortawesome/free-solid-svg-icons'; import { Button, Card, @@ -41,87 +44,104 @@ export default function ScaleConverterPage() { description="Convert between units using a scaling factor/ratio." > -

Convert

- - Specify a scale, then enter one or more expressions. Each expression - will be scaled appropriately. If you enter an expression such as - "100 mm in ft," the scaled value will be converted into the - target unit. - - -
- - - Scale - - - - 1 : - - - - - - - Expression - - - - - {errors.conversion} - - - - - - -
-
- - - - History - - - - - - - {entries.length ? ( - entries.map((entry) => ( - - - {entry.value} {entry.unit} - - - - {entry.result.toFixed(2)} {entry.targetUnit} - - - )) - ) : ( - No entries. - )} - - + + +

+ Convert Scale +

+ +
+ + + + Specify a scale, then enter one or more expressions. Each + expression will be scaled appropriately. If you enter an + expression such as "100 mm in ft," the scaled value will + be converted into the target unit. + + + + + + +
+ + + Scale + + + + 1 : + + + + + + + Expression + + + + + {errors.conversion} + + + + + + +
+
+ + + + History + + + + + + + {entries.length ? ( + entries.map((entry) => ( + + + {entry.value} {entry.unit} + + + + {entry.result.toFixed(2)} {entry.targetUnit} + + + )) + ) : ( + No entries. + )} + + + +
);