-
Notifications
You must be signed in to change notification settings - Fork 887
feat: implement Premium features page using shadcn/ui and Tailwind #15094
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
Merged
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
459a028
wip
jaaydenh 169c4f5
fix
jaaydenh 24c97dc
update lock file
jaaydenh 4134d90
wip
jaaydenh 15eded8
revert css
jaaydenh 9dba1c8
fix: import index.css
jaaydenh 579ced7
feat: changes for premium page
jaaydenh ae3bd9d
feat: implement Premium page with Tailwind and shadcn button
jaaydenh f977408
fix: fix lock file
jaaydenh 71826a8
chore: updates to button styles
jaaydenh 093d947
chore: update variant
jaaydenh 58fbeb3
chore: update colors
jaaydenh 4e6daaf
chore: move CacheProvider to ThemeProvider
jaaydenh 287a67a
chore: update paths for shadcn
jaaydenh 1310637
fix: fix format
jaaydenh 281ec8a
feat: use Lucide instead of Radix icons
jaaydenh 25cbb87
fix: add useEffect cleanup function
jaaydenh 42e82b6
chore: add comment
jaaydenh 4ae065d
fix: fix format
jaaydenh fd045a6
feat: show premium tab if no premium license
jaaydenh e015d20
fix: fix format
jaaydenh 3eba3af
fix: use rem for font overrides
jaaydenh 162ad19
fix: remove fontSize
jaaydenh fcb4c2a
fix: fix lockfile
jaaydenh 962045c
chore: add font sizes to Tailwind config
jaaydenh 09c5844
feat: add icons for OSS version
jaaydenh ef4b261
fix: use sentence case
jaaydenh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "$schema": "https://ui.shadcn.com/schema.json", | ||
| "style": "new-york", | ||
| "rsc": false, | ||
| "tsx": true, | ||
| "tailwind": { | ||
| "config": "tailwind.config.js", | ||
| "css": "src/index.css", | ||
| "baseColor": "zinc", | ||
| "cssVariables": true, | ||
| "prefix": "" | ||
| }, | ||
| "aliases": { | ||
| "components": "/components", | ||
| "utils": "/utils", | ||
| "ui": "/components/ui", | ||
| "lib": "/lib", | ||
| "hooks": "/hooks" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,6 +36,7 @@ | |
| "@alwaysmeticulous/recorder-loader": "2.137.0", | ||
| "@emoji-mart/data": "1.2.1", | ||
| "@emoji-mart/react": "1.1.1", | ||
| "@emotion/cache": "11.13.1", | ||
| "@emotion/css": "11.13.4", | ||
| "@emotion/react": "11.13.3", | ||
| "@emotion/styled": "11.13.0", | ||
|
|
@@ -49,6 +50,7 @@ | |
| "@mui/system": "5.16.7", | ||
| "@mui/utils": "5.16.6", | ||
| "@mui/x-tree-view": "7.18.0", | ||
| "@radix-ui/react-slot": "1.1.0", | ||
| "@tanstack/react-query-devtools": "4.35.3", | ||
| "@xterm/addon-canvas": "0.7.0", | ||
| "@xterm/addon-fit": "0.10.0", | ||
|
|
@@ -63,6 +65,8 @@ | |
| "chartjs-adapter-date-fns": "3.0.0", | ||
| "chartjs-plugin-annotation": "3.0.1", | ||
| "chroma-js": "2.4.2", | ||
| "class-variance-authority": "0.7.0", | ||
| "clsx": "2.1.1", | ||
| "color-convert": "2.0.1", | ||
| "cron-parser": "4.9.0", | ||
| "cronstrue": "2.50.0", | ||
|
|
@@ -74,6 +78,7 @@ | |
| "front-matter": "4.0.2", | ||
| "jszip": "3.10.1", | ||
| "lodash": "4.17.21", | ||
| "lucide-react": "0.454.0", | ||
| "monaco-editor": "0.52.0", | ||
| "pretty-bytes": "6.1.1", | ||
| "react": "18.3.1", | ||
|
|
@@ -93,6 +98,8 @@ | |
| "resize-observer-polyfill": "1.5.1", | ||
| "rollup-plugin-visualizer": "5.12.0", | ||
| "semver": "7.6.2", | ||
| "tailwind-merge": "2.5.4", | ||
| "tailwindcss-animate": "1.0.7", | ||
| "tzdata": "1.0.40", | ||
| "ua-parser-js": "1.0.33", | ||
| "ufuzzy": "npm:@leeoniya/[email protected]", | ||
|
|
@@ -141,6 +148,7 @@ | |
| "@types/ua-parser-js": "0.7.36", | ||
| "@types/uuid": "9.0.2", | ||
| "@vitejs/plugin-react": "4.3.3", | ||
| "autoprefixer": "10.4.20", | ||
| "chromatic": "11.16.3", | ||
| "eventsourcemock": "2.0.0", | ||
| "express": "4.21.0", | ||
|
|
@@ -151,13 +159,15 @@ | |
| "jest-websocket-mock": "2.5.0", | ||
| "jest_workaround": "0.1.14", | ||
| "msw": "2.3.5", | ||
| "postcss": "8.4.47", | ||
| "prettier": "3.3.3", | ||
| "protobufjs": "7.4.0", | ||
| "rxjs": "7.8.1", | ||
| "ssh2": "1.16.0", | ||
| "storybook": "8.3.5", | ||
| "storybook-addon-remix-react-router": "3.0.1", | ||
| "storybook-react-context": "0.6.0", | ||
| "tailwindcss": "3.4.13", | ||
| "ts-node": "10.9.1", | ||
| "ts-proto": "1.164.0", | ||
| "ts-prune": "0.10.3", | ||
|
|
@@ -166,11 +176,7 @@ | |
| "vite-plugin-checker": "0.8.0", | ||
| "vite-plugin-turbosnap": "1.0.3" | ||
| }, | ||
| "browserslist": [ | ||
| "chrome 110", | ||
| "firefox 111", | ||
| "safari 16.0" | ||
| ], | ||
| "browserslist": ["chrome 110", "firefox 111", "safari 16.0"], | ||
| "resolutions": { | ||
| "optionator": "0.9.3", | ||
| "semver": "7.6.2" | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: should we just remove it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@aslilac Were you keeping this around for some reason?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was hoping to re-enable it after Biome pushed a couple more bug fix releases. Enabling this would mean that it'd sort imports on file save (and avoid annoying CI failures) but someone (I think Asher?) encountered a really nasty bug with it. It's been a few months though, so maybe we should enable it!