From 025dd3893b91e73e8418606767618e9ef9f4c98a Mon Sep 17 00:00:00 2001
From: "Brady L. Hurlburt" <brady.hurlburt@rovercode.com>
Date: Wed, 29 Apr 2020 22:41:08 -0400
Subject: [PATCH 1/5] Add theme files

---
 package.json |  1 +
 src/index.js | 21 ++++++++++++---------
 src/theme.js | 13 +++++++++++++
 3 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 src/theme.js

diff --git a/package.json b/package.json
index c9825e81..a60e64fe 100644
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
   "dependencies": {
     "@material-ui/core": "^4.9.12",
     "@material-ui/icons": "^4.9.1",
+    "@material-ui/styles": "^4.9.10",
     "@sentry/browser": "^5.15.4",
     "axios": "^0.19.2",
     "brace": "^0.11.1",
diff --git a/src/index.js b/src/index.js
index 7fb86358..fff8b417 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,4 +1,5 @@
 import 'semantic-ui-css/semantic.min.css';
+import { ThemeProvider } from '@material-ui/core/styles';
 
 import React from 'react';
 import { render } from 'react-dom';
@@ -12,11 +13,11 @@ import { createLogger } from 'redux-logger';
 import promise from 'redux-promise-middleware';
 import createDebounce from 'redux-debounced';
 import * as Sentry from '@sentry/browser';
+import theme from '@/theme';
 import appReducers from './reducers/index';
 import { USER_LOGOUT } from './actions/auth';
 import AuthApi from './utils/auth-api';
 
-
 import NotFound from './containers/Global/NotFound';
 import ProgramList from './containers/ProgramList';
 import Accounts from './containers/Accounts/Base';
@@ -85,14 +86,16 @@ render(
     <ReduxProvider store={store}>
       <BrowserRouter>
         <CookiesProvider>
-          <Switch>
-            <Route path="/accounts" component={Accounts} />
-            <ProtectedRoute exact path="/" component={ProgramList} />
-            <ProtectedRoute exact path="/programs" component={ProgramList} />
-            <ProtectedRoute exact path="/mission-control" component={MissionControl} />
-            <ProtectedRoute exact path="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/user/settings" component={UserSetting} />
-            <Route component={NotFound} />
-          </Switch>
+          <ThemeProvider theme={theme}>
+            <Switch>
+              <Route path="/accounts" component={Accounts} />
+              <ProtectedRoute exact path="/" component={ProgramList} />
+              <ProtectedRoute exact path="/programs" component={ProgramList} />
+              <ProtectedRoute exact path="/mission-control" component={MissionControl} />
+              <ProtectedRoute exact path="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/user/settings" component={UserSetting} />
+              <Route component={NotFound} />
+            </Switch>
+          </ThemeProvider>
         </CookiesProvider>
       </BrowserRouter>
     </ReduxProvider>
diff --git a/src/theme.js b/src/theme.js
new file mode 100644
index 00000000..63866390
--- /dev/null
+++ b/src/theme.js
@@ -0,0 +1,13 @@
+import { createMuiTheme } from '@material-ui/core/styles';
+import purple from '@material-ui/core/colors/purple';
+import green from '@material-ui/core/colors/green';
+
+export default createMuiTheme({
+  palette: {
+    primary: purple,
+    secondary: green,
+  },
+  status: {
+    danger: 'orange',
+  },
+});

From 652a2ead3405c08112fae8648a067816a4ab7aac Mon Sep 17 00:00:00 2001
From: "Brady L. Hurlburt" <brady.hurlburt@rovercode.com>
Date: Wed, 29 Apr 2020 23:12:51 -0400
Subject: [PATCH 2/5] Fill in colors in theme

---
 src/components/ProgramList.js                 | 10 ++++--
 .../__snapshots__/ProgramList.test.js.snap    |  3 +-
 src/index.js                                  |  4 +--
 src/theme.js                                  | 34 +++++++++++++++----
 4 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/src/components/ProgramList.js b/src/components/ProgramList.js
index 61481017..feb5cabe 100644
--- a/src/components/ProgramList.js
+++ b/src/components/ProgramList.js
@@ -191,8 +191,14 @@ class ProgramList extends Component {
 
     return (
       <>
-        <Button variant="contained" color="primary" href="/mission-control" style={{ marginLeft: '10%' }}>
-          <Add />
+        <Button
+          variant="contained"
+          color="primary"
+          size="large"
+          startIcon={<Add />}
+          href="/mission-control"
+          style={{ marginLeft: '10%' }}
+        >
           <FormattedMessage
             id="app.program_list.new"
             description="Button label to create new program"
diff --git a/src/components/__tests__/__snapshots__/ProgramList.test.js.snap b/src/components/__tests__/__snapshots__/ProgramList.test.js.snap
index 2e2709ed..b4dcdab5 100644
--- a/src/components/__tests__/__snapshots__/ProgramList.test.js.snap
+++ b/src/components/__tests__/__snapshots__/ProgramList.test.js.snap
@@ -5,6 +5,8 @@ exports[`The ProgramList component renders on the page with no errors 1`] = `
   <WithStyles(ForwardRef(Button))
     color="primary"
     href="/mission-control"
+    size="large"
+    startIcon={<Memo(AddIcon) />}
     style={
       Object {
         "marginLeft": "10%",
@@ -12,7 +14,6 @@ exports[`The ProgramList component renders on the page with no errors 1`] = `
     }
     variant="contained"
   >
-    <AddIcon />
     <FormattedMessage
       defaultMessage="New Program"
       id="app.program_list.new"
diff --git a/src/index.js b/src/index.js
index fff8b417..7f705550 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,5 +1,5 @@
 import 'semantic-ui-css/semantic.min.css';
-import { ThemeProvider } from '@material-ui/core/styles';
+import { ThemeProvider, responsiveFontSizes } from '@material-ui/core/styles';
 
 import React from 'react';
 import { render } from 'react-dom';
@@ -86,7 +86,7 @@ render(
     <ReduxProvider store={store}>
       <BrowserRouter>
         <CookiesProvider>
-          <ThemeProvider theme={theme}>
+          <ThemeProvider theme={responsiveFontSizes(theme)}>
             <Switch>
               <Route path="/accounts" component={Accounts} />
               <ProtectedRoute exact path="/" component={ProgramList} />
diff --git a/src/theme.js b/src/theme.js
index 63866390..3ae37a75 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -1,13 +1,35 @@
 import { createMuiTheme } from '@material-ui/core/styles';
-import purple from '@material-ui/core/colors/purple';
-import green from '@material-ui/core/colors/green';
 
 export default createMuiTheme({
   palette: {
-    primary: purple,
-    secondary: green,
+    primary: {
+      main: '#114BFD', /* blue */
+    },
+    secondary: {
+      main: '#FF0459', /* magenta */
+    },
+    error: {
+      main: '#FF0000', /* TODO: some kind of red??? */
+    },
+    warning: {
+      main: '#FEAD11', /* yellow */
+    },
+    info: {
+      main: '#00FDA3', /* light green */
+    },
+    success: {
+      main: '#00FF00', /* TODO: some kind of green??? */
+    },
+    contrastThreshold: 3,
+    tonalOffset: 0.2,
   },
-  status: {
-    danger: 'orange',
+  typography: {
+    fontFamily: [
+      'Lato', 'sans-serif',
+    ].join(','),
+    button: {
+      fontWeight: 'bold',
+      textTransform: 'none',
+    },
   },
 });

From 3125027f916a8a5f1afa1f2431f1d870051a1d4f Mon Sep 17 00:00:00 2001
From: "Brady L. Hurlburt" <brady.hurlburt@rovercode.com>
Date: Wed, 29 Apr 2020 23:59:47 -0400
Subject: [PATCH 3/5] Fill in success color in theme

---
 src/theme.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/theme.js b/src/theme.js
index 3ae37a75..7c5537ba 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -15,10 +15,10 @@ export default createMuiTheme({
       main: '#FEAD11', /* yellow */
     },
     info: {
-      main: '#00FDA3', /* light green */
+      main: '#00FDA3', /* lime green, cyan */
     },
     success: {
-      main: '#00FF00', /* TODO: some kind of green??? */
+      main: '#21BA45', /* green */
     },
     contrastThreshold: 3,
     tonalOffset: 0.2,

From 26f24395ac9ef9de81d41b4c699fe67a3530654b Mon Sep 17 00:00:00 2001
From: "Brady L. Hurlburt" <brady.hurlburt@rovercode.com>
Date: Thu, 30 Apr 2020 12:59:44 -0400
Subject: [PATCH 4/5] Move and rename theme

---
 src/index.js                                      | 4 ++--
 src/{theme.js => themes/rovercodeDefaultLight.js} | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename src/{theme.js => themes/rovercodeDefaultLight.js} (89%)

diff --git a/src/index.js b/src/index.js
index 7f705550..b2c1fe62 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,7 +13,7 @@ import { createLogger } from 'redux-logger';
 import promise from 'redux-promise-middleware';
 import createDebounce from 'redux-debounced';
 import * as Sentry from '@sentry/browser';
-import theme from '@/theme';
+import rovercodeDefaultLight from '@/themes/rovercodeDefaultLight';
 import appReducers from './reducers/index';
 import { USER_LOGOUT } from './actions/auth';
 import AuthApi from './utils/auth-api';
@@ -86,7 +86,7 @@ render(
     <ReduxProvider store={store}>
       <BrowserRouter>
         <CookiesProvider>
-          <ThemeProvider theme={responsiveFontSizes(theme)}>
+          <ThemeProvider theme={responsiveFontSizes(rovercodeDefaultLight)}>
             <Switch>
               <Route path="/accounts" component={Accounts} />
               <ProtectedRoute exact path="/" component={ProgramList} />
diff --git a/src/theme.js b/src/themes/rovercodeDefaultLight.js
similarity index 89%
rename from src/theme.js
rename to src/themes/rovercodeDefaultLight.js
index 7c5537ba..76756913 100644
--- a/src/theme.js
+++ b/src/themes/rovercodeDefaultLight.js
@@ -8,9 +8,6 @@ export default createMuiTheme({
     secondary: {
       main: '#FF0459', /* magenta */
     },
-    error: {
-      main: '#FF0000', /* TODO: some kind of red??? */
-    },
     warning: {
       main: '#FEAD11', /* yellow */
     },
@@ -20,6 +17,7 @@ export default createMuiTheme({
     success: {
       main: '#21BA45', /* green */
     },
+    /* Keep default error red */
     contrastThreshold: 3,
     tonalOffset: 0.2,
   },

From e33c35d7001075da6adb097fb8c47e7af4e31c76 Mon Sep 17 00:00:00 2001
From: "Brady L. Hurlburt" <brady.hurlburt@rovercode.com>
Date: Fri, 1 May 2020 10:47:31 -0400
Subject: [PATCH 5/5] Create themes module interface

---
 src/index.js                                      | 4 ++--
 src/themes/index.js                               | 2 ++
 src/themes/{rovercodeDefaultLight.js => light.js} | 0
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 src/themes/index.js
 rename src/themes/{rovercodeDefaultLight.js => light.js} (100%)

diff --git a/src/index.js b/src/index.js
index b2c1fe62..2b6bb9c7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,7 +13,6 @@ import { createLogger } from 'redux-logger';
 import promise from 'redux-promise-middleware';
 import createDebounce from 'redux-debounced';
 import * as Sentry from '@sentry/browser';
-import rovercodeDefaultLight from '@/themes/rovercodeDefaultLight';
 import appReducers from './reducers/index';
 import { USER_LOGOUT } from './actions/auth';
 import AuthApi from './utils/auth-api';
@@ -24,6 +23,7 @@ import Accounts from './containers/Accounts/Base';
 import MissionControl from './containers/MissionControl';
 import UserSetting from './containers/UserSetting';
 import ProtectedRoute from './components/ProtectedRoute';
+import { light } from './themes';
 
 import enMessages from './translations/locales/en.json';
 import esMessages from './translations/locales/es.json';
@@ -86,7 +86,7 @@ render(
     <ReduxProvider store={store}>
       <BrowserRouter>
         <CookiesProvider>
-          <ThemeProvider theme={responsiveFontSizes(rovercodeDefaultLight)}>
+          <ThemeProvider theme={responsiveFontSizes(light)}>
             <Switch>
               <Route path="/accounts" component={Accounts} />
               <ProtectedRoute exact path="/" component={ProgramList} />
diff --git a/src/themes/index.js b/src/themes/index.js
new file mode 100644
index 00000000..f57af9da
--- /dev/null
+++ b/src/themes/index.js
@@ -0,0 +1,2 @@
+/* eslint-disable import/prefer-default-export */
+export { default as light } from './light';
diff --git a/src/themes/rovercodeDefaultLight.js b/src/themes/light.js
similarity index 100%
rename from src/themes/rovercodeDefaultLight.js
rename to src/themes/light.js