diff --git a/HOSTING_REQUIREMENTS.md b/HOSTING_REQUIREMENTS.md new file mode 100644 index 00000000..4a3b2f8b --- /dev/null +++ b/HOSTING_REQUIREMENTS.md @@ -0,0 +1,6 @@ +Internet : 1GBIT (recommended 5GBIT)
+Ram : 2GB
+Cpu : Any recent one
+OS: Microsoft Windows, Macos +GNU/LINUX (doesnt work on "musl" distros ) +systemd or any service manager \ No newline at end of file diff --git a/css/app.js b/css/app.js index b8e79789..d810ed79 100644 --- a/css/app.js +++ b/css/app.js @@ -1,5 +1,15 @@ // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-3.0-or-later +// Get the current URL +const url = new URL(window.location.href); + +// Remove the 'fx' query parameter +url.searchParams.delete('fx'); + +// Replace the current URL without the 'fx' parameter +history.replaceState(null, '', url.toString()); + + // Retrieve volume from local storage or set to max if not available const initialVolume = localStorage.getItem('playerVolume') || 1; const video = document.getElementById('video'); diff --git a/css/landing.css b/css/landing.css index 5db5c8fc..5cef2e57 100644 --- a/css/landing.css +++ b/css/landing.css @@ -849,7 +849,11 @@ button[type="submit"]:hover { height: 700px; object-fit: cover; object-position: top; - mask-image: linear-gradient(black, #0000); + mask-image: linear-gradient(#5315ff,#0000); + border-top-left-radius: 1em; + border-top-right-radius: 1em; + pointer-events: none; + -webkit-mask-image: linear-gradient(#5315ff,#0000); } .landing-actions a { background: #fff; diff --git a/css/logo.svg b/css/logo.svg index b972543f..c17d3a52 100644 --- a/css/logo.svg +++ b/css/logo.svg @@ -2,93 +2,84 @@ Poketube \ No newline at end of file + transform="translate(-383.8923,-33.717606)"> diff --git a/css/mobile.css b/css/mobile.css index 120cef06..fd665aed 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -254,21 +254,24 @@ body { height:66px } .new-button { - background:#0009; - border-radius:0.5em; - padding-right:1em; - display:flex; - justify-content:center; - align-items:center; - align-content:center; - width:max-content; - margin-top:4px; - margin-left:3px; - margin-right:0 + background: #0009; + border-radius: 1.5em; + padding-right: 1em; + display: flex; + justify-content: center; + align-items: center; + align-content: center; + width: max-content; + margin-top: 4px; + margin-left: 3px; + margin-right: 0; + border: solid 0.5px #333; } .pill-button { - margin-left:1em; - font-family:ubuntu,sans-serif + margin-left: 1em; + font-family: 'PokeTube Flex'; + font-stretch: ultra-expanded; + font-weight: 800; } .vertical { border-left:1px solid gray; @@ -1742,7 +1745,7 @@ a.icon-link>i { background:#fff; border-radius:2em; text-transform:initial; - font-weight:900; + font-weight:1000; padding:10px 16px; border:none; margin-left:.5em; @@ -1768,11 +1771,13 @@ h3 { ptd-custom-more { color:#fff } + @media screen and (orientation:landscape) { .ptnewbuttons { margin-left:auto; width:fit-content; width:-moz-fit-content; + overflow:scroll; max-width:150em!important; margin-right: auto !important; } diff --git a/html/channel.ejs b/html/channel.ejs index 6572debd..89d7ca8e 100644 --- a/html/channel.ejs +++ b/html/channel.ejs @@ -49,9 +49,12 @@ src:url('https://p.poketube.fun/https://cdn.statically.io/gh/brecert/discord-quote-generator/main/Ginto-Nord-800.woff') format("woff"); } + .channel-info-container > img { - width: 100%; + width: 98%; border-radius: 1em; + margin-top: 6px; + margin-bottom: -9px; } :root { --text-primary: #fff; @@ -254,8 +257,14 @@ padding-bottom: 32px; table-layout: auto; border-spacing: 4px 0; } - .tabs.tabs-center { - margin: auto; +.tabs.tabs-center { + margin-left: 2em; + margin-top: 3em !important; + font-size: 12px; + font-family: ubuntu; + border-top-right-radius: 11px; + border-top-left-radius: 11px; + background: #333; } .tabs.tabs-justify { width: 100%; @@ -558,7 +567,7 @@ color:#ea9999 !important; <% } %> -
+

<%=j.Channel?.Metadata.Name%> @@ -590,18 +599,20 @@ color:#ea9999 !important;

Error: <%= error.message %>

<% } %> - -

-
- - +

+ +
+ + <% if (!isMobile) { %> -
- <% if (!tab) { %> +
+ <% if (!tab) { %> Videos @@ -636,8 +647,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=< <% } %> - About - <% } %> + <% } %> <% if (tab === "about") { %> Videos @@ -670,8 +680,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=< <% } %> - About - <% } %> + <% } %> <% if (tab === "community") { %> @@ -696,8 +705,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=< Community - About - <% } %> + <% } %> <% if (tab === "shorts") { %> @@ -724,8 +732,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=< <% } %> <% } %> - About - <% } %> + <% } %> <% if (tab === "live") { %> @@ -751,8 +758,7 @@ white-space: nowrap;text-decoration: none;" href="/feeds/videos.xml?channel_id=< <% } %> <% } %> - About - <% } %> + <% } %>
@@ -810,10 +816,11 @@ width: fit-content;
-
- <% if (!tab) { %> +
- Home + <% if (!tab) { %> + + Videos <% if (Array.isArray(c.comments)) { %> <% if (c.comments.length != "0") { %> @@ -821,22 +828,50 @@ width: fit-content; Community <% } %> <% } %> - About - <% } %> - <% if (tab ==="about") { %> + <% if (Array?.isArray(shorts?.videos)) { %> + +<% if (turntomins(shorts?.videos[0]?.lengthSeconds) != "aN:aN" ) { %> - Home + Shorts + <% } %> + <% } %> + <% } %> + <% if (tab ==="about") { %> + <% if (Array?.isArray(shorts?.videos)) { %> + +<% if (turntomins(shorts?.videos[0]?.lengthSeconds) != "aN:aN" ) { %> + + Shorts + <% } %> + <% } %> + Videos Community - About - <% } %> + <% } %> <% if (tab ==="community") { %> - Home - Community - About - <% } %> + Videos + <% if (Array?.isArray(shorts?.videos)) { %> + +<% if (turntomins(shorts?.videos[0]?.lengthSeconds) != "aN:aN" ) { %> + Shorts + <% } %> + <% } %> + Community + <% } %> + <% if (tab ==="shorts") { %> + + Videos + <% if (Array?.isArray(shorts?.videos)) { %> + +<% if (turntomins(shorts?.videos[0]?.lengthSeconds) != "aN:aN" ) { %> + + Shorts + <% } %> + <% } %> + Community + <% } %>
@@ -1312,53 +1347,21 @@ width: fit-content; diff --git a/html/lite.ejs b/html/lite.ejs index 90a45436..368dd3b0 100644 --- a/html/lite.ejs +++ b/html/lite.ejs @@ -20,7 +20,7 @@ --> - + <% if (e === false) { %> @@ -31,15 +31,15 @@ - - + + <% } %> - <%=inv_vid.title%> | PokeTube Lite + <%=inv_vid.title%> | Lite + + <% if (lightOrDark(color) == "light") { %> + .player.video-ambient-container { + box-shadow: 0 -8px 5.9em <%=color%>; + } + + <% } %> + + <% if (lightOrDark(color) == "dark") { %> + .player.video-ambient-container { + box-shadow: 0 -8px 5.9em <%=color2%>; + } + + <% } %> + @@ -267,17 +281,12 @@ background: none !important;
-