From d8121d1bf45d2701851f968efe2b92c660c477b5 Mon Sep 17 00:00:00 2001 From: Anoncer Date: Fri, 4 Oct 2024 15:55:08 +0200 Subject: [PATCH 01/11] Update Readme --- README.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 573eb0d..4d3943e 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,25 @@ -______ + + + + Shows an illustrated sun in light mode and a moon with stars in dark mode. + - -___ - - -![Platform](https://img.shields.io/badge/platform-ios%20%7C%20android-brightgreen) ![Release](https://img.shields.io/github/v/release/AN0NCER/an0ncer.github.io) ![Code](https://img.shields.io/github/languages/top/AN0NCER/an0ncer.github.io) -# Tunime +# Tunime - + -This site is a mobile application for watching anime. Uses data from **Shikimori** and **Kodik** player, as well as **PWA** functionality. +**`https://an0ncer.github.io/`** - это онлайн-платформа для просмотра аниме с возможностью управлять своим аккаунтом и управлением аниме. Сайт обладает удобным и простым интерфейсом, имеет множество различных функций и собственный сервер. Кроме того, сайт поддерживает функционал PWA, что позволяет добавить его на главный экран мобильного устройства и использовать как полноценное приложение **(Tunime MAX)**. + + + + + Shows an illustrated sun in light mode and a moon with stars in dark mode. + ## Functional @@ -39,10 +44,6 @@ This site is a mobile application for watching anime. Uses data from **Shikimori - [X] User page. - [X] Settings page. -## Description - -**`https://an0ncer.github.io/`** - is an online platform for watching anime with the ability to manage your account and save your favorites. The site has a convenient and simple interface, has many filters and categories to search for anime. In addition, the site supports PWA functionality, which allows you to add it to the home screen of a mobile device and use it as a full-fledged application. - ## Stats ![Alt](https://repobeats.axiom.co/api/embed/ade0779625b8da67b375884494164252f8348c2d.svg "Repobeats analytics image") From 8bdcd8f0fa38e139a191ffdcc7157d301485c4a3 Mon Sep 17 00:00:00 2001 From: Anoncer Date: Fri, 4 Oct 2024 16:11:28 +0200 Subject: [PATCH 02/11] Update Readme --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 4d3943e..f59e6c4 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,7 @@ -![Release](https://img.shields.io/github/v/release/AN0NCER/an0ncer.github.io) -![Code](https://img.shields.io/github/languages/top/AN0NCER/an0ncer.github.io) - - -# Tunime +# Tunime From fcdf7c428db0e9038a832b63f82b3bc404cc2a15 Mon Sep 17 00:00:00 2001 From: Anoncer Date: Fri, 4 Oct 2024 16:17:29 +0200 Subject: [PATCH 03/11] Update Readme --- README.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/README.md b/README.md index f59e6c4..eede3f5 100644 --- a/README.md +++ b/README.md @@ -40,17 +40,6 @@ - [X] User page. - [X] Settings page. -## Stats - -![Alt](https://repobeats.axiom.co/api/embed/ade0779625b8da67b375884494164252f8348c2d.svg "Repobeats analytics image") - ---- - -Interactive menu with easy settings options - -![Menu](https://github.com/AN0NCER/resources/blob/main/new-interact-menu.png?raw=true) -___ - From f88b24e8166bbc8d713bea9d73dad86e232d8fca Mon Sep 17 00:00:00 2001 From: Anoncer Date: Sat, 5 Oct 2024 14:20:55 +0200 Subject: [PATCH 04/11] Update Readme --- README.md | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index eede3f5..47efbd4 100644 --- a/README.md +++ b/README.md @@ -12,14 +12,22 @@ **`https://an0ncer.github.io/`** - это онлайн-платформа для просмотра аниме с возможностью управлять своим аккаунтом и управлением аниме. Сайт обладает удобным и простым интерфейсом, имеет множество различных функций и собственный сервер. Кроме того, сайт поддерживает функционал PWA, что позволяет добавить его на главный экран мобильного устройства и использовать как полноценное приложение **(Tunime MAX)**. - - - Shows an illustrated sun in light mode and a moon with stars in dark mode. + + + Shows an illustrated sun in light mode and a moon with stars in dark mode. -## Functional +## Функционал + +### Франшизы + + + + + Shows an illustrated sun in light mode and a moon with stars in dark mode. + - +## Functional - [X] Search anime by name. - [X] View information about anime, including description, genre, number of episodes and rating. @@ -31,15 +39,6 @@ - [X] Ability to download TV series and movies to your device. -## Pages - -- [X] Main page. -- [X] Search page. -- [X] Page witch anime (Can Watch). -- [X] List page (User anime). -- [X] User page. -- [X] Settings page. - From 5ea479b3ca0d3aa21b351c7c2e5302282d927b11 Mon Sep 17 00:00:00 2001 From: Anoncer Date: Sat, 5 Oct 2024 19:27:30 +0200 Subject: [PATCH 05/11] Update Readme --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.md b/README.md index 47efbd4..6479416 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,28 @@ Shows an illustrated sun in light mode and a moon with stars in dark mode. + + +### Удобные она + + + +### Интерактивное меню & Профиль + + + +### Доступность аниме + + + +### Синхронизация + + + +### Настройки + + + ## Functional - [X] Search anime by name. From 958c3bdd96c269d2361ea69d9e7e04f376c6b403 Mon Sep 17 00:00:00 2001 From: Anoncer Date: Sat, 5 Oct 2024 19:39:10 +0200 Subject: [PATCH 06/11] fix url readme --- README.md | 37 +++++++------------------------------ 1 file changed, 7 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 6479416..fc2bb78 100644 --- a/README.md +++ b/README.md @@ -11,22 +11,10 @@ **`https://an0ncer.github.io/`** - это онлайн-платформа для просмотра аниме с возможностью управлять своим аккаунтом и управлением аниме. Сайт обладает удобным и простым интерфейсом, имеет множество различных функций и собственный сервер. Кроме того, сайт поддерживает функционал PWA, что позволяет добавить его на главный экран мобильного устройства и использовать как полноценное приложение **(Tunime MAX)**. - - - - Shows an illustrated sun in light mode and a moon with stars in dark mode. - + ## Функционал -### Франшизы - - - - - Shows an illustrated sun in light mode and a moon with stars in dark mode. - - ### Удобные она @@ -49,21 +37,10 @@ -## Functional - -- [X] Search anime by name. -- [X] View information about anime, including description, genre, number of episodes and rating. -- [X] Play video on mobile device with Kodik player. -- [X] Add anime to favorites. -- [X] User account management. -- [X] Work offline as a PWA app. -- [X] Mobile optimization and friendly user interface. -- [X] Ability to download TV series and movies to your device. +## Дополнительно - - - - - - - \ No newline at end of file + + + + Shows an illustrated sun in light mode and a moon with stars in dark mode. + From 2105a4a0cda62a5a0973bd21e73e4cd2e054e878 Mon Sep 17 00:00:00 2001 From: Anoncer Date: Sat, 5 Oct 2024 19:46:00 +0200 Subject: [PATCH 07/11] Update Readme --- README.md | 10 +++++----- images/space.svg | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 images/space.svg diff --git a/README.md b/README.md index fc2bb78..1a2ff8b 100644 --- a/README.md +++ b/README.md @@ -17,23 +17,23 @@ -### Удобные она + -### Интерактивное меню & Профиль + -### Доступность аниме + -### Синхронизация + -### Настройки + diff --git a/images/space.svg b/images/space.svg new file mode 100644 index 0000000..41d8f50 --- /dev/null +++ b/images/space.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file From e68191c9050cd41beb392d309c70a3e295d1768f Mon Sep 17 00:00:00 2001 From: Anoncer Date: Sat, 5 Oct 2024 19:48:19 +0200 Subject: [PATCH 08/11] remove svg space --- images/space.svg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 images/space.svg diff --git a/images/space.svg b/images/space.svg deleted file mode 100644 index 41d8f50..0000000 --- a/images/space.svg +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file From 6c0f81b0fc4a6163a815fb1c05bb8225b7f1483f Mon Sep 17 00:00:00 2001 From: Anoncer Date: Sat, 5 Oct 2024 19:55:10 +0200 Subject: [PATCH 09/11] Update Readme --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1a2ff8b..db1e34a 100644 --- a/README.md +++ b/README.md @@ -17,23 +17,23 @@ - + - + - + - + - + From c8e4df77c057d7a91846b6dfbb0cfb87b69baba9 Mon Sep 17 00:00:00 2001 From: Anoncer Date: Sun, 6 Oct 2024 00:15:10 +0200 Subject: [PATCH 10/11] Update readme --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index db1e34a..060e502 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,11 @@ **`https://an0ncer.github.io/`** - это онлайн-платформа для просмотра аниме с возможностью управлять своим аккаунтом и управлением аниме. Сайт обладает удобным и простым интерфейсом, имеет множество различных функций и собственный сервер. Кроме того, сайт поддерживает функционал PWA, что позволяет добавить его на главный экран мобильного устройства и использовать как полноценное приложение **(Tunime MAX)**. - + + + -## Функционал + From 270b6ea5672d576f79747f06f955c03649ff5bdb Mon Sep 17 00:00:00 2001 From: Anoncer Date: Sun, 6 Oct 2024 22:36:51 +0200 Subject: [PATCH 11/11] Added parameters custom style to settings + 51009 Updatet animation load page code --- javascript/pages/anime/51009.js | 13 +++ javascript/pages/anime/51122.js | 2 +- javascript/pages/settings.js | 6 ++ javascript/pages/watch.js | 12 +-- javascript/parametrs.js | 1 + style/css/list.css | 1 - style/css/watch.css | 29 ++++++- style/watch.scss | 125 ++-------------------------- style/watch/_pageloading.scss | 142 ++++++++++++++++++++++++++++++++ sw.js | 4 +- watch.html | 3 +- 11 files changed, 208 insertions(+), 130 deletions(-) create mode 100644 javascript/pages/anime/51009.js create mode 100644 style/watch/_pageloading.scss diff --git a/javascript/pages/anime/51009.js b/javascript/pages/anime/51009.js new file mode 100644 index 0000000..a029d51 --- /dev/null +++ b/javascript/pages/anime/51009.js @@ -0,0 +1,13 @@ +import { Screenshots } from "../watch/mod_resource.js"; + +const url = "https://image.tmdb.org/t/p/original/fgPa2oJD8lbLaTanzlGDd32tqDE.jpg"; + +$(`.page-loading`).css("--image", `url(${url})`); + +export default { + OnLoad: () => { + $('.galery-slider').prepend(`
`); + $(`.galery-slider > .slide[data-id="${Screenshots.length - 1}"]`).click(); + Screenshots.push({ original: url }); + } +} \ No newline at end of file diff --git a/javascript/pages/anime/51122.js b/javascript/pages/anime/51122.js index 3f33161..73c0d0e 100644 --- a/javascript/pages/anime/51122.js +++ b/javascript/pages/anime/51122.js @@ -10,7 +10,7 @@ if (/Android|webOS|iPhone|iPad|iPod|Opera Mini/i.test(navigator.userAgent)) { const url = "https://image.tmdb.org/t/p/original/Ao8SbtYJbxBuzFTQFSdHF7lLmDE.jpg"; const bg = "https://image.tmdb.org/t/p/original/iCqaGYVQw9MYZap5pNgTRkdPBWf.jpg"; -$(`.page-loading`).css({ "background": `linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 1)), url('${load_image}') no-repeat center center / cover` }); +$(`.page-loading`).css("--image", `url(${load_image})`); export default { OnLoad: () => { diff --git a/javascript/pages/settings.js b/javascript/pages/settings.js index bd2592a..a255e79 100644 --- a/javascript/pages/settings.js +++ b/javascript/pages/settings.js @@ -92,6 +92,12 @@ const Parameters = [ name: 'Скрыть героев', description: 'Позволяет пользователю убирать изображения персонажей для более нейтрального просмотра сайта.' }, + { + type: 'boolean', + param: 'customstyle', + name: 'Кастомизация', + description: 'Включить кастомные стили для некоторых аниме.' + }, // { // type: 'boolean', // param: '', diff --git a/javascript/pages/watch.js b/javascript/pages/watch.js index a4de3c1..8b642c9 100644 --- a/javascript/pages/watch.js +++ b/javascript/pages/watch.js @@ -29,11 +29,13 @@ import(`/javascript/pages/watch/mod_collection.js`); //Авторизируем пользователя Main(async (e) => { - try { - const data = await import(`/javascript/pages/anime/${$ID}.js`); - $RULES = data.default; - console.log(`[watch] - Custom RULES uploaded`); - } catch { } + if ($PARAMETERS.anime.customstyle) { + try { + const data = await import(`/javascript/pages/anime/${$ID}.js`); + $RULES = data.default; + console.log(`[watch] - Custom RULES uploaded`); + } catch { } + } //Проверка на существование такого ID const check = await CheckID($ID); diff --git a/javascript/parametrs.js b/javascript/parametrs.js index cc7d50a..bd7cd43 100644 --- a/javascript/parametrs.js +++ b/javascript/parametrs.js @@ -9,6 +9,7 @@ const $PARAMETERS = { anime: { syncdata: true, hidehero: false, + customstyle: true, }, watch: { dubanime: false, diff --git a/style/css/list.css b/style/css/list.css index eee6087..034b75f 100644 --- a/style/css/list.css +++ b/style/css/list.css @@ -1055,7 +1055,6 @@ body.menuver[data-orientation="90"] .span-row { } .app > .wrapper .anime-content .anime-list .card-loader, .app > .wrapper .anime-content .anime-search-result .card-loader { - max-height: 200px; aspect-ratio: 1/1.44; border-radius: 4px; display: flex; diff --git a/style/css/watch.css b/style/css/watch.css index 3d2a281..4fadd76 100644 --- a/style/css/watch.css +++ b/style/css/watch.css @@ -21,10 +21,29 @@ body.loading { left: 0; width: 100%; height: 100dvh; - background: #101318; opacity: 1; z-index: 9999; } +.page-loading::before { + content: ""; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: #101318; + z-index: 1; +} +.page-loading::after { + content: ""; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 2; + background: linear-gradient(rgba(0, 0, 0, 0.5), rgb(0, 0, 0)), var(--image) center center/cover no-repeat; +} .page-loading .loader { position: absolute; top: calc(50% - 32px); @@ -33,6 +52,7 @@ body.loading { height: 64px; border-radius: 50%; perspective: 800px; + z-index: 3; } .page-loading .wrapper { max-width: 900px; @@ -43,6 +63,7 @@ body.loading { width: 100%; left: 0; right: 0; + z-index: 3; } .page-loading .wrapper .text-error { position: absolute; @@ -632,6 +653,12 @@ main .player-title .player-controls .btn { background: #191C21; } +.spotify { + margin-left: 20px; + margin-right: 20px; + margin-top: 20px; +} + .episodes { margin: 20px 20px 10px 20px; overflow: hidden; diff --git a/style/watch.scss b/style/watch.scss index 194561a..c2dd332 100644 --- a/style/watch.scss +++ b/style/watch.scss @@ -15,124 +15,7 @@ body { } } -.page-loading { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100dvh; - background: #101318; - opacity: 1; - z-index: 9999; - - .loader { - position: absolute; - top: calc(50% - 32px); - left: calc(50% - 32px); - width: 64px; - height: 64px; - border-radius: 50%; - perspective: 800px; - } - - .wrapper { - max-width: 900px; - margin: 0 auto; - position: absolute; - bottom: 20px; - height: 4px; - width: 100%; - left: 0; - right: 0; - - .text-error { - position: absolute; - bottom: 10px; - text-align: center; - left: 20px; - right: 20px; - color: #ff000057; - font-family: "Manrope"; - font-size: 12px; - } - - .progress { - position: relative; - height: 4px; - margin-left: 20px; - margin-right: 20px; - border-radius: 3px; - background: #ffffff07; - overflow: hidden; - - .bar { - width: 0%; - height: 100%; - background: #5fbff325; - transition: 0.6s ease-in-out; - } - } - } - - .inner { - position: absolute; - box-sizing: border-box; - width: 100%; - height: 100%; - border-radius: 50%; - } - - .inner.one { - left: 0%; - top: 0%; - animation: rotate-one 1s linear infinite; - border-bottom: 3px solid #efeffa; - } - - .inner.two { - right: 0%; - top: 0%; - animation: rotate-two 1s linear infinite; - border-right: 3px solid #efeffa; - } - - .inner.three { - right: 0%; - bottom: 0%; - animation: rotate-three 1s linear infinite; - border-top: 3px solid #efeffa; - } - - @keyframes rotate-one { - 0% { - transform: rotateX(35deg) rotateY(-45deg) rotateZ(0deg); - } - - 100% { - transform: rotateX(35deg) rotateY(-45deg) rotateZ(360deg); - } - } - - @keyframes rotate-two { - 0% { - transform: rotateX(50deg) rotateY(10deg) rotateZ(0deg); - } - - 100% { - transform: rotateX(50deg) rotateY(10deg) rotateZ(360deg); - } - } - - @keyframes rotate-three { - 0% { - transform: rotateX(35deg) rotateY(55deg) rotateZ(0deg); - } - - 100% { - transform: rotateX(35deg) rotateY(55deg) rotateZ(360deg); - } - } -} +@import './watch/pageloading'; header { width: 100%; @@ -748,6 +631,12 @@ main { } } +.spotify { + margin-left: 20px; + margin-right: 20px; + margin-top: 20px; +} + .episodes { margin: 20px 20px 10px 20px; overflow: hidden; diff --git a/style/watch/_pageloading.scss b/style/watch/_pageloading.scss new file mode 100644 index 0000000..d288d9b --- /dev/null +++ b/style/watch/_pageloading.scss @@ -0,0 +1,142 @@ +.page-loading { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100dvh; + opacity: 1; + z-index: 9999; + + + &::before { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: #101318; + z-index: 1; + } + + &::after { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 2; + background: linear-gradient(rgba(0, 0, 0, 0.5), rgb(0, 0, 0)), var(--image) center center / cover no-repeat; + } + + .loader { + position: absolute; + top: calc(50% - 32px); + left: calc(50% - 32px); + width: 64px; + height: 64px; + border-radius: 50%; + perspective: 800px; + z-index: 3; + } + + .wrapper { + max-width: 900px; + margin: 0 auto; + position: absolute; + bottom: 20px; + height: 4px; + width: 100%; + left: 0; + right: 0; + z-index: 3; + + .text-error { + position: absolute; + bottom: 10px; + text-align: center; + left: 20px; + right: 20px; + color: #ff000057; + font-family: "Manrope"; + font-size: 12px; + } + + .progress { + position: relative; + height: 4px; + margin-left: 20px; + margin-right: 20px; + border-radius: 3px; + background: #ffffff07; + overflow: hidden; + + .bar { + width: 0%; + height: 100%; + background: #5fbff325; + transition: 0.6s ease-in-out; + } + } + } + + .inner { + position: absolute; + box-sizing: border-box; + width: 100%; + height: 100%; + border-radius: 50%; + } + + .inner.one { + left: 0%; + top: 0%; + animation: rotate-one 1s linear infinite; + border-bottom: 3px solid #efeffa; + } + + .inner.two { + right: 0%; + top: 0%; + animation: rotate-two 1s linear infinite; + border-right: 3px solid #efeffa; + } + + .inner.three { + right: 0%; + bottom: 0%; + animation: rotate-three 1s linear infinite; + border-top: 3px solid #efeffa; + } + + @keyframes rotate-one { + 0% { + transform: rotateX(35deg) rotateY(-45deg) rotateZ(0deg); + } + + 100% { + transform: rotateX(35deg) rotateY(-45deg) rotateZ(360deg); + } + } + + @keyframes rotate-two { + 0% { + transform: rotateX(50deg) rotateY(10deg) rotateZ(0deg); + } + + 100% { + transform: rotateX(50deg) rotateY(10deg) rotateZ(360deg); + } + } + + @keyframes rotate-three { + 0% { + transform: rotateX(35deg) rotateY(55deg) rotateZ(0deg); + } + + 100% { + transform: rotateX(35deg) rotateY(55deg) rotateZ(360deg); + } + } +} \ No newline at end of file diff --git a/sw.js b/sw.js index 252859e..d1910fa 100644 --- a/sw.js +++ b/sw.js @@ -1,5 +1,5 @@ -const version = '2.5.1'; -const hash = '5f177'; +const version = '2.5.2'; +const hash = 'eae05'; const cacheName = `pwa-tunime-${hash}-v${version}`; const appShellFilesToCache = [ // Директория: /images/genres diff --git a/watch.html b/watch.html index d0d8846..759b6be 100644 --- a/watch.html +++ b/watch.html @@ -17,8 +17,7 @@ - +