From 3cb96a539abbc917c10c1b7156abcec3ff5020b7 Mon Sep 17 00:00:00 2001
From: Liam <67254223+RealFascinated@users.noreply.github.com>
Date: Thu, 20 Oct 2022 16:13:45 +0100
Subject: [PATCH] Switch to enviroment variables

---
 .env.local-example            | 11 +++++++++++
 config.json                   |  8 --------
 pages/_app.js                 | 15 ++++++---------
 pages/_document.js            |  4 +---
 src/consts/LeaderboardType.js | 11 ++++++-----
 utils/utils.js                |  5 ++---
 6 files changed, 26 insertions(+), 28 deletions(-)
 create mode 100644 .env.local-example
 delete mode 100644 config.json

diff --git a/.env.local-example b/.env.local-example
new file mode 100644
index 0000000..52cd16b
--- /dev/null
+++ b/.env.local-example
@@ -0,0 +1,11 @@
+SITE_NAME=BeatSaber Overlay
+SITE_TITLE=BeatSaber Overlay - Simple and easy to use BeatSaber overlay
+SITE_DESCRIPTION=Free, simple, and easy to use beat saber overlay for OBS
+SITE_COLOR=#0EBFE9
+SITE_URL=https://bs-overlay.fascinated.cc
+HTTP_PROXY=https://proxy.fascinated.cc
+
+REDIS_IP=127.0.0.1
+REDIS_USERNAME=yes
+REDIS_PASSWORD=yes
+REDIS_DATABASE=0
\ No newline at end of file
diff --git a/config.json b/config.json
deleted file mode 100644
index f035823..0000000
--- a/config.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"name": "BeatSaber Overlay",
-	"title": "BeatSaber Overlay - Simple and easy to use BeatSaber overlay",
-	"description": "Free, simple, and easy to use beat saber overlay for OBS",
-	"color": "#0EBFE9",
-	"url": "https://bs-overlay.fascinated.cc",
-	"proxy_url": "https://proxy.fascinated.cc"
-}
diff --git a/pages/_app.js b/pages/_app.js
index 23a377e..3db1694 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -1,9 +1,6 @@
 import { createTheme, NextUIProvider } from "@nextui-org/react";
 import { NextSeo } from "next-seo";
 import { ThemeProvider as NextThemesProvider } from "next-themes";
-
-import Config from "../config.json";
-
 import "../styles/globals.css";
 
 const lightTheme = createTheme({
@@ -32,13 +29,13 @@ function MyApp({ Component, pageProps }) {
 		>
 			<NextUIProvider>
 				<NextSeo
-					title={Config.name}
-					description={Config.description}
+					title={process.env.SITE_NAME}
+					description={process.env.SITE_DESCRIPTION}
 					openGraph={{
-						url: Config.url,
-						title: Config.name,
-						description: Config.description,
-						site_name: Config.name,
+						url: process.env.SITE_URL,
+						title: process.env.SITE_NAME,
+						description: process.env.SITE_DESCRIPTION,
+						site_name: process.env.SITE_NAME,
 						images: [
 							{
 								url: "https://cdn.fascinated.cc/fHknFPctAC.png?raw=true",
diff --git a/pages/_document.js b/pages/_document.js
index d4ce890..f0bb1fa 100644
--- a/pages/_document.js
+++ b/pages/_document.js
@@ -2,8 +2,6 @@ import { CssBaseline, Image } from "@nextui-org/react";
 import Document, { Head, Html, Main, NextScript } from "next/document";
 import React from "react";
 
-import Config from "../config.json";
-
 class MyDocument extends Document {
 	static async getInitialProps(ctx) {
 		const initialProps = await Document.getInitialProps(ctx);
@@ -28,7 +26,7 @@ class MyDocument extends Document {
 					/>
 					<link rel="shortcut icon" href="/favicon.ico" />
 
-					<meta name="theme-color" content={Config.color} />
+					<meta name="theme-color" content={process.env.SITE_COLOR} />
 					<meta
 						property="og:keywords"
 						content="BeatSaber,Overlay,OBS,Twitch,YouTube,BeatSaber Overlay,Github,"
diff --git a/src/consts/LeaderboardType.js b/src/consts/LeaderboardType.js
index a9e1d2b..1229a53 100644
--- a/src/consts/LeaderboardType.js
+++ b/src/consts/LeaderboardType.js
@@ -1,17 +1,18 @@
-import Config from "../../config.json";
-
 const WebsiteTypes = {
 	ScoreSaber: {
 		ApiUrl: {
 			PlayerData:
-				Config.proxy_url + "/https://scoresaber.com/api/player/%s/basic",
+				process.env.NEXT_PUBLIC_HTTP_PROXY +
+				"/https://scoresaber.com/api/player/%s/basic",
 		},
 	},
 	BeatLeader: {
 		ApiUrl: {
-			PlayerData: Config.proxy_url + "/https://api.beatleader.xyz/player/%s",
+			PlayerData:
+				process.env.NEXT_PUBLIC_HTTP_PROXY +
+				"/https://api.beatleader.xyz/player/%s",
 			MapData:
-				Config.proxy_url +
+				process.env.NEXT_PUBLIC_HTTP_PROXY +
 				"/https://api.beatleader.xyz/leaderboard/hash/%h/%d/%m",
 		},
 		async getMapStarCount(mapHash, mapDiff, characteristic) {
diff --git a/utils/utils.js b/utils/utils.js
index f9a6f1e..4dc3368 100644
--- a/utils/utils.js
+++ b/utils/utils.js
@@ -1,10 +1,9 @@
-import Config from "../config.json";
-
 const mapCache = new Map();
 
 module.exports = {
 	BEATSAVER_MAP_API:
-		Config.proxy_url + "/https://api.beatsaver.com/maps/hash/%s",
+		process.env.NEXT_PUBLIC_HTTP_PROXY +
+		"/https://api.beatsaver.com/maps/hash/%s",
 
 	/**
 	 * Gets a specified maps data from BeatSaver