8000 feat: implement Premium features page using shadcn/ui and Tailwind by jaaydenh · Pull Request #15094 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

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.

Sign up for GitHub

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 27 commits into from
Nov 6, 2024
Merged

feat: implement Premium features page using shadcn/ui and Tailwind #15094

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
459a028
wip
jaaydenh Oct 2, 2024
169c4f5
fix
jaaydenh Oct 15, 2024
24c97dc
update lock file
jaaydenh Oct 15, 2024
4134d90
wip
jaaydenh Oct 16, 2024
15eded8
revert css
jaaydenh Oct 16, 2024
9dba1c8
fix: import index.css
jaaydenh Oct 30, 2024
579ced7
feat: changes for premium page
jaaydenh Oct 30, 2024
ae3bd9d
feat: implement Premium page with Tailwind and shadcn button
jaaydenh Nov 1, 2024
f977408
fix: fix lock file
jaaydenh Nov 1, 2024
71826a8
chore: updates to button styles
jaaydenh Nov 1, 2024
093d947
chore: update variant
jaaydenh Nov 1, 2024
58fbeb3
chore: update colors
jaaydenh Nov 1, 2024
4e6daaf
chore: move CacheProvider to The 8000 meProvider
jaaydenh Nov 1, 2024
287a67a
chore: update paths for shadcn
jaaydenh Nov 1, 2024
1310637
fix: fix format
jaaydenh Nov 1, 2024
281ec8a
feat: use Lucide instead of Radix icons
jaaydenh Nov 2, 2024
25cbb87
fix: add useEffect cleanup function
jaaydenh Nov 3, 2024
42e82b6
chore: add comment
jaaydenh Nov 3, 2024
4ae065d
fix: fix format
jaaydenh Nov 3, 2024
fd045a6
feat: show premium tab if no premium license
jaaydenh Nov 3, 2024
e015d20
fix: fix format
jaaydenh Nov 3, 2024
3eba3af
fix: use rem for font overrides
jaaydenh Nov 5, 2024
162ad19
fix: remove fontSize
jaaydenh Nov 5, 2024
fcb4c2a
fix: fix lockfile
jaaydenh Nov 5, 2024
962045c
chore: add font sizes to Tailwind config
jaaydenh Nov 5, 2024
09c5844
feat: add icons for OSS version
jaaydenh Nov 6, 2024
ef4b261
fix: use sentence case
jaaydenh Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: use Lucide instead of Radix icons
  • Loading branch information
@jaaydenh
jaaydenh committed Nov 5, 2024
commit 281ec8a4c35f00e17aa55dfe9974efe3a82a5815
1 change: 0 additions & 1 deletion site/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
"@mui/system": "5.16.7",
"@mui/utils": "5.16.6",
"@mui/x-tree-view": "7.18.0",
"@radix-ui/react-icons": "1.3.0",
"@radix-ui/react-slot": "1.1.0",
"@tanstack/react-query-devtools": "4.35.3",
"@xterm/addon-canvas": "0.7.0",
Expand Down
22 changes: 5 additions & 17 deletions site/pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions site/src/pages/DeploymentSettingsPage/PremiumPage/PremiumPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ExternalLinkIcon } from "@radix-ui/react-icons";
import { SquareArrowOutUpRight } from "lucide-react";
import { Button } from "components/ui/button";
import type { FC } from "react";
import { docs } from "utils/docs";
Expand Down Expand Up @@ -37,7 +37,7 @@ const EnterpriseVersion: FC = () => {
<h2 className="text-sm font-semibold m-0">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be a need for an m-0? Seeing that makes me think that Tailwind's default reset isn't being applied correctly. Though I'm not sure if that's actually expected while we're migrating off MUI

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in the tailwind config the css reset is turned off.

corePlugins: {
		preflight: false,
	},

So we are going to need to do things like this in the short-term or maybe we can find another workaround

Multi-Organization Access Controls&nbsp;
</h2>
<ExternalLinkIcon />
<SquareArrowOutUpRight size={14} />
</span>
</a>
<p className="text-sm max-w-xl text-content-secondary mt-0 font-medium">
Expand All @@ -53,7 +53,7 @@ const EnterpriseVersion: FC = () => {
>
<span className="flex items-center">
<h2 className="text-sm font-semibold m-0">Custom Role&nbsp;</h2>
<ExternalLinkIcon />
<SquareArrowOutUpRight size={14} />
</span>
</a>
<p className="text-sm max-w-xl text-content-secondary mt-0 font-medium">
Expand All @@ -67,11 +67,11 @@ const EnterpriseVersion: FC = () => {
className="no-underline text-sm text-content-link"
href={docs("/admin/users/quotas")}
>
<span className="flex items-center">
<span className="flex items-center text-sm">
<h2 className="text-sm font-semibold m-0">
Org-Level Quotas for Chargeback&nbsp;
</h2>
<ExternalLinkIcon />
<SquareArrowOutUpRight size={14} />
</span>
</a>
<p className="text-sm max-w-xl text-content-secondary mt-0 font-medium">
Expand Down
5 changes: 1 addition & 4 deletions site/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
"skipLibCheck": true,
"strict": true,
"target": "es2020",
"baseUrl": "src/",
"paths": {
"@/*": ["./*"]
}
"baseUrl": "src/"
},
"include": ["**/*.ts", "**/*.tsx"],
"exclude": ["node_modules/", "_jest"],
Expand Down
0