Commit 3ffc9893 authored by Luis Gustavo Arseno Santana's avatar Luis Gustavo Arseno Santana
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !15
parents 13b7fddc 27f48b4d
{
"dev":{
"REACT_APP_API_URL": "localhost",
"REACT_APP_API_PORT": "3000",
"PORT": "8080"
},
"hom":{
"REACT_APP_API_URL": "3.81.165.52",
"REACT_APP_API_PORT": "3000",
"PORT": "80"
}
}
{
"env": {
"browser": true,
"commonjs": true,
"es6": true
},
"extends": ["plugin:react/recommended", "airbnb"],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly"
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaFeatures": {
"jsx": true,
"js": true
},
"ecmaVersion": 2018
},
"plugins": ["react"],
"rules": {
"react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
"import/no-extraneous-dependencies": [
"error",
{
"devDependencies": ["*/.stories.*"]
}
],
"no-alert": 0,
"no-console": 0,
"react/destructuring-assignment": 0,
"react/prop-types": 0,
"react/jsx-props-no-spreading": 0
}
}
\ No newline at end of file
# compiled output
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out
# dependencies
/node_modules
# profiling files
chrome-profiler-events*.json
speed-measure-plugin*.json
# IDEs and editors
/.idea
.prettierrc
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace
# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*
# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings
# System Files
.DS_Store
Thumbs.db
module.exports = {
stories: ['../src/**/*.stories.js'],
addons: [
'@storybook/preset-create-react-app',
'@storybook/addon-actions',
'@storybook/addon-links',
'@storybook/addon-info'
],
};
# Rede de Mentores Frontend # Rede de Mentores Frontend
Esse projeto é o frontend do projeto Rede de mentores Esse projeto é o frontend do projeto Rede de mentores
\ No newline at end of file
# temos que terminar o README.md
This diff is collapsed.
...@@ -3,18 +3,32 @@ ...@@ -3,18 +3,32 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@material-ui/core": "^4.9.14",
"@material-ui/icons": "^4.9.1",
"@material/react-layout-grid": "^0.15.0",
"@testing-library/jest-dom": "^4.2.4", "@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0", "@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1", "@testing-library/user-event": "^7.2.1",
"axios": "^0.19.2",
"material-components-web": "^5.1.0",
"notistack": "^0.9.17",
"prop-types": "^15.7.2",
"react": "^16.13.1", "react": "^16.13.1",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"react-scripts": "3.4.1" "react-icons": "^3.10.0",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
"react-scripts": "3.4.1",
"styled-components": "^5.0.1"
}, },
"scripts": { "scripts": {
"start": "react-scripts start", "start": "env-cmd -r .env-cmdrc.json -e dev react-scripts start",
"build": "react-scripts build", "build": "react-scripts build",
"start-hom": "env-cmd -r .env-cmdrc.json -e hom react-scripts start",
"test": "react-scripts test", "test": "react-scripts test",
"eject": "react-scripts eject" "eject": "react-scripts eject",
"storybook": "start-storybook -p 9009 -s public",
"build-storybook": "build-storybook -s public"
}, },
"eslintConfig": { "eslintConfig": {
"extends": "react-app" "extends": "react-app"
...@@ -30,5 +44,22 @@ ...@@ -30,5 +44,22 @@
"last 1 firefox version", "last 1 firefox version",
"last 1 safari version" "last 1 safari version"
] ]
},
"devDependencies": {
"@storybook/addon-actions": "^5.3.18",
"@storybook/addon-info": "^5.3.18",
"@storybook/addon-links": "^5.3.18",
"@storybook/addons": "^5.3.18",
"@storybook/preset-create-react-app": "^2.1.1",
"@storybook/react": "^5.3.18",
"babel-eslint": "^10.1.0",
"env-cmd": "^10.1.0",
"eslint": "^6.8.0",
"eslint-config-airbnb": "^18.1.0",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.19.0",
"eslint-plugin-react-hooks": "^2.5.1",
"prettier-eslint": "^9.0.1"
} }
} }
{
"singleQuote": true,
"trailingComma": "es5",
"arrowParens": "always",
"no-unused-vars": [2, { "vars": "all", "varsIgnorePattern": "[iI]gnored" }]
}
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL. work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`. Learn how to configure a non-root public URL by running `npm run build`.
--> -->
<title>React App</title> <title>Rede de Mentores</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>
......
No preview for this file type
import React from 'react';
import './index.css';
import Routes from './routes';
function App() {
return <Routes />;
}
export default App;
import React from 'react';
export default function RefrashIcon() {
return (
<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" height="24" viewBox="0 0 24 24" width="24">
<path d="M0 0h24v24H0z" fill="none" />
<path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z" />
</svg>
);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment