diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js index 463d13c2..e704d502 100644 --- a/frontend/src/components/BottomBar.js +++ b/frontend/src/components/BottomBar.js @@ -1,5 +1,5 @@ import React, { Component } from 'react' -import {Badge, TextField, ListItemAvatar, Avatar,Paper, Grid, IconButton, Typography, Select, MenuItem, List, ListItemText, ListItem, ListItemIcon, ListItemButton, Divider, Dialog, DialogContent} from "@mui/material"; +import {Badge, Tooltip, TextField, ListItemAvatar, Avatar,Paper, Grid, IconButton, Typography, Select, MenuItem, List, ListItemText, ListItem, ListItemIcon, ListItemButton, Divider, Dialog, DialogContent} from "@mui/material"; import MediaQuery from 'react-responsive' import { Link } from 'react-router-dom' @@ -264,17 +264,25 @@ bottomBarDesktop =()=>{ +
+ 0 & !this.state.profileShown & this.props.avatarLoaded) ? true: false} + title="You have an active order"> 0 & !this.state.profileShown) ? "": null} color="primary"> this.props.setAppState({avatarLoaded: true}), + }} + src={this.props.nickname ? window.location.origin +'/static/assets/avatars/' + this.props.nickname + '.png' : null} /> - - + + + +
@@ -354,19 +362,23 @@ bottomBarDesktop =()=>{ + + - - - + + + + +
@@ -470,51 +482,62 @@ bottomBarPhone =()=>{
- - 0 & !this.state.profileShown) ? "": null} color="primary"> - this.props.setAppState({avatarLoaded: true}), - }} - src={this.props.nickname ? window.location.origin +'/static/assets/avatars/' + this.props.nickname + '.png' : null} - /> - - + 0 & !this.state.profileShown & this.props.avatarLoaded) ? true: false} + title="You have an active order"> + + 0 & !this.state.profileShown) ? "": null} color="primary"> + this.props.setAppState({avatarLoaded: true}), + }} + src={this.props.nickname ? window.location.origin +'/static/assets/avatars/' + this.props.nickname + '.png' : null} + /> + + +
- - - - - + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + - - - - - + + + + + + + @@ -529,19 +552,23 @@ bottomBarPhone =()=>{ - - - - - + + + + + + + + + diff --git a/frontend/src/components/HomePage.js b/frontend/src/components/HomePage.js index 23b35202..1c47c140 100644 --- a/frontend/src/components/HomePage.js +++ b/frontend/src/components/HomePage.js @@ -30,7 +30,7 @@ export default class HomePage extends Component {
- }/> + }/> diff --git a/frontend/src/components/MakerPage.js b/frontend/src/components/MakerPage.js index b98490b9..c6e2aad6 100644 --- a/frontend/src/components/MakerPage.js +++ b/frontend/src/components/MakerPage.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Paper, Button , Grid, Typography, TextField, Select, FormHelperText, MenuItem, FormControl, Radio, FormControlLabel, RadioGroup, dividerClasses} from "@mui/material" +import { Tooltip, Paper, Button , Grid, Typography, TextField, Select, FormHelperText, MenuItem, FormControl, Radio, FormControlLabel, RadioGroup, dividerClasses} from "@mui/material" import { Link } from 'react-router-dom' import getFlags from './getFlags' @@ -184,6 +184,7 @@ export default class MakerPage extends Component {
+
+ /> + +