diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 7176d85..6f4866b --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ ___ The package manager that you need to use with MinPluto must be [Bun](https://bun.sh/) since it appears to be the most functional option for this project. Attempting to use another package manager like Yarn or PNPM may cause issues, view [Package Managers](#package-managers) in the [Compatibility](#compatibility) section. There seems to be some issues related to both `@astrojs/vue` and `@iconoir/vue`. -Bun is much faster for installation time and it works standalone, meaning you don't need NodeJS installed for it to work. +You'll still need to have [NodeJS](https://nodejs.org/en/download/package-manager) v21 or newer install in order for translations to work properly. ___ diff --git a/astro-i18next.config.mjs b/astro-i18next.config.mjs old mode 100644 new mode 100755 diff --git a/astro.config.mjs b/astro.config.mjs old mode 100644 new mode 100755 diff --git a/bun.lockb b/bun.lockb index 4834312..9af6c08 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/docker-compose.yml b/docker-compose.yml old mode 100644 new mode 100755 diff --git a/instances.json b/instances.json old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 index c5f5e49..92ac298 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minpluto", - "version": "2024.07.26", + "version": "2024.08.02", "description": "An open source frontend alternative to YouTube.", "repository": "https://sudovanilla.org/MinPluto/MinPluto", "author": "Korbs ", diff --git a/src/components/Chip.astro b/src/components/Chip.astro old mode 100644 new mode 100755 diff --git a/src/components/Dialog.astro b/src/components/Dialog.astro old mode 100644 new mode 100755 diff --git a/src/components/DiscoverChannel.astro b/src/components/DiscoverChannel.astro old mode 100644 new mode 100755 diff --git a/src/components/Dropdown.astro b/src/components/Dropdown.astro old mode 100644 new mode 100755 diff --git a/src/components/MusicItem.astro b/src/components/MusicItem.astro old mode 100644 new mode 100755 diff --git a/src/components/Search.astro b/src/components/Search.astro old mode 100644 new mode 100755 diff --git a/src/components/VideoItem.astro b/src/components/VideoItem.astro old mode 100644 new mode 100755 diff --git a/src/components/buttons/Telemtry.astro b/src/components/buttons/Telemtry.astro old mode 100644 new mode 100755 diff --git a/src/components/category/trending.astro b/src/components/category/trending.astro old mode 100644 new mode 100755 diff --git a/src/components/global/Analytics.astro b/src/components/global/Analytics.astro old mode 100644 new mode 100755 diff --git a/src/components/global/Footer.astro b/src/components/global/Footer.astro old mode 100644 new mode 100755 diff --git a/src/components/global/Head.astro b/src/components/global/Head.astro old mode 100644 new mode 100755 index d9e8816..42c9acc --- a/src/components/global/Head.astro +++ b/src/components/global/Head.astro @@ -3,8 +3,7 @@ import i18next, { t } from "i18next"; // Cookies -/// Language -//// If the user is new to the site, set English as default +/// Set Default if (Astro.cookies.get("Language") === undefined) { Astro.cookies.set("Language", "EN", {path: "/",sameSite: 'strict'}) } else { @@ -12,6 +11,13 @@ if (Astro.cookies.get("Language") === undefined) { if (UserLanguage === "JP") {i18next.changeLanguage("jp")} else if (UserLanguage === "EN") {i18next.changeLanguage("en")} } +if (Astro.cookies.get("Milieu") === undefined) { + Astro.cookies.set("Milieu", "Enabled", {path: "/",sameSite: 'strict'}) +} else { + var UserLanguage = Astro.cookies.get("Language").value + if (UserLanguage === "JP") {i18next.changeLanguage("jp")} + else if (UserLanguage === "EN") {i18next.changeLanguage("en")} +} /// Telemtry //// Users should be opted-out by default diff --git a/src/components/global/MobileNav.astro b/src/components/global/MobileNav.astro old mode 100644 new mode 100755 diff --git a/src/components/global/Sidebar.astro b/src/components/global/Sidebar.astro old mode 100644 new mode 100755 diff --git a/src/components/information/InstanceList.astro b/src/components/information/InstanceList.astro old mode 100644 new mode 100755 diff --git a/src/components/information/Invidious.astro b/src/components/information/Invidious.astro old mode 100644 new mode 100755 diff --git a/src/components/search/Creator.astro b/src/components/search/Creator.astro old mode 100644 new mode 100755 diff --git a/src/components/search/Stream.astro b/src/components/search/Stream.astro old mode 100644 new mode 100755 diff --git a/src/components/text/PrivacyPolicyAnalytics.astro b/src/components/text/PrivacyPolicyAnalytics.astro old mode 100644 new mode 100755 diff --git a/src/components/text/PrivacyPolicyCloudflare.astro b/src/components/text/PrivacyPolicyCloudflare.astro old mode 100644 new mode 100755 diff --git a/src/components/video-player/Controls.astro b/src/components/video-player/Controls.astro old mode 100644 new mode 100755 index a23ad31..e737c8f --- a/src/components/video-player/Controls.astro +++ b/src/components/video-player/Controls.astro @@ -1,15 +1,27 @@ --- +// Cookies +if (Astro.cookies.get("Milieu").value === "Enabled") { + var Milieu = true +} else { + var Milieu = false +} + +// Icons import { +ArrowUpRight, Backward15Seconds, Enlarge, Forward15Seconds, + NavArrowRight, PlaySolid, Settings, +SwitchOff, +SwitchOn, } from "@iconoir/vue"; ---
-

DJI: Landscape Footage of Cities

+

The Mark On The Wall

@@ -29,9 +41,108 @@ import {

- +
-
\ No newline at end of file + +
+ +
+ + + +
+ {Milieu ? + + : + + } + + +
+
+ + + +
+ + + + + \ No newline at end of file diff --git a/src/components/video-player/Player.astro b/src/components/video-player/Player.astro old mode 100644 new mode 100755 index df6fcbe..a9d79d5 --- a/src/components/video-player/Player.astro +++ b/src/components/video-player/Player.astro @@ -1,6 +1,13 @@ --- // Properties -const { Poster, Source } = Astro.props +const { Poster, Video, Audio } = Astro.props + +// Cookies +if (Astro.cookies.get("Milieu").value === "Enabled") { + var Milieu = true +} else { + var Milieu = false +} // Components import Controls from '@components/video-player/Controls.astro' @@ -10,12 +17,85 @@ import '@styles/player.scss' ---
- - + + + +
- \ No newline at end of file + + +{Milieu ? + + : + null +} \ No newline at end of file diff --git a/src/data/discover.json b/src/data/discover.json old mode 100644 new mode 100755 diff --git a/src/env.d.ts b/src/env.d.ts old mode 100644 new mode 100755 diff --git a/src/layouts/API.astro b/src/layouts/API.astro old mode 100644 new mode 100755 diff --git a/src/layouts/Default.astro b/src/layouts/Default.astro old mode 100644 new mode 100755 index 18cbf9a..884662d --- a/src/layouts/Default.astro +++ b/src/layouts/Default.astro @@ -1,22 +1,22 @@ --- // Properties -const { Title, Description } = Astro.props +const { Title, Description } = Astro.props; // Components -import Head from '@components/global/Head.astro' -import MobileNav from '@components/global/MobileNav.astro' -import Sidebar from '@components/global/Sidebar.astro' -import Footer from '@components/global/Footer.astro' +import Head from "@components/global/Head.astro"; +import MobileNav from "@components/global/MobileNav.astro"; +import Sidebar from "@components/global/Sidebar.astro"; +import Footer from "@components/global/Footer.astro"; // Styles -import '@styles/index.scss' -import '@styles/mobile.scss' +import "@styles/index.scss"; +import "@styles/mobile.scss"; --- - - - + + +
- +
-