master
Tudor Stanciu 2022-07-18 08:49:59 +03:00
parent af084e84af
commit dc50b0ebc6
5 changed files with 29 additions and 16 deletions

View File

@ -19,6 +19,11 @@ COPY --from=builder /app/build/index.html ./application/
#install static server #install static server
RUN npm install -g serve 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 #set workdir to root
WORKDIR / WORKDIR /

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
echo "Welcome!" echo "Welcome!"
version="1.3.6" version="1.3.7"
platform="linux/amd64,linux/arm64,linux/arm/v7" platform="linux/amd64,linux/arm64,linux/arm/v7"
#version="1.3.2-arm64" #version="1.3.2-arm64"
#platform="linux/arm64" #platform="linux/arm64"

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "reverse-proxy-frontend", "name": "reverse-proxy-frontend",
"version": "1.3.6", "version": "1.3.7",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

View File

@ -1,6 +1,6 @@
{ {
"name": "reverse-proxy-frontend", "name": "reverse-proxy-frontend",
"version": "1.3.6", "version": "1.3.7",
"private": true, "private": true,
"description": "Reverse proxy frontend application", "description": "Reverse proxy frontend application",
"author": { "author": {

View File

@ -1,6 +1,5 @@
import React, { useState, useEffect } from "react"; import React, { useState, useEffect } from "react";
import { makeStyles } from "@material-ui/core/styles"; import { makeStyles } from "@material-ui/core/styles";
import MenuIcon from "@material-ui/icons/Menu";
import { import {
Container, Container,
Toolbar, Toolbar,
@ -14,18 +13,30 @@ import { useTranslation } from "react-i18next";
import Flag from "react-flags"; import Flag from "react-flags";
import Navigation from "./Navigation"; import Navigation from "./Navigation";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(() => ({
root: { root: {
flexGrow: 1 flexGrow: 1
}, },
menuButton: {
marginRight: theme.spacing(2)
},
title: { title: {
flexGrow: 1 flexGrow: 1
}, },
navigation: { navigation: {
marginLeft: 0 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 = () => {
<div className={classes.root}> <div className={classes.root}>
<AppBar position="static"> <AppBar position="static">
<Toolbar> <Toolbar>
<IconButton <div className={classes.logo}>
edge="start" <a href="/" className={classes.miniLogo}>
className={classes.menuButton} <img src="/favicon.ico" alt="logo" className={classes.img} />
color="inherit" </a>
aria-label="menu" </div>
>
<MenuIcon />
</IconButton>
<Container className={classes.navigation}> <Container className={classes.navigation}>
<Typography variant="h6" className={classes.title}> <Typography variant="h6" className={classes.title}>