From bab9fb10c0bb0a497de6cf4fc8a8d1a684074cea Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Sat, 28 May 2022 13:28:09 -0700
Subject: Fix login logo

---
 modern/src/login/LoginLayout.js      |  3 ++-
 modern/src/login/LoginPage.js        | 15 +++------------
 modern/src/resources/images/logo.svg |  3 +--
 3 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'modern')

diff --git a/modern/src/login/LoginLayout.js b/modern/src/login/LoginLayout.js
index f3a688ef..dff187c4 100644
--- a/modern/src/login/LoginLayout.js
+++ b/modern/src/login/LoginLayout.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { useMediaQuery, Paper } from '@mui/material';
 import makeStyles from '@mui/styles/makeStyles';
 import { useTheme } from '@mui/material/styles';
+import logoSvg from '../resources/images/logo.svg';
 
 const useStyles = makeStyles((theme) => ({
   root: {
@@ -57,7 +58,7 @@ const LoginLayout = ({ children }) => {
         <div className={classes.sidebar}>
           {!useMediaQuery(theme.breakpoints.down('lg')) && (
             <svg height="64" width="240">
-              <use xlinkHref="/logo.svg#img" />
+              <use xlinkHref={`${logoSvg}#img`} />
             </svg>
           )}
         </div>
diff --git a/modern/src/login/LoginPage.js b/modern/src/login/LoginPage.js
index 1d18f2a8..0077f6bd 100644
--- a/modern/src/login/LoginPage.js
+++ b/modern/src/login/LoginPage.js
@@ -1,16 +1,6 @@
 import React, { useState } from 'react';
 import {
-  useMediaQuery,
-  InputLabel,
-  Select,
-  MenuItem,
-  FormControl,
-  Button,
-  TextField,
-  Link,
-  Snackbar,
-  IconButton,
-  Tooltip,
+  useMediaQuery, InputLabel, Select, MenuItem, FormControl, Button, TextField, Link, Snackbar, IconButton, Tooltip,
 } from '@mui/material';
 import makeStyles from '@mui/styles/makeStyles';
 import CloseIcon from '@mui/icons-material/Close';
@@ -22,6 +12,7 @@ import { sessionActions } from '../store';
 import { useLocalization, useTranslation } from '../common/components/LocalizationProvider';
 import LoginLayout from './LoginLayout';
 import usePersistedState from '../common/util/usePersistedState';
+import logoSvg from '../resources/images/logo.svg';
 
 const useStyles = makeStyles((theme) => ({
   legacy: {
@@ -109,7 +100,7 @@ const LoginPage = () => {
         {useMediaQuery(theme.breakpoints.down('lg')) && (
           <div className={classes.logoContainer}>
             <svg height="64" width="240">
-              <use xlinkHref="/logo.svg#img" />
+              <use xlinkHref={`${logoSvg}#img`} />
             </svg>
           </div>
         )}
diff --git a/modern/src/resources/images/logo.svg b/modern/src/resources/images/logo.svg
index 8183831f..94097d1f 100644
--- a/modern/src/resources/images/logo.svg
+++ b/modern/src/resources/images/logo.svg
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg id="svg2985" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="64" viewBox="0 0 240 64" width="240" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<svg width="240" height="64" viewBox="0 0 240 64" xmlns="http://www.w3.org/2000/svg">
  <g id="img">
   <rect id="rect3778" height="64" width="240" y="0" x="0" fill="none"/>
   <g id="g4194">
-- 
cgit v1.2.3