Skip to content

Commit

Permalink
chore: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
alexluong committed Oct 16, 2019
2 parents 6ed51d8 + 3c56d1f commit 8ae618e
Show file tree
Hide file tree
Showing 111 changed files with 2,648 additions and 6,321 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Expand Up @@ -56,6 +56,15 @@
"contributions": [
"doc"
]
},
{
"login": "wKovacs64",
"name": "Justin Hall",
"avatar_url": "https://avatars1.githubusercontent.com/u/1288694?v=4",
"profile": "https://github.com/wKovacs64",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 10,
Expand Down
12 changes: 12 additions & 0 deletions .github/FUNDING.yml
@@ -0,0 +1,12 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: segunadebayo
open_collective: chakra-ui
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
20 changes: 20 additions & 0 deletions .github/stale.yml
@@ -0,0 +1,20 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 14
# Issues with these labels will never be considered stale
exemptLabels:
- regression
- pinned
- security
# Label to use when marking an issue as stale
staleLabel: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs.Thank you for
your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
unmarkComment: false
only: issues
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -13,3 +13,6 @@ packages/*/.env
yarn.lock
yarn-error.log
packages/*/.rpt2_cache
.next
# Local Netlify folder
.netlify
7 changes: 7 additions & 0 deletions .nowignore
@@ -0,0 +1,7 @@
node_modules
public
out
.next
.env
.cache
yarn-error.log
3 changes: 1 addition & 2 deletions .storybook/config.js
@@ -1,6 +1,6 @@
import { addDecorator, configure } from "@storybook/react";
import React from "react";
import { CSSReset, useColorMode, ThemeProvider } from "@chakra-ui/core";
import { CSSReset, ThemeProvider } from "../packages/chakra-ui/src";

// function loadStories() {
// require("../stories");
Expand All @@ -13,7 +13,6 @@ function loadStories() {
}

const AppProvider = ({ children }) => {
// const { colorMode, toggleColorMode } = useColorMode();
return (
<ThemeProvider>
<CSSReset />
Expand Down
1 change: 0 additions & 1 deletion .storybook/presets.js

This file was deleted.

24 changes: 24 additions & 0 deletions BACKERS.md
@@ -0,0 +1,24 @@
# Chakra UI backers

Chakra UI is licensed as MIT and completely Open Source and free to use. However
the amount of effort needed to maintain and develop new features is not
sustainable without proper financial backing.

## How to become a backer or Insider

## Chakra Insiders

You can get regular insider updates and become an Insider from as little as 5
USD / mo by sponsoring the lead maintainer,
[Segun Adebayo via Patreon](https://patreon.com/segunadebayo). You'll get
regular updates with all the news, blogs, content and early access to features.

[Become a Backer today](https://patreon.com/segunadebayo)

## Individual backers (Patreon / GitHub)

Whatever tier, whether 5 USD or 500 USD, if you're a backer on Patreon, or a
GitHub Sponsor, then please send a PR to have your name listed below:

- Bolaji Ayodeji
- Olaoluwa Faniyi
77 changes: 77 additions & 0 deletions CODE_OF_CONDUCT.md
@@ -0,0 +1,77 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making 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 . 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
47 changes: 41 additions & 6 deletions CONTRIBUTING.md
Expand Up @@ -4,13 +4,48 @@ If you're reading this, you're awesome! Thank you for helping us make this
project great and being a part of the Chakra UI community. Here are a few
guidelines that will help you along the way.

## Branch naming convention

Branches created to address issues should be named in the following format:

- Issue Type/Issue-ID-Issue Summary

`Issue Type` - Shows the type of issue being worked on, and could be any one of
the following:

- bug (any fix to an existing feature to correct an anomaly).
- feature (a new, working functionality).
- chore (a task that doesn't change the behavior of the library. e.g
documentation, tests addition, etc).

`Issue ID` - The issue ID assigned by Github.

`Issue Summary` - Short description of the issue being worked on.

## Submitting a pull request

Chakra UI is a community project, so pull requests are always welcome, but,
Chakra UI is a community project, so pull requests are always welcome. But
before working on a large change, it is best to open an issue first to discuss
it with the maintainers.

As with issues, please begin the title with [ComponentName].
it with the maintainers. If no issue exists addressing the change you would like
implemented, feel free to create one.

If you decide to work on an already opened issue, do check the comments thread
of that particular issue just incase someone else is already working on a fix.
Should there be no one assigned that issue, indicate you are working on that
issue by leaving a comment in the thread. This is to ensure nobody else takes up
that same issue.

Assuming you get the green light to work on the opened issue, the following
steps would guide you on how to submit a PR:-

- Create a fork of the chakra-ui repository
- Create a branch out of the master branch of your forked repository, following
the branch naming convention above.
- It is advisable to make atomic commits, as this would help other maintainers
understand the changes made. Also, working on small changes per single PR is
advisable as those are easy to review and maintain.
- When you are sure your change works as intended, proceed to raise a PR against
the chakra-ui master branch

## Getting Started

Expand Down Expand Up @@ -38,7 +73,7 @@ yarn bootstrap # bootstraps lerna so all dependencies get

yarn storybook # starts storybook server

yarn docs:dev # runs the documentation site locally
yarn docs # runs the documentation site locally

yarn core:build # build the component library

Expand All @@ -51,7 +86,7 @@ The documentation site is built with Next but we created a simple command to run
it.

```sh
npm run docs:dev
npm run docs
```

You can now access the documentation site [locally](http://localhost:3000).
Expand Down
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -141,6 +141,7 @@ Thanks goes to these wonderful people
<td align="center"><a href="https://github.com/devanshj"><img src="https://avatars0.githubusercontent.com/u/30295578?v=4" width="40px;" alt="Devansh Jethmalani"/><br /><sub><b>Devansh Jethmalani</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui/commits?author=devanshj" title="Code">💻</a></td>
<td align="center"><a href="http://adrianaleixandre.com"><img src="https://avatars3.githubusercontent.com/u/920212?v=4" width="40px;" alt="Adrian Aleixandre"/><br /><sub><b>Adrian Aleixandre</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui/commits?author=Vynlar" title="Code">💻</a> <a href="https://github.com/chakra-ui/chakra-ui/commits?author=Vynlar" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/lee-reinhardt"><img src="https://avatars1.githubusercontent.com/u/980089?v=4" width="40px;" alt="Lee"/><br /><sub><b>Lee</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui/commits?author=lee-reinhardt" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/wKovacs64"><img src="https://avatars1.githubusercontent.com/u/1288694?v=4" width="40px;" alt="Justin Hall"/><br /><sub><b>Justin Hall</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui/commits?author=wKovacs64" title="Code">💻</a></td>
</tr>
</table>

Expand Down
23 changes: 23 additions & 0 deletions examples/create-react-app/.gitignore
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
59 changes: 59 additions & 0 deletions examples/create-react-app/README.md
@@ -0,0 +1,59 @@
This project was bootstrapped with
[Create React App](https://github.com/facebook/create-react-app).

## Available Scripts

In the project directory, you can run:

### `yarn start`

Runs the app in the development mode.<br /> Open
[http://localhost:3000](http://localhost:3000) to view it in the browser.

The page will reload if you make edits.<br /> You will also see any lint errors
in the console.

### `yarn test`

Launches the test runner in the interactive watch mode.<br /> See the section
about
[running tests](https://facebook.github.io/create-react-app/docs/running-tests)
for more information.

### `yarn build`

Builds the app for production to the `build` folder.<br /> It correctly bundles
React in production mode and optimizes the build for the best performance.

The build is minified and the filenames include the hashes.<br /> Your app is
ready to be deployed!

See the section about
[deployment](https://facebook.github.io/create-react-app/docs/deployment) for
more information.

### `yarn eject`

**Note: this is a one-way operation. Once you `eject`, you can’t go back!**

If you aren’t satisfied with the build tool and configuration choices, you can
`eject` at any time. This command will remove the single build dependency from
your project.

Instead, it will copy all the configuration files and the transitive
dependencies (Webpack, Babel, ESLint, etc) right into your project so you have
full control over them. All of the commands except `eject` will still work, but
they will point to the copied scripts so you can tweak them. At this point
you’re on your own.

You don’t have to ever use `eject`. The curated feature set is suitable for
small and middle deployments, and you shouldn’t feel obligated to use this
feature. However we understand that this tool wouldn’t be useful if you couldn’t
customize it when you are ready for it.

## Learn More

You can learn more in the
[Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).

To learn React, check out the [React documentation](https://reactjs.org/).
36 changes: 36 additions & 0 deletions examples/create-react-app/package.json
@@ -0,0 +1,36 @@
{
"name": "create-react-app",
"version": "0.1.0",
"private": true,
"dependencies": {
"@types/jest": "24.0.18",
"@types/node": "12.7.11",
"@types/react": "16.9.5",
"@types/react-dom": "16.9.1",
"react": "^16.10.2",
"react-dom": "^16.10.2",
"react-scripts": "3.2.0",
"typescript": "3.6.3"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
Binary file added examples/create-react-app/public/favicon.ico
Binary file not shown.

0 comments on commit 8ae618e

Please sign in to comment.