Atualização da versão do sistema

rtenorioh · May 22, 2022 · 6fd1c5e · 6fd1c5e
1 parent cf8969a
commit 6fd1c5e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,7 +1,10 @@
 {
   "name": "frontend",
   "version": "0.1.0",
-  "versionSystem": "1.0.3",
+  "system": {
+    "version": "1.0.4",
+    "name": "Press Ticket"
+  },
   "private": true,
   "dependencies": {
     "@material-ui/core": "^4.11.0",
@@ -52,4 +55,4 @@
       "last 1 safari version"
     ]
   }
-}
+}
diff --git a/frontend/src/layout/index.js b/frontend/src/layout/index.js
@@ -30,7 +30,7 @@ import api from "../services/api";
 import toastError from "../errors/toastError";
 
 import logodash from "../assets/logo-dash.png";
-import { versionSystem } from "../../package.json";
+import { system } from "../../package.json";
 
 const drawerWidth = 240;
 
@@ -114,6 +114,11 @@ const useStyles = makeStyles((theme) => ({
     overflow: "auto",
     flexDirection: "column",
   },
+  systemCss: {
+    opacity: "0.5",
+    fontSize: "12px",
+    marginLeft: "8px",
+  }
 }));
 
 const LoggedInLayout = ({ children }) => {
@@ -239,7 +244,10 @@ const LoggedInLayout = ({ children }) => {
             noWrap
             className={classes.title}
           >
-            {i18n.t("mainDrawer.appBar.site.title")} - v { versionSystem }
+            {system.name}
+            <span className={classes.systemCss}>
+              {"(v"}{system.version}{")"}
+            </span>
           </Typography>
           {user.id && <NotificationsPopOver />}
 

diff --git a/frontend/src/pages/Login/index.js b/frontend/src/pages/Login/index.js
@@ -19,7 +19,7 @@ import { makeStyles } from "@material-ui/core/styles";
 import { i18n } from "../../translate/i18n";
 
 import { AuthContext } from "../../context/Auth/AuthContext";
-import { versionSystem } from "../../../package.json";
+import { system } from "../../../package.json";
 import logo from '../../assets/logo.png';
 
 const Copyright = () => {
@@ -28,7 +28,7 @@ const Copyright = () => {
       © {new Date().getFullYear()}
       {" - "}
       <Link color="inherit" href="https://github.com/rtenorioh/Press-Ticket">
-        Press Ticket - v {versionSystem}
+        Press Ticket - v{system.version}
       </Link>
       {"."}
     </Typography>
@@ -109,7 +109,7 @@ const Login = () => {
                     aria-label="toggle password visibility"
                     onClick={() => setShowPassword((e) => !e)}
                   >
-                    {showPassword ? <VisibilityOff /> : <Visibility />}
+                    {showPassword ? <VisibilityOff color="secondary" /> : <Visibility color="secondary" />}
                   </IconButton>
                 </InputAdornment>
               )

diff --git a/frontend/src/pages/Signup/index.js b/frontend/src/pages/Signup/index.js
@@ -28,7 +28,7 @@ import { i18n } from "../../translate/i18n";
 import api from "../../services/api";
 import toastError from "../../errors/toastError";
 
-import { versionSystem } from "../../../package.json";
+import { system } from "../../../package.json";
 import logo from '../../assets/logo.png';
 
 const Copyright = () => {
@@ -37,7 +37,7 @@ const Copyright = () => {
 			© {new Date().getFullYear()}
 			{" - "}
 			<Link color="inherit" href="https://github.com/rtenorioh/Press-Ticket">
-				Press Ticket - v {versionSystem}
+			Press Ticket - v{system.version}
 			</Link>
 			{"."}
 		</Typography>
@@ -157,7 +157,7 @@ const SignUp = () => {
 														aria-label="toggle password visibility"
 														onClick={() => setShowPassword((e) => !e)}
 													>
-														{showPassword ? <VisibilityOff /> : <Visibility />}
+														{showPassword ? <VisibilityOff color="secondary" /> : <Visibility color="secondary" />}
 													</IconButton>
 												</InputAdornment>
 											)