From 97551951deeec4c40ed56fc5d0bca438997a81e0 Mon Sep 17 00:00:00 2001 From: Cooper Ransom Date: Tue, 2 Apr 2024 22:59:41 -0400 Subject: [PATCH] Make it better lol --- package.json | 4 +- pnpm-lock.yaml | 63 +++++----- src/components/layout/Navigation.tsx | 2 +- src/pages/About.tsx | 2 +- src/pages/{TopFlix.tsx => Discover.tsx} | 31 +---- src/pages/Support.tsx | 22 +++- src/pages/TopSources.tsx | 155 ------------------------ src/setup/App.tsx | 6 +- src/utils/setup/App.tsx | 6 +- 9 files changed, 63 insertions(+), 228 deletions(-) rename src/pages/{TopFlix.tsx => Discover.tsx} (95%) delete mode 100644 src/pages/TopSources.tsx diff --git a/package.json b/package.json index f185e7f0..10a3cdf0 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@formkit/auto-animate": "^0.8.1", "@headlessui/react": "^1.7.18", "@ladjs/country-language": "^1.0.3", - "@movie-web/providers": "^2.2.7", + "@movie-web/providers": "^2.2.8", "@noble/hashes": "^1.4.0", "@plasmohq/messaging": "^0.6.2", "@react-spring/web": "^9.7.3", @@ -83,7 +83,7 @@ "@types/lodash.isequal": "^4.5.8", "@types/lodash.merge": "^4.6.9", "@types/lodash.throttle": "^4.1.9", - "@types/node": "^20.12.2", + "@types/node": "^20.12.3", "@types/pako": "^2.0.3", "@types/react": "^18.2.74", "@types/react-dom": "^18.2.23", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 62948f97..a0443362 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -22,8 +22,8 @@ dependencies: specifier: ^1.0.3 version: 1.0.3 '@movie-web/providers': - specifier: ^2.2.7 - version: 2.2.7 + specifier: ^2.2.8 + version: 2.2.8 '@noble/hashes': specifier: ^1.4.0 version: 1.4.0 @@ -180,8 +180,8 @@ devDependencies: specifier: ^4.1.9 version: 4.1.9 '@types/node': - specifier: ^20.12.2 - version: 20.12.2 + specifier: ^20.12.3 + version: 20.12.3 '@types/pako': specifier: ^2.0.3 version: 2.0.3 @@ -298,7 +298,7 @@ devDependencies: version: 5.4.3 vite: specifier: ^5.2.7 - version: 5.2.7(@types/node@20.12.2) + version: 5.2.7(@types/node@20.12.3) vite-plugin-checker: specifier: ^0.6.4 version: 0.6.4(eslint@8.57.0)(typescript@5.4.3)(vite@5.2.7) @@ -313,7 +313,7 @@ devDependencies: version: 1.0.2(vite@5.2.7) vitest: specifier: ^1.4.0 - version: 1.4.0(@types/node@20.12.2)(jsdom@23.2.0) + version: 1.4.0(@types/node@20.12.3)(jsdom@23.2.0) workbox-window: specifier: ^7.0.0 version: 7.0.0 @@ -1901,8 +1901,8 @@ packages: engines: {node: '>= 14'} dev: false - /@movie-web/providers@2.2.7: - resolution: {integrity: sha512-XwU1IkXrF7e99JtC5Tna00/yuRECqEyBo8bhTtVE6ZFLYj3YQXVm2sdHjcyerjbyAsXvKGeikWEkrvHofTUjDA==} + /@movie-web/providers@2.2.8: + resolution: {integrity: sha512-fsksIYuRn39TLC1PLMZrM6AW5kRQCWFmK0aK/p9bTui0ojs6aXLIZbvIwK0svzKLP2pmH6xJEhALxF8SYPE72Q==} requiresBuild: true dependencies: cheerio: 1.0.0-rc.12 @@ -2246,11 +2246,11 @@ packages: /@types/node-forge@1.3.11: resolution: {integrity: sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.3 dev: false - /@types/node@20.12.2: - resolution: {integrity: sha512-zQ0NYO87hyN6Xrclcqp7f8ZbXNbRfoGWNcMvHTPQp9UUrwI0mI7XBz+cu7/W6/VClYo2g63B0cjull/srU7LgQ==} + /@types/node@20.12.3: + resolution: {integrity: sha512-sD+ia2ubTeWrOu+YMF+MTAB7E+O7qsMqAbMfW7DG3K1URwhZ5hN1pLlRVGbf4wDFzSfikL05M17EyorS86jShw==} dependencies: undici-types: 5.26.5 @@ -2316,7 +2316,7 @@ packages: /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.3 dev: true /@types/semver@7.5.8: @@ -2474,7 +2474,7 @@ packages: '@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.3) '@types/babel__core': 7.20.5 react-refresh: 0.14.0 - vite: 5.2.7(@types/node@20.12.2) + vite: 5.2.7(@types/node@20.12.3) transitivePeerDependencies: - supports-color dev: true @@ -2846,7 +2846,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001605 - electron-to-chromium: 1.4.723 + electron-to-chromium: 1.4.724 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) @@ -3352,8 +3352,8 @@ packages: jake: 10.8.7 dev: true - /electron-to-chromium@1.4.723: - resolution: {integrity: sha512-rxFVtrMGMFROr4qqU6n95rUi9IlfIm+lIAt+hOToy/9r6CDv0XiEcQdC3VP71y1pE5CFTzKV0RvxOGYCPWWHPw==} + /electron-to-chromium@1.4.724: + resolution: {integrity: sha512-RTRvkmRkGhNBPPpdrgtDKvmOEYTrPlXDfc0J/Nfq5s29tEahAwhiX4mmhNzj6febWMleulxVYPh7QwCSL/EldA==} /emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -4669,7 +4669,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.3 merge-stream: 2.0.0 supports-color: 7.2.0 dev: true @@ -6754,7 +6754,7 @@ packages: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} dev: true - /vite-node@1.4.0(@types/node@20.12.2): + /vite-node@1.4.0(@types/node@20.12.3): resolution: {integrity: sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -6763,7 +6763,7 @@ packages: debug: 4.3.4 pathe: 1.1.2 picocolors: 1.0.0 - vite: 5.2.7(@types/node@20.12.2) + vite: 5.2.7(@types/node@20.12.3) transitivePeerDependencies: - '@types/node' - less @@ -6819,7 +6819,7 @@ packages: strip-ansi: 6.0.1 tiny-invariant: 1.3.3 typescript: 5.4.3 - vite: 5.2.7(@types/node@20.12.2) + vite: 5.2.7(@types/node@20.12.3) vscode-languageclient: 7.0.0 vscode-languageserver: 7.0.0 vscode-languageserver-textdocument: 1.0.11 @@ -6831,7 +6831,7 @@ packages: peerDependencies: vite: '>=2.0.0-beta.69' dependencies: - vite: 5.2.7(@types/node@20.12.2) + vite: 5.2.7(@types/node@20.12.3) dev: true /vite-plugin-pwa@0.17.5(vite@5.2.7)(workbox-build@7.0.0)(workbox-window@7.0.0): @@ -6845,7 +6845,7 @@ packages: debug: 4.3.4 fast-glob: 3.3.2 pretty-bytes: 6.1.1 - vite: 5.2.7(@types/node@20.12.2) + vite: 5.2.7(@types/node@20.12.3) workbox-build: 7.0.0 workbox-window: 7.0.0 transitivePeerDependencies: @@ -6862,10 +6862,10 @@ packages: fast-glob: 3.3.2 fs-extra: 11.2.0 picocolors: 1.0.0 - vite: 5.2.7(@types/node@20.12.2) + vite: 5.2.7(@types/node@20.12.3) dev: true - /vite@5.2.7(@types/node@20.12.2): + /vite@5.2.7(@types/node@20.12.3): resolution: {integrity: sha512-k14PWOKLI6pMaSzAuGtT+Cf0YmIx12z9YGon39onaJNy8DLBfBJrzg9FQEmkAM5lpHBZs9wksWAsyF/HkpEwJA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -6893,7 +6893,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.3 esbuild: 0.20.2 postcss: 8.4.38 rollup: /@rollup/wasm-node@4.13.2 @@ -6901,7 +6901,7 @@ packages: fsevents: 2.3.3 dev: true - /vitest@1.4.0(@types/node@20.12.2)(jsdom@23.2.0): + /vitest@1.4.0(@types/node@20.12.3)(jsdom@23.2.0): resolution: {integrity: sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true @@ -6926,7 +6926,7 @@ packages: jsdom: optional: true dependencies: - '@types/node': 20.12.2 + '@types/node': 20.12.3 '@vitest/expect': 1.4.0 '@vitest/runner': 1.4.0 '@vitest/snapshot': 1.4.0 @@ -6945,8 +6945,8 @@ packages: strip-literal: 2.1.0 tinybench: 2.6.0 tinypool: 0.8.3 - vite: 5.2.7(@types/node@20.12.2) - vite-node: 1.4.0(@types/node@20.12.2) + vite: 5.2.7(@types/node@20.12.3) + vite-node: 1.4.0(@types/node@20.12.3) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -7312,11 +7312,6 @@ packages: optional: true dev: true - /xml-name-validator@4.0.0: - resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==} - engines: {node: '>=12'} - dev: true - /xml-name-validator@5.0.0: resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==} engines: {node: '>=18'} diff --git a/src/components/layout/Navigation.tsx b/src/components/layout/Navigation.tsx index 24a3069b..b3022d0b 100644 --- a/src/components/layout/Navigation.tsx +++ b/src/components/layout/Navigation.tsx @@ -104,7 +104,7 @@ export function Navigation(props: NavigationProps) { navigate("/flix")} + onClick={() => navigate("/discover")} rel="noreferrer" className="text-xl text-white tabbable rounded-full" > diff --git a/src/pages/About.tsx b/src/pages/About.tsx index 32e9601a..c5d1d9f0 100644 --- a/src/pages/About.tsx +++ b/src/pages/About.tsx @@ -78,7 +78,7 @@ export function AboutPage() { > diff --git a/src/pages/TopFlix.tsx b/src/pages/Discover.tsx similarity index 95% rename from src/pages/TopFlix.tsx rename to src/pages/Discover.tsx index e974c663..1e76a99c 100644 --- a/src/pages/TopFlix.tsx +++ b/src/pages/Discover.tsx @@ -51,38 +51,13 @@ const categories: Category[] = [ name: "Now Playing", endpoint: "/movie/now_playing?language=en-US", }, - { - name: "Popular", - endpoint: "/movie/popular?language=en-US", - }, { name: "Top Rated", endpoint: "/movie/top_rated?language=en-US", }, ]; -export function Button(props: { - className: string; - onClick?: () => void; - children: React.ReactNode; - disabled?: boolean; -}) { - return ( - - ); -} - -export function TopFlix() { +export function Discover() { const { t } = useTranslation(); const [showBg] = useState(false); const [genres, setGenres] = useState([]); @@ -281,7 +256,7 @@ export function TopFlix() { ))} + ); +} + // From about just removed the numbers export function Ol(props: { items: React.ReactNode[] }) { return ( diff --git a/src/pages/TopSources.tsx b/src/pages/TopSources.tsx deleted file mode 100644 index ee44e0f8..00000000 --- a/src/pages/TopSources.tsx +++ /dev/null @@ -1,155 +0,0 @@ -import { ReactNode, useEffect, useState } from "react"; -import { useNavigate } from "react-router-dom"; - -import { ThiccContainer } from "@/components/layout/ThinContainer"; -import { Divider } from "@/components/utils/Divider"; -import { Heading1, Paragraph } from "@/components/utils/Text"; -import { BACKEND_URL } from "@/setup/constants"; - -import { SubPageLayout } from "./layouts/SubPageLayout"; -import { PageTitle } from "./parts/util/PageTitle"; -import { Button } from "./TopFlix"; - -function ConfigValue(props: { name: string; children?: ReactNode }) { - return ( - <> -
-

-

{props.name}

-

-

{props.children}

-
- - - ); -} - -async function getTopSources() { - const response = await fetch(`${BACKEND_URL}/metrics`); - const text = await response.text(); - - const regex = - /mw_provider_status_count{provider_id="([^"]+)",status="([^"]+)"} (\d+)/g; - let match = regex.exec(text); - const items: { [key: string]: any } = {}; - - while (match !== null) { - const [_, providerId, status, count] = match; - if (items[providerId]) { - items[providerId].count += parseInt(count, 10); - } else { - items[providerId] = { - providerId, - status, - count: parseInt(count, 10), - }; - } - match = regex.exec(text); - } - - if (Object.keys(items).length > 0) { - return Object.values(items); - } - throw new Error("RECENT_PLAYED_ITEMS not found"); -} - -export function TopSources() { - const [recentPlayedItems, setRecentPlayedItems] = useState([]); - const [failStatusCount, setFailStatusCount] = useState(0); - const [successStatusCount, setSuccessStatusCount] = useState(0); - const navigate = useNavigate(); - - useEffect(() => { - getTopSources() - .then((items) => { - const limitedItems = items.filter( - (item, index, self) => - index === self.findIndex((t2) => t2.providerId === item.providerId), - ); - setRecentPlayedItems(limitedItems); - - // Calculate fail and success status counts - const failCount = limitedItems.reduce( - (acc, item) => - item.status === "failed" || item.status === "notfound" - ? acc + parseInt(item.count, 10) - : acc, - 0, - ); - const successCount = limitedItems.reduce( - (acc, item) => - item.status === "success" ? acc + parseInt(item.count, 10) : acc, - 0, - ); - setFailStatusCount(failCount.toLocaleString()); - setSuccessStatusCount(successCount.toLocaleString()); - }) - .catch((error) => { - console.error("Error fetching recent played items:", error); - }); - }, []); - - function getItemsForCurrentPage() { - const sortedItems = recentPlayedItems.sort((a, b) => b.count - a.count); - - return sortedItems.map((item, index) => ({ - ...item, - rank: index + 1, - })); - } - - return ( - - - -
- Top sources - - The most used providers on sudo-flix.lol, this data is fetched from - the current backend deployment too. - -
-
-
-

- Fail Count: {failStatusCount} -

-
-
-

- Success Count: {successStatusCount} -

-
-
-
- -
-
-
- -
- - {getItemsForCurrentPage().map((item) => { - return ( - - {`Requests: `} - {parseInt(item.count, 10).toLocaleString()} - - ); - })} -
- - - ); -} diff --git a/src/setup/App.tsx b/src/setup/App.tsx index 25309e21..97983c7b 100644 --- a/src/setup/App.tsx +++ b/src/setup/App.tsx @@ -15,6 +15,7 @@ import { useOnlineListener } from "@/hooks/usePing"; import { AboutPage } from "@/pages/About"; import { AdminPage } from "@/pages/admin/AdminPage"; import VideoTesterView from "@/pages/developer/VideoTesterView"; +import { Discover } from "@/pages/Discover"; import { DmcaPage, shouldHaveDmcaPage } from "@/pages/Dmca"; import MaintenancePage from "@/pages/errors/MaintenancePage"; import { NotFoundPage } from "@/pages/errors/NotFoundPage"; @@ -25,7 +26,6 @@ import { OnboardingExtensionPage } from "@/pages/onboarding/OnboardingExtension" import { OnboardingProxyPage } from "@/pages/onboarding/OnboardingProxy"; import { RegisterPage } from "@/pages/Register"; import { SupportPage } from "@/pages/Support"; -import { TopFlix } from "@/pages/TopFlix"; import { Layout } from "@/setup/Layout"; import { useHistoryListener } from "@/stores/history"; import { LanguageProvider } from "@/stores/language"; @@ -150,8 +150,8 @@ function App() { ) : null} {/* Support page */} } /> - {/* Top flix page */} - } /> + {/* Discover page */} + } /> {/* Settings page */} } /> - {/* Top flix page */} - } /> + {/* Discover page */} + } /> {/* Settings page */}