Merging main.

This commit is contained in:
Lucid Kobold
2021-12-22 12:12:13 -06:00
5 changed files with 64 additions and 52 deletions

View File

@@ -22,7 +22,7 @@
"@types/react": "^17.0.37", "@types/react": "^17.0.37",
"date-fns": "^2.27.0", "date-fns": "^2.27.0",
"formik": "^2.2.9", "formik": "^2.2.9",
"framer-motion": "^5.4.5", "framer-motion": "^5.5.5",
"next": "12.0.7", "next": "12.0.7",
"react": "17.0.2", "react": "17.0.2",
"react-dom": "17.0.2", "react-dom": "17.0.2",
@@ -30,8 +30,8 @@
}, },
"devDependencies": { "devDependencies": {
"@iconify/react": "^3.1.0", "@iconify/react": "^3.1.0",
"@typescript-eslint/eslint-plugin": "^5.7.0", "@typescript-eslint/eslint-plugin": "^5.8.0",
"eslint": "^8.4.1", "eslint": "^8.5.0",
"eslint-config-next": "12.0.7", "eslint-config-next": "12.0.7",
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-jsx-a11y": "^6.5.1",

View File

@@ -29,6 +29,7 @@ const AppTheme = extendTheme({
footer: "#0097a7", footer: "#0097a7",
footerText: "black", footerText: "black",
content: "#2d3748", content: "#2d3748",
patreon: "#FF424D",
}, },
}, },
styles: { styles: {

View File

@@ -157,6 +157,18 @@ const buttonStyles = {
border: "1px solid #0068ff", border: "1px solid #0068ff",
}, },
}), }),
patreon: (props: Dict<never> | StyleFunctionProps) => ({
bg: "brand.patreon",
fontSize: "lg",
p: 3,
color: "whiteAlpha",
_hover: {
bg: mode(
whiten("brand.patreon", 20),
darken("brand.patreon", 20)
)(props),
},
}),
}, },
// default values for `size` and `variant` // default values for `size` and `variant`
defaultProps: {}, defaultProps: {},

View File

@@ -87,8 +87,7 @@ const Footer = (): JSX.Element => {
> >
<Button <Button
color="whiteAlpha" color="whiteAlpha"
background="#FF424D" variant="patreon"
variant="credits"
leftIcon={<Icon icon="ri:patreon-fill" />} leftIcon={<Icon icon="ri:patreon-fill" />}
> >
Fund This App Fund This App

View File

@@ -1526,12 +1526,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/eslint-plugin@npm:^5.7.0": "@typescript-eslint/eslint-plugin@npm:^5.8.0":
version: 5.7.0 version: 5.8.0
resolution: "@typescript-eslint/eslint-plugin@npm:5.7.0" resolution: "@typescript-eslint/eslint-plugin@npm:5.8.0"
dependencies: dependencies:
"@typescript-eslint/experimental-utils": 5.7.0 "@typescript-eslint/experimental-utils": 5.8.0
"@typescript-eslint/scope-manager": 5.7.0 "@typescript-eslint/scope-manager": 5.8.0
debug: ^4.3.2 debug: ^4.3.2
functional-red-black-tree: ^1.0.1 functional-red-black-tree: ^1.0.1
ignore: ^5.1.8 ignore: ^5.1.8
@@ -1544,23 +1544,23 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: e3674ee680e5dffecdb5d243d6c958ea8003021919d1b2068a3bebfde8e5303b3cecbc28cd144e1bacececb638b3d90fd3e16cd9e1f2e397c0eac8f148b9d3ac checksum: 96a21a3e19baf57e30c97953e35832b1f4e135c865b2dfd5afe53772bd08556b9ad724e55696dce9acf471553ab66ae45737e82abba6c15152f79a47d2d9f055
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/experimental-utils@npm:5.7.0": "@typescript-eslint/experimental-utils@npm:5.8.0":
version: 5.7.0 version: 5.8.0
resolution: "@typescript-eslint/experimental-utils@npm:5.7.0" resolution: "@typescript-eslint/experimental-utils@npm:5.8.0"
dependencies: dependencies:
"@types/json-schema": ^7.0.9 "@types/json-schema": ^7.0.9
"@typescript-eslint/scope-manager": 5.7.0 "@typescript-eslint/scope-manager": 5.8.0
"@typescript-eslint/types": 5.7.0 "@typescript-eslint/types": 5.8.0
"@typescript-eslint/typescript-estree": 5.7.0 "@typescript-eslint/typescript-estree": 5.8.0
eslint-scope: ^5.1.1 eslint-scope: ^5.1.1
eslint-utils: ^3.0.0 eslint-utils: ^3.0.0
peerDependencies: peerDependencies:
eslint: "*" eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
checksum: 5e9ca434d834059632bf6f227c9d7f13f143f5a42d8518df6e54db242e971bae09038d9abcc5ff3debab8ecf17c742544ff66778f6bcbc90e94d92ee358d8315 checksum: c97798bcc3332331a75661e073d38783ee4882803b0247db76df851bc8594c9b7e23fb9de28aa212c331b18ff2e8c23657ae1b9b994eeec528214fcf8d81e9fb
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1591,13 +1591,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/scope-manager@npm:5.7.0": "@typescript-eslint/scope-manager@npm:5.8.0":
version: 5.7.0 version: 5.8.0
resolution: "@typescript-eslint/scope-manager@npm:5.7.0" resolution: "@typescript-eslint/scope-manager@npm:5.8.0"
dependencies: dependencies:
"@typescript-eslint/types": 5.7.0 "@typescript-eslint/types": 5.8.0
"@typescript-eslint/visitor-keys": 5.7.0 "@typescript-eslint/visitor-keys": 5.8.0
checksum: 8323e9787cb21c2e6c3de6bef2eb56e7e37c04f9c19413ad54964545dacc27a59ce6c19d660f4a20c0c6a368eee264d231436e9e8f221ed551abdcaf78596e12 checksum: 15f365a491c096104d3279617522375b6084117ac21e52cf04935a1cce192d730785a1e47afd8a8ca9aa907f1f9cd34793610406ce93447addf6854cdfa830f3
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1608,10 +1608,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/types@npm:5.7.0": "@typescript-eslint/types@npm:5.8.0":
version: 5.7.0 version: 5.8.0
resolution: "@typescript-eslint/types@npm:5.7.0" resolution: "@typescript-eslint/types@npm:5.8.0"
checksum: 4573250e59ea9e0b163c3e05e44ffb4b1ba4cdcfd6081c1f0b532e4c4bbbc5eb34ff4286c81c815115a1a1690cc8b1ad7b3ed79f3798773bf494b6ed82d0396b checksum: eda7a2c4620fd0cd56a81af6f44d8de96eb5912dda69907cd422e3fb5845b45c004a2c50f1896b6573b70f41f175208434d13dd744ea23aec2094ba916578a81
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1633,12 +1633,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/typescript-estree@npm:5.7.0": "@typescript-eslint/typescript-estree@npm:5.8.0":
version: 5.7.0 version: 5.8.0
resolution: "@typescript-eslint/typescript-estree@npm:5.7.0" resolution: "@typescript-eslint/typescript-estree@npm:5.8.0"
dependencies: dependencies:
"@typescript-eslint/types": 5.7.0 "@typescript-eslint/types": 5.8.0
"@typescript-eslint/visitor-keys": 5.7.0 "@typescript-eslint/visitor-keys": 5.8.0
debug: ^4.3.2 debug: ^4.3.2
globby: ^11.0.4 globby: ^11.0.4
is-glob: ^4.0.3 is-glob: ^4.0.3
@@ -1647,7 +1647,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 0a63186e7b89dc3a1607d2b838ee7b44b4471654f3e77d62687242e5cb9d2a2385312f438dcfdcb70dadcb3638a141e1660483f7bb5d2cf3563cc9a43b0b2d94 checksum: 67f51754d1dea9eafc8d052b67a2d7a3b20e20d97de03fc49615fe70d0373323619dfa5986a8e71cb9b2ec6079fb050049100763b5dbadae52b30c7d11c57ebd
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1661,13 +1661,13 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/visitor-keys@npm:5.7.0": "@typescript-eslint/visitor-keys@npm:5.8.0":
version: 5.7.0 version: 5.8.0
resolution: "@typescript-eslint/visitor-keys@npm:5.7.0" resolution: "@typescript-eslint/visitor-keys@npm:5.8.0"
dependencies: dependencies:
"@typescript-eslint/types": 5.7.0 "@typescript-eslint/types": 5.8.0
eslint-visitor-keys: ^3.0.0 eslint-visitor-keys: ^3.0.0
checksum: 59f7468c37cfcb92eb0de15b7ece47dd64a56c4d03d13167140c980399a4f12f20c1df52534f486cefc46bab65e717689b81decb327d2677063c47c0a26ae875 checksum: 03a349d4a577aa128b27d13a16e6e365d18e6aa9f297bc2a632bc2ddae8cfed9cb66c227f87fde9924e9f8a58c40c41df6f537016d037a05fe1908bfa0839d18
languageName: node languageName: node
linkType: hard linkType: hard
@@ -3139,9 +3139,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"eslint@npm:^8.4.1": "eslint@npm:^8.5.0":
version: 8.4.1 version: 8.5.0
resolution: "eslint@npm:8.4.1" resolution: "eslint@npm:8.5.0"
dependencies: dependencies:
"@eslint/eslintrc": ^1.0.5 "@eslint/eslintrc": ^1.0.5
"@humanwhocodes/config-array": ^0.9.2 "@humanwhocodes/config-array": ^0.9.2
@@ -3183,7 +3183,7 @@ __metadata:
v8-compile-cache: ^2.0.3 v8-compile-cache: ^2.0.3
bin: bin:
eslint: bin/eslint.js eslint: bin/eslint.js
checksum: d962cd7cd0f68ddc2412f47154b8992ad3af987cf47fa6e60e51a2b7d32a91f934388f7d29e2c45b16b7ac69f0d220d0a483189ec6ba43a8a480110c34f158f9 checksum: c1a9e26070520a308cc30b62ba0d37d5b115ed23987a93219819537bdea9398e6ebe57c27d97be36ecc83b5162c72e82ecb0a9e5b44b7992980f9be90eb5c4b3
languageName: node languageName: node
linkType: hard linkType: hard
@@ -3417,9 +3417,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"framer-motion@npm:^5.4.5": "framer-motion@npm:^5.5.5":
version: 5.4.5 version: 5.5.5
resolution: "framer-motion@npm:5.4.5" resolution: "framer-motion@npm:5.5.5"
dependencies: dependencies:
"@emotion/is-prop-valid": ^0.8.2 "@emotion/is-prop-valid": ^0.8.2
framesync: 6.0.1 framesync: 6.0.1
@@ -3430,7 +3430,7 @@ __metadata:
style-value-types: 5.0.0 style-value-types: 5.0.0
tslib: ^2.1.0 tslib: ^2.1.0
peerDependencies: peerDependencies:
"@react-three/fiber": ^7.0.21 "@react-three/fiber": "*"
react: ">=16.8 || ^17.0.0" react: ">=16.8 || ^17.0.0"
react-dom: ">=16.8 || ^17.0.0" react-dom: ">=16.8 || ^17.0.0"
three: ^0.135.0 three: ^0.135.0
@@ -3442,7 +3442,7 @@ __metadata:
optional: true optional: true
three: three:
optional: true optional: true
checksum: f39f3067b2b594e9f47e780245169e180ccae0e8d4901019bfab598f4ca7c5482811bdf6ecacacb587d7ec939f19928c43232b3a34ca3e18168cb3663f9536e2 checksum: 95329fd69c721768bd6e5ecb72a7a822f389e73121981b1344b67af60c63cff29baca4235537ee558d54c415438702e40b153be4449d7fa970ddb118dddb783c
languageName: node languageName: node
linkType: hard linkType: hard
@@ -4406,16 +4406,16 @@ __metadata:
"@emotion/styled": ^11.6.0 "@emotion/styled": ^11.6.0
"@iconify/react": ^3.1.0 "@iconify/react": ^3.1.0
"@types/react": ^17.0.37 "@types/react": ^17.0.37
"@typescript-eslint/eslint-plugin": ^5.7.0 "@typescript-eslint/eslint-plugin": ^5.8.0
date-fns: ^2.27.0 date-fns: ^2.27.0
eslint: ^8.4.1 eslint: ^8.5.0
eslint-config-next: 12.0.7 eslint-config-next: 12.0.7
eslint-config-prettier: ^8.3.0 eslint-config-prettier: ^8.3.0
eslint-plugin-jsx-a11y: ^6.5.1 eslint-plugin-jsx-a11y: ^6.5.1
eslint-plugin-react: ^7.27.1 eslint-plugin-react: ^7.27.1
eslint-plugin-react-hooks: ^4.3.0 eslint-plugin-react-hooks: ^4.3.0
formik: ^2.2.9 formik: ^2.2.9
framer-motion: ^5.4.5 framer-motion: ^5.5.5
next: 12.0.7 next: 12.0.7
prettier: ^2.5.1 prettier: ^2.5.1
react: 17.0.2 react: 17.0.2