From 5a3bae9f3eaa72fe2c6317ec50f35bbc4bde1e18 Mon Sep 17 00:00:00 2001
From: Loreina Chew <loreina.chew@gmail.com>
Date: Wed, 12 Dec 2018 11:25:57 -0500
Subject: [PATCH 1/6] add coloured address bar

---
 public/index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/index.html b/public/index.html
index 01309859d..19a857de2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -62,6 +62,10 @@
   <meta name="msapplication-wide310x150logo" content="%PUBLIC_URL%/favicon/mstile-310x150.png" />
   <meta name="msapplication-square310x310logo" content="%PUBLIC_URL%/favicon/mstile-310x310.png" />
 
+  <meta name="theme-color" content="#F2463A">
+  <meta name="msapplication-navbutton-color" content="#F2463A">
+  <meta name="apple-mobile-web-app-status-bar-style" content="#F2463A">
+
   <!-- Global site tag (gtag.js) - Google Analytics -->
   <script async src="https://www.googletagmanager.com/gtag/js?id=UA-120508272-2"></script>
   <script>

From 05142e2b19a34fff0ada22eeefb6ae96e1bc9b80 Mon Sep 17 00:00:00 2001
From: Loreina Chew <loreina.chew@gmail.com>
Date: Wed, 12 Dec 2018 11:26:12 -0500
Subject: [PATCH 2/6] update ms tile color

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 19a857de2..21d1f36cc 100644
--- a/public/index.html
+++ b/public/index.html
@@ -55,7 +55,7 @@
   <link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon/favicon-128.png" sizes="128x128" />
   <link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon/favicon.png" />
   <meta name="application-name" content="&nbsp;" />
-  <meta name="msapplication-TileColor" content="#F07C74" />
+  <meta name="msapplication-TileColor" content="#F2463A" />
   <meta name="msapplication-TileImage" content="%PUBLIC_URL%/favicon/mstile-144x144.png" />
   <meta name="msapplication-square70x70logo" content="%PUBLIC_URL%/favicon/mstile-70x70.png" />
   <meta name="msapplication-square150x150logo" content="%PUBLIC_URL%/favicon/mstile-150x150.png" />

From 9782afe27977de150533edd64f0fca049fb2d092 Mon Sep 17 00:00:00 2001
From: Loreina Chew <loreina.chew@gmail.com>
Date: Wed, 12 Dec 2018 11:26:22 -0500
Subject: [PATCH 3/6] change dashboard title

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 21d1f36cc..5fae6d4c5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -20,7 +20,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-  <title>McHacks 6</title>
+  <title>Dashboard | McHacks 6</title>
 
   <meta property="og:title" content="McHacks" />
   <meta property="og:url" content="https://mchacks.ca" />

From de37bb291a6bf89f6d10b771ab4d6ef263c2c988 Mon Sep 17 00:00:00 2001
From: Loreina Chew <loreina.chew@gmail.com>
Date: Wed, 12 Dec 2018 12:46:02 -0500
Subject: [PATCH 4/6] fix autosuggest dropdown colors

---
 src/shared/Autosuggest.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/shared/Autosuggest.tsx b/src/shared/Autosuggest.tsx
index e2920e9ce..26a5ae5fd 100644
--- a/src/shared/Autosuggest.tsx
+++ b/src/shared/Autosuggest.tsx
@@ -57,12 +57,14 @@ const AutosuggestWrapper = styled.div`
 
   .react-autosuggest__suggestion--highlighted {
     font-weight: normal;
-    background-color: ${props => props.theme.colors.primaryLight};
+    background-color: ${props => props.theme.colors.primary};
+    color: ${props => props.theme.colors.white};
   }
 
   .react-autosuggest__suggestion--selected {
     font-weight: normal;
     background-color: ${props => props.theme.colors.primary};
+    color: ${props => props.theme.colors.white};
   }
 `;
 

From 1e6ce2b5aaaea33c2cb8e8d06c16d26c0f5e7785 Mon Sep 17 00:00:00 2001
From: Loreina Chew <loreina.chew@gmail.com>
Date: Wed, 12 Dec 2018 12:47:34 -0500
Subject: [PATCH 5/6] fix shirt size dropdown colours

---
 src/shared/StyledSelect.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/shared/StyledSelect.tsx b/src/shared/StyledSelect.tsx
index f5da40d6a..2f08ab4dd 100644
--- a/src/shared/StyledSelect.tsx
+++ b/src/shared/StyledSelect.tsx
@@ -14,6 +14,7 @@ const StyledSelect = styled(Select)`
     &--is-focused,
     &--is-selected {
       background-color: ${props => props.theme.colors.primary};
+      color: ${props => props.theme.colors.white};
     }
   }
 `;

From 8b68150b6a95923685d28decabfc165134d90641 Mon Sep 17 00:00:00 2001
From: Erick Zhao <erick.zhao@mail.mcgill.ca>
Date: Wed, 12 Dec 2018 19:42:01 -0500
Subject: [PATCH 6/6] Add check for localhost to decide which API to use

---
 src/api/api.ts          | 9 ++++++++-
 src/config/constants.ts | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/api/api.ts b/src/api/api.ts
index 9092711df..a8c800e68 100644
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -42,4 +42,11 @@ class API {
     }
 }
 
-export default new API(CONSTANTS.API_URL);
+let API_URL;
+if (location.hostname === "localhost" || location.hostname === "127.0.0.1" || location.hostname === "") {
+    API_URL = CONSTANTS.LOCAL_API_URL;
+} else {
+    API_URL = CONSTANTS.PROD_API_URL;
+}
+
+export default new API(API_URL);
diff --git a/src/config/constants.ts b/src/config/constants.ts
index 16a154b40..c3171e0c7 100644
--- a/src/config/constants.ts
+++ b/src/config/constants.ts
@@ -1,4 +1,8 @@
-export const API_URL = 'http://localhost:3000/api';
+export const LOCAL_API_URL = 'http://localhost:3000/api';
+export const PROD_API_URL = 'https://api.mchacks.ca/api/';
+
+//
+
 export const CACHE_USER_KEY = 'userInfo';
 export const CACHE_HACKER_KEY = 'hackerInfo';