diff --git a/Dockerfile b/Dockerfile index 4b71c41..5503910 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,11 @@ COPY --from=builder /app/build/index.html ./application/ #install static server RUN npm install -g serve +# environment variables +ENV Author="Tudor Stanciu" +ARG APP_VERSION=0.0.0.0 +ENV APP_VERSION=${APP_VERSION} + #set workdir to root WORKDIR / diff --git a/buildx.sh b/buildx.sh index e0c556d..c00e40f 100644 --- a/buildx.sh +++ b/buildx.sh @@ -1,7 +1,7 @@ #!/bin/bash echo "Welcome!" -version="1.3.6" +version="1.3.7" platform="linux/amd64,linux/arm64,linux/arm/v7" #version="1.3.2-arm64" #platform="linux/arm64" diff --git a/package-lock.json b/package-lock.json index 191b533..737c899 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "reverse-proxy-frontend", - "version": "1.3.6", + "version": "1.3.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8c71c3b..cc9bfcc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "reverse-proxy-frontend", - "version": "1.3.6", + "version": "1.3.7", "private": true, "description": "Reverse proxy frontend application", "author": { diff --git a/src/components/layout/ApplicationBar.js b/src/components/layout/ApplicationBar.js index ab719b0..eb0131c 100644 --- a/src/components/layout/ApplicationBar.js +++ b/src/components/layout/ApplicationBar.js @@ -1,6 +1,5 @@ import React, { useState, useEffect } from "react"; import { makeStyles } from "@material-ui/core/styles"; -import MenuIcon from "@material-ui/icons/Menu"; import { Container, Toolbar, @@ -14,18 +13,30 @@ import { useTranslation } from "react-i18next"; import Flag from "react-flags"; import Navigation from "./Navigation"; -const useStyles = makeStyles(theme => ({ +const useStyles = makeStyles(() => ({ root: { flexGrow: 1 }, - menuButton: { - marginRight: theme.spacing(2) - }, title: { flexGrow: 1 }, navigation: { marginLeft: 0 + }, + logo: { + margin: "0", + display: "block", + position: "relative" + }, + miniLogo: { + opacity: 1, + textAlign: "center" + }, + img: { + width: "100%", + verticalAlign: "middle", + border: "0", + maxHeight: "60px" } })); @@ -77,14 +88,11 @@ const ApplicationBar = () => {
- - - +
+ + logo + +