GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-13 09:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from natecarlson/fix-frontend-variables

Browse Source 
Fix admin client variables
This commit is contained in:
Luke Berndt
2020-12-27 22:23:58 -05:00
committed by GitHub
parent 54ba9ad60e ea41b303a7
commit cfa0105b28
6 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
admin/src/client/System/System.js
View File

@@ -33,11 +33,6 @@ function planName(planType) {
} }
} }
var backend_server =
process.env["BACKEND_SERVER"] != null
? process.env["BACKEND_SERVER"]
: "https://api.openmhz.com";
class System extends Component { class System extends Component {
constructor(props) { constructor(props) {
super(props); super(props);

3
admin/src/client/components/pure/About.js
View File

@@ -1,9 +1,6 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Container, Header } from "semantic-ui-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 { class About extends Component {

2
admin/src/client/components/pure/Navigation.js
View File

@@ -8,8 +8,6 @@ const navStyle = {
const blankStyle = { const blankStyle = {
marginBottom: "50px" 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 { class Navigation extends Component {
constructor(props) { constructor(props) {

3
admin/src/server/index.js
View File

@@ -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_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 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 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'; 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 media_server = "${media_server}";
const socket_server = "${socket_server}"; const socket_server = "${socket_server}";
const account_server = "${account_server}"; const account_server = "${account_server}";
const site_name = "${site_name}";
const admin_email = "${admin_email}";
const proPlanValue = ${proPlanValue}; const proPlanValue = ${proPlanValue};
const freePlanValue = ${freePlanValue}; const freePlanValue = ${freePlanValue};
</script> </script>

2
frontend/src/client/Main/Main.js
View File

@@ -53,8 +53,6 @@ const HomepageHeading = ({ mobile }) => (
</Container> </Container>
) )
var site_name = process.env['SITE_NAME'] != null ? process.env['SITE_NAME'] : "OpenMHz";
/* /*
HomepageHeading.propTypes = { HomepageHeading.propTypes = {
mobile: PropTypes.bool, mobile: PropTypes.bool,

1
frontend/src/server/index.js
View File

@@ -71,6 +71,7 @@ app.get("*", (req, res, next) => {
const freePlanValue = ${freePlanValue}; const freePlanValue = ${freePlanValue};
const proPlanArchive = ${proPlanArchive}; const proPlanArchive = ${proPlanArchive};
const freePlanArchive = ${freePlanArchive}; const freePlanArchive = ${freePlanArchive};
const site_name = "${site_name}";
</script> </script>
<script src="${backend_server}/socket.io/socket.io.js"></script> <script src="${backend_server}/socket.io/socket.io.js"></script>
<script> <script>