Browse Source

Added login redirection and login momorization

master
ss.pedroisac 5 years ago
parent
commit
4a36e5286f
10 changed files with 70 additions and 11 deletions
  1. +1
    -2
      .gitignore
  2. +2
    -1
      User/settings.json
  3. +1
    -1
      User/state/24ce6c0.json
  4. +1
    -1
      User/state/global.json
  5. BIN
      dbs/social.mv.db
  6. +6
    -0
      dbs/social.trace.db
  7. +3
    -1
      website/src/App.js
  8. +28
    -5
      website/src/pages/Login/index.js
  9. +28
    -0
      website/src/pages/Main/index.js
  10. +0
    -0
      website/src/pages/Main/index.less

+ 1
- 2
.gitignore View File

@ -1,4 +1,5 @@
node_modules/ node_modules/
extensions
.DS_Store .DS_Store
*.log *.log
.idea/ .idea/
@ -9,9 +10,7 @@ CachedExtensionVSIXs
machineid machineid
/trash/* /trash/*
languagepacks.json languagepacks.json
extensions
logs logs
.Trash .Trash
*~* *~*

+ 2
- 1
User/settings.json View File

@ -9,5 +9,6 @@
"[javascript]": { "[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode", "editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true "editor.formatOnSave": true
}
},
"explorer.confirmDragAndDrop": false
} }

+ 1
- 1
User/state/24ce6c0.json
File diff suppressed because it is too large
View File


+ 1
- 1
User/state/global.json
File diff suppressed because it is too large
View File


BIN
dbs/social.mv.db View File


+ 6
- 0
dbs/social.trace.db View File

@ -3188,3 +3188,9 @@ select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-13 12:30:42 jdbc[3]: exception 2021-04-13 12:30:42 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement: org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198] select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-13 23:10:44 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]
2021-04-17 13:16:05 jdbc[3]: exception
org.h2.jdbc.JdbcSQLDataException: Data conversion error converting "social-netuno"; SQL statement:
select * from netuno_app where uid = 'social-netuno' [22018-198]

+ 3
- 1
website/src/App.js View File

@ -4,6 +4,7 @@ import { BrowserRouter, Switch, Route } from "react-router-dom";
import Home from "./pages/Home"; import Home from "./pages/Home";
import Login from "./pages/Login"; import Login from "./pages/Login";
import Register from "./pages/Register"; import Register from "./pages/Register";
import Main from './pages/Main';
function App() { function App() {
return ( return (
@ -12,7 +13,8 @@ function App() {
<Switch> <Switch>
<Route path="/" exact component={Home} /> <Route path="/" exact component={Home} />
<Route path="/login" component={Login} /> <Route path="/login" component={Login} />
<Route path="/register" exact component={Register} />
<Route path="/register" component={Register} />
<Route path="/main" component={Main} />
</Switch> </Switch>
</BrowserRouter> </BrowserRouter>
</div> </div>


+ 28
- 5
website/src/pages/Login/index.js View File

@ -1,8 +1,9 @@
import React from "react";
import React, { useState } from "react";
import "./index.less"; import "./index.less";
import Header from "../../components/Header"; import Header from "../../components/Header";
import { Form, Input, Button, Checkbox, Row, Col } from "antd";
import { Form, Input, Button, Checkbox, Row, Col, notification } from "antd";
import _auth from "@netuno/auth-client"; import _auth from "@netuno/auth-client";
import { Redirect } from "react-router-dom";
const layout = { const layout = {
labelCol: { span: 4 }, labelCol: { span: 4 },
@ -14,15 +15,24 @@ const tailLayout = {
}; };
const Login = () => { const Login = () => {
const [isLogged, setIsLogged] = useState(false);
const onFinish = (values) => { const onFinish = (values) => {
_auth.login({ _auth.login({
username: values.username, username: values.username,
password: values.password, password: values.password,
success: () => { success: () => {
alert("Login efetuado");
setIsLogged(true);
if (values.remember) {
localStorage.setItem("login", JSON.stringify(values));
} else {
localStorage.removeItem("login");
}
}, },
fail: () => { fail: () => {
alert("ocorreu um erro");
notification["error"]({
message: "Ocorreu um erro",
description: "Não foi possível realizar o login.",
});
}, },
}); });
}; };
@ -30,6 +40,15 @@ const Login = () => {
const onFinishFailed = (errorInfo) => { const onFinishFailed = (errorInfo) => {
console.log("Failed:", errorInfo); console.log("Failed:", errorInfo);
}; };
let initialValues = {
remember: true,
};
if (localStorage.getItem("login")) {
initialValues = JSON.parse(localStorage.getItem("login"));
}
if (_auth.isLogged()) {
return <Redirect to="/main" />;
}
return ( return (
<div className="login"> <div className="login">
<Header /> <Header />
@ -38,6 +57,7 @@ const Login = () => {
<Col span={12}> <Col span={12}>
<Form <Form
{...layout} {...layout}
initialValues={initialValues}
className="login__form" className="login__form"
onFinish={onFinish} onFinish={onFinish}
onFinishFailed={onFinishFailed} onFinishFailed={onFinishFailed}
@ -46,7 +66,10 @@ const Login = () => {
label="Username" label="Username"
name="username" name="username"
rules={[ rules={[
{ required: true, message: "Por favor digite o seu nome de usuário." }
{
required: true,
message: "Por favor digite o seu nome de usuário.",
},
]} ]}
> >
<Input /> <Input />


+ 28
- 0
website/src/pages/Main/index.js View File

@ -0,0 +1,28 @@
import React, { useState } from "react";
import "./index.less";
import { Redirect } from "react-router-dom";
import _auth from "@netuno/auth-client";
const Main = () => {
const [isLogged, setIsLogged] = useState(true);
if (!_auth.isLogged()) {
return <Redirect to="/login" />;
} else {
console.log(_auth.isLogged);
return (
<div>
Bem-vindo
<button
onClick={() => {
_auth.logout();
setIsLogged(false);
}}
>
Sair
</button>
</div>
);
}
};
export default Main;

+ 0
- 0
website/src/pages/Main/index.less View File


Loading…
Cancel
Save