Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #370 from ergonode/develop
Browse files Browse the repository at this point in the history
Release v0.7.0
  • Loading branch information
bleto authored Apr 27, 2020
2 parents 3982147 + e321daa commit 46b7684
Show file tree
Hide file tree
Showing 1,446 changed files with 66,196 additions and 33,091 deletions.
11 changes: 0 additions & 11 deletions .babelrc

This file was deleted.

8 changes: 1 addition & 7 deletions .env.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
API_PROTOCOL=http
API_HOST=localhost
API_PREFIX=/api/v1/

# if port exist--
# API_PORT=8000
# ---------------
API_BASE_URL=http://localhost:8000/api/v1/
8 changes: 5 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package.json
router.js
node_modules/
cypress/
build/
dist/
coverage/
lib/
vendor/
.history/
.vscode/
modules.config.js
91 changes: 61 additions & 30 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,36 @@ module.exports = {
es6: true,
node: true,
jest: true,
"cypress/globals": true
'cypress/globals': true,
},
parserOptions: {
parser: 'babel-eslint'
parser: 'babel-eslint',
},
extends: [
// https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
'airbnb-base',
'plugin:vue/strongly-recommended',
'plugin:jest/recommended',
'plugin:cypress/recommended'
'plugin:cypress/recommended',
],
// required to lint *.vue files
plugins: [
'vue',
'jest',
'notice',
'cypress'
'cypress',
'markdown',
],
// add your custom rules here
rules: {
'notice/notice':[
"error", {
"templateFile":"./config/.copyright",
"messages":{
"whenFailedToMatch":"Couldn't find 'License Header', are you sure you added it?"
}
},
'arrow-parens': ['error', 'as-needed', { requireForBlockBody: true }],
'import/no-mutable-exports': 'error',
'import/order': 'error',
'import/first': 'error',
'notice/notice': [
'error', {
templateFile: './config/.copyright',
messages: {
whenFailedToMatch: "Couldn't find 'License Header', are you sure you added it?",
},
},
],
'import/extensions': 'off',
'no-console': 'off',
Expand All @@ -54,30 +55,60 @@ module.exports = {
'state',
],
}],
'class-methods-use-this':['off'],
'camelcase': ['off'],
'class-methods-use-this': ['off'],
'global-require': ['off'],
'import/no-dynamic-require': ['off'],
'no-underscore-dangle': 'off',
'no-unused-vars':['error', { 'argsIgnorePattern': 'commit' }],
'no-unused-vars': ['error', { argsIgnorePattern: 'commit' }],
'max-len': ['error', {
'code': 100,
'ignoreTrailingComments': true,
'ignoreComments': true,
'ignoreUrls': true,
'ignoreStrings': true,
'ignoreTemplateLiterals': true,
code: 100,
ignoreTrailingComments: true,
ignoreComments: true,
ignoreUrls: true,
ignoreStrings: true,
ignoreTemplateLiterals: true,
}],
'vue/component-name-in-template-casing': ['error',
'PascalCase',
{
'ignores': ['nuxt', 'nuxt-link'],
}
'PascalCase',
],
'vue/order-in-components': ['error', {
'order': [
'asyncData',
order: [
'el',
'name',
'parent',
'functional',
['delimiters', 'comments'],
['components', 'directives', 'filters'],
'extends',
'mixins',
'beforeRouteEnter',
'beforeRouteUpdate',
'beforeRouteLeave',
'middleware',
'validate',
'inheritAttrs',
'model',
['props', 'propsData'],
'fetch',
'asyncData',
'data',
'computed',
'watch',
'watchQuery',
'LIFECYCLE_HOOKS',
'methods',
'head',
'layout',
['template', 'render'],
'renderError',
'transition',
'loading',
'scrollToTop',
],
}],
}
'jest/no-commented-out-tests': 'off',
'jest/expect-expect': 'off',
'jest/no-mocks-import': 'off',
},
};
22 changes: 12 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# dependencies
node_modules
package-lock.json
report

# tests
/coverage
/screenshotsFolder
/videosFolder
coverage
screenshotsFolder
videosFolder
cypress.env.json

# logs
Expand All @@ -17,11 +16,11 @@ npm-debug.log

# Nuxt generate
dist
/build
!/build/.gitkeep
/tmp
/foto
/ftp
build
!build/.gitkeep
tmp
foto
ftp

# ESLint generate
.eslintcache
Expand All @@ -38,11 +37,14 @@ dist
lerna-debug.log
npm-debug.log
yarn-error.log
/**/npm-debug.log
**/npm-debug.log
.env

# configurations
# exclude everything
config/*
# exception to the rule
!config/.copyright
modules.config.js
vendor
.huskyrc
File renamed without changes.
59 changes: 59 additions & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
* See LICENSE for license details.
*/
const path = require("path");

module.exports = {
presets: ['@storybook/addon-docs/preset'],
stories: ['../stories/**/*.stories.(js|mdx)'],
addons: [
'@storybook/addon-actions',
'@storybook/addon-links',
'@storybook/addon-knobs',
],
webpack: async config => {
config.resolve.alias = {
...config.resolve.alias,
['@Core']: path.resolve(__dirname, '../modules/@ergo/core'),
};

config.module.rules.push({
test: /\.scss$/,
loaders: [
'style-loader',
'css-loader',
'sass-loader',
{
loader: 'sass-resources-loader',
options: {
resources: path.resolve(__dirname, '../modules/@ergo/core/assets/scss/main.scss')
}
}],
include: path.resolve(__dirname, '../'),
});

const mdxRules = config.module.rules.filter(({ test }) => {
return String(test) === String(/\.mdx$/) || String(test) === String(/\.(stories|story).mdx$/)
});
mdxRules.forEach(mdxRule => {
const [babelLoader] = mdxRule.use.filter(({ loader }) => loader === 'babel-loader');
babelLoader.options.presets = babelLoader.options.presets.filter(preset => !preset.includes('babel-preset-vue'))
});

config.module.rules.push({
test: /\.(mjs|jsx?)$/,
use: [{
loader: 'babel-loader',
options: {
cacheDirectory: path.resolve(__dirname, '../node_modules/.cache/storybook'),
presets: ['@vue/app'],
babelrc: false
}
}],
exclude: [path.resolve(__dirname, '../node_modules')]
});

return config
},
};
15 changes: 15 additions & 0 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/*
* Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
* See LICENSE for license details.
*/
import '!style-loader!css-loader!sass-loader!./reset-storybook.scss';
import { DocsPage, DocsContainer } from '@storybook/addon-docs/blocks';
import { addParameters } from '@storybook/vue';

addParameters({
docs: {
container: DocsContainer,
page: DocsPage,
inlineStories: true,
},
});
52 changes: 52 additions & 0 deletions .storybook/reset-storybook.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
* Copyright © Bold Brand Commerce Sp. z o.o. All rights reserved.
* See LICENSE for license details.
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
border: 0;
padding: 0;
margin: 0;
font: inherit;
font-size: 100%;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}

body {
line-height: 1;
}

ol, ul {
list-style: none;
}

blockquote, q {
quotes: none;
}

blockquote:before, blockquote:after,
q:before, q:after {
content: "";
content: none;
}

table {
border-collapse: collapse;
border-spacing: 0;
}
5 changes: 0 additions & 5 deletions .stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ nuxt.config.js
package.json
package-lock.json
router.js
.stylelintrc.js
Dockerfile
Jenkinsfile
node_modules/
Expand All @@ -11,8 +10,4 @@ build/
docker/
static/
coverage/
assets/scss/_variables/_colors.scss
assets/scss/_variables/_borders.scss
assets/scss/_variables/_elevators.scss
assets/scss/_variables/_indexes.scss

Loading

0 comments on commit 46b7684

Please sign in to comment.