parent
5bee208995
commit
f91b4ed6da
GPG key ID:
901B2ADDF27C2263
4 changed files with 33 additions and 28 deletions
38
Cargo.lock
generated
38
Cargo.lock
generated
|
|
@ -146,7 +146,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
|
|||
[[package]]
|
||||
name = "based"
|
||||
version = "0.1.0"
|
||||
source = "git+https://git.hydrar.de/jmarya/based?branch=ui#c05d0dcc0a46e721e8664a15e6e2f264aa8d4b53"
|
||||
source = "git+https://git.hydrar.de/jmarya/based?branch=ui#f2cfcf27bbe7668caf95a99e7b8f7698e023fdec"
|
||||
dependencies = [
|
||||
"bcrypt",
|
||||
"chrono",
|
||||
|
|
@ -251,9 +251,9 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
|
|||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.13"
|
||||
version = "1.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
|
||||
checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
|
||||
dependencies = [
|
||||
"shlex",
|
||||
]
|
||||
|
|
@ -415,9 +415,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "data-encoding"
|
||||
version = "2.7.0"
|
||||
version = "2.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
|
||||
checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010"
|
||||
|
||||
[[package]]
|
||||
name = "der"
|
||||
|
|
@ -534,9 +534,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.1"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
||||
checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
|
|
@ -1329,9 +1329,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
|
|||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.8.3"
|
||||
version = "0.8.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
|
||||
checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
|
||||
dependencies = [
|
||||
"adler2",
|
||||
]
|
||||
|
|
@ -1473,9 +1473,9 @@ checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
|
|||
|
||||
[[package]]
|
||||
name = "openssl"
|
||||
version = "0.10.70"
|
||||
version = "0.10.71"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6"
|
||||
checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
|
||||
dependencies = [
|
||||
"bitflags 2.8.0",
|
||||
"cfg-if",
|
||||
|
|
@ -1505,9 +1505,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
|
|||
|
||||
[[package]]
|
||||
name = "openssl-sys"
|
||||
version = "0.9.105"
|
||||
version = "0.9.106"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc"
|
||||
checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"libc",
|
||||
|
|
@ -2206,9 +2206,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.13.2"
|
||||
version = "1.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
||||
checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
|
@ -2729,9 +2729,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.22.23"
|
||||
version = "0.22.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
|
||||
checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"serde",
|
||||
|
|
@ -3303,9 +3303,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
|||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
|
||||
checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -33,13 +33,12 @@ pub async fn render_page(
|
|||
// TODO : profile pictures
|
||||
DropDown(
|
||||
Avatar("", &user.username).use_initials(),
|
||||
Column(vec![Link(
|
||||
DropdownMenu(vec![DropdownMenuEntry(
|
||||
"/history",
|
||||
Padding(Text("Video History").medium())
|
||||
.x(ScreenValue::_4)
|
||||
.y(ScreenValue::_2),
|
||||
)
|
||||
.use_htmx()]),
|
||||
)]),
|
||||
)
|
||||
}))
|
||||
.no_dropdown(),
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ use based::request::respond_html;
|
|||
use based::ui::components::prelude::InfinityScroll;
|
||||
use based::ui::components::{ColoredSpinner, Shell};
|
||||
use based::ui::prelude::*;
|
||||
use based::ui::primitives::div::Center;
|
||||
use based::{
|
||||
auth::MaybeUser,
|
||||
request::{
|
||||
|
|
@ -94,7 +95,7 @@ pub async fn latest_page(
|
|||
check_private!(conf, user, shell, ctx);
|
||||
|
||||
let mut videos: Vec<_> = library
|
||||
.get_newly_added(24, offset.unwrap_or_default() as i64)
|
||||
.get_newly_added(21, offset.unwrap_or_default() as i64)
|
||||
.await;
|
||||
let has_content = !videos.is_empty();
|
||||
let video_elements = VerticalVideoGrid(&mut videos).await;
|
||||
|
|
@ -109,7 +110,7 @@ pub async fn latest_page(
|
|||
ScreenValue::fit,
|
||||
Margin(InfinityScroll(
|
||||
ColoredSpinner(Purple::_600),
|
||||
&format!("/latest?offset={}", offset.unwrap_or_default() + 24),
|
||||
&format!("/latest?offset={}", offset.unwrap_or_default() + 21),
|
||||
))
|
||||
.x(ScreenValue::auto),
|
||||
)
|
||||
|
|
@ -127,7 +128,7 @@ pub async fn latest_page(
|
|||
ScreenValue::fit,
|
||||
Margin(InfinityScroll(
|
||||
ColoredSpinner(Purple::_600),
|
||||
&format!("/latest?offset={}", offset.unwrap_or_default() + 24),
|
||||
&format!("/latest?offset={}", offset.unwrap_or_default() + 21),
|
||||
))
|
||||
.x(ScreenValue::auto),
|
||||
))
|
||||
|
|
@ -171,7 +172,12 @@ pub async fn dir_page(
|
|||
}
|
||||
|
||||
pub async fn is_private_page(shell: &Shell, ctx: RequestContext) -> StringResponse {
|
||||
page!(shell, ctx, "WatchDogs", Text("This is a private instance"))
|
||||
page!(
|
||||
shell,
|
||||
ctx,
|
||||
"WatchDogs",
|
||||
Margin(Center(Text("This is a private instance").bold()._4xl())).top(ScreenValue::_12)
|
||||
)
|
||||
}
|
||||
|
||||
#[get("/")]
|
||||
|
|
|
|||
|
|
@ -55,9 +55,9 @@ pub async fn watch_page(
|
|||
Context(Aspect::Video(
|
||||
Background(
|
||||
Rounded(
|
||||
Video().controls().autoplay().width(1080).add_src(
|
||||
Width(ScreenValue::full, Video().controls().autoplay().width(1080).add_src(
|
||||
Source(&format!("/video/raw?v={}", video.id), Some("video/mp4".to_string()))
|
||||
).poster(&format!("/video/thumbnail?v={}", video.id))
|
||||
).poster(&format!("/video/thumbnail?v={}", video.id)))
|
||||
).size(Size::Large)
|
||||
).color(Colors::Black)
|
||||
))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue