From 6d0db7a376ee690e7d3f26001bc818efa2207aa9 Mon Sep 17 00:00:00 2001 From: Ian Warner Date: Sun, 13 Oct 2019 22:30:33 +0200 Subject: [PATCH 1/5] fix: Added workflows --- .github/FUNDING.yml | 2 ++ .github/issue_template.md | 20 ++++++++++++++++++++ .github/workflows/lint.yml | 23 +++++++++++++++++++++++ README.md | 2 ++ 4 files changed, 47 insertions(+) create mode 100644 .github/FUNDING.yml create mode 100644 .github/issue_template.md create mode 100644 .github/workflows/lint.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..14f5792cf --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,2 @@ +# These are supported funding model platforms +github: [iwarner] diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100644 index 000000000..09dd61a38 --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,20 @@ +### Description + + + +### Steps to reproduce + + + +### Environment + + +- **OS:** +- **Node.js:** diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 000000000..ebc0d38ea --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,23 @@ +name: Lint IndustryUI + +on: [push, pull_request] + +jobs: + lint: + name: Lint + + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v1 + + - name: Use Node.js ${{ matrix.node_version }} + uses: actions/setup-node@v1 + with: + version: ${{ matrix.node_version }} + + - name: Lint + run: | + npm install + npm run lint diff --git a/README.md b/README.md index d98dc2514..85753fb1e 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ our components used throughout our NextJS projects. It enables us to rapidly prototype any type of site at any scale. +![](https://github.com/actions/hello-world/workflows/.github/workflows/main.yml/badge.svg) + ## Install - $ yarn install From d540409b8b1296f2a81bd03f1639a1f0f470e092 Mon Sep 17 00:00:00 2001 From: Ian Warner Date: Sun, 13 Oct 2019 22:36:01 +0200 Subject: [PATCH 2/5] fix: updated badge for readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85753fb1e..3796dbd01 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ our components used throughout our NextJS projects. It enables us to rapidly prototype any type of site at any scale. -![](https://github.com/actions/hello-world/workflows/.github/workflows/main.yml/badge.svg) +![](https://github.com/DryKISS/industryui.com/workflows/.github/workflows/lint.yml/badge.svg) ## Install From fa79f925e2993d957f451a4b41a469a366eb9a53 Mon Sep 17 00:00:00 2001 From: Ian Warner Date: Sun, 13 Oct 2019 23:56:50 +0200 Subject: [PATCH 3/5] fix: updated badge URL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3796dbd01..d1594ad99 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ our components used throughout our NextJS projects. It enables us to rapidly prototype any type of site at any scale. -![](https://github.com/DryKISS/industryui.com/workflows/.github/workflows/lint.yml/badge.svg) +![](https://github.com/DryKISS/industryui.com/workflows/Lint%20IndustryUI/badge.svg) ## Install From 607372892178573fe32fa4777640f28ae3f086f3 Mon Sep 17 00:00:00 2001 From: Ian Warner Date: Mon, 14 Oct 2019 00:26:19 +0200 Subject: [PATCH 4/5] fix: added template placeholder - fixed lint issue --- .github/CODE_OF_CONDUCT.md | 76 +++++++++++++++++++ .github/CONTRIBUTING.md | 33 ++++++++ .github/pull_request_template.md | 9 +++ .../organisms/messaging/components/message.js | 2 +- 4 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 .github/CODE_OF_CONDUCT.md create mode 100644 .github/CONTRIBUTING.md create mode 100644 .github/pull_request_template.md diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..8ed3e9429 --- /dev/null +++ b/.github/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# 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 ian.warner@drykiss.com. 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 \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 000000000..fa7f03f0f --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,33 @@ +## How to contribute to IndustryUI + +#### **Did you find a bug?** + +* **Ensure the bug was not already reported** by searching on GitHub Issues. + +#### **Did you write a patch that fixes a bug?** + +* Open a new GitHub pull request with the patch. + +* Ensure the PR description clearly describes the problem and solution. +Include the relevant issue number if applicable. + +* Create a Loom video showcasing your effort. + +#### **Did you fix whitespace, format code, or make a purely cosmetic patch?** + +We appreciate this and any change for the better is a good chnage. + +#### **Do you intend to add a new feature or change an existing one?** + +* Suggest your change in the and start writing code :) + +* Do not open an issue on GitHub until you have collected positive feedback +about the change. GitHub issues are primarily intended for bug reports and fixes. + +#### **Do you want to contribute to the documentation?** + +* Please contact us for further information + +Thanks! :heart: :heart: :heart: + +DryKISS Team diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..18a428c43 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,9 @@ +Please ensure your pull request adheres to the following guidelines: + +- [ ] Use the following format: `* [owner/repo](link)` +- [ ] Link additions should be added to the bottom of the relevant category. +- [ ] New categories or improvements to the existing categorization are welcome. +- [ ] Search previous suggestions before making a new one, as yours may be a duplicate. +- [ ] Sort by alphabetical order + +Thanks for contributing! diff --git a/components/organisms/messaging/components/message.js b/components/organisms/messaging/components/message.js index 4587e1e5e..8b2591fd3 100644 --- a/components/organisms/messaging/components/message.js +++ b/components/organisms/messaging/components/message.js @@ -3,7 +3,7 @@ */ // React -import { string, number } from 'prop-types' +import { string } from 'prop-types' // UI import { Card, Column, Icon, Image, Row } from '../../../' From 5669294867e3f4c6bf14dbf0ae616d0b896df4ac Mon Sep 17 00:00:00 2001 From: Ian Warner Date: Mon, 14 Oct 2019 00:34:40 +0200 Subject: [PATCH 5/5] fix: added build to workflow to test storybook can build still --- .github/workflows/lint.yml | 9 ++++++++- OLDbabel.config.js | 38 -------------------------------------- 2 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 OLDbabel.config.js diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ebc0d38ea..78e177afd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,7 +17,14 @@ jobs: with: version: ${{ matrix.node_version }} - - name: Lint + - name: Install run: | npm install + + - name: Lint + run: | npm run lint + + - name: Build + run: | + npm run build-storybook diff --git a/OLDbabel.config.js b/OLDbabel.config.js deleted file mode 100644 index a6eba3377..000000000 --- a/OLDbabel.config.js +++ /dev/null @@ -1,38 +0,0 @@ -module.exports = function (api) { - api.cache(true) - - const presets = [ - 'next/babel' - ] - - const plugins = [ - [ - 'styled-components', { - displayName: true, - ssr: true - } - ], - [ - 'module-resolver', - { - root: ['./'], - alias: { - api: './api', - config: './config' - } - } - ] - ] - - const env = { - test: { - plugins: ['require-context-hook'] - } - } - - return { - presets, - plugins, - env - } -}