Skip to content

Commit 03abefe

Browse files
committed
Merge branch 'main' of github.com:saas-js/saas-ui
2 parents 2e5ac64 + 41c3b24 commit 03abefe

File tree

42 files changed

+1532
-319
lines changed

Some content is hidden

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

42 files changed

+1532
-319
lines changed

.changeset/tough-snakes-search.md

-6
This file was deleted.

CODE_OF_CONDUCT.md

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
# Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to make participation in our project and our
7+
community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and
9+
expression, level of experience, education, socio-economic status, nationality,
10+
personal appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
- Using welcoming and inclusive language
18+
- Being respectful of differing viewpoints and experiences
19+
- Gracefully accepting constructive criticism
20+
- Focusing on what is best for the community
21+
- Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
- The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
- Trolling, insulting/derogatory comments, and personal or political attacks
28+
- Public or private harassment
29+
- Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
- Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or reject
41+
comments, commits, code, wiki edits, issues, and other contributions that are
42+
not aligned to this Code of Conduct, or to ban temporarily or permanently any
43+
contributor for other behaviors that they deem inappropriate, threatening,
44+
offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at **hello@saas-ui.dev**. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an
62+
incident. Further details of specific enforcement policies may be posted
63+
separately.
64+
65+
Project maintainers who do not follow or enforce the Code of Conduct in good
66+
faith may face temporary or permanent repercussions as determined by other
67+
members of the project's leadership.
68+
69+
## Attribution
70+
71+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
72+
version 1.4, available at
73+
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
74+
75+
[homepage]: https://www.contributor-covenant.org
76+
77+
For answers to common questions about this code of conduct, see
78+
https://www.contributor-covenant.org/faq

README.md

+30-32
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</a>
1515
<img alt="MIT License" src="https://img.shields.io/github/license/saas-js/saas-ui"/>
1616
<a href="https://twitter.com/intent/follow?screen_name=saas_js">
17-
<img src="https://img.shields.io/twitter/follow/saas_js?style=social&logo=twitter" alt="follow on Twitter">
17+
<img src="https://img.shields.io/twitter/follow/saas_js" alt="follow on Twitter">
1818
</a>
1919
</p>
2020

@@ -23,7 +23,7 @@
2323
Saas UI is an advanced component library designed to build beautiful B2B and dashboard style apps with speed.
2424
It's built on top of Chakra UI and fully written in Typescript.
2525

26-
This repository contains all [open source components](/packages), aswell as the [documentation website](apps/website/pages/docs).
26+
This repository contains all [open source components](/packages), as well as the [documentation website](apps/website/pages/docs).
2727

2828
## Links
2929

@@ -39,52 +39,50 @@ This repository contains all [open source components](/packages), aswell as the
3939

4040
Want to help? Great! Check out the [contributing guidelines](CONTRIBUTING.md) and feel free to open a PR or [discussion](https://github.com/saas-js/saas-ui/discussions/new) for feature requests and feedback.
4141

42-
If you like to support the project financially you can [Sponsor](https://github.com/sponsors/saas-js) Saas UI, or consider ordering [Saas UI Pro Beta](https://appulse.gumroad.com/l/saas-ui-pro-pre-order), all funds will go to the further development of Saas UI. This will give you access to the private Git repository with the beta and our private Discord server for support.
42+
If you'd like to support the project financially, you can [become a sponsor](https://github.com/sponsors/saas-js) of Saas UI or consider ordering [Saas UI Pro Beta](https://saas-ui.lemonsqueezy.com/checkout/buy/5c76854f-738a-46b8-b32d-932a97d477f5). All funds will go toward the further development of Saas UI. This will give you access to the private Git repository with the beta and our private Discord server for support.
43+
44+
## Sponsors ❤️
45+
46+
Saas UI is sponsored by these amazing companies and people.
47+
48+
- [LocalXPose](https://localxpose.io/)
4349

4450
### Core
4551

46-
40+ essential open source components built on top of Chakra UI.
47-
Everything you need to build
52+
40+ essential open-source components built on top of Chakra UI.
4853

4954
- Authentication screens
50-
- Powerfull forms manager
55+
- Powerful forms manager
5156
- DatePicker / DateRangePicker
5257
- Stepper, Timeline, DataTable and much more.
5358

5459
### Pro
5560

5661
A premium frontend starter pack designed for SaaS products.
57-
Complete source code available in a monorepo that can serve as a starting point for your project.
62+
Complete source code available in a monorepo that can serve as a starting point or as a reference for your project.
5863

5964
![theme-tokens](https://user-images.githubusercontent.com/32583/172424112-72bacfdd-17df-4024-81db-690dc47d0c81.png)
6065

61-
- [x] Example SaaS app (NextJS & Electron)
62-
- [x] Authentication screens (Supabase/Magic/Clerk/Custom)
63-
- [x] App layout
64-
- [x] DataGrid with filtering/pagination
65-
- [x] User profiles
66-
- [x] Charts / Sparklines
67-
- [x] Settings pages
68-
- [x] Feature flags
69-
- [x] Billing/subscription management (Paddle)
70-
- [x] Mock graph api (MSW)
71-
- [x] Custom color schemes
72-
- [x] Glass theme
73-
- [x] Onboarding flows
74-
75-
#### In progress
76-
77-
- [ ] Example pages (CRM, Inbox)
78-
- [ ] Upselling flows (Trials, upgrades, etc)
79-
- [ ] File uploads
66+
- Example Next.js SaaS app (https://demo.saas-ui.dev)
67+
- Authentication screens (Supabase/Magic/Clerk/Custom)
68+
- App layout
69+
- DataGrid and DataBoard (Kanban) with filtering/pagination
70+
- Charts / Sparklines
71+
- User account pages
72+
- Settings pages
73+
- Feature flags
74+
- Billing/subscription management (Lemonsqueezy)
75+
- Mocked API with React Query
76+
- Custom color schemes
77+
- Glass theme
78+
- Onboarding flows
79+
- Example pages (CRM, Inbox)
8080

8181
## Using this repo
8282

83-
The docs website depends on private packages (`@saas-ui/pro`). If you don't have access to the Pro repository,
84-
remove `"apps/*",` from `workspaces` in `package.json` before running `yarn`. This will allow you to install all dependencies,
85-
and run Storybooks for local development.
83+
The docs website depends on private packages (`@saas-ui-pro/react`), and won't build properly without access to the private Git submodule.
8684

87-
## Storybook
85+
### Storybook
8886

8987
https://storybook.saas-ui.pro
9088

@@ -94,13 +92,13 @@ Or run locally:
9492
yarn storybook
9593
```
9694

97-
## Build
95+
### Build
9896

9997
```bash
10098
yarn build:packages
10199
```
102100

103-
## Website
101+
### Website
104102

105103
Before running the website you need to build the props-docs by running this.
106104

apps/palette/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# palette
22

3+
## 1.4.6
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [1c64bfaf]
8+
- Updated dependencies [4a3c9dc7]
9+
- @saas-ui/react@2.3.1
10+
- @saas-ui/theme-glass@0.5.1
11+
312
## 1.4.5
413

514
### Patch Changes

apps/palette/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "palette-docs",
3-
"version": "1.4.5",
3+
"version": "1.4.6",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",

apps/palette/src/client/components/configuration.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
SelectOption,
2626
} from '@saas-ui/react'
2727
import { useCallback } from 'react'
28-
import { FaTwitter } from 'react-icons/fa'
28+
import { FaXTwitter } from 'react-icons/fa6'
2929
import Section from './section'
3030

3131
const PaletteConfiguration = () => {
@@ -148,7 +148,7 @@ const PaletteConfiguration = () => {
148148
<Button
149149
as="a"
150150
href="https://twitter.com/intent/tweet?text=I%20created%20my%20%40chakra_ui%20color%20palette%20with%20%40saas_js%20%F0%9F%A4%A9%0A%0A%0Ahttps%3A//palette.saas-ui.dev%20"
151-
leftIcon={<FaTwitter />}
151+
leftIcon={<FaXTwitter />}
152152
variant="solid"
153153
colorScheme="primary"
154154
>

apps/palette/src/client/components/nav.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Badge, Box, HStack, Text, Button, IconButton } from '@chakra-ui/react'
22

3-
import { FaTwitter, FaGithub } from 'react-icons/fa'
3+
import { FaGithub } from 'react-icons/fa'
4+
import { FaXTwitter } from 'react-icons/fa6'
45

56
export const Nav = () => {
67
return (
@@ -16,7 +17,7 @@ export const Nav = () => {
1617
<IconButton
1718
as="a"
1819
href="https://twitter.com/intent/tweet?text=Check%20out%20this%20color%20palette%20generator%20for%20%40chakra_ui.%20Build%20by%20%40saas_js%0Ahttps%3A//palette.saas-ui.dev"
19-
icon={<FaTwitter />}
20+
icon={<FaXTwitter />}
2021
variant="ghost"
2122
aria-label="Share on Twitter"
2223
/>

apps/website/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# website
22

3+
## 2.3.2
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [1c64bfaf]
8+
- Updated dependencies [4a3c9dc7]
9+
- @saas-ui/forms@2.2.1
10+
- @saas-ui/react@2.3.1
11+
312
## 2.3.1
413

514
### Patch Changes

apps/website/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "website",
3-
"version": "2.3.1",
3+
"version": "2.3.2",
44
"private": true,
55
"author": "Eelco Wiersma <eelco@appulse.nl>",
66
"scripts": {

apps/website/src/components/footer.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Flex, HStack, IconButton, Stack, Text } from '@chakra-ui/react'
22
import { Link } from '@saas-ui/react'
3-
import { FaDiscord, FaGithub, FaTwitter } from 'react-icons/fa'
3+
import { FaDiscord, FaGithub } from 'react-icons/fa'
44
import Footer, { Copyright, FooterLink } from './layout/footer'
5+
import { FaXTwitter } from 'react-icons/fa6'
56

67
import Logo from './saas-ui'
78

@@ -52,7 +53,7 @@ const CustomFooter = () => {
5253
<IconButton
5354
variant="ghost"
5455
aria-label="twitter"
55-
icon={<FaTwitter size="14" />}
56+
icon={<FaXTwitter size="14" />}
5657
borderRadius="md"
5758
as={Link}
5859
href="https://twitter.com/saas_js"

apps/website/src/components/layout/navigation.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import {
99
Tooltip,
1010
useBreakpointValue,
1111
} from '@chakra-ui/react'
12-
import { FaDiscord, FaGithub, FaTwitter } from 'react-icons/fa'
12+
import { FaDiscord, FaGithub } from 'react-icons/fa'
13+
import { FaXTwitter } from 'react-icons/fa6'
1314

1415
import { useRouter } from 'next/router'
1516

@@ -111,7 +112,7 @@ const Header = () => {
111112
<IconButton
112113
variant="ghost"
113114
aria-label="twitter"
114-
icon={<FaTwitter size="14" />}
115+
icon={<FaXTwitter size="14" />}
115116
borderRadius="md"
116117
as={Link}
117118
href="https://twitter.com/saas_js"

apps/website/src/components/testimonials/testimonial.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
Text,
1010
} from '@chakra-ui/react'
1111
import { Link } from '@saas-ui/react'
12-
import { FaTwitter } from 'react-icons/fa'
12+
import { FaXTwitter } from 'react-icons/fa6'
1313

1414
interface Testimonial extends CardProps {
1515
name: string
@@ -43,7 +43,7 @@ export const Testimonial = ({
4343

4444
{href && (
4545
<Link href={href} position="absolute" top="4" right="4">
46-
<FaTwitter />
46+
<FaXTwitter />
4747
</Link>
4848
)}
4949
</CardBody>

apps/website/src/docs/components/mdx-components/codeblock/react-live-scope.tsx

+4-8
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,9 @@ import {
5858
FiInfo,
5959
} from 'react-icons/fi'
6060

61-
import {
62-
FaFacebook,
63-
FaTwitter,
64-
FaGithub,
65-
FaSlack,
66-
FaCookie,
67-
} from 'react-icons/fa'
61+
import { FaFacebook, FaGithub, FaSlack, FaCookie } from 'react-icons/fa'
62+
63+
import { FaXTwitter } from 'react-icons/fa6'
6864

6965
const reactIcons = {
7066
FiHome,
@@ -90,7 +86,7 @@ const reactIcons = {
9086
FiUnderline,
9187
FiLink,
9288
FaFacebook,
93-
FaTwitter,
89+
FaXTwitter,
9490
FaGithub,
9591
FaSlack,
9692
FaCookie,

0 commit comments

Comments
 (0)