Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-03-11 21:27:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'development' into feat/manage-streaming-urls

Browse source
This commit is contained in:
Lachezar Lechev 2024-11-08 14:44:50 +02:00
commit ad8e0f9b57
No known key found for this signature in database
GPG key ID: 69BDCB3ED8CE8037
7 changed files with 38 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -37,7 +37,7 @@ jobs:
# "--parrents where no error if existing, make parent directories as needed."
- run: mkdir -p ./build/${{ github.head_ref || github.ref_name }}
- name: Deploy to GitHub Pages
if: github.repository == 'Stremio/stremio-web' && github.actor != 'dependabot[bot]'
if: github.event.pull_request.head.repo.fork == false && github.actor != 'dependabot[bot]'
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}

25
package-lock.json generated
View file

@ -1,12 +1,12 @@
{
"name": "stremio",
"version": "5.0.0-beta.12",
"version": "5.0.0-beta.13",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "stremio",
"version": "5.0.0-beta.12",
"version": "5.0.0-beta.13",
"license": "gpl-2.0",
"dependencies": {
"@babel/runtime": "7.16.0",
@ -14,7 +14,7 @@
"@stremio/stremio-colors": "5.0.1",
"@stremio/stremio-core-web": "https://stremio.github.io/stremio-core/stremio-core-web/feat/streming-server-urls-bucket/dev/stremio-stremio-core-web-0.47.8.tgz",
"@stremio/stremio-icons": "5.4.0",
"@stremio/stremio-video": "0.0.38",
"@stremio/stremio-video": "0.0.46",
"a-color-picker": "1.2.1",
"bowser": "2.11.0",
"buffer": "6.0.3",
@ -36,7 +36,7 @@
"react-i18next": "^12.1.1",
"react-is": "18.2.0",
"spatial-navigation-polyfill": "github:Stremio/spatial-navigation#64871b1422466f5f45d24ebc8bbd315b2ebab6a6",
"stremio-translations": "github:Stremio/stremio-translations#378218c9617f3e763ba5f6755e4d39c1c158747d",
"stremio-translations": "github:Stremio/stremio-translations#57d66ecc8e2df4e73a613dc5e17123ce62ae63f7",
"url": "0.11.0",
"use-long-press": "^3.1.5"
},
@ -3167,9 +3167,9 @@
]
},
"node_modules/@stremio/stremio-video": {
"version": "0.0.38",
"resolved": "https://registry.npmjs.org/@stremio/stremio-video/-/stremio-video-0.0.38.tgz",
"integrity": "sha512-ev9z3YdMcZAsTQjEwOLfqB9EI8GdbQzwSGMZIOLPR/7/Ce7BQIctwDnEtTLgPmCsRpYZsqOD1PiBwU9tiDHZ8w==",
"version": "0.0.46",
"resolved": "https://registry.npmjs.org/@stremio/stremio-video/-/stremio-video-0.0.46.tgz",
"integrity": "sha512-U15CGB6CrUZKq3IKcEouAEH2RQoLy2+BI/hDStEYEACxlRlFaavKPI2opl37muh9TY089RnZVBYAM3yDidBZdg==",
"dependencies": {
"buffer": "6.0.3",
"color": "4.2.3",
@ -3181,7 +3181,7 @@
"magnet-uri": "6.2.0",
"url": "0.11.0",
"video-name-parser": "1.4.6",
"vtt.js": "github:jaruba/vtt.js#e4f5f5603730866bacb174a93f51b734c9f29e6a"
"vtt.js": "github:jaruba/vtt.js#84d33d157848407d790d78423dacc41a096294f0"
}
},
"node_modules/@stylistic/eslint-plugin": {
@ -13727,8 +13727,9 @@
},
"node_modules/stremio-translations": {
"version": "1.44.9",
"resolved": "git+ssh://git@github.com/Stremio/stremio-translations.git#378218c9617f3e763ba5f6755e4d39c1c158747d",
"integrity": "sha512-3GboN8JS2LgrdIVK/gW+n6r1kLrGG+D/tWkRv8PJo2mZLzh49HTzS2u7XXUSkNmA4AGUyEf8QRjyBhlOg8JNTQ=="
"resolved": "git+ssh://git@github.com/Stremio/stremio-translations.git#57d66ecc8e2df4e73a613dc5e17123ce62ae63f7",
"integrity": "sha512-Q3Q++Tx3quu71tgTfS8CEP6CajdGyig92SdtRyGMsLHHkgBgzP9ggYBUHVbKAfXcKUegABIkW8CxMueEw758Xg==",
"license": "MIT"
},
"node_modules/string_decoder": {
"version": "1.1.1",
@ -14888,8 +14889,8 @@
},
"node_modules/vtt.js": {
"version": "0.13.0",
"resolved": "git+ssh://git@github.com/jaruba/vtt.js.git#e4f5f5603730866bacb174a93f51b734c9f29e6a",
"integrity": "sha512-RXV60lPGrmjuRcV/jRuydLC2thMaMlmK4Vc3DtBmVSotFA3986sgW0H5AH9IUmHzQo4bFR2gELYLcfwVh7Dqow==",
"resolved": "git+ssh://git@github.com/jaruba/vtt.js.git#84d33d157848407d790d78423dacc41a096294f0",
"integrity": "sha512-N/WeijIW9oiGmfqWdEcNqSblzfnXR8dfsBRNPIG9YYFhIBU0Y2c7w8Sfl0bDOZVhjA5qHbwoHx6SxDgRLiraTQ==",
"license": "Apache-2.0"
},
"node_modules/w3c-hr-time": {

6
package.json
View file

@ -1,7 +1,7 @@
{
"name": "stremio",
"displayName": "Stremio",
"version": "5.0.0-beta.12",
"version": "5.0.0-beta.13",
"author": "Smart Code OOD",
"private": true,
"license": "gpl-2.0",
@ -18,7 +18,7 @@
"@stremio/stremio-colors": "5.0.1",
"@stremio/stremio-core-web": "https://stremio.github.io/stremio-core/stremio-core-web/feat/streming-server-urls-bucket/dev/stremio-stremio-core-web-0.47.8.tgz",
"@stremio/stremio-icons": "5.4.0",
"@stremio/stremio-video": "0.0.38",
"@stremio/stremio-video": "0.0.46",
"a-color-picker": "1.2.1",
"bowser": "2.11.0",
"buffer": "6.0.3",
@ -40,7 +40,7 @@
"react-i18next": "^12.1.1",
"react-is": "18.2.0",
"spatial-navigation-polyfill": "github:Stremio/spatial-navigation#64871b1422466f5f45d24ebc8bbd315b2ebab6a6",
"stremio-translations": "github:Stremio/stremio-translations#378218c9617f3e763ba5f6755e4d39c1c158747d",
"stremio-translations": "github:Stremio/stremio-translations#57d66ecc8e2df4e73a613dc5e17123ce62ae63f7",
"url": "0.11.0",
"use-long-press": "^3.1.5"
},

4
src/common/Image/Image.js
View file

@ -19,9 +19,9 @@ const Image = ({ className, src, alt, fallbackSrc, renderFallback, ...props }) =
typeof renderFallback === 'function' ?
renderFallback()
:
<img {...props} className={className} src={fallbackSrc} alt={alt} />
<img {...props} className={className} src={fallbackSrc} alt={alt} loading='lazy'/>
:
<img {...props} className={className} src={src} alt={alt} onError={onError} />;
<img {...props} className={className} src={src} alt={alt} loading='lazy' onError={onError} />;
};
Image.propTypes = {

18
src/common/interfaceLanguages.json
View file

@ -7,6 +7,10 @@
"name": "български език",
"codes": ["bg-BG", "bul"]
},
{
"name": "বাংলা",
"codes": ["bn-Bd", "ben"]
},
{
"name": "català",
"codes": ["ca-CA", "cat"]
@ -75,6 +79,14 @@
"name": "italiano",
"codes": ["it-IT", "ita"]
},
{
"name": "日本語 (にほんご)",
"codes": ["ja-JP", "jpn"]
},
{
"name": "한국어",
"codes": ["ko-KR", "kor"]
},
{
"name": "македонски јазик",
"codes": ["mk-MK", "mkd"]
@ -135,6 +147,10 @@
"name": "українська мова",
"codes": ["uk-UA", "ukr"]
},
{
"name": "Tiếng Việt",
"codes": ["vi-VN", "vie"]
},
{
"name": "中文(中华人民共和国)",
"codes": ["zh-CN", "zho"]
@ -147,4 +163,4 @@
"name": "中文(台灣)",
"codes": ["zh-TW", "zho"]
}
]
]

2
src/common/useTranslate.js
View file

@ -19,7 +19,7 @@ const useTranslate = () => {
const catalogTitle = useCallback(({ addon, id, name, type } = {}, withType = true) => {
if (addon && id && name) {
const partialKey = `${addon.manifest.id.replaceAll('.', '_')}_${id}`;
const partialKey = `${addon.manifest.id.split('.').join('_')}_${id}`;
const translatedName = stringWithPrefix(partialKey, 'CATALOG_', name);
if (type && withType) {

2
src/routes/MetaDetails/VideosList/Video/Video.js
View file

@ -116,7 +116,7 @@ const Video = ({ className, id, title, thumbnail, episode, released, upcoming, w
}
<div className={styles['upcoming-watched-container']}>
{
upcoming ?
upcoming && !watched ?
<div className={styles['upcoming-container']}>
<div className={styles['flag-label']}>Upcoming</div>
</div>