({
[theme.breakpoints.down(700)]: {
display: "none",
},
+ height: 30,
marginLeft: "auto",
marginRight: "auto",
- fontSize: "1.5rem",
- fontWeight: 500,
- color: Colours.colours.violet,
- cursor: "default",
alignSelf: "center",
},
app_just_logo: {
@@ -27,12 +24,9 @@ export const NavigationStyle = makeStyles(theme => ({
[theme.breakpoints.up(700)]: {
display: "none",
},
+ height: 40,
marginLeft: "auto",
marginRight: "auto",
- fontSize: "1.5rem",
- fontWeight: 500,
- color: Colours.colours.violet,
- cursor: "default",
alignSelf: "center",
},
nav_menu: {
diff --git a/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.test.tsx b/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.test.tsx
index f55ce58f1..7250e5883 100644
--- a/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.test.tsx
+++ b/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.test.tsx
@@ -44,6 +44,7 @@ describe("test component: featuresView", () => {
avatarSource=""
userAliasText=""
menu={{ image: "", items: [items] }}
+ logoImgName="logo.svg"
languages={languages}
languageId="eng"
languageHandler={jest.fn()}
diff --git a/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.tsx b/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.tsx
index 29e3e64f0..66070a0db 100644
--- a/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.tsx
+++ b/TokanPages.ClientApp/src/Components/Layout/Navigation/View/navigationView.tsx
@@ -4,9 +4,9 @@ import Toolbar from "@material-ui/core/Toolbar";
import IconButton from "@material-ui/core/IconButton";
import Avatar from "@material-ui/core/Avatar";
import MenuIcon from "@material-ui/icons/Menu";
-import { FormControl, Grid, MenuItem, Select, Box, Typography } from "@material-ui/core";
+import { FormControl, Grid, MenuItem, Select, Box } from "@material-ui/core";
import { LanguageItemDto } from "../../../../Api/Models/";
-import { GET_FLAG_URL } from "../../../../Api/Request";
+import { GET_FLAG_URL, GET_ICONS_URL } from "../../../../Api/Request";
import { ApplicationLanguageState } from "../../../../Store/States/";
import { HideOnScroll } from "../../../../Shared/Components/Scroll";
import { Item } from "../../../../Shared/Components/ListRender/Models";
@@ -27,6 +27,7 @@ interface BaseProperties extends ViewProperties {
avatarName: string;
avatarSource: string;
userAliasText: string;
+ logoImgName: string;
languages: ApplicationLanguageState;
languageId: string;
languageHandler: (event: LanguageChangeEvent) => void;
@@ -127,8 +128,6 @@ const RenderLanguageSelection = (props: Properties): JSX.Element => {
export const NavigationView = (props: Properties): JSX.Element => {
const classes = NavigationStyle();
- const logo = ">";
- const name = "> tom kandula";
return (
@@ -138,8 +137,8 @@ export const NavigationView = (props: Properties): JSX.Element => {
{props.isLoading ? null : }
- {name}
- {logo}
+ {RenderImage(GET_ICONS_URL, props?.logoImgName, classes.app_full_logo)}
+ {RenderImage(GET_ICONS_URL, props?.menu?.image, classes.app_just_logo)}
{props.isLoading ? null : }
diff --git a/TokanPages.ClientApp/src/Components/Layout/Navigation/navigation.tsx b/TokanPages.ClientApp/src/Components/Layout/Navigation/navigation.tsx
index df396c245..d24ef2f23 100644
--- a/TokanPages.ClientApp/src/Components/Layout/Navigation/navigation.tsx
+++ b/TokanPages.ClientApp/src/Components/Layout/Navigation/navigation.tsx
@@ -54,6 +54,7 @@ export const Navigation = (): JSX.Element => {
userAliasText={store?.userData?.aliasName}
avatarName={store?.userData?.avatarName}
avatarSource={avatarSource}
+ logoImgName={navigation?.content?.logo}
languages={language}
languageId={language?.id}
languageHandler={languageHandler}