From 88a000562667c523df81c7e649d14197b91c1c3f Mon Sep 17 00:00:00 2001 From: MIKIBUR Date: Fri, 26 Apr 2024 18:28:32 +0200 Subject: [PATCH] User Bar (#38) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mikołaj Burdzy --- package.json | 2 +- src/App.js | 3 ++ src/Tournaments/TournamentNav.js | 10 ----- src/Tournaments/TournamentsLeaderboard.js | 9 +++-- src/User/UserButtons.js | 47 +++++++++++++++++++++++ src/User/UserButtons.scss | 34 ++++++++++++++++ src/lists/TournamentsList.js | 22 ++--------- src/resources/logout.svg | 12 ++++++ src/resources/settings.svg | 5 +++ src/resources/user.svg | 5 +++ 10 files changed, 115 insertions(+), 34 deletions(-) create mode 100644 src/User/UserButtons.js create mode 100644 src/User/UserButtons.scss create mode 100644 src/resources/logout.svg create mode 100644 src/resources/settings.svg create mode 100644 src/resources/user.svg diff --git a/package.json b/package.json index f55d068..3385fa1 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "sass": "^1.69.5", "web-vitals": "^2.1.4" }, - "proxy": "http://localhost:8080/", + "proxy": "http://10.242.93.198:8080/", "scripts": { "start": "react-scripts start", "build": "react-scripts build", diff --git a/src/App.js b/src/App.js index 6fe8923..9d78e0e 100644 --- a/src/App.js +++ b/src/App.js @@ -1,10 +1,13 @@ import './App.scss' import User from "./User/User"; import {Link} from "react-router-dom"; +import UserButtons from './User/UserButtons'; function App() { return (
+ +

Bot-Wars

diff --git a/src/Tournaments/TournamentNav.js b/src/Tournaments/TournamentNav.js index f36a5d0..2d23a43 100644 --- a/src/Tournaments/TournamentNav.js +++ b/src/Tournaments/TournamentNav.js @@ -8,16 +8,6 @@ import { connect } from 'react-redux'; function TournamentNav({ isAuthenticated }) { return ( <> -
-
- Username - 1234 -
-
- {/* */} - set -
-