Merge pull request #30 from YTVanced/dev

Remove dependency on API v1
TeamVanced · Feb 18, 2022 · 4ff3825 · 4ff3825
2 parents ee22655 + aff732e
commit 4ff3825
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 31 deletions.
diff --git a/src/App.js b/src/App.js
@@ -24,7 +24,7 @@ const tagManagerArgs = {
 	gtmId: "GTM-MXQ4LWV",
 };
 
-export const ChangeLogContext = createContext();
+export const ManagerContext = createContext();
 export const ShowBraveContext = createContext();
 
 // Change this to show BRAVE across website
@@ -42,17 +42,17 @@ const App = () => {
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [location]);
 
-	const [changeLogs, setChangeLogs] = useState({});
+	const [managerData, setManager] = useState({});
 
 	useEffect(() => {
-		fetch(process.env.REACT_APP_VANCED_LATEST_API_URL)
+		fetch("https://api.github.com/repos/YTVanced/VancedManager/releases/latest")
 			.then(res => res.json())
-			.then(data => setChangeLogs(data));
+			.then(data => setManager(data));
 	}, []);
 
 	return (
 		<ShowBraveContext.Provider value={showBrave}>
-			<ChangeLogContext.Provider value={changeLogs}>
+			<ManagerContext.Provider value={managerData}>
 				<ScrollReveal
 					ref={childRef}
 					children={() => (
@@ -84,7 +84,7 @@ const App = () => {
 						</Switch>
 					)}
 				/>
-			</ChangeLogContext.Provider>
+			</ManagerContext.Provider>
 		</ShowBraveContext.Provider>
 	);
 };

diff --git a/src/assets/scss/core/abstracts/_mixins.scss b/src/assets/scss/core/abstracts/_mixins.scss
@@ -1,6 +1,10 @@
 // Font Family
 @mixin font-family($elem) {
+	@if (type-of($elem) == string) {
 	font-family: unquote(get-font-family($elem));
+	} @else {
+		font-family: initial;
+	}
 }
 
 // Font-size + Line-height + Kerning

diff --git a/src/components/layout/Header.js b/src/components/layout/Header.js
@@ -3,8 +3,7 @@ import PropTypes from "prop-types";
 import classNames from "classnames";
 import { Link } from "react-router-dom";
 import Logo from "./partials/Logo";
-import { ChangeLogContext } from "../../App";
-import { Link as LinkScroll } from "react-scroll";
+import { ManagerContext } from "../../App";
 
 const propTypes = {
 	navPosition: PropTypes.string,
@@ -80,9 +79,7 @@ const Header = ({
 		className,
 	);
 
-	const ytVanced = useContext(ChangeLogContext)?.vanced;
-	const musicVanced = useContext(ChangeLogContext)?.music;
-	const vancedManagerAPKUrl = useContext(ChangeLogContext)?.manager?.url;
+	const vancedManagerAPKUrl = "https://github.com/YTVanced/VancedManager/releases/latest/download/manager.apk";
 
 	return (
 		<header {...props} className={classes}>

diff --git a/src/components/layout/partials/FooterNav.js b/src/components/layout/partials/FooterNav.js
@@ -1,14 +1,14 @@
 import React, { useContext } from "react";
 import classNames from "classnames";
 import { Link } from "react-router-dom";
-import { ChangeLogContext, ShowBraveContext } from "../../../App";
+import { ManagerContext, ShowBraveContext } from "../../../App";
 import { SiBrave, SiAdguard } from "react-icons/si";
 import { ADGUARD, BRAVE } from "../../../constants/links";
 
 const FooterNav = ({ className, ...props }) => {
 	const classes = classNames("footer-nav", className);
 
-	const vancedManagerAPKUrl = useContext(ChangeLogContext)?.manager?.url;
+	const vancedManagerAPKUrl = "https://github.com/YTVanced/VancedManager/releases/latest/download/manager.apk";
 	const showBrave = useContext(ShowBraveContext);
 
 	return (

diff --git a/src/components/sections/ChangeLogs.js b/src/components/sections/ChangeLogs.js
@@ -1,8 +1,8 @@
-import React, { useContext } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import classNames from "classnames";
 import { SectionProps } from "../../utils/SectionProps";
 
-import { ChangeLogContext } from "../../App";
+import { ManagerContext } from "../../App";
 
 const propTypes = {
 	...SectionProps.types,
@@ -37,13 +37,35 @@ const ChangeLogs = ({
 		bottomDivider && "has-bottom-divider",
 	);
 
-	const changeLogs = useContext(ChangeLogContext);
+	const [vancedData, setVanced] = useState({});
+	const [musicData, setMusic] = useState({});
+	const [microgData, setMicrog] = useState({});
+
+	useEffect(() => {
+		fetch("https://api.github.com/repos/YTVanced/Vanced/releases/latest")
+			.then(res => res.json())
+			.then(data => setVanced(data));
+	}, []);
+
+	useEffect(() => {
+		fetch("https://api.github.com/repos/YTVanced/VancedMusic/releases/latest")
+			.then(res => res.json())
+			.then(data => setMusic(data));
+	}, []);
+
+	useEffect(() => {
+		fetch("https://api.github.com/repos/YTVanced/VancedMicroG/releases/latest")
+			.then(res => res.json())
+			.then(data => setMicrog(data));
+	}, []);
+
+	const managerData = useContext(ManagerContext);
 
 	const changeLogsLoopData = [
-		{ name: "Vanced Manager", data: changeLogs?.manager },
-		{ name: "MicroG", data: changeLogs?.microg },
-		{ name: "YouTube™ Music Vanced", data: changeLogs?.music },
-		{ name: "YouTube™ Vanced", data: changeLogs?.vanced },
+		{ name: "Vanced Manager", data: managerData },
+		{ name: "MicroG", data: microgData },
+		{ name: "YouTube™ Music Vanced", data: musicData },
+		{ name: "YouTube™ Vanced", data: vancedData },
 	];
 
 	return (
@@ -68,21 +90,22 @@ const ChangeLogs = ({
 						<React.Fragment key={data.name}>
 							<h3>
 								{data.name}{" "}
-								<a href={data?.data?.url}>
+								<a href={data?.data?.html_url}>
 									<span
 										className="m-0 mb-32 reveal-from-bottom text-sm text-color-secondary"
 										data-reveal-delay="400"
 									>
-										(v{data?.data?.version})
+										({data?.data?.tag_name?.split('-')[0]})
 									</span>
 								</a>
 							</h3>
 							<p>Changelog:</p>
 							<ul>
-								{data?.data?.changelog.split("- ").map(point => {
+								{data?.data?.body?.split("- ").map(point => {
 									if (point) {
 										return <li key={point}>{point}</li>;
 									}
+									return point;
 								})}
 							</ul>
 							<hr />

diff --git a/src/components/sections/Hero.js b/src/components/sections/Hero.js
@@ -8,7 +8,7 @@ import Button from "../elements/Button";
 import getRandomQuotes from "../../utils/getRandomQuotes";
 import Image from "../elements/Image";
 import DownloadImg from "./../../assets/images/download.svg";
-import { ChangeLogContext, ShowBraveContext } from "../../App";
+import { ManagerContext, ShowBraveContext } from "../../App";
 
 import { SiBrave, SiAdguard } from "react-icons/si";
 import { ADGUARD, BRAVE } from "../../constants/links";
@@ -58,7 +58,7 @@ const Hero = ({
 		bottomDivider && "has-bottom-divider",
 	);
 
-	const vancedManager = useContext(ChangeLogContext)?.manager;
+	const vancedManager = useContext(ManagerContext);
 	const showBrave = useContext(ShowBraveContext);
 
 	return (
@@ -85,9 +85,9 @@ const Hero = ({
 										tag="a"
 										color="primary"
 										wideMobile
-										href={vancedManager?.url}
+										href="https://github.com/YTVanced/VancedManager/releases/latest/download/manager.apk"
 									>
-										Vanced Manager (v{vancedManager?.version})
+										Vanced Manager ({vancedManager?.tag_name?.split('-')[0]})
 										<Image
 											src={DownloadImg}
 											alt="Features tile icon 01"

diff --git a/src/components/sections/HeroPc.js b/src/components/sections/HeroPc.js
@@ -8,7 +8,6 @@ import Button from "../elements/Button";
 import getRandomQuotes from "../../utils/getRandomQuotes";
 import Image from "../elements/Image";
 import DownloadImg from "./../../assets/images/download.svg";
-import { ChangeLogContext, ShowBraveContext } from "../../App";
 
 import { SiBrave, SiAdguard } from "react-icons/si";
 import { ADGUARD, BRAVE } from "../../constants/links";
@@ -58,9 +57,6 @@ const Hero = ({
 		bottomDivider && "has-bottom-divider",
 	);
 
-	const vancedManager = useContext(ChangeLogContext)?.manager;
-	const showBrave = useContext(ShowBraveContext);
-
 	return (
 		<section {...props} className={outerClasses}>
 			<div className="container-sm">