Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: migrate /explorer page to shadcn/ui #1323

Merged
merged 107 commits into from
Jul 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
4eb63e7
install/upgrade dependencies & configure shadcn/ui
BrickheadJohnny Jun 27, 2024
f2e1010
use ts for tailwind config
BrickheadJohnny Jun 27, 2024
71a186f
add basic `layout.tsx`
BrickheadJohnny Jun 27, 2024
88fae3b
fix: remove top-level `/app` folder & add playground page
BrickheadJohnny Jun 27, 2024
fc83d9c
v2 add next theme (#1325)
dominik-stumpf Jun 27, 2024
d474773
feat: `Card` component (#1326)
BrickheadJohnny Jun 27, 2024
8d024c8
feat: `Dialog` component (#1328)
BrickheadJohnny Jun 27, 2024
a32ceb6
add shadcn button and style adjustments (#1327)
dominik-stumpf Jun 27, 2024
3a9323c
build: revert sourcing on postinstall
dominik-stumpf Jun 27, 2024
c69176d
fix(DialogExample): add `asChild` prop to trigger
BrickheadJohnny Jun 27, 2024
ea661c7
feat(Dialog): add focus management props
BrickheadJohnny Jun 28, 2024
156b4d2
feat(Dialog): export `DialogCloseButton` component
BrickheadJohnny Jun 28, 2024
46f8618
fix: update `--muted-foreground` variable
BrickheadJohnny Jun 29, 2024
7edc914
fix(ThemeToggle): make the buttons smaller
BrickheadJohnny Jun 29, 2024
d8d321d
Storybook (#1332)
BrickheadJohnny Jun 29, 2024
f6694f4
feat: add tooltip (#1335)
dominik-stumpf Jul 1, 2024
0a923e6
feat: `Toast` component & `useToast` hook (#1333)
BrickheadJohnny Jul 1, 2024
544146d
feat: `AlertDialog` component (#1337)
BrickheadJohnny Jul 1, 2024
773c2f7
Merge remote-tracking branch 'origin' into shadcn-ui
dominik-stumpf Jul 1, 2024
7a54835
Merge branch 'main' into shadcn-ui
BrickheadJohnny Jul 2, 2024
5ae1590
Merge branch 'main' into shadcn-ui
BrickheadJohnny Jul 2, 2024
e837fff
`Dialog` improvements (#1351)
BrickheadJohnny Jul 3, 2024
0e6572a
Merge branch 'main' into shadcn-ui
BrickheadJohnny Jul 4, 2024
e9635f8
fix(AlertDialog.stories): import types only
BrickheadJohnny Jul 4, 2024
64ac97b
fix(useToast): eslint issue
BrickheadJohnny Jul 4, 2024
da54c40
feat: `Form` component (#1358)
BrickheadJohnny Jul 5, 2024
25c0d32
feat: `Badge` component
BrickheadJohnny Jul 8, 2024
b1bf522
feat: `DropdownMenu` component (#1359)
BrickheadJohnny Jul 8, 2024
a525c4b
Merge branch 'main' into shadcn-ui
BrickheadJohnny Jul 9, 2024
a400f6d
chore: change default theme to dark
dominik-stumpf Jul 9, 2024
163c8a9
Merge branch 'main' into shadcn-ui
BrickheadJohnny Jul 10, 2024
08601ab
Merge branch 'main' into shadcn-ui
BrickheadJohnny Jul 10, 2024
39fdd57
feat: add anchor component (#1362)
dominik-stumpf Jul 10, 2024
399161c
chore: merge main branch
dominik-stumpf Jul 10, 2024
c26854d
style: apply biome check
dominik-stumpf Jul 10, 2024
0d79c4b
feat: add header (#1329)
dominik-stumpf Jul 10, 2024
406b992
Merge branch 'main' of github.com:guildxyz/guild.xyz into shadcn-ui
dominik-stumpf Jul 10, 2024
fa8b9dc
style: apply biome check
dominik-stumpf Jul 10, 2024
870188b
feat: add avatar and separator
dominik-stumpf Jul 10, 2024
aa75541
chore: update team href
dominik-stumpf Jul 10, 2024
626b754
Merge branch 'main' into shadcn-ui
BrickheadJohnny Jul 11, 2024
7edde79
fix: ring colors
BrickheadJohnny Jul 11, 2024
4cf228c
fix(CardMotionWrapper): add easing functions
BrickheadJohnny Jul 11, 2024
e0d19dd
fix(Dialog): ring color
BrickheadJohnny Jul 11, 2024
10ef137
fix: fine-tune accent & border colors
BrickheadJohnny Jul 11, 2024
8b4b437
fix(SharedSocials): UI improvements
BrickheadJohnny Jul 11, 2024
d6e4fc5
fix(ThemeToggle): make it work in both pages & app router
BrickheadJohnny Jul 11, 2024
c6e62e3
fix: minor UI issues
BrickheadJohnny Jul 11, 2024
3aa6e44
fix(ConnectRequirementPlatformButton): use the new `Button` component
BrickheadJohnny Jul 11, 2024
4baf3fa
fix(RequirementConnectButton): accept `ButtonProps`
BrickheadJohnny Jul 11, 2024
7470a91
feat: add notifications (#1360)
dominik-stumpf Jul 11, 2024
3cc3cdc
feat: add compound layout component (#1363)
dominik-stumpf Jul 11, 2024
1260a27
fix(NavMenu): add create-guild
dovalid Jul 11, 2024
fcaba43
UI(NavMenu): whitespace impros, highlight current path
dovalid Jul 11, 2024
afa804e
fix(NavMenu): use the `usePathname` hook
BrickheadJohnny Jul 12, 2024
2aecad4
fix(ThemeToggle): remove `console.log`
BrickheadJohnny Jul 12, 2024
b9e602d
v2 explorer (#1330)
dominik-stumpf Jul 12, 2024
efca6a1
UI(Dialog): mobile style
dovalid Jul 12, 2024
19256a6
Merge branch 'main' of github.com:guildxyz/guild.xyz into shadcn-ui
dominik-stumpf Jul 12, 2024
3bee065
fix(css): darken dark mode skeleton color (#1379)
dominik-stumpf Jul 13, 2024
638a502
chore: delete linux related esbuild plugin (#1380)
dominik-stumpf Jul 13, 2024
0b114cc
notification fix and cleanup (#1377)
dominik-stumpf Jul 13, 2024
821b6f0
fix(layout): add `antialiased` class
BrickheadJohnny Jul 15, 2024
7b85870
fix(Dialog): close animation
BrickheadJohnny Jul 15, 2024
9697adb
chore: remove `* as React` imports
BrickheadJohnny Jul 15, 2024
b5fc36b
feat(`Dialog`): scrollable body
BrickheadJohnny Jul 15, 2024
51beea6
fix: recaptcha focus issues
BrickheadJohnny Jul 15, 2024
1919d02
UI(AccountConnections): whitespace
dovalid Jul 15, 2024
6094711
UI(Tooltip): medium font-weight
dovalid Jul 15, 2024
926397e
UI(SharedSocials): border color
dovalid Jul 15, 2024
860bd77
chore: add `AppErrorBoundary` to `Providers` too
BrickheadJohnny Jul 15, 2024
f3754e5
fix(Button): wrap button content in a `span`
BrickheadJohnny Jul 15, 2024
d4170f5
fix(Button): truncate content
BrickheadJohnny Jul 15, 2024
a111dd5
UI(Dialog): header whitespace
dovalid Jul 15, 2024
9ace37c
Merge branch 'shadcn-ui' of https://github.com/guildxyz/guild.xyz int…
dovalid Jul 15, 2024
fee546c
fix(UsersGuildPins): fix element height
BrickheadJohnny Jul 15, 2024
2c291b5
chore: remove the playground page
BrickheadJohnny Jul 15, 2024
2254532
fix(HeaderBackground): light mode colors
BrickheadJohnny Jul 15, 2024
94a7b16
feat(`Button`): new variants (#1384)
BrickheadJohnny Jul 15, 2024
de024d8
feat(Toast): add icons & fine-tune design
BrickheadJohnny Jul 15, 2024
14eb37d
feat(`Badge`): new, fine-tuned variants
BrickheadJohnny Jul 16, 2024
03503c1
fix(JoinModal): focus management & z-index
BrickheadJohnny Jul 16, 2024
9e52980
fix(GuildCard): use bold icon
BrickheadJohnny Jul 16, 2024
599ee94
fix(AccountConnections): define keys
BrickheadJohnny Jul 16, 2024
f86a510
fix(SharedSocials): define keys
BrickheadJohnny Jul 16, 2024
94c0755
refactor(AddRewardButton): extract constants & types to separate files
BrickheadJohnny Jul 16, 2024
4e4640e
Merge branch 'main' of github.com:guildxyz/guild.xyz into shadcn-ui
dominik-stumpf Jul 16, 2024
d3fb86a
fix(guild page): Vercel ISR issues (#1391)
BrickheadJohnny Jul 16, 2024
2da3f96
fix(Toaster): icon size
BrickheadJohnny Jul 16, 2024
922aa8b
feat: use `Separator` instead of `hr`
BrickheadJohnny Jul 16, 2024
742db49
feat: temporarily add `--max-old-space-size=4096` to the `build` script
BrickheadJohnny Jul 16, 2024
95edb35
fix(Web3Inbox): if condition & styling issues
BrickheadJohnny Jul 16, 2024
c17bb03
fix: use z-index values from Chakra UI
BrickheadJohnny Jul 16, 2024
d68f62e
refactor: extract route change indicator to its own component
BrickheadJohnny Jul 16, 2024
3328c58
UI(NavMenu): highlight current path with background too
dovalid Jul 16, 2024
2fb814b
UI(Badge): medium font weight
dovalid Jul 16, 2024
fe96846
fix(tailwind config): update dark mode selector
BrickheadJohnny Jul 16, 2024
3286613
fix: use the `dark:` modifier everywhere
BrickheadJohnny Jul 16, 2024
1091631
chore: merge main branch
dominik-stumpf Jul 16, 2024
700bda7
Merge branch 'shadcn-ui' of github.com:guildxyz/guild.xyz into shadcn-ui
dominik-stumpf Jul 16, 2024
6d81ea2
v2 a11y concerns and cleanup (#1394)
dominik-stumpf Jul 16, 2024
14fd628
chore: move antialiased
dominik-stumpf Jul 16, 2024
9a30b7d
feat: add top loading bar
BrickheadJohnny Jul 16, 2024
a9cf011
fix(explorer): use bold icons
BrickheadJohnny Jul 16, 2024
76543ee
feat: custom error page
BrickheadJohnny Jul 16, 2024
d68cc51
feat(explorer): `Preload` component
BrickheadJohnny Jul 16, 2024
27906ae
chore: replace GuildLogo by Avatar (#1395)
dominik-stumpf Jul 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,7 @@ cypress/screenshots
cypress/videos

.idea

*.tsbuildinfo

*storybook.log
storybook-static
24 changes: 24 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import type { StorybookConfig } from "@storybook/nextjs";

const config: StorybookConfig = {
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
addons: [
"@storybook/addon-onboarding",
"@storybook/addon-links",
"@storybook/addon-essentials",
"@chromatic-com/storybook",
"@storybook/addon-interactions",
"@storybook/addon-themes",
],
framework: {
name: "@storybook/nextjs",
options: {},
},
staticDirs: ["../public"],
refs: {
"@chakra-ui/react": {
disable: true,
},
},
};
export default config;
31 changes: 31 additions & 0 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import type { Preview } from "@storybook/react"
import "../src/app/globals.css"
import { dystopian, inter } from "../src/fonts"

import { withThemeByDataAttribute } from "@storybook/addon-themes"

document?.querySelector("body")?.classList.add(inter.variable, dystopian.variable)

const preview: Preview = {
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},

decorators: [
withThemeByDataAttribute({
themes: {
light: "",
dark: "dark",
},
defaultTheme: "dark",
attributeName: "data-theme",
}),
],
}

export default preview
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Open source interface for Guild.xyz -- a tool for platformless membership manage
- Framework
- React with Next.js
- Styling:
- Chakra UI
- Chakra UI (migration to Tailwind CSS and Radix UI in progress)
- Phosphor icons
- Framer motion
- State management:
Expand Down
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"files": {
"include": ["src", "cypress"],
"ignore": ["node_modules", ".next", "public", ".out"]
"ignore": ["node_modules", ".next", "public", ".out", "package-lock.json"]
},
"organizeImports": {
"enabled": true
Expand Down
17 changes: 17 additions & 0 deletions components.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": true,
"tsx": true,
"tailwind": {
"config": "tailwind.config.js",
"css": "app/globals.css",
"baseColor": "gray",
"cssVariables": true,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
11 changes: 10 additions & 1 deletion next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ const nextConfig = {
],
})

// To get rid of "Can't resolve ..." errors which come from some wallet connector SDKs
config.externals.push("pino-pretty", "lokijs", "encoding")

if (!config.plugins) config.plugins = []
if (process.env.VERCEL_ENV === "production") {
config.plugins.push(
Expand Down Expand Up @@ -90,7 +93,13 @@ const nextConfig = {
},
experimental: {
scrollRestoration: true,
optimizePackageImports: ["@phosphor-icons/react"],
bundlePagesExternals: true,
optimizePackageImports: [
"@phosphor-icons/react",
"@phosphor-icons/react/dist/ssr",
"@fuels/react",
"fuels",
],
},
async rewrites() {
return {
Expand Down
Loading
Loading