Skip to content

Commit

Permalink
Alteração do indicador de versão
Browse files Browse the repository at this point in the history
  • Loading branch information
rtenorioh committed Jan 30, 2023
1 parent 426f02b commit f300f4f
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 21 deletions.
14 changes: 0 additions & 14 deletions frontend/src/layout/MainListItems.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Link as RouterLink } from "react-router-dom";
import {
Badge,
Divider,
Link,
ListItem,
ListItemIcon,
ListItemText,
Expand All @@ -31,8 +30,6 @@ import { i18n } from "../translate/i18n";
import { WhatsAppsContext } from "../context/WhatsApp/WhatsAppsContext";
import { AuthContext } from "../context/Auth/AuthContext";
import { Can } from "../components/Can";
import { systemVersion } from "../../package.json";
import { system } from "../config.json";

const useStyles = makeStyles(theme => ({
icon: {
Expand All @@ -46,12 +43,6 @@ const useStyles = makeStyles(theme => ({
},
divider: {
backgroundColor: theme.palette.divide.main
},
systemCss: {
display: "flex",
justifyContent: "center",
opacity: 0.5,
fontSize: 12
}
}));

Expand Down Expand Up @@ -194,11 +185,6 @@ const MainListItems = (props) => {
</>
)}
/>
<span className={classes.systemCss}>
<Link color="inherit" href={system.url || "https://github.com/rtenorioh/Press-Ticket"}>
v{systemVersion}
</Link>
</span>
</div>
);
};
Expand Down
27 changes: 20 additions & 7 deletions frontend/src/layout/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ import React, { useState, useContext, useEffect } from "react";
import clsx from "clsx";

import {
makeStyles,
Drawer,
AppBar,
Toolbar,
List,
Typography,
Divider,
MenuItem,
Drawer,
IconButton,
Link,
List,
makeStyles,
Menu,
MenuItem,
Toolbar,
Typography
} from "@material-ui/core";

import MenuIcon from "@material-ui/icons/Menu";
Expand All @@ -28,6 +29,7 @@ import { i18n } from "../translate/i18n";
import api from "../services/api";
import toastError from "../errors/toastError";
import { system } from "../config.json";
import { systemVersion } from "../../package.json";
import logodash from "../assets/logo-dash.png";

const drawerWidth = 240;
Expand All @@ -40,7 +42,6 @@ const useStyles = makeStyles((theme) => ({
height: "calc(100vh - 56px)",
},
},

toolbar: {
paddingRight: 24, // keep right padding when drawer closed
color: "#ffffff",
Expand Down Expand Up @@ -114,6 +115,12 @@ const useStyles = makeStyles((theme) => ({
display: "flex",
overflow: "auto",
flexDirection: "column",
},
systemCss: {
display: "flex",
justifyContent: "center",
opacity: 0.2,
fontSize: 12
}
}));

Expand Down Expand Up @@ -275,6 +282,12 @@ const LoggedInLayout = ({ children }) => {
<MenuItem onClick={handleClickLogout}>
{i18n.t("mainDrawer.appBar.user.logout")}
</MenuItem>
<Divider />
<span className={classes.systemCss}>
<Link color="inherit" href={system.url || "https://github.com/rtenorioh/Press-Ticket"}>
v{systemVersion}
</Link>
</span>
</Menu>
</div>
</Toolbar>
Expand Down

0 comments on commit f300f4f

Please sign in to comment.