Skip to content

Commit cf14b69

Browse files
committed
Merge branch 'dev' into pr/13783
2 parents 575aeee + b61aea4 commit cf14b69

File tree

86 files changed

+403
-4563
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+403
-4563
lines changed

.eslintrc.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
// Packages. `react` related packages come first.
2424
// Also, put `react-icons` in sorting order not with `react`
2525
["^react(?!-.)$", "^\\w", "^@\\w"],
26-
// The Chakra theme directory if imported to story file or other places
27-
["^@/@chakra-ui"],
2826
// From the `types` directory.
2927
["^@/lib/types", "^@/lib/interfaces"],
3028
// From the `components` directory.

.github/ISSUE_TEMPLATE/suggest_quiz.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Suggest quiz
2-
description: Add, update, delete questions for a quiz on ethereum.osg
2+
description: Add, update, delete questions for a quiz on ethereum.org
33
title: Add/Update/Delete quiz question
44
labels: ["feature ✨", "quiz 📚"]
55
body:

.github/workflows/chromatic.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
- "src/components/**/*"
1616
- "src/pages/**/*"
1717
- "src/layouts/**/*"
18-
- "src/@chakra-ui/**/*"
1918
- ".storybook/**/*"
2019
- "tailwind.config.ts"
2120
- "src/styles/**/*"

.storybook/ChakraDecorator.tsx

Lines changed: 0 additions & 64 deletions
This file was deleted.

.storybook/main.ts

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin"
2-
import { propNames } from "@chakra-ui/react"
32
import type { StorybookConfig } from "@storybook/nextjs"
43

54
/**
@@ -41,11 +40,6 @@ const config: StorybookConfig = {
4140
docs: {
4241
autodocs: "tag",
4342
},
44-
refs: {
45-
"@chakra-ui/react": {
46-
disable: true,
47-
},
48-
},
4943
webpackFinal: async (config) => {
5044
config.module = config.module || {}
5145
config.module.rules = config.module.rules || []
@@ -79,23 +73,6 @@ const config: StorybookConfig = {
7973
typescript: {
8074
reactDocgenTypescriptOptions: {
8175
shouldExtractLiteralValuesFromEnum: true,
82-
/**
83-
* For handling bloated controls table of Chakra Props
84-
*
85-
* https://github.com/chakra-ui/chakra-ui/issues/2009#issuecomment-852793946
86-
*/
87-
propFilter: (prop) => {
88-
const excludedPropNames = propNames.concat([
89-
"as",
90-
"apply",
91-
"sx",
92-
"__css",
93-
])
94-
const isStyledSystemProp = excludedPropNames.includes(prop.name)
95-
const isHTMLElementProp =
96-
prop.parent?.fileName.includes("node_modules") ?? false
97-
return !(isStyledSystemProp || isHTMLElementProp)
98-
},
9976
},
10077

10178
reactDocgen: "react-docgen-typescript",

.storybook/types.ts

Lines changed: 0 additions & 83 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"private": true,
66
"scripts": {
77
"dev": "next dev",
8-
"postinstall": "yarn theme",
98
"build": "next build",
109
"postbuild": "next-sitemap",
1110
"start": "next start",
@@ -23,16 +22,11 @@
2322
"markdown-checker": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/markdownChecker.ts",
2423
"events-import": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/events-import.ts",
2524
"crowdin-needs-review": "ts-node -O '{ \"module\": \"commonjs\" }' src/scripts/crowdin/reports/generateReviewReport.ts",
26-
"theme": "chakra-cli tokens ./src/@chakra-ui/theme.ts",
27-
"theme:watch": "chakra-cli tokens ./src/@chakra-ui/theme.ts --watch",
2825
"prepare": "husky"
2926
},
3027
"dependencies": {
31-
"@chakra-ui/react": "^2.8.0",
3228
"@crowdin/crowdin-api-client": "^1.25.0",
3329
"@docsearch/react": "^3.5.2",
34-
"@emotion/react": "^11.11.1",
35-
"@emotion/styled": "^11.11.0",
3630
"@hookform/resolvers": "^3.8.0",
3731
"@next/bundle-analyzer": "^14.2.5",
3832
"@radix-ui/react-accordion": "^1.2.0",
@@ -96,7 +90,6 @@
9690
"yaml-loader": "^0.8.0"
9791
},
9892
"devDependencies": {
99-
"@chakra-ui/cli": "^2.4.1",
10093
"@chromatic-com/storybook": "1.5.0",
10194
"@netlify/plugin-nextjs": "^5.8.0",
10295
"@storybook/addon-essentials": "8.1.10",
@@ -150,4 +143,4 @@
150143
"jackspeak": "2.1.1",
151144
"sharp": "0.32.6"
152145
}
153-
}
146+
}

public/content/developers/docs/design-and-ux/index.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ This is a curated list of user research done in web3 that may help with design a
2323

2424
| Area of focus | Name |
2525
| :------------------------------------------------------ | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
26-
| <Tag variant="solid" status="success">Crypto onboarding</Tag> | [The WalletConnect Pulse 2024: Crypto Consumer Sentiment & Usage](https://walletconnect.com/pulse-2024-crypto-consumer-report) |
26+
| <Tag variant="solid" status="success">Crypto onboarding</Tag> | [The Reown Pulse 2024: Crypto Consumer Sentiment & Usage](https://reown.com/blog/unveiling-walletconnects-consumer-crypto-report) |
2727
| <Tag variant="solid" status="success">Crypto onboarding</Tag> | [CRADL: UX in Cryptocurrency](https://docs.google.com/presentation/d/1s2OPSH5sMJzxRYaJSSRTe8W2iIoZx0PseIV-WeZWD1s/edit?usp=sharing) |
2828
| <Tag variant="solid" status="success">Crypto onboarding</Tag> | [CRADL: Onboarding to Cryptocurrency](https://docs.google.com/presentation/d/1R9nFuzA-R6SxaGCKhoMbE4Vxe0JxQSTiHXind3LVq_w/edit?usp=sharing) |
2929
| <Tag variant="solid" status="success">Crypto onboarding</Tag> | [Bitcoin UX report](https://github.com/patestevao/BitcoinUX-report/blob/master/report.md) |
@@ -45,7 +45,6 @@ This is a curated list of user research done in web3 that may help with design a
4545
- [Web3 UX Design Handbook](https://web3ux.design/) - Practical guide to designing Web3 apps
4646
- [Web3 Design Principles](https://medium.com/@lyricalpolymath/web3-design-principles-f21db2f240c1) - A framework of UX rules for blockchain based dapps
4747
- [Blockchain Design Principles](https://medium.com/design-ibm/blockchain-design-principles-599c5c067b6e) - Lessons learned by the blockchain design team at IBM
48-
- [Web3 Design Patterns](https://www.web3designpatterns.io/)- A curated library of design patterns from real Web3 products
4948
- [W3design.io](https://w3design.io/) - A curated library of UI flows of different projects in the ecosystem
5049
- [Neueux.com](https://neueux.com/apps) - UI library of user flows with diverse filtering options
5150
- [Web3's Usability Crisis: What You NEED to Know!](https://www.youtube.com/watch?v=oBSXT_6YDzg) - A panel discussion on pitfalls of developer focused project building (video, 34 min)
@@ -58,7 +57,6 @@ This is a curated list of user research done in web3 that may help with design a
5857
## Web3 Design Case Studies {#design-case-studies}
5958

6059
- [Deep Work Studio](https://deepwork.studio/case-studies/)
61-
- [Crypto UX Handbook](https://www.cryptouxhandbook.com/)
6260
- [Selling an NFT on OpenSea](https://builtformars.com/case-studies/opensea)
6361
- [Wallet UX teardown how wallets need to change](https://www.youtube.com/watch?v=oTpuxYj8JWI&ab_channel=ETHDenver) (video, 20 min)
6462

@@ -79,7 +77,7 @@ Get involved in professional community-driven organizations or join design group
7977
- [Openux.xyz](https://openux.xyz/)
8078
- [Open Source Web3Design](https://www.web3designers.org/)
8179

82-
## Design Systems {#design-systems}
80+
## Design Systems and other design resources {#design-systems-and-resources}
8381

8482
- [Optimism Design](https://www.figma.com/@optimism) (Figma)
8583
- [Ethereum.org Design system](https://www.figma.com/@ethdotorg) (Figma)

src/@chakra-ui/components/Accordion.ts

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)