Skip to content

Commit

Permalink
fix: merge branch 'minor' into feat/snapshot-testing-setup
Browse files Browse the repository at this point in the history
  • Loading branch information
Ajamuar committed Aug 3, 2021
2 parents a72512b + df62e23 commit 039818f
Show file tree
Hide file tree
Showing 123 changed files with 37,084 additions and 37,284 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
"useTabs": false
}
],
"no-bitwise": 0
"no-bitwise": 0,
"prefer-const": "warn",
"no-console": ["error", { "allow": ["warn", "error"] }]
},
"plugins": ["prettier"]
}
19 changes: 13 additions & 6 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ about: Create a report to help us improve
title: ''
labels: v3
assignees: ''

---

** Before reporting this bug, please...**

1. Check the latest documentation: https://docs.nativebase.io/
2. Check for existing open/closed issues for a possible duplicate before creating a new issue: https://github.com/GeekyAnts/NativeBase/issues
3. Use the latest NativeBase release: https://github.com/GeekyAnts/NativeBase/releases
4. Check examples from NativeBase KitchenSink https://github.com/GeekyAnts/NativeBase-KitchenSink
5. For discussion purpose make use of NativeBase discord: https://discord.gg/TSgCw2UPmb


**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behaviour:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -35,12 +35,19 @@ It would be easier for us to debug if you can reproduce the error in a codesandb
If applicable, add screenshots to help explain your problem.

**Platform**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

- NativeBase version [e.g. 3.0.1]
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Browser version [e.g. 22]
- React Native version [e.g. 0.64]
- Expo sdk version [e.g. 41]
- node [e.g. 14.16.1]
- yarn or npm [e.g. 6.1]

**Additional information**

1. Add any other context about the problem here.
2. Is the bug present in both iOS and Android or in any one of them?
3. If you want your issue to be looked at quicker, please attach a snack reproducible with your issue. Makes it easier for us!
24 changes: 24 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: Feature request
about: Create a feature request
title: ''
labels: v3
assignees: ''
---

Thanks for filing an issue 😄!

Please search open/closed issues before submitting. Someone
might have asked the same thing before 😉!

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
17 changes: 17 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!-- Thanks for submitting a pull request! We appreciate you spending the time to work on these changes. Please provide enough information so that others can review your pull request. The three fields below are mandatory. -->

## Summary

<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[CATEGORY] [TYPE] - Message

## Test Plan

<!-- Demonstrate the code is solid. Example: The exact commands you ran and their output, screenshots / videos if the pull request changes the user interface. -->
8 changes: 3 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"javascript.validate.enable": true,
"eslint.enable": false,
"tslint.enable": true,
"eslint.format.enable": false,
"eslint.run": "onType",
"tslint.enable": false,
"tslint.autoFixOnSave": true,
"flow.enabled": false,
"editor.tabSize": 2,
Expand All @@ -12,9 +13,6 @@
"prettier.jsxSingleQuote": true,
"prettier.singleQuote": true,

// A list of languages IDs to disable this extension on
"prettier.disableLanguages": ["vue"],

// Path to a .prettierignore or similar file
"prettier.ignorePath": ".prettierignore",
// If true, puts the `>` of a multi-line jsx element at the end of the last line instead of being alone on the next line
Expand Down
42 changes: 21 additions & 21 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
We'd love for you to contribute to our source code and to make NativeBase even better than it is
today! Here are some guidelines we'd like you to follow:

* [Code of Conduct](#coc)
* [Ways to Contribute](#wtc)
* [Questions and Problems](#question)
* [Issues and Bugs](#issue)
* [Feature Requests](#feature)
* [Issue Submission Guidelines](#submit)
* [Setting Up Development Environment ](#dev-env)
* [Pull Request Submission Guidelines](#submit-pr)
* [Improving Documentation](#docs)
- [Code of Conduct](#coc)
- [Ways to Contribute](#wtc)
- [Questions and Problems](#question)
- [Issues and Bugs](#issue)
- [Feature Requests](#feature)
- [Issue Submission Guidelines](#submit)
- [Setting Up Development Environment ](#dev-env)
- [Pull Request Submission Guidelines](#submit-pr)
- [Improving Documentation](#docs)

## <a name="coc"></a> Code of Conduct

Expand Down Expand Up @@ -60,12 +60,13 @@ You can request a new feature by submitting an issue to our [GitHub Repository](

If you would like to implement a new feature then consider what kind of change it is:

* **Major Changes** that you wish to contribute to the project should be discussed first in an
- **Major Changes** that you wish to contribute to the project should be discussed first in an
[GitHub issue](https://github.com/GeekyAnts/NativeBase/issues) that clearly outlines the changes and benefits of the feature.
* **Small Changes** can directly be crafted and submitted to the [GitHub Repository](https://github.com/GeekyAnts/NativeBase)
- **Small Changes** can directly be crafted and submitted to the [GitHub Repository](https://github.com/GeekyAnts/NativeBase)
as a Pull Request. See the section about [Contributing Code](#submit-pr).

## <a name="submit"></a> Issue Submission Guidelines

Before you submit your issue search the archive, maybe your question was already answered.

If your issue appears to be a bug, and hasn't been reported, open a new issue. Help us to maximize
Expand All @@ -77,13 +78,13 @@ make it easier to understand and categorize the issue.
In general, providing the following information will increase the chances of your issue being dealt
with quickly:

* **Issue Description** - if an error is being thrown a non-minified stack trace helps
* **Motivation for or Use Case** - explain why this is a bug for you
* **NativeBase Version(s)** - is it a regression?
* **Browsers and Operating System** - is this a problem with all browsers or only specific ones?
* **Reproduce the Error** - provide a live example (using [expo snack](https://snack.expo.io/) or an unambiguous set of steps.
* **Related Issues** - has a similar issue been reported before?
* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
- **Issue Description** - if an error is being thrown a non-minified stack trace helps
- **Motivation for or Use Case** - explain why this is a bug for you
- **NativeBase Version(s)** - is it a regression?
- **Browsers and Operating System** - is this a problem with all browsers or only specific ones?
- **Reproduce the Error** - provide a live example (using [expo snack](https://snack.expo.io/) or an unambiguous set of steps.
- **Related Issues** - has a similar issue been reported before?
- **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
causing the problem (line of code or commit)

## <a name="dev-env"></a> Setting Up your Development Environment
Expand Down Expand Up @@ -157,7 +158,7 @@ The process of proposing a change to NativeBase can be summarized as follows:
1. Fork the NativeBase repository and create your branch from `master`.
2. Make the desired changes to NativeBase source. Use the `Storybook Testbed` app to test them out.
3. If you've added code that should be tested, add tests.
4. If you've changed APIs, update the documentation, which is available [here](https://github.com/nativebase/website/).
4. If you've changed APIs, update the documentation, which is available [here](https://github.com/GeekyAnts/nativebase-docs).
5. Ensure the test suite passes, either locally or on CI once you opened a pull request.
6. Make sure your code lints. To keep project away from disputes we make use of **ESLint**, which is really a handy linting tool that enforces strict coding styles and makes sure your files are free from dead code. Each module of NativeBase has bundled ESLint as a dev dependency and checks your code everytime you commit.
7. Push the changes to your fork.
Expand All @@ -168,5 +169,4 @@ If all goes well, your pull request will be merged. If it is not merged, maintai
## <a name="docs"></a> Helping with Documentation
The NativeBase documentation is hosted as part of the NativeBase website repository at https://github.com/nativebase/website. The website itself is located at <https://alpha.nativebase.io/> and it is built using [Docusaurus V2](https://v2.docusaurus.io/). If there's anything you'd like to change in the docs, you can get started by clicking on the "Edit" button located on the bottom left of most pages on the website.
The NativeBase documentation is hosted as part of the NativeBase website repository at https://github.com/GeekyAnts/nativebase-docs. The website itself is located at <https://alpha.nativebase.io/> and it is built using [Docusaurus V2](https://v2.docusaurus.io/). If there's anything you'd like to change in the docs, you can get started by clicking on the "Edit" button located on the bottom left of most pages on the website.
19 changes: 19 additions & 0 deletions example/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"extends": ["@react-native-community", "prettier"],
"rules": {
"prettier/prettier": [
"error",
{
"quoteProps": "preserve",
"singleQuote": true,
"tabWidth": 2,
"trailingComma": "es5",
"useTabs": false
}
],
"no-bitwise": 0,
"prefer-const": "warn",
"no-console": "off"
},
"plugins": ["prettier"]
}
13 changes: 13 additions & 0 deletions example/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@ export default () => {
'Roboto-Light': require('./assets/fonts/Roboto-Light.ttf'),
'Roboto-Regular': require('./assets/fonts/Roboto-Regular.ttf'),
'Roboto-Medium': require('./assets/fonts/Roboto-Medium.ttf'),

'Montserrat-Bold': require('./assets/fonts/Montserrat-Bold.ttf'),
'Montserrat-Italic': require('./assets/fonts/Montserrat-Italic.ttf'),
'Montserrat-Light': require('./assets/fonts/Montserrat-Light.ttf'),
'Montserrat-Regular': require('./assets/fonts/Montserrat-Regular.ttf'),
'Montserrat-Medium': require('./assets/fonts/Montserrat-Medium.ttf'),
'Montserrat-MediumItalic': require('./assets/fonts/Montserrat-MediumItalic.ttf'),
'Montserrat-Black': require('./assets/fonts/Montserrat-Black.ttf'),
'Montserrat-BlackItalic': require('./assets/fonts/Montserrat-BlackItalic.ttf'),
'Montserrat-ExtraBold': require('./assets/fonts/Montserrat-ExtraBold.ttf'),
'Montserrat-ExtraBoldItalic': require('./assets/fonts/Montserrat-ExtraBoldItalic.ttf'),
'Montserrat-SemiBold': require('./assets/fonts/Montserrat-SemiBold.ttf'),
'Montserrat-SemiBoldItalic': require('./assets/fonts/Montserrat-SemiBoldItalic.ttf'),
});

if (!loaded) return null;
Expand Down
Loading

0 comments on commit 039818f

Please sign in to comment.