Commit 40379059 authored by Alex Pinto's avatar Alex Pinto

Merge branch 'feat/oauth' into 'master'

Feat/oauth

See merge request !3
parents 18141a34 7514afb5
...@@ -32,4 +32,5 @@ build/ ...@@ -32,4 +32,5 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
/frontend/node_modules/ /frontend/node_modules/
\ No newline at end of file /frontend/src/config/
\ No newline at end of file
...@@ -32377,6 +32377,15 @@ ...@@ -32377,6 +32377,15 @@
"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz", "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
"integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==" "integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="
}, },
"react-google-login": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/react-google-login/-/react-google-login-5.2.2.tgz",
"integrity": "sha512-JUngfvaSMcOuV0lFff7+SzJ2qviuNMQdqlsDJkUM145xkGPVIfqWXq9Ui+2Dr6jdJWH5KYdynz9+4CzKjI5u6g==",
"requires": {
"@types/react": "*",
"prop-types": "^15.6.0"
}
},
"react-icons": { "react-icons": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.2.0.tgz", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.2.0.tgz",
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"axios": "^0.21.1", "axios": "^0.21.1",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-google-login": "^5.2.2",
"react-icons": "^4.2.0", "react-icons": "^4.2.0",
"react-redux": "^7.2.4", "react-redux": "^7.2.4",
"react-scripts": "4.0.3", "react-scripts": "4.0.3",
......
import Login from "./components/session/Login";
import Logout from "./components/session/Logout";
import Header from "./components/header/Header"; import Header from "./components/header/Header";
import Footer from "./components/footer/Footer"; import Footer from "./components/footer/Footer";
import OrderIndex from "./components/order/OrderIndex" import OrderIndex from "./components/order/OrderIndex"
...@@ -5,9 +7,11 @@ import OrderIndex from "./components/order/OrderIndex" ...@@ -5,9 +7,11 @@ import OrderIndex from "./components/order/OrderIndex"
const App = () => { const App = () => {
return ( return (
<div className="app"> <div className="app">
<Header /> <Login />
<OrderIndex /> <Logout />
<Footer /> <Header />
<OrderIndex />
<Footer />
</div> </div>
); );
} }
......
import React from 'react';
import { GoogleLogin } from "react-google-login";
import keys from '../../config/keys_dev'
const clientId = keys.clientId;
const Login = () => {
const responseGoogle = (response) => {
console.log(response);
};
return (
<div>
<GoogleLogin
clientId={clientId}
buttonText="Login with Google"
onSuccess={responseGoogle}
onFailure={responseGoogle}
cookiePolicy={"single_host_origin"}
// isSignedIn={true}
/>
</div>
);
}
export default Login;
\ No newline at end of file
import React from "react";
import { GoogleLogout } from "react-google-login";
import keys from "../../config/keys_dev";
const clientId = keys.clientId;
const Logout = () => {
const responseGoogle = (response) => {
console.log(response);
};
return (
<div>
<GoogleLogout
clientId={clientId}
buttonText="Logout"
onLogoutSuccess={responseGoogle}
isSignedIn={true}
/>
</div>
);
};
export default Logout;
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