Skip to content

Commit

Permalink
update nextjs and change rules eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
@CarlosZiegler
CarlosZiegler committed Nov 1, 2020
1 parent 4887ec1 commit bca440b
Show file tree
Hide file tree
Showing 12 changed files with 2,214 additions and 1,905 deletions.
51 changes: 15 additions & 36 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,16 @@
"jest": true
},
"parser": "babel-eslint",
"extends": [
"airbnb",
"plugin:react/recommended",
"eslint:recommended"
],
"extends": ["airbnb", "plugin:react/recommended", "eslint:recommended"],
"settings": {
"import/resolver": {
"alias": {
"map": [
[
"@assets",
"./src/assets"
],
[
"@components",
"./src/components"
],
[
"@services",
"./src/services"
],
[
"@styles",
"./styles"
],
[
"@utils",
"./src/utils"
]
["@assets", "./src/assets"],
["@components", "./src/components"],
["@services", "./src/services"],
["@styles", "./styles"],
["@utils", "./src/utils"]
]
}
}
Expand All @@ -46,9 +27,7 @@
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": [
"react"
],
"plugins": ["react"],
"rules": {
"react/react-in-jsx-scope": "off",
"react/jsx-props-no-spreading": "off",
Expand All @@ -59,21 +38,21 @@
"consistent-return": "off",
"no-underscore-dangle": "off",
"react/no-unescaped-entities": "off",
"jsx-a11y/no-interactive-element-interactions": "off",
"jsx-a11y/click-events-have-key-events": "off",
"jsx-a11y/no-static-element-interactions": "off",
"react/jsx-one-expression-per-line": "off",
"no-alert": "off",
"comma-dangle": "off",
"react/jsx-filename-extension": [
1,
{
"extensions": [
".js",
".jsx"
]
"extensions": [".js", ".jsx"]
}
],
"react/prop-types": 0,
"react/jsx-indent": "off",
"indent": [
2,
2
],
"indent": [2, 2],
"arrow-parens": "off",
"object-curly-newline": "off"
}
Expand Down
55 changes: 55 additions & 0 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"workbench.startupEditor": "newUntitledFile",
"workbench.colorTheme": "Dracula",
"liveServer.settings.donotVerifyTags": true,
"terminal.integrated.shell.osx": "/bin/zsh",
"workbench.iconTheme": "material-icon-theme",
"editor.rulers": [
80,
120
],
"editor.renderLineHighlight": "gutter",
"editor.tabSize": 4,
"emmet.includeLanguages": {
"javascript": "javascriptreact"
},
"emmet.syntaxProfiles": {
"javascript": "jsx"
},
"javascript.updateImportsOnFileMove.enabled": "never",
"editor.parameterHints.enabled": false,
"breadcrumbs.enabled": true,
"javascript.suggest.autoImports": false,
"window.zoomLevel": 1,
"sqltools.useNodeRuntime": true,
"editor.maxTokenizationLineLength": 175,
"tabnine.experimentalAutoImports": true,
"sync.gist": "a5af6793fd54698cf8ac01abca3f22bc",
"sync.autoDownload": true,
"sync.autoUpload": true,
"sync.quietSync": true,
"eslint.format.enable": true,
"eslint.debug": true,
"eslint.options": {},
"launch": {
"configurations": [],
"compounds": []
},
"editor.formatOnSave": true,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
},
"editor.codeActionsOnSave": { "source.fixAll.eslint": true },
"eslint.validate": [
"javascript",
"javascriptreact",
],
"prettier.eslintIntegration": true,
"eslint.alwaysShowStatus": true,
"eslint.workingDirectories": [{ "mode": "auto" }]
}
10 changes: 5 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
"dependencies": {
"@material-ui/core": "^4.11.0",
"axios": "^0.19.2",
"next": "9.4.2",
"react": "16.13.1",
"react-dom": "16.13.1",
"next": "^10.0.0",
"next-images": "^1.4.1",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-ga": "^2.7.0",
"react-lottie": "^1.2.3",
"react-router-dom": "^5.2.0",
Expand All @@ -28,8 +29,7 @@
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.20.0",
"eslint-plugin-react-hooks": "^4.0.2",
"next-images": "^1.4.1"
"eslint-plugin-react-hooks": "^4.0.2"
},
"eslintConfig": {
"extends": [
Expand Down
36 changes: 24 additions & 12 deletions src/components/MenuButton/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import Router from 'next/router';
import Button from '@material-ui/core/Button';
import Menu from '@material-ui/core/Menu';
import MenuItem from '@material-ui/core/MenuItem';
Expand All @@ -10,7 +9,7 @@ export default function SimpleMenu() {
const [isReady, setIsReady] = React.useState(false);
const [token, setToken] = React.useState(null);

const handleClick = (event) => {
const handleClick = event => {
setAnchorEl(event.currentTarget);
};

Expand All @@ -19,11 +18,11 @@ export default function SimpleMenu() {
};

React.useEffect(() => {
setIsReady((isReady) => isReady = true);
setIsReady(true);
}, []);

React.useEffect(() => {
if (isReady != false) {
if (isReady !== false) {
setToken(localStorage.getItem('token'));
}
}, [isReady]);
Expand All @@ -33,9 +32,13 @@ export default function SimpleMenu() {
};

return (

<div>
<Button className="btn-menu" aria-controls="simple-menu" aria-haspopup="true" onClick={handleClick}>
<Button
className="btn-menu"
aria-controls="simple-menu"
aria-haspopup="true"
onClick={handleClick}
>
<span>Menu</span>
</Button>
<Menu
Expand All @@ -46,29 +49,38 @@ export default function SimpleMenu() {
onClose={handleClose}
>
<MenuItem onClick={handleClose}>
<a href="/" className="menu-item">Home</a>
<a href="/" className="menu-item">
Home
</a>
</MenuItem>
{!token && (
<div>
<MenuItem onClick={handleClose}>
<a href="/login" className="menu-item">Login</a>
<a href="/login" className="menu-item">
Login
</a>
</MenuItem>
<MenuItem onClick={handleClose}>
<a href="/signup" className="menu-item">Signup</a>
<a href="/signup" className="menu-item">
Signup
</a>
</MenuItem>
</div>
)}
{token && (
<div>
<MenuItem onClick={handleClose}>
<a href="/main" className="menu-item">Main</a>
<a href="/main" className="menu-item">
Main
</a>
</MenuItem>
<MenuItem onClick={handleClose}>
<a className="menu-item" onClick={handleLogout}>Logout</a>
<a className="menu-item" onClick={handleLogout}>
Logout
</a>
</MenuItem>
</div>
)}

</Menu>
</div>
);
Expand Down
42 changes: 22 additions & 20 deletions src/pages/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import React, { useState } from 'react';
import Router from 'next/router';
import React from 'react';
import Link from 'next/link';
import api from '@services/Api';

import Navbar from '@components/Navbar';
import Footer from '@components/Footer';
Expand All @@ -15,33 +13,37 @@ export default function Home() {
<div className="content">
<Navbar />
<div className="header-content">
<img className="main-img" src={hireImg} alt="Hire Image" />
<img className="main-img" src={hireImg} alt="Hire" />
<p className="main-text">
Somos uma plataforma
{' '}
<span className="text-bold"> GRATUITA </span>
que busca conectar recrutadores e profissionais.
Somos uma plataforma <span className="text-bold"> GRATUITA </span>
que busca conectar recrutadores e profissionais.
</p>
<span className="text-ask">
E você, quem é?
</span>
<span className="text-ask">E você, quem é?</span>
<div className="btn-header-group">
<Link href="/vagas"><a className="btn-primary">Eu estou procurando novo emprego</a></Link>
<Link href="/signup"><a className="btn-secondary">Eu estou procurando profissionais</a></Link>
<Link href="/vagas">
<a className="btn-primary">Eu estou procurando novo emprego</a>
</Link>
<Link href="/signup">
<a className="btn-secondary">Eu estou procurando profissionais</a>
</Link>
</div>
</div>
<div className="partner-container">
<h3 className="partner-title">
Empresas Solidarias
</h3>
<h3 className="partner-title">Empresas Solidarias</h3>
<p className="partner-content">
Qual está sendo sua ação diante do mundo e o legado que irá deixar?
Qual está sendo sua ação diante do mundo e o legado que irá deixar?
</p>
<div className="partner-logo">
<a href="https://gama.academy/"><img src={gamaLogo} alt="" className="Gama Academy" /></a>
<a href="http://talkntalk.com.br/"><img src={tntLogo} alt="" className="TNT" /></a>
<a href="https://gama.academy/">
<img src={gamaLogo} alt="" className="Gama Academy" />
</a>
<a href="http://talkntalk.com.br/">
<img src={tntLogo} alt="" className="TNT" />
</a>
</div>
<Link href="/parcerias"><a className="btn-yellow">Saiba Mais</a></Link>
<Link href="/parcerias">
<a className="btn-yellow">Saiba Mais</a>
</Link>
</div>
<Footer />
</div>
Expand Down
37 changes: 29 additions & 8 deletions src/pages/login/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ export default function Login() {
const [password, setPassword] = useState('');
const [error, setError] = useState(null);


const handleLogin = async () => {
const result = await userLogin(email, password);
if (result) {
Expand All @@ -28,15 +27,37 @@ export default function Login() {
<img src={loginImg} alt="" className="login-img" />
<form className="login-form">
<h1 className="no-margin text-navy">Bem vindo de volta!</h1>
<label htmlFor="email" className="label">Email:</label>
<input type="text" id="email" className="form-input" placeholder="Email" required onChange={(e) => setEmail(e.target.value.toLowerCase())} />
<label htmlFor="senha" className="label">Senha:</label>
<input type="password" id="senha" className="form-input" placeholder="Password" required onChange={(e) => setPassword(e.target.value)} />
<label htmlFor="email" className="label">
Email:
</label>
<input
type="text"
id="email"
className="form-input"
placeholder="Email"
required
onChange={e => setEmail(e.target.value.toLowerCase())}
/>
<label htmlFor="senha" className="label">
Senha:
</label>
<input
type="password"
id="senha"
className="form-input"
placeholder="Password"
required
onChange={e => setPassword(e.target.value)}
/>
{error && <span className="text-danger">{error?.message}</span>}
<button className="btn-green" type="button" onClick={() => handleLogin()}>LOGIN</button>
<button className="btn-green" type="button" onClick={() => handleLogin()}>
LOGIN
</button>
<p className="text-after">
Don't have an account?
<Link href="/signup"><a>Signup</a></Link>
Don't have an account?
<Link href="/signup">
<a>Signup</a>
</Link>
</p>
</form>
</div>
Expand Down
Loading

0 comments on commit bca440b

Please sign in to comment.