diff --git a/.eslintrc.js b/.eslintrc.js index 6ac8438..5925128 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -6,7 +6,7 @@ module.exports = { browser: true, es2021: true, node: true, - 'jest/globals': true + 'jest/globals': true, }, extends: [ 'plugin:react/recommended', @@ -19,12 +19,7 @@ module.exports = { parserOptions: { ecmaVersion: 7, }, - plugins: [ - 'react', - '@typescript-eslint', - 'jest', - 'testing-library' - ], + plugins: ['react', '@typescript-eslint', 'jest', 'testing-library'], rules: { '@typescript-eslint/dot-notation': 'off', '@typescript-eslint/no-implied-eval': 'off', @@ -34,10 +29,10 @@ module.exports = { 'max-len': ['error', { code: 200, ignoreTemplateLiterals: true, ignoreStrings: true }], 'import/no-extraneous-dependencies': 'off', 'react/jsx-filename-extension': 'off', - 'semi': 'error', + semi: 'error', 'object-curly-spacing': 'error', - 'indent': ['error', 2], - 'quotes': ['error', 'single', { 'allowTemplateLiterals': true, 'avoidEscape': true }], + indent: ['error', 2], + quotes: ['error', 'single', { allowTemplateLiterals: true, avoidEscape: true }], 'space-before-blocks': 'error', 'no-param-reassign': 'off', 'consistent-this': ['error', 'self'], @@ -98,18 +93,18 @@ module.exports = { }, }, { - 'files': ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)'], - 'extends': ['plugin:testing-library/react'], + files: ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)'], + extends: ['plugin:testing-library/react'], rules: { 'testing-library/prefer-screen-queries': 'off', - 'testing-library/no-node-access': 'off' - } + 'testing-library/no-node-access': 'off', + }, }, { files: ['./packages/**/src/**/index.js', './packages/**/src/**/index.d.ts'], - 'rules': { - 'no-restricted-exports': 'off' - } - } - ] + rules: { + 'no-restricted-exports': 'off', + }, + }, + ], }; diff --git a/.storybook/preview.js b/.storybook/preview.js index 08fee47..7d193eb 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,7 +1,8 @@ import { ThemeProvider } from 'emotion-theming'; -import { createTheme } from "@mui/material/styles"; +import { createTheme } from '@mui/material/styles'; import { THEME } from '@master-c8/theme'; +import { BrowserRouter } from 'react-router-dom'; const getHiredTheme = createTheme(THEME); @@ -14,25 +15,30 @@ const getStyles = ({ __sb } = {}) => ({ flexWrap: 'wrap', height: '100%', gap: '10px 30px', - alignItems: 'center' -}) + alignItems: 'center', +}); export const parameters = { - actions: { - argTypesRegex: "^on[A-Z].*" + actions: { + argTypesRegex: '^on[A-Z].*', }, controls: { matchers: { color: /(background|color)$/i, date: /Date$/, }, - } -} + }, +}; export const decorators = [ + (Story) => ( + + + + ), (Story) => ( - + ), (Story, { parameters }) => ( @@ -40,4 +46,4 @@ export const decorators = [ ), -]; \ No newline at end of file +]; diff --git a/package.json b/package.json index 7574533..5ba72fd 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "prettier": "2.4.1", "react": "17.0.2", "react-dom": "17.0.2", + "react-router-dom": "^6.0.2", "styled-components": "^5.3.3", "tsconfig-paths-webpack-plugin": "3.5.1", "typescript": "4.4.4", diff --git a/packages/components/package.json b/packages/components/package.json index 16ea624..4f2b29b 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@master-c8/commons", - "version": "0.0.6", + "version": "0.1.8", "private": false, "description": "Platzi Master C8 commons", "main": "./dist/index", @@ -45,8 +45,8 @@ } }, "dependencies": { - "@master-c8/theme": "0.1.3", - "@master-c8/icons": "0.1.0", + "@master-c8/theme": "0.1.9", + "@master-c8/icons": "0.1.3", "prop-types": "15.7.2" }, "publishConfig": { diff --git a/packages/components/src/Header/Header.js b/packages/components/src/Header/Header.js index 3a88bed..b9816fd 100644 --- a/packages/components/src/Header/Header.js +++ b/packages/components/src/Header/Header.js @@ -1,16 +1,20 @@ import PropTypes from 'prop-types'; +import { Link } from 'react-router-dom'; + import { Button, Container } from '@mui/material'; import { Logotype } from '@master-c8/commons'; import { HeaderContent, BtnGroup } from './Header.styles'; -const Header = ({ onClickLogin, onClickSignup, isLogged, children }) => { +const Header = ({ onClickLogin, onClickSignup, isLogged, children, route }) => { return ( - + + + {!isLogged && (