Skip to content

Commit

Permalink
Merge branch 'main' of github.com:saas-js/saas-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
Pagebakers committed Nov 1, 2023
2 parents 2e5ac64 + 41c3b24 commit 03abefe
Show file tree
Hide file tree
Showing 42 changed files with 1,532 additions and 319 deletions.
6 changes: 0 additions & 6 deletions .changeset/tough-snakes-search.md

This file was deleted.

78 changes: 78 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to make participation in our project and our
community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and
expression, level of experience, education, socio-economic status, nationality,
personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, or to ban temporarily or permanently any
contributor for other behaviors that they deem inappropriate, threatening,
offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at **[email protected]**. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an
incident. Further details of specific enforcement policies may be posted
separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 1.4, available at
https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
62 changes: 30 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</a>
<img alt="MIT License" src="https://img.shields.io/github/license/saas-js/saas-ui"/>
<a href="https://twitter.com/intent/follow?screen_name=saas_js">
<img src="https://img.shields.io/twitter/follow/saas_js?style=social&logo=twitter" alt="follow on Twitter">
<img src="https://img.shields.io/twitter/follow/saas_js" alt="follow on Twitter">
</a>
</p>

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

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

## Links

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

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.

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.
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.

## Sponsors ❤️

Saas UI is sponsored by these amazing companies and people.

- [LocalXPose](https://localxpose.io/)

### Core

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

- Authentication screens
- Powerfull forms manager
- Powerful forms manager
- DatePicker / DateRangePicker
- Stepper, Timeline, DataTable and much more.

### Pro

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

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

- [x] Example SaaS app (NextJS & Electron)
- [x] Authentication screens (Supabase/Magic/Clerk/Custom)
- [x] App layout
- [x] DataGrid with filtering/pagination
- [x] User profiles
- [x] Charts / Sparklines
- [x] Settings pages
- [x] Feature flags
- [x] Billing/subscription management (Paddle)
- [x] Mock graph api (MSW)
- [x] Custom color schemes
- [x] Glass theme
- [x] Onboarding flows

#### In progress

- [ ] Example pages (CRM, Inbox)
- [ ] Upselling flows (Trials, upgrades, etc)
- [ ] File uploads
- Example Next.js SaaS app (https://demo.saas-ui.dev)
- Authentication screens (Supabase/Magic/Clerk/Custom)
- App layout
- DataGrid and DataBoard (Kanban) with filtering/pagination
- Charts / Sparklines
- User account pages
- Settings pages
- Feature flags
- Billing/subscription management (Lemonsqueezy)
- Mocked API with React Query
- Custom color schemes
- Glass theme
- Onboarding flows
- Example pages (CRM, Inbox)

## Using this repo

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

## Storybook
### Storybook

https://storybook.saas-ui.pro

Expand All @@ -94,13 +92,13 @@ Or run locally:
yarn storybook
```

## Build
### Build

```bash
yarn build:packages
```

## Website
### Website

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

Expand Down
9 changes: 9 additions & 0 deletions apps/palette/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# palette

## 1.4.6

### Patch Changes

- Updated dependencies [1c64bfaf]
- Updated dependencies [4a3c9dc7]
- @saas-ui/react@2.3.1
- @saas-ui/theme-glass@0.5.1

## 1.4.5

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/palette/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "palette-docs",
"version": "1.4.5",
"version": "1.4.6",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
4 changes: 2 additions & 2 deletions apps/palette/src/client/components/configuration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {
SelectOption,
} from '@saas-ui/react'
import { useCallback } from 'react'
import { FaTwitter } from 'react-icons/fa'
import { FaXTwitter } from 'react-icons/fa6'
import Section from './section'

const PaletteConfiguration = () => {
Expand Down Expand Up @@ -148,7 +148,7 @@ const PaletteConfiguration = () => {
<Button
as="a"
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"
leftIcon={<FaTwitter />}
leftIcon={<FaXTwitter />}
variant="solid"
colorScheme="primary"
>
Expand Down
5 changes: 3 additions & 2 deletions apps/palette/src/client/components/nav.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Badge, Box, HStack, Text, Button, IconButton } from '@chakra-ui/react'

import { FaTwitter, FaGithub } from 'react-icons/fa'
import { FaGithub } from 'react-icons/fa'
import { FaXTwitter } from 'react-icons/fa6'

export const Nav = () => {
return (
Expand All @@ -16,7 +17,7 @@ export const Nav = () => {
<IconButton
as="a"
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"
icon={<FaTwitter />}
icon={<FaXTwitter />}
variant="ghost"
aria-label="Share on Twitter"
/>
Expand Down
9 changes: 9 additions & 0 deletions apps/website/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# website

## 2.3.2

### Patch Changes

- Updated dependencies [1c64bfaf]
- Updated dependencies [4a3c9dc7]
- @saas-ui/forms@2.2.1
- @saas-ui/react@2.3.1

## 2.3.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/website/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "website",
"version": "2.3.1",
"version": "2.3.2",
"private": true,
"author": "Eelco Wiersma <[email protected]>",
"scripts": {
Expand Down
5 changes: 3 additions & 2 deletions apps/website/src/components/footer.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Flex, HStack, IconButton, Stack, Text } from '@chakra-ui/react'
import { Link } from '@saas-ui/react'
import { FaDiscord, FaGithub, FaTwitter } from 'react-icons/fa'
import { FaDiscord, FaGithub } from 'react-icons/fa'
import Footer, { Copyright, FooterLink } from './layout/footer'
import { FaXTwitter } from 'react-icons/fa6'

import Logo from './saas-ui'

Expand Down Expand Up @@ -52,7 +53,7 @@ const CustomFooter = () => {
<IconButton
variant="ghost"
aria-label="twitter"
icon={<FaTwitter size="14" />}
icon={<FaXTwitter size="14" />}
borderRadius="md"
as={Link}
href="https://twitter.com/saas_js"
Expand Down
5 changes: 3 additions & 2 deletions apps/website/src/components/layout/navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import {
Tooltip,
useBreakpointValue,
} from '@chakra-ui/react'
import { FaDiscord, FaGithub, FaTwitter } from 'react-icons/fa'
import { FaDiscord, FaGithub } from 'react-icons/fa'
import { FaXTwitter } from 'react-icons/fa6'

import { useRouter } from 'next/router'

Expand Down Expand Up @@ -111,7 +112,7 @@ const Header = () => {
<IconButton
variant="ghost"
aria-label="twitter"
icon={<FaTwitter size="14" />}
icon={<FaXTwitter size="14" />}
borderRadius="md"
as={Link}
href="https://twitter.com/saas_js"
Expand Down
4 changes: 2 additions & 2 deletions apps/website/src/components/testimonials/testimonial.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
Text,
} from '@chakra-ui/react'
import { Link } from '@saas-ui/react'
import { FaTwitter } from 'react-icons/fa'
import { FaXTwitter } from 'react-icons/fa6'

interface Testimonial extends CardProps {
name: string
Expand Down Expand Up @@ -43,7 +43,7 @@ export const Testimonial = ({

{href && (
<Link href={href} position="absolute" top="4" right="4">
<FaTwitter />
<FaXTwitter />
</Link>
)}
</CardBody>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,9 @@ import {
FiInfo,
} from 'react-icons/fi'

import {
FaFacebook,
FaTwitter,
FaGithub,
FaSlack,
FaCookie,
} from 'react-icons/fa'
import { FaFacebook, FaGithub, FaSlack, FaCookie } from 'react-icons/fa'

import { FaXTwitter } from 'react-icons/fa6'

const reactIcons = {
FiHome,
Expand All @@ -90,7 +86,7 @@ const reactIcons = {
FiUnderline,
FiLink,
FaFacebook,
FaTwitter,
FaXTwitter,
FaGithub,
FaSlack,
FaCookie,
Expand Down
Loading

1 comment on commit 03abefe

@vercel
Copy link

@vercel vercel bot commented on 03abefe Nov 1, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.