From 51a553ad7912525a286bf9d18ceb028c266c5561 Mon Sep 17 00:00:00 2001 From: Nidboj132 Date: Sat, 6 May 2023 17:16:43 +0200 Subject: login test --- frontend/src/components/login.js | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'frontend/src/components') 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 @@ import React from 'react'; import { Link } from "react-router-dom"; -import Cookies from "js-cookie"; import "./login.css"; import img1 from "../imgs/login.png" @@ -10,22 +9,31 @@ import img3 from "../imgs/11.png" export default function Login() { -const isLoggedIn = Cookies.get('token') !== undefined; - +function login() { + window.location.href="https://lp.ardapektezol.com/api/v1/login" +} function logout() { - Cookies.remove('token') + setToken(null) window.location.href="/" } -const [data, setData] = React.useState(); +const [token, setToken] = React.useState(null); +const isLoggedIn = token !== null; +React.useEffect(() => { + fetch(`/api/v1/token`) + .then(r => {console.log(r)}) + .then(d => {setToken(d.data.token);console.log(d)}) + }, []); + +const [[profile], setProfile] = React.useState(); React.useEffect(() => { fetch(`/api/v1/profile`,{ headers: { 'Content-Type': 'application/json', - Authorization: Cookies.get('token') + Authorization: token }}) .then(r => {console.log(r)}) - .then(d => {setData(d);console.log(d)}) + .then(d => {setProfile(d);console.log(d)}) }, []); return ( @@ -39,8 +47,8 @@ return ( ) : ( - - -- cgit v1.2.3 From e2fd1fc093b72f045f49a4bc95a7b0d809cba754 Mon Sep 17 00:00:00 2001 From: Nidboj132 Date: Sat, 6 May 2023 17:22:48 +0200 Subject: login test --- frontend/src/components/login.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'frontend/src/components') diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js index 258e9c7..507cf5b 100644 --- a/frontend/src/components/login.js +++ b/frontend/src/components/login.js @@ -25,7 +25,7 @@ React.useEffect(() => { .then(d => {setToken(d.data.token);console.log(d)}) }, []); -const [[profile], setProfile] = React.useState(); +const [profile, setProfile] = React.useState(); React.useEffect(() => { fetch(`/api/v1/profile`,{ headers: { -- cgit v1.2.3 From 9d532e86571453c5db59979416fc0428f2e80a22 Mon Sep 17 00:00:00 2001 From: Nidboj132 Date: Sat, 6 May 2023 17:51:01 +0200 Subject: login test --- frontend/src/components/login.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'frontend/src/components') diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js index 507cf5b..558bc8f 100644 --- a/frontend/src/components/login.js +++ b/frontend/src/components/login.js @@ -16,13 +16,15 @@ function logout() { setToken(null) window.location.href="/" } - const [token, setToken] = React.useState(null); const isLoggedIn = token !== null; React.useEffect(() => { fetch(`/api/v1/token`) - .then(r => {console.log(r)}) - .then(d => {setToken(d.data.token);console.log(d)}) + .then(r => r.json()) + .then(d => { + setToken(d.data.token); + console.log(d); + }) }, []); const [profile, setProfile] = React.useState(); @@ -32,10 +34,11 @@ React.useEffect(() => { 'Content-Type': 'application/json', Authorization: token }}) - .then(r => {console.log(r)}) + .then(r => r.json()) .then(d => {setProfile(d);console.log(d)}) }, []); + return ( <> {isLoggedIn ? ( -- cgit v1.2.3 From 022e927b77f4d8dd8711645e314b97628a2c55f4 Mon Sep 17 00:00:00 2001 From: Nidboj132 Date: Sat, 6 May 2023 17:59:09 +0200 Subject: login test --- frontend/package-lock.json | 14 ++++++++++++++ frontend/package.json | 1 + frontend/src/components/login.js | 4 +++- 3 files changed, 18 insertions(+), 1 deletion(-) (limited to 'frontend/src/components') diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 0c4569a..9bfe340 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -11,6 +11,7 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "js-cookie": "^3.0.5", "react": "^18.2.0", "react-dom": "^18.2.0", "react-scripts": "5.0.1", @@ -11530,6 +11531,14 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/js-cookie": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", + "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", + "engines": { + "node": ">=14" + } + }, "node_modules/js-sdsl": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", @@ -25457,6 +25466,11 @@ } } }, + "js-cookie": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", + "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==" + }, "js-sdsl": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 123a434..72e2117 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,6 +6,7 @@ "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^13.5.0", + "js-cookie": "^3.0.5", "react": "^18.2.0", "react-dom": "^18.2.0", "react-scripts": "5.0.1", diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js index 558bc8f..8dea383 100644 --- a/frontend/src/components/login.js +++ b/frontend/src/components/login.js @@ -1,5 +1,6 @@ import React from 'react'; import { Link } from "react-router-dom"; +import Cookies from 'js-cookie'; import "./login.css"; import img1 from "../imgs/login.png" @@ -13,6 +14,7 @@ function login() { window.location.href="https://lp.ardapektezol.com/api/v1/login" } function logout() { + Cookies.remove('token') setToken(null) window.location.href="/" } @@ -36,7 +38,7 @@ React.useEffect(() => { }}) .then(r => r.json()) .then(d => {setProfile(d);console.log(d)}) - }, []); + }, [token]); return ( -- cgit v1.2.3