From ee157c17638082fc443212d3d5e244476060681a Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sat, 27 Feb 2021 23:43:26 -0800
Subject: [PATCH] Fix styling

---
 .../src/classes/{server-config => app-config}/index.ts   | 0
 packages/webapp/src/classes/client/rest-client/index.ts  | 9 +++------
 packages/webapp/src/components/layout/header/styled.ts   | 2 +-
 packages/webapp/src/components/maps-page/style.ts        | 4 +++-
 .../webapp/src/components/registration-page/index.tsx    | 2 +-
 packages/webapp/src/redux/clientSlice.ts                 | 2 +-
 packages/webapp/src/theme/index.ts                       | 6 ++++--
 7 files changed, 13 insertions(+), 12 deletions(-)
 rename packages/webapp/src/classes/{server-config => app-config}/index.ts (100%)

diff --git a/packages/webapp/src/classes/server-config/index.ts b/packages/webapp/src/classes/app-config/index.ts
similarity index 100%
rename from packages/webapp/src/classes/server-config/index.ts
rename to packages/webapp/src/classes/app-config/index.ts
diff --git a/packages/webapp/src/classes/client/rest-client/index.ts b/packages/webapp/src/classes/client/rest-client/index.ts
index d3f435cf..b70ad9fb 100644
--- a/packages/webapp/src/classes/client/rest-client/index.ts
+++ b/packages/webapp/src/classes/client/rest-client/index.ts
@@ -170,8 +170,7 @@ export default class RestClient implements Client {
         const handler = (success: (mapId: number) => void, reject: (error: ErrorInfo) => void) => {
             axios
                 .post(
-                    `${this.baseUrl}/c/restful/maps?title=${model.title}&description=${
-                        model.description ? model.description : ''
+                    `${this.baseUrl}/c/restful/maps?title=${model.title}&description=${model.description ? model.description : ''
                     }`,
                     model.content,
                     { headers: { 'Content-Type': model.contentType } }
@@ -280,8 +279,7 @@ export default class RestClient implements Client {
                 })
                 .then(() => {
                     return axios.put(
-                        `${this.baseUrl}/c/restful/maps/${id}/description`,
-                        basicInfo.description,
+                        `${this.baseUrl}/c/restful/maps/${id}/description`, basicInfo.description || ' ',
                         { headers: { 'Content-Type': 'text/plain' } }
                     );
                 })
@@ -302,8 +300,7 @@ export default class RestClient implements Client {
         const handler = (success: (mapId: number) => void, reject: (error: ErrorInfo) => void) => {
             axios
                 .post(
-                    `${this.baseUrl}/c/restful/maps?title=${model.title}&description=${
-                        model.description ? model.description : ''
+                    `${this.baseUrl}/c/restful/maps?title=${model.title}&description=${model.description ? model.description : ''
                     }`,
                     null,
                     { headers: { 'Content-Type': 'application/json' } }
diff --git a/packages/webapp/src/components/layout/header/styled.ts b/packages/webapp/src/components/layout/header/styled.ts
index 1bc5bdc6..4f0b4b7c 100644
--- a/packages/webapp/src/components/layout/header/styled.ts
+++ b/packages/webapp/src/components/layout/header/styled.ts
@@ -63,7 +63,7 @@ export const StyledDiv = styled.nav`
 
     display: grid;
     white-space: nowrap;
-    grid-template-columns: 150px 1fr 130px 160px 50px;
+    grid-template-columns: 200px 1fr 130px 160px 50px;
 `;
 
 export const Logo = styled.span`
diff --git a/packages/webapp/src/components/maps-page/style.ts b/packages/webapp/src/components/maps-page/style.ts
index 996c3401..f95a82f5 100644
--- a/packages/webapp/src/components/maps-page/style.ts
+++ b/packages/webapp/src/components/maps-page/style.ts
@@ -27,15 +27,17 @@ export const useStyles = makeStyles((theme: Theme) =>
         },
         newMapButton: {
             marginRight: 10,
+            minWidth: '130px'
         },
         importButton: {
             marginRight: 10,
+            minWidth: '130px'
         },
         rightButtonGroup: {
             marginRight: 10,
             flexGrow: 10,
             textAlign: 'right',
-            minWidth: '200px',
+            minWidth: '280px',
         },
         drawer: {
             width: drawerWidth,
diff --git a/packages/webapp/src/components/registration-page/index.tsx b/packages/webapp/src/components/registration-page/index.tsx
index 7721fca4..3b840527 100644
--- a/packages/webapp/src/components/registration-page/index.tsx
+++ b/packages/webapp/src/components/registration-page/index.tsx
@@ -16,7 +16,7 @@ import GlobalError from '../form/global-error';
 import SubmitButton from '../form/submit-button';
 import Typography from '@material-ui/core/Typography';
 import FormControl from '@material-ui/core/FormControl';
-import AppConfig from '../../classes/server-config';
+import AppConfig from '../../classes/app-config';
 
 export type Model = {
     email: string;
diff --git a/packages/webapp/src/redux/clientSlice.ts b/packages/webapp/src/redux/clientSlice.ts
index 9d22643a..b35b1ac5 100644
--- a/packages/webapp/src/redux/clientSlice.ts
+++ b/packages/webapp/src/redux/clientSlice.ts
@@ -3,7 +3,7 @@ import { createSlice } from '@reduxjs/toolkit';
 import { useQuery } from 'react-query';
 import Client, { AccountInfo, ErrorInfo, MapInfo } from '../classes/client';
 import { useSelector } from 'react-redux';
-import AppConfig from '../classes/server-config';
+import AppConfig from '../classes/app-config';
 
 
 export interface ClientStatus {
diff --git a/packages/webapp/src/theme/index.ts b/packages/webapp/src/theme/index.ts
index 752edef3..b64bdb9e 100644
--- a/packages/webapp/src/theme/index.ts
+++ b/packages/webapp/src/theme/index.ts
@@ -26,6 +26,9 @@ const theme = createMuiTheme({
             root: {
                 color: '#f9a826',
             },
+            outlined:{
+                zIndex: 'inherit'
+            }
         },
         MuiButton: {
             root: {
@@ -42,8 +45,7 @@ const theme = createMuiTheme({
                 '&:hover': {
                     backgroundColor: 'rgba(249, 168, 38, 0.91)',
                 },
-            },
-            textPrimary: {},
+            }
         },
     },
     typography: {