diff --git a/Frontend/src/Components/App.jsx b/Frontend/src/Components/App.jsx index 4ae2a6e..ed69f75 100644 --- a/Frontend/src/Components/App.jsx +++ b/Frontend/src/Components/App.jsx @@ -13,15 +13,17 @@ import Login from './Login'; function App() { + const [admin,setAdmin]=useState(false) + useEffect(() => { - if(localStorage.islogin===undefined) + if(localStorage.getItem("islogin")==null) { localStorage.setItem('islogin','') } + if(localStorage.getItem("islogin")==="loggedin"){ + setAdmin(true); + } }, []) - const value= (localStorage.getItem('islogin')==='')? false : true; - - const [admin,setAdmin]=useState(value) return ( <> diff --git a/Frontend/src/Components/Login.js b/Frontend/src/Components/Login.js index f9ae883..9a753e3 100644 --- a/Frontend/src/Components/Login.js +++ b/Frontend/src/Components/Login.js @@ -45,7 +45,7 @@ export default function Login() { Login Password - onValueChange(e)} name='inputpassword' /> + onValueChange(e)} name='inputpassword' autoComplete="off" /> diff --git a/Frontend/src/Components/Service/api.js b/Frontend/src/Components/Service/api.js index 676ad5b..98b0c53 100644 --- a/Frontend/src/Components/Service/api.js +++ b/Frontend/src/Components/Service/api.js @@ -1,7 +1,7 @@ import axios from 'axios'; const PORT = process.env.PORT || 8080; -const usersUrl = `http://localhost:${PORT}/users`; +const usersUrl = "https://backendlivescore.herokuapp.com/users"; export const getUsers = async id => { id = id || ''; diff --git a/Frontend/src/Components/Sports/Badminton/BadmintonViewScore.js b/Frontend/src/Components/Sports/Badminton/BadmintonViewScore.js index 69b66ef..22126dc 100644 --- a/Frontend/src/Components/Sports/Badminton/BadmintonViewScore.js +++ b/Frontend/src/Components/Sports/Badminton/BadmintonViewScore.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {useContext} from 'react'; import { useParams } from 'react-router-dom'; import { useState, useEffect } from 'react'; import { @@ -14,9 +14,12 @@ import Readrow from './Readrow'; import { io } from 'socket.io-client'; import { FormGroup, FormControl, InputLabel, Input, Typography } from '@material-ui/core'; import { Button } from '@mui/material'; +import { Link } from 'react-router-dom'; +import { UserContext } from '../../../UserContext'; const PORT = process.env.PORT || 8080; -const socket = io(`http://localhost:${PORT}`); +const socket = io("https://backendlivescore.herokuapp.com/"); + @@ -46,11 +49,22 @@ const useStyles = makeStyles({ fontSize: 18, }, }, + container: { + width: '50%', + margin: '5% 0 0 25%', + '& > *': { + marginTop: 20 + } + } }); function BadmintonViewScore(props) { const [user, setUser] = useState(initialValue); const [show, setShow] = useState(true); + const {admin,setAdmin}=useContext(UserContext) + var currentDate = new Date().toLocaleDateString('en-GB'); + var matchDate = new Date(user.date).toLocaleDateString('en-GB'); + const showedit = matchDate === currentDate; const classes = useStyles(); const { id } = useParams(); socket.on('updated_badmintonScore', user => { @@ -96,14 +110,15 @@ function BadmintonViewScore(props) { - - {/* Winner of the match */} + {showedit && ( + <> + Winner onValueChange(e)} name='winner' /> - {show ? ( + {show ? ( - )} - + )} + + ) + } ); } diff --git a/Frontend/src/Components/Sports/Badminton/Editscore.js b/Frontend/src/Components/Sports/Badminton/Editscore.js index d323d99..2de9f0f 100644 --- a/Frontend/src/Components/Sports/Badminton/Editscore.js +++ b/Frontend/src/Components/Sports/Badminton/Editscore.js @@ -19,7 +19,7 @@ import { UserContext } from '../../../UserContext'; import { Link } from 'react-router-dom'; const PORT = process.env.PORT || 8080; -const socket = io(`http://localhost:${PORT}8080`); +const socket = io("https://backendlivescore.herokuapp.com/"); const initialValue = { title: '', diff --git a/Frontend/src/Components/Sports/TableTennis/TableTennis.js b/Frontend/src/Components/Sports/TableTennis/TableTennis.js index 327bc2b..51feb34 100644 --- a/Frontend/src/Components/Sports/TableTennis/TableTennis.js +++ b/Frontend/src/Components/Sports/TableTennis/TableTennis.js @@ -1,16 +1,19 @@ import React, { useState } from 'react'; import Timeline from '../../Card/Timeline'; import Button from '@mui/material/Button'; +import { Link } from 'react-router-dom'; import '../../component.css'; export default function TableTennis() { const [active, setActive] = useState('female'); return (
- + + {active === 'male' && (