Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
warehouse-management
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ascend
warehouse-management
Commits
40379059
Commit
40379059
authored
May 04, 2021
by
Alex Pinto
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feat/oauth' into 'master'
Feat/oauth See merge request
!3
parents
18141a34
7514afb5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
71 additions
and
4 deletions
+71
-4
.gitignore
.gitignore
+2
-1
package-lock.json
frontend/package-lock.json
+9
-0
package.json
frontend/package.json
+1
-0
App.jsx
frontend/src/App.jsx
+7
-3
Login.jsx
frontend/src/components/session/Login.jsx
+27
-0
Logout.jsx
frontend/src/components/session/Logout.jsx
+25
-0
No files found.
.gitignore
View file @
40379059
...
@@ -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
frontend/package-lock.json
View file @
40379059
...
@@ -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",
frontend/package.json
View file @
40379059
...
@@ -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"
,
...
...
frontend/src/App.jsx
View file @
40379059
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
>
);
);
}
}
...
...
frontend/src/components/session/Login.jsx
0 → 100644
View file @
40379059
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
frontend/src/components/session/Logout.jsx
0 → 100644
View file @
40379059
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
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment