From 0875c3b7fb5b74ee1c18d2660be822114876d919 Mon Sep 17 00:00:00 2001 From: Pas <74743263+Pasithea0@users.noreply.github.com> Date: Fri, 11 Jul 2025 11:29:43 -0600 Subject: [PATCH] return github and fix typos --- .github/CONTRIBUTING.md | 8 ++++---- .github/pull_request_template.md | 4 ++-- src/components/LinksDropdown.tsx | 6 ++++++ src/components/layout/Footer.tsx | 5 +++++ src/setup/config.ts | 4 ++-- src/setup/constants.ts | 2 +- src/utils/setup/constants.ts | 2 +- 7 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 3b29d820..cffe7352 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -37,14 +37,14 @@ If you do not have a GitHub account or want to discuss a feature or bug with us [Join bruh](https://docs.pstream.org/links/discord) ### GitHub Issues -To make a GitHub issue for sudo-flix, please visit the [new issue page](https://github.com/p-stream/p-strean/issues/new/choose) where you can pick either the "Bug Report" or "Feature Request" template. +To make a GitHub issue for sudo-flix, please visit the [new issue page](https://github.com/p-stream/p-stream/issues/new/choose) where you can pick either the "Bug Report" or "Feature Request" template. When filling out an issue template, please include as much detail as possible and any screenshots or console logs as appropriate. -After an issue is created, it will be assigned either the https://github.com/p-stream/p-strean/labels/bug or https://github.com/p-stream/p-strean/labels/feature label, along with https://github.com/p-stream/p-strean/labels/awaiting-approval. One of our maintainers will review your issue and, if it's accepted, will set the https://github.com/p-stream/p-strean/labels/approved label. +After an issue is created, it will be assigned either the https://github.com/p-stream/p-stream/labels/bug or https://github.com/p-stream/p-stream/labels/feature label, along with https://github.com/p-stream/p-stream/labels/awaiting-approval. One of our maintainers will review your issue and, if it's accepted, will set the https://github.com/p-stream/p-stream/labels/approved label. ## Before you start! -Before starting a contribution, please check your contribution is part of an open issue on [our issues page](https://github.com/p-stream/p-strean/issues?q=is%3Aopen+is%3Aissue+label%3Aapproved). +Before starting a contribution, please check your contribution is part of an open issue on [our issues page](https://github.com/p-stream/p-stream/issues?q=is%3Aopen+is%3Aissue+label%3Aapproved). GitHub issues are how we track our bugs and feature requests that will be implemented into sudo-flix - all contributions **must** have an issue and be approved by a maintainer before a pull request can be worked on. @@ -53,7 +53,7 @@ If a pull request is opened before an issue is created and accepted, you may ris > **Note** > The exception to this are language contributions, which are discussed in [this section](#language-contributions) -Also, make sure that the issue you would like to work on has been given the https://github.com/p-stream/p-strean/labels/approved label by a maintainer. Otherwise, if we reject the issue, it means your work will have gone to waste! +Also, make sure that the issue you would like to work on has been given the https://github.com/p-stream/p-stream/labels/approved label by a maintainer. Otherwise, if we reject the issue, it means your work will have gone to waste! ## Contributing If you're here because you'd like to work on an issue, amazing! Thank you for even considering contributing to sudo-flix; it means a lot :heart: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 00af0eb4..a167bd72 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,6 +1,6 @@ This pull request resolves #XXX - - [ ] I have read and agreed to the [code of conduct](https://github.com/p-stream/p-strean/blob/production/.github/CODE_OF_CONDUCT.md). - - [ ] I have read and complied with the [contributing guidelines](https://github.com/p-stream/p-strean/blob/production/.github/CONTRIBUTING.md). + - [ ] I have read and agreed to the [code of conduct](https://github.com/p-stream/p-stream/blob/production/.github/CODE_OF_CONDUCT.md). + - [ ] I have read and complied with the [contributing guidelines](https://github.com/p-stream/p-stream/blob/production/.github/CONTRIBUTING.md). - [ ] I have tested all of my changes. - Enter discord user: `` (we require this for the contributor role) diff --git a/src/components/LinksDropdown.tsx b/src/components/LinksDropdown.tsx index 5b1329d6..34ea4941 100644 --- a/src/components/LinksDropdown.tsx +++ b/src/components/LinksDropdown.tsx @@ -293,6 +293,12 @@ export function LinksDropdown(props: { children: React.ReactNode }) { ) : null}
+ {conf().GITHUB_LINK && ( + + )} {t("footer.legal.disclaimerText")}

+ {conf().GITHUB_LINK && ( + + {t("footer.links.github")} + + )} {t("footer.links.discord")} diff --git a/src/setup/config.ts b/src/setup/config.ts index 8189e0fb..ca70e993 100644 --- a/src/setup/config.ts +++ b/src/setup/config.ts @@ -2,7 +2,7 @@ import { APP_VERSION, BACKEND_URL, DISCORD_LINK, - GITHUB_LINK, + // GITHUB_LINK, TWITTER_LINK, } from "./constants"; @@ -112,7 +112,7 @@ function getKey(key: keyof Config, defaultString?: string): string | null { export function conf(): RuntimeConfig { return { APP_VERSION, - GITHUB_LINK, + GITHUB_LINK: getKey("GITHUB_LINK", ""), DISCORD_LINK, TWITTER_LINK, DMCA_EMAIL: getKey("DMCA_EMAIL"), diff --git a/src/setup/constants.ts b/src/setup/constants.ts index 5a55286e..6a3c0983 100644 --- a/src/setup/constants.ts +++ b/src/setup/constants.ts @@ -1,6 +1,6 @@ export const APP_VERSION = import.meta.env.PACKAGE_VERSION; export const DISCORD_LINK = "https://discord.gg/7z6znYgrTG"; -export const GITHUB_LINK = "https://github.com/p-stream/p-strean"; +// export const GITHUB_LINK = "https://github.com/p-stream/p-stream"; export const TWITTER_LINK = "https://twitter.com/SudoFlix"; export const GA_ID = import.meta.env.VITE_GA_ID; export const BACKEND_URL = import.meta.env.VITE_BACKEND_URL; diff --git a/src/utils/setup/constants.ts b/src/utils/setup/constants.ts index 4c6d7fc8..7b62852c 100644 --- a/src/utils/setup/constants.ts +++ b/src/utils/setup/constants.ts @@ -1,5 +1,5 @@ export const APP_VERSION = import.meta.env.PACKAGE_VERSION; export const DISCORD_LINK = "https://discord.gg/7z6znYgrTG"; -export const GITHUB_LINK = "https://github.com/p-stream/p-strean"; +export const GITHUB_LINK = "https://github.com/p-stream/p-stream"; export const GA_ID = import.meta.env.VITE_GA_ID; export const BACKEND_URL = import.meta.env.VITE_BACKEND_URL;