Skip to content

Commit

Permalink
Merge pull request #84 from b2wads/develop
Browse files Browse the repository at this point in the history
Release da versão 7.0.0
  • Loading branch information
Ana Azevedo authored Nov 6, 2019
2 parents 05c1195 + 327ed6c commit b4a4627
Show file tree
Hide file tree
Showing 98 changed files with 2,336 additions and 1,895 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@
["css-modules-transform", {
"preprocessCss": "./internals/css-modules-transform.js",
"generateScopedName": "grm-[name]__[local]",
"extensions": [".styl"]
"extensions": [".styl"],
"extractCss": "./lib/css/modules/components.css"
}]
],
"ignore": ["./internals/css-modules-transform.js"]
Expand Down
52 changes: 52 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
## 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, gender identity and expression, level of experience,
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.

### Attribution

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

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
36 changes: 36 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
name: Bug report
about: Create a report to help us improve
title: "[BUG]"
labels: bug
assignees: ''

---

**Descreva o bug**

**Para reproduzir**
Passos para reproduzir o bug:
1. Vá para '...'
2. Click em '....'
3. Bug!

**Comportamento esperado**
<!-- Explique o que deveria acontecer ao conduzir os passos descritos -->

**Screenshots**
<!-- Se for possível, fornecer screenshots do erro -->

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Conteúdo adiconal**
<!-- Mais contexto, links, comentários sobre o bug -->
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[FEATURE]"
labels: enhancement
assignees: ''

---

**Descrição do problema relativo a essa feature**
<!-- Acho difícil executar tal ação no componente x... -->

**Descreva a solução sugerida e o porquê dessa decisão**
<!-- Acho melhor separar as funcionalidades em dois componentes pois melhora a leitura do código, etc... -->

**Conteúdo adiconal**
<!-- Screenshots, exemplos, links relacionados a feature -->
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/general-issue-template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: General issue template
about: Describe this issue purpose here.
title: "[OTHER]"
labels: ''
assignees: ''

---

<!--- Describe the idea/problem --->
7 changes: 7 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Fixes #

## Proposed Changes

-
-
-
11 changes: 5 additions & 6 deletions .storybook/config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
import React from 'react';
import { configure } from '@storybook/react';
import { setAddon, addDecorator } from '@storybook/react';
import { setOptions } from '@storybook/addon-options';
import { withOptions } from '@storybook/addon-options';
import { addParameters } from '@storybook/react';
import { themes } from '@storybook/theming';


import infoAddon from '@storybook/addon-info';

import "../source/styl/variables.styl";
import "../source/styl/style.styl";
import 'react-dates/lib/css/_datepicker.css';
import styles from "../source/styl/03-pages/storybook.styl";
import "../source/styl/vendor/react-dates.styl";
import styles from "./storybook.styl";

addDecorator((fn, { kind, story }) => <div className={styles.container}>
<header className={styles.header}>
Expand All @@ -23,7 +24,7 @@ addDecorator((fn, { kind, story }) => <div className={styles.container}>
</div>);

setOptions({
name: 'Grimório 📜✨',
name: 'Grimório ✨',
});

setAddon(infoAddon);
Expand All @@ -33,8 +34,6 @@ addParameters({
},
});

configure(loadStories, module);

function loadStories() {
const req = require.context('../source/components', true, /\.stories\.js$/);
req.keys().forEach(filename => req(filename));
Expand Down
File renamed without changes.
101 changes: 92 additions & 9 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,104 @@
const webpackConfig = require('../internals/webpack/webpack.dev.config.js');
const path = require('path');

const webpackConfigRules = [// rules for modules (configure loaders, parser options, etc.)
// JS LOADER
{
test: /\.js$/,
exclude: /node_modules/,
use: {
loader: 'babel-loader'
}
},
// STYLUS LOADER
{
test: /\.styl$/,
exclude : /(node_modules)/,
include: [path.resolve(__dirname, './'), path.resolve(__dirname, '../source/components')],
use: [
'style-loader',
{
loader: 'css-loader',
options: {
importLoaders: true,
sourceMap: true,
modules: {
mode: 'local',
localIdentName: 'grm-[name]__[local]',
context: path.resolve(__dirname, '../source/'),
},
}
},
{
loader: 'stylus-loader',
options: {
import: path.resolve(__dirname, `../source/styl/config.styl`),
},
},
]
},
{
test: /\.styl$/,
exclude : /(node_modules)/,
include: [path.resolve(__dirname, '../source')],
exclude: [path.resolve(__dirname, '../source/components')],
use: [
'style-loader',
'css-loader',
{
loader: 'stylus-loader',
options: {
import: path.resolve(__dirname, `../source/styl/config.styl`),
},
},
]
},
// CSS LOADER
{
test: /\.css$/,
include: [path.resolve(__dirname, `../node_modules/react-dates/lib`)],
use: [
'style-loader',
'css-loader',
// {
// loader: 'postcss-loader',
// options: {
// ident: 'postcss',
// plugins: postCSSPlugins,
// },
// },
]
},
// IMG LOADER
{
test: /\.(jpe?g|jpg|gif|ico|png|woff|woff2|eot|ttf)$/,
include: path.resolve(__dirname, '../source/'),
exclude: /(node_modules)/,
use: {
loader: 'file-loader'
}
},
// SVG LOADER
{
test: /\.svg$/,
exclude: /node_modules/,
loader: 'svg-react-loader',
},
// STORIES
{
test: /\.stories\.js?$/,
loaders: [require.resolve('@storybook/addon-storysource/loader')],
enforce: 'pre',
}
];

// Export a function. Accept the base config as the only param.
module.exports = async ({ config, mode }) => {
// `mode` has a value of 'DEVELOPMENT' or 'PRODUCTION'
// You can change the configuration based on that.
// 'PRODUCTION' is used when building the static version of storybook.

// Make whatever fine-grained changes you need
config.module.rules = (config.module.rules || []).concat(webpackConfig.module.rules);
config.resolve.alias = webpackConfig.resolve.alias;

config.module.rules.push({
test: /\.stories\.js?$/,
loaders: [require.resolve('@storybook/addon-storysource/loader')],
enforce: 'pre',
});
config.module.rules = (config.module.rules || []).concat(webpackConfigRules);

// Return the altered config
return config;
Expand Down
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 B2WADS

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading

0 comments on commit b4a4627

Please sign in to comment.