From e0351745b01b93644f4153eab464d794864fd024 Mon Sep 17 00:00:00 2001
From: Nate Carlson <git@natecarlson.com>
Date: Tue, 22 Dec 2020 17:32:44 +0000
Subject: [PATCH] Frontend doesn't have access to env variables - pass the
 details in from the server.

---
 admin/src/client/components/pure/About.js      | 3 ---
 admin/src/client/components/pure/Navigation.js | 2 --
 admin/src/server/index.js                      | 3 +++
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/admin/src/client/components/pure/About.js b/admin/src/client/components/pure/About.js
index 054593e..65f0a3f 100644
--- a/admin/src/client/components/pure/About.js
+++ b/admin/src/client/components/pure/About.js
@@ -1,9 +1,6 @@
 import React, { Component } from "react";
 import { Container, Header } from "semantic-ui-react";
 
-var site_name = process.env['SITE_NAME'] != null ? process.env['SITE_NAME'] : "OpenMHz";
-var admin_email = process.env['ADMIN_EMAIL'] != null ? process.env['ADMIN_EMAIL'] : "luke@openmhz.com";
-
 class About extends Component {
 
 
diff --git a/admin/src/client/components/pure/Navigation.js b/admin/src/client/components/pure/Navigation.js
index 360b5ad..be3f0dc 100644
--- a/admin/src/client/components/pure/Navigation.js
+++ b/admin/src/client/components/pure/Navigation.js
@@ -8,8 +8,6 @@ const navStyle = {
 const blankStyle = {
   marginBottom: "50px"
 };
-var account_server = process.env['ACCOUNT_SERVER'] != null ? process.env['ACCOUNT_SERVER'] : 'https://account.openmhz.com';
-var site_name = process.env['SITE_NAME'] != null ? process.env['SITE_NAME'] : "OpenMHz";
 
 class Navigation extends Component {
   constructor(props) {
diff --git a/admin/src/server/index.js b/admin/src/server/index.js
index bcf2f00..07714dd 100644
--- a/admin/src/server/index.js
+++ b/admin/src/server/index.js
@@ -132,6 +132,7 @@ function isLoggedIn(req, res, next) {
 
 
 var admin_server = process.env['ADMIN_SERVER'] != null ? process.env['ADMIN_SERVER'] : 'https://admin.openmhz.com';
+var admin_email = process.env['ADMIN_EMAIL'] != null ? process.env['ADMIN_EMAIL'] : "luke@openmhz.com";
 var beta_frontend_server = process.env['BETA_FRONTEND_SERVER'] != null ? process.env['BETA_FRONTEND_SERVER'] : 'https://beta.openmhz.com';
 var backend_server = process.env['BACKEND_SERVER'] != null ? process.env['BACKEND_SERVER'] : 'https://api.openmhz.com';
 var frontend_server = process.env['FRONTEND_SERVER'] != null ? process.env['FRONTEND_SERVER'] : 'https://openmhz.com';
@@ -189,6 +190,8 @@ app.get("*", (req, res, next) => {
       const media_server = "${media_server}";
       const socket_server = "${socket_server}";
       const account_server = "${account_server}";
+      const site_name = "${site_name}";
+      const admin_email = "${admin_email}";
 			const proPlanValue = ${proPlanValue};
 			const freePlanValue = ${freePlanValue};
     </script>