aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--frontend/package-lock.json14
-rw-r--r--frontend/package.json1
-rw-r--r--frontend/src/components/login.js26
3 files changed, 17 insertions, 24 deletions
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 9bfe340..0c4569a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -11,7 +11,6 @@
11 "@testing-library/jest-dom": "^5.16.5", 11 "@testing-library/jest-dom": "^5.16.5",
12 "@testing-library/react": "^13.4.0", 12 "@testing-library/react": "^13.4.0",
13 "@testing-library/user-event": "^13.5.0", 13 "@testing-library/user-event": "^13.5.0",
14 "js-cookie": "^3.0.5",
15 "react": "^18.2.0", 14 "react": "^18.2.0",
16 "react-dom": "^18.2.0", 15 "react-dom": "^18.2.0",
17 "react-scripts": "5.0.1", 16 "react-scripts": "5.0.1",
@@ -11531,14 +11530,6 @@
11531 "url": "https://github.com/chalk/supports-color?sponsor=1" 11530 "url": "https://github.com/chalk/supports-color?sponsor=1"
11532 } 11531 }
11533 }, 11532 },
11534 "node_modules/js-cookie": {
11535 "version": "3.0.5",
11536 "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
11537 "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
11538 "engines": {
11539 "node": ">=14"
11540 }
11541 },
11542 "node_modules/js-sdsl": { 11533 "node_modules/js-sdsl": {
11543 "version": "4.3.0", 11534 "version": "4.3.0",
11544 "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", 11535 "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
@@ -25466,11 +25457,6 @@
25466 } 25457 }
25467 } 25458 }
25468 }, 25459 },
25469 "js-cookie": {
25470 "version": "3.0.5",
25471 "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
25472 "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="
25473 },
25474 "js-sdsl": { 25460 "js-sdsl": {
25475 "version": "4.3.0", 25461 "version": "4.3.0",
25476 "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", 25462 "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 72e2117..123a434 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -6,7 +6,6 @@
6 "@testing-library/jest-dom": "^5.16.5", 6 "@testing-library/jest-dom": "^5.16.5",
7 "@testing-library/react": "^13.4.0", 7 "@testing-library/react": "^13.4.0",
8 "@testing-library/user-event": "^13.5.0", 8 "@testing-library/user-event": "^13.5.0",
9 "js-cookie": "^3.0.5",
10 "react": "^18.2.0", 9 "react": "^18.2.0",
11 "react-dom": "^18.2.0", 10 "react-dom": "^18.2.0",
12 "react-scripts": "5.0.1", 11 "react-scripts": "5.0.1",
diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 4ef1e2a..258e9c7 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -1,6 +1,5 @@
1import React from 'react'; 1import React from 'react';
2import { Link } from "react-router-dom"; 2import { Link } from "react-router-dom";
3import Cookies from "js-cookie";
4 3
5import "./login.css"; 4import "./login.css";
6import img1 from "../imgs/login.png" 5import img1 from "../imgs/login.png"
@@ -10,22 +9,31 @@ import img3 from "../imgs/11.png"
10 9
11export default function Login() { 10export default function Login() {
12 11
13const isLoggedIn = Cookies.get('token') !== undefined; 12function login() {
14 13 window.location.href="https://lp.ardapektezol.com/api/v1/login"
14}
15function logout() { 15function logout() {
16 Cookies.remove('token') 16 setToken(null)
17 window.location.href="/" 17 window.location.href="/"
18} 18}
19 19
20const [data, setData] = React.useState(); 20const [token, setToken] = React.useState(null);
21const isLoggedIn = token !== null;
22React.useEffect(() => {
23 fetch(`/api/v1/token`)
24 .then(r => {console.log(r)})
25 .then(d => {setToken(d.data.token);console.log(d)})
26 }, []);
27
28const [[profile], setProfile] = React.useState();
21React.useEffect(() => { 29React.useEffect(() => {
22 fetch(`/api/v1/profile`,{ 30 fetch(`/api/v1/profile`,{
23 headers: { 31 headers: {
24 'Content-Type': 'application/json', 32 'Content-Type': 'application/json',
25 Authorization: Cookies.get('token') 33 Authorization: token
26 }}) 34 }})
27 .then(r => {console.log(r)}) 35 .then(r => {console.log(r)})
28 .then(d => {setData(d);console.log(d)}) 36 .then(d => {setProfile(d);console.log(d)})
29 }, []); 37 }, []);
30 38
31return ( 39return (
@@ -39,8 +47,8 @@ return (
39 <button onClick={logout}><img src={img3} alt="" /><span></span></button> 47 <button onClick={logout}><img src={img3} alt="" /><span></span></button>
40 </Link> 48 </Link>
41 ) : ( 49 ) : (
42 <Link to="/api/v1/login" className='login'> 50 <Link className='login'>
43 <button> 51 <button onClick={login}>
44 <img src={img2} alt="" /> 52 <img src={img2} alt="" />
45 <span><img src={img1} alt="Sign in through Steam" /></span> 53 <span><img src={img1} alt="Sign in through Steam" /></span>
46 </button> 54 </button>