diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7ccfd0ae..656a3e09 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ -* Maintainers: [MW-Exodus Team](https://github.com/MW-Legacy) -* Founder: (P-Stream)[https://github.com/p-stream] +* Founder: [@movie-web/project-leads](https://github.com/movie-web-archive) +* Maintainers: [@p-stream](https://github.com/p-stream) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 97ff3867..4c905420 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,21 +1,19 @@ -# Contributing Guidelines for sudo-flix +# Contributing Guidelines for P-Stream Thank you for investing your time in contributing to our project! Your contribution will be reflected on all of the community hosted instances that are on the latest version. Please read our [Code of Conduct](./CODE_OF_CONDUCT.md) to keep our community approachable and respectable. ## Contents -- [Contributing Guidelines for sudo-flix](#contributing-guidelines-for-sudo-flix) - - [Contents](#contents) - - [New contributor guide](#new-contributor-guide) - - [Requesting a feature or reporting a bug](#requesting-a-feature-or-reporting-a-bug) - - [Discord Server](#discord-server) - - [GitHub Issues](#github-issues) - - [Before you start!](#before-you-start) - - [Contributing](#contributing) - - [Recommended Development Environment](#recommended-development-environment) - - [Tips](#tips) - - [Language Contributions](#language-contributions) + - [New Contributor Guide](#new-contributor-guide) + - [Requesting a feature or reporting a bug](#requesting-a-feature-or-reporting-a-bug) + - [Discord Server](#discord-server) + - [GitHub Issues](#github-issues) + - [Before you start](#before-you-start) + - [Contributing](#before-you-start) + - [Recommended Development Environment](#recommended-development-environment) + - [Tips](#tips) + - [Language Contributions](#language-contributions) ## New contributor guide @@ -29,15 +27,16 @@ To get an overview of the project, read the [README](README.md). Here are some r ## Requesting a feature or reporting a bug There are two places where to request features or report bugs: + - The P-Stream Discord server - GitHub Issues - - The sudo-flix Discord server ### Discord Server -If you do not have a GitHub account or want to discuss a feature or bug with us before making an issue, you can join our Discord server. -[Join bruh](https://docs.pstream.mov/links/discord) +If you do not have a GitHub account or want to discuss a feature or bug with us before making an issue, you can join our Discord server. + +Discord Server ### GitHub Issues -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. +To make a GitHub issue for P-Stream, 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. @@ -46,7 +45,7 @@ After an issue is created, it will be assigned either the https://github.com/p-s ## 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-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. +GitHub issues are how we track our bugs and feature requests that will be implemented into P-Stream - all contributions **must** have an issue and be approved by a maintainer before a pull request can be worked on. If a pull request is opened before an issue is created and accepted, you may risk having your pull request rejected! Always check with us before starting work on a feature - we don't want to waste your time! @@ -56,7 +55,7 @@ If a pull request is opened before an issue is created and accepted, you may ris 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: +If you're here because you'd like to work on an issue, amazing! Thank you for even considering contributing to P-Stream; it means a lot :heart: Firstly, make sure you've read the [Before you start!](#before-you-start) section! @@ -65,7 +64,7 @@ When you have found a GitHub issue you would like to work on, you can request to If you are assigned to an issue but can't complete it for whatever reason, no problem! Just let us know, and we will open up the issue to have someone else assigned. ### Recommended Development Environment -Our recommended development environment to work on sudo-flix is: +Our recommended development environment to work on P-Stream is: - [Visual Studio Code](https://code.visualstudio.com/) - [ESLint Extension](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) - [EditorConfig Extension](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig) @@ -79,13 +78,18 @@ Here are some tips to make sure that your pull requests are :pinched_fingers: fi - KISS - Keep It Simple Soldier! - Simple code makes readable and efficient code! - Follow standard best practices for TypeScript and React. -- Keep as much as possible to the style of sudo-flix. Look around our codebase to familiarise yourself with how we do things! +- Keep as much as possible to the style of P-Stream. Look around our codebase to familiarise yourself with how we do things! - Ensure to take note of the ESLint errors and warnings! **Do not ignore them!** They are there for a reason. - Test, test, test! Make sure you thoroughly test the features you are contributing. ### Language Contributions -Language contributions help sudo-flix massively, allowing people worldwide to use our app! +Language contributions help P-Stream massively, allowing people worldwide to use our app! -1. Create a new langague json file -2. Implement the langague file into settings -3. Thats it make a PR +We use Weblate for crowdsourcing our translations. [Click here to go to our translation tool.](https://docs.pstream.mov/links/weblate) + + +1. First make sure you make an account. (click the link above) +2. Click the language you want to help translate, if it's not listed you can click the plus top left to add a new language. +3. In the top right of the screen, click "translate" +4. Here you will be prompted a key to translate, fill in a translation and proceed to the next item by pressing "save and continue". +5. Thats all there is to it, every translation will eventually come through and be pushed with an update. This usually doesn't take longer than a week. diff --git a/.github/P-Stream.png b/.github/P-Stream.png deleted file mode 100644 index 8817fa53..00000000 Binary files a/.github/P-Stream.png and /dev/null differ diff --git a/.github/SECURITY.md b/.github/SECURITY.md index 6736829f..cee95701 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -2,9 +2,9 @@ ## Supported Versions -The latest version of sudo-flix is the only version that is supported, as it is the only version that is being actively developed. +The latest version of P-Stream is the only version that is supported, as it is the only version that is being actively developed. ## Reporting a Vulnerability -You can contact the sudo-flix maintainers to report a vulnerability: - - Report the vulnerability in the [Discord](https://docs.pstream.mov/links/discord). +You can contact the P-Stream maintainers to report a vulnerability: + - Report the vulnerability in the [P-Stream Discord server](https://docs.pstream.mov/links/discord) diff --git a/.github/Sudo-Flix.png b/.github/Sudo-Flix.png deleted file mode 100644 index 4bf156f6..00000000 Binary files a/.github/Sudo-Flix.png and /dev/null differ diff --git a/.github/logo-dark.svg b/.github/logo-dark.svg new file mode 100644 index 00000000..7319e655 --- /dev/null +++ b/.github/logo-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/.github/logo-light.svg b/.github/logo-light.svg new file mode 100644 index 00000000..e366b1cd --- /dev/null +++ b/.github/logo-light.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a167bd72..f938b4a2 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-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 read and agreed to the [code of conduct](https://github.com/p-stream/p-stream/blob/dev/.github/CODE_OF_CONDUCT.md). + - [ ] I have read and complied with the [contributing guidelines](https://github.com/p-stream/p-stream/blob/dev/.github/CONTRIBUTING.md). + - [ ] What I'm implementing was assigned to me and is an [approved issue](https://github.com/p-stream/p-stream/issues?q=is%3Aopen+is%3Aissue+label%3Aapproved). For reference, please take a look at our [GitHub projects](https://github.com/p-stream/p-stream/projects). - [ ] I have tested all of my changes. - - Enter discord user: `` (we require this for the contributor role) diff --git a/.github/workflows/broken-sync.yml b/.github/workflows/broken-sync.yml new file mode 100644 index 00000000..a051bf19 --- /dev/null +++ b/.github/workflows/broken-sync.yml @@ -0,0 +1,26 @@ +name: Sync fork + +permissions: + contents: write + +on: + schedule: + - cron: "0 0 * * *" + workflow_dispatch: + +jobs: + sync: + name: Sync fork + runs-on: ubuntu-latest + if: ${{ github.event.repository.fork }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Sync fork + run: gh repo sync ${{ github.repository }} + env: + GH_TOKEN: ${{ github.token }} + + - uses: gautamkrishnar/keepalive-workflow@v1 diff --git a/.github/workflows/deploying.yml b/.github/workflows/deploying.yml index a19c0ca9..7a35c27f 100644 --- a/.github/workflows/deploying.yml +++ b/.github/workflows/deploying.yml @@ -3,7 +3,7 @@ name: Deploying on: push: branches: - - main + - production jobs: build_pwa: @@ -82,7 +82,7 @@ jobs: path: ./dist_pwa - name: Zip PWA files - run: cd dist_pwa && zip -r ../movie-web.pwa.zip . + run: cd dist_pwa && zip -r ../p-stream.pwa.zip . - name: Download normal artifact uses: actions/download-artifact@v4 @@ -91,7 +91,7 @@ jobs: path: ./dist_normal - name: Zip normal files - run: cd dist_normal && zip -r ../movie-web.zip . + run: cd dist_normal && zip -r ../p-stream.zip . - name: Get version id: package-version @@ -101,31 +101,31 @@ jobs: id: create_release uses: actions/create-release@v1 env: - PAT_TOKEN: ${{ secrets.PAT_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ steps.package-version.outputs.current-version }} - release_name: Movie web v${{ steps.package-version.outputs.current-version }} + release_name: P-Stream v${{ steps.package-version.outputs.current-version }} draft: false prerelease: false - name: Upload release (PWA) uses: actions/upload-release-asset@v1 env: - PAT_TOKEN: ${{ secrets.PAT_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./movie-web.pwa.zip - asset_name: movie-web.pwa.zip + asset_path: ./p-stream.pwa.zip + asset_name: p-stream.pwa.zip asset_content_type: application/zip - name: Upload Release (Normal) uses: actions/upload-release-asset@v1 env: - PAT_TOKEN: ${{ secrets.PAT_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./movie-web.zip - asset_name: movie-web.zip + asset_path: ./p-stream.zip + asset_name: p-stream.zip asset_content_type: application/zip registry: @@ -156,7 +156,7 @@ jobs: with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} - password: ${{ secrets.PAT_TOKEN }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Extract Docker metadata id: meta diff --git a/.github/workflows/linting_testing.yml b/.github/workflows/linting_testing.yml index 993ea894..99e1e1ab 100644 --- a/.github/workflows/linting_testing.yml +++ b/.github/workflows/linting_testing.yml @@ -3,7 +3,10 @@ name: Linting and Testing on: push: branches: - - main + - production + - dev + - beta + - embed pull_request: jobs: