diff --git a/src/layouts/Category.astro b/src/layouts/Category.astro index 00af81f..8655310 100644 --- a/src/layouts/Category.astro +++ b/src/layouts/Category.astro @@ -13,13 +13,13 @@ import Video from '@components/VideoItem.astro' // Configuration import { - DEFAULT_DATA_PROXY, - DEFAULT_VIDEO_PROXY + DEFAULT_MEDIA_DATA_PROXY, + DEFAULT_MEDIA_DATA_PROXY } from '@utils/GetConfig' // Fetch -const fetchFrom = DEFAULT_DATA_PROXY + '/api/v1/trending' + FetchData +const fetchFrom = DEFAULT_MEDIA_DATA_PROXY + '/api/v1/trending' + FetchData const response = await fetch(fetchFrom) const data = await response.json() @@ -35,7 +35,7 @@ const heroItem = data.slice(0,1)
{heroItem.map((data) => - + )}
diff --git a/src/pages/category/music.astro b/src/pages/category/music.astro index 3e43c29..e1a8cf6 100644 --- a/src/pages/category/music.astro +++ b/src/pages/category/music.astro @@ -6,15 +6,14 @@ changeLanguage("en"); // Configuration import { - DEFAULT_DATA_PROXY, - DEFAULT_VIDEO_PROXY -} from '../../../config.json' + DEFAULT_MEDIA_DATA_PROXY +} from '@utils/GetConfig' // Components import MusicItem from '@components/MusicItem.astro' // Fetch -const fetchFrom = DEFAULT_DATA_PROXY + '/api/v1/trending?type=music' +const fetchFrom = DEFAULT_MEDIA_DATA_PROXY + '/api/v1/trending?type=music' const response = await fetch(fetchFrom) const data = await response.json() @@ -30,7 +29,7 @@ const heroItem = data.slice(0,1)
{heroItem.map((data) => - + )}
diff --git a/src/pages/channel/[...slug].astro b/src/pages/channel/[...slug].astro index 9db9f1e..8cf0a1e 100644 --- a/src/pages/channel/[...slug].astro +++ b/src/pages/channel/[...slug].astro @@ -6,7 +6,7 @@ import i18next, { t, changeLanguage } from "i18next"; changeLanguage("en"); // Configuration -import { DEFAULT_DATA_PROXY, DEFAULT_IMAGE_PROXY, SERVER_DOMAIN } from '@utils/GetConfig' +import { DEFAULT_MEDIA_DATA_PROXY, DEFAULT_IMAGE_PROXY, SERVER_DOMAIN } from '@utils/GetConfig' import { BrightStar, Donate, Download, ShareIos, ThumbsUp } from "@iconoir/vue"; // Components @@ -14,22 +14,22 @@ import Video from '@components/VideoItem.astro' // Fetch const SWV = Astro.url.href.split("channel/").pop(); -const channel = await fetch(DEFAULT_DATA_PROXY + "/api/v1/channels/" + SWV).then((response) => response.json()); +const channel = await fetch(DEFAULT_MEDIA_DATA_PROXY + "/api/v1/channels/" + SWV).then((response) => response.json()); const DescriptionFormat = channel.descriptionHtml.replaceAll("\n", "
"); ---
- +
- +
- +

{channel.author}

{channel.subCountText}

@@ -45,7 +45,6 @@ const DescriptionFormat = channel.descriptionHtml.replaceAll("\n", "
"); {t("CHANNEL.COMMUNITY")}
-->
-

{t("CHANNEL.ABOUT")} {channel.author}

{t("CHANNEL.LATEST")}

diff --git a/src/pages/discover/tech.astro b/src/pages/discover/tech.astro index 4d3ae5a..aef6f76 100644 --- a/src/pages/discover/tech.astro +++ b/src/pages/discover/tech.astro @@ -7,7 +7,7 @@ const { FetchData, CategoryName, CategoryDescription } = Astro.props; // Use on top of Default Layout import Base from "@layouts/Default.astro"; // Configuration -import { DEFAULT_DATA_PROXY, DEFAULT_IMAGE_PROXY } from '@utils/GetConfig' +import { DEFAULT_MEDIA_DATA_PROXY, DEFAULT_IMAGE_PROXY } from '@utils/GetConfig' // Discover Data import Discover from "../../data/discover.json"; @@ -17,9 +17,9 @@ changeLanguage("en");
{Discover.Tech.map((channel) => - +
- +

{channel.Name}

 diff --git a/src/pages/embed/[...slug].astro b/src/pages/embed/[...slug].astro index 9d3ecc7..6291257 100644 --- a/src/pages/embed/[...slug].astro +++ b/src/pages/embed/[...slug].astro @@ -3,11 +3,11 @@ import { t, changeLanguage } from "i18next"; import Embed from "@layouts/Embed.astro"; import "@styles/video.scss"; // Configuration -import { DEFAULT_VIDEO_PROXY, DEFAULT_DATA_PROXY, DEFAULT_IMAGE_PROXY, SERVER_DOMAIN } from '@utils/GetConfig' +import { DEFAULT_MEDIA_DATA_PROXY, DEFAULT_MEDIA_DATA_PROXY, DEFAULT_IMAGE_PROXY, SERVER_DOMAIN } from '@utils/GetConfig' // Fetch const SWV = Astro.url.href.split("embed/").pop(); -const video = await fetch(DEFAULT_DATA_PROXY + "/api/v1/videos/" + SWV).then((response) => response.json()); +const video = await fetch(DEFAULT_MEDIA_DATA_PROXY + "/api/v1/videos/" + SWV).then((response) => response.json()); changeLanguage("en"); --- @@ -15,7 +15,7 @@ changeLanguage("en"); @@ -25,7 +25,7 @@ changeLanguage("en"); autoplay poster={DEFAULT_IMAGE_PROXY + '/https://i.ytimg.com/vi/' + video.videoId + '/maxresdefault.jpg'} video-title={video.title} - src={DEFAULT_VIDEO_PROXY + '/latest_version?id=' + video.videoId + '&itag=22&local=true'} + src={DEFAULT_MEDIA_DATA_PROXY + '/latest_version?id=' + video.videoId + '&itag=22&local=true'} >
diff --git a/src/pages/index.astro b/src/pages/index.astro index 40aa60a..3bff58e 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -8,30 +8,30 @@ changeLanguage("en"); // Configuration import { - DEFAULT_DATA_PROXY, + DEFAULT_MEDIA_DATA_PROXY, DEFAULT_IMAGE_PROXY } from '@utils/GetConfig' import { FireFlame, Frame, Gamepad, GraphUp, Movie, MusicDoubleNote } from "@iconoir/vue"; // Fetch -const TrendingFetch = DEFAULT_DATA_PROXY + '/api/v1/trending' +const TrendingFetch = DEFAULT_MEDIA_DATA_PROXY + '/api/v1/trending' const TrendingResponse = await fetch(TrendingFetch) const TrendingData = await TrendingResponse.json() const TrendingSplit = TrendingData.slice(0, 1) -const MoviesFetch = DEFAULT_DATA_PROXY + '/api/v1/trending?type=movies' +const MoviesFetch = DEFAULT_MEDIA_DATA_PROXY + '/api/v1/trending?type=movies' const MoviesResponse = await fetch(MoviesFetch) const MoviesData = await MoviesResponse.json() const MoviesSplit = MoviesData.slice(0, 1) -const MusicFetch = DEFAULT_DATA_PROXY + '/api/v1/trending?type=music' +const MusicFetch = DEFAULT_MEDIA_DATA_PROXY + '/api/v1/trending?type=music' const MusicResponse = await fetch(MusicFetch) const MusicData = await MusicResponse.json() const MusicSplit = MusicData.slice(0, 1) -const GamingFetch = DEFAULT_DATA_PROXY + '/api/v1/trending?type=gaming' +const GamingFetch = DEFAULT_MEDIA_DATA_PROXY + '/api/v1/trending?type=gaming' const GamingResponse = await fetch(GamingFetch) const GamingData = await GamingResponse.json() const GamingSplit = GamingData.slice(0, 1) @@ -48,7 +48,7 @@ const GamingSplit = GamingData.slice(0, 1)
{TrendingSplit.map((data) => - +

{t("SIDEBAR.CATEGORY_LIST.TRENDING")}

@@ -56,7 +56,7 @@ const GamingSplit = GamingData.slice(0, 1) )} {MoviesSplit.map((data) => - +

{t("SIDEBAR.CATEGORY_LIST.MOVIES")}

@@ -64,7 +64,7 @@ const GamingSplit = GamingData.slice(0, 1) )} {MusicSplit.map((data) => - +

{t("SIDEBAR.CATEGORY_LIST.MUSIC")}

@@ -72,7 +72,7 @@ const GamingSplit = GamingData.slice(0, 1) )} {GamingSplit.map((data) => - +

{t("SIDEBAR.CATEGORY_LIST.GAMES")}

@@ -82,7 +82,6 @@ const GamingSplit = GamingData.slice(0, 1)
-