From 2fa39cb3e9eabd188b353751797a989da4aad74d Mon Sep 17 00:00:00 2001 From: Cristiano Pires Date: Wed, 11 Oct 2023 08:09:25 +0100 Subject: [PATCH] - --- public/main.js | 2 +- public/preload.js | 6 +++--- src/Components/Login.css | 4 +--- src/Components/Navigation.js | 9 ++------- src/Pages/Home.css | 16 +++++++++++++--- src/Pages/Home.js | 6 ++---- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/public/main.js b/public/main.js index 8c6f317..47f8f94 100644 --- a/public/main.js +++ b/public/main.js @@ -45,7 +45,7 @@ ipcMain.on('maximize', (event, data) => }) ipcMain.on('minimize', (event, data) => { - window.hide(); + window.minimize(); }); ipcMain.on('login', async (event, data) => { diff --git a/public/preload.js b/public/preload.js index 32ac4ef..87cd369 100644 --- a/public/preload.js +++ b/public/preload.js @@ -6,7 +6,7 @@ const ipc = { 'send': [ 'close', 'maximize', - 'minimze', + 'minimize', 'login', 'register', ], @@ -14,7 +14,7 @@ const ipc = { 'receive': [ 'close', 'maximize', - 'minimze', + 'minimize', 'login', 'register', ], @@ -22,7 +22,7 @@ const ipc = { 'sendReceive':[ 'close', 'maximize', - 'minimze', + 'minimize', 'login', 'register', ] diff --git a/src/Components/Login.css b/src/Components/Login.css index e5517ba..c9b1cd1 100644 --- a/src/Components/Login.css +++ b/src/Components/Login.css @@ -18,7 +18,6 @@ span .bt { - width: auto; height: 2em; background-color: rgba(0, 0, 0, 0); border: 1px solid rgba(0, 0, 0, 0); @@ -28,7 +27,6 @@ span } .Login { - float:left; + min-width: 2em; position: relative; - left:2em; } diff --git a/src/Components/Navigation.js b/src/Components/Navigation.js index 86488b2..5ef119e 100644 --- a/src/Components/Navigation.js +++ b/src/Components/Navigation.js @@ -1,11 +1,9 @@ import './Navigation.css'; + import {HashRouter,Link,Route,Routes} from "react-router-dom"; -import Login from "../Components/Login"; import Games from "../Pages/Games" -import Listener from "../Pages/Listener" import Leagues from "../Pages/Leagues" -import Home from "../Pages/Home" import React from "react"; class Navigation extends React.Component @@ -15,16 +13,13 @@ class Navigation extends React.Component return (
-

Home

Leagues

My Games

+ - }/> }/> }/> - }/> - }/>
); diff --git a/src/Pages/Home.css b/src/Pages/Home.css index f21053b..9e4109b 100644 --- a/src/Pages/Home.css +++ b/src/Pages/Home.css @@ -1,15 +1,25 @@ .tempNavBar { position: relative; - top:3em; + top:5em; display: flex; - left: calc(50% - 6em); + left: calc(50% - 7em); + gap: 2em; } + .btTempNav { min-width: 5em; text-decoration: none; position: relative; color:ivory; - background-color: red; + padding: 0.5em 0.5em 0.5em 0.5em; + border-radius: 4px; + background-color: rgba(22, 59, 59, 0.521); } +body +{ + overflow-x:hidden; + height:auto ; + position: relative; +} \ No newline at end of file diff --git a/src/Pages/Home.js b/src/Pages/Home.js index 65d8c11..d00d5a6 100644 --- a/src/Pages/Home.js +++ b/src/Pages/Home.js @@ -1,6 +1,6 @@ import React from 'react'; import './Home.css' -import {HashRouter,Link,Route,Routes, redirect} from "react-router-dom"; +import {HashRouter,Link,Route,Routes, Navigate} from "react-router-dom"; import Login from "../Components/Login"; @@ -10,7 +10,6 @@ const { cookieSlicer } = require("../lib"); function Home() { var Hash = cookieSlicer(document.cookie,'Hash'); - // console.log(Hash) return ( @@ -22,11 +21,10 @@ function Home() { (
-

Login

Register

- + }/> }/>