aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock7
-rw-r--r--Cargo.toml1
-rw-r--r--ui/client-scripts/Cargo.toml2
-rw-r--r--ui/client-scripts/build.rs1
m---------ui/client-scripts/src/jshelper0
-rw-r--r--ui/client-style/Cargo.toml7
-rw-r--r--ui/client-style/build.rs20
-rw-r--r--ui/client-style/src/forms.css (renamed from web/style/forms.css)0
-rw-r--r--ui/client-style/src/js-player.css (renamed from web/style/js-player.css)0
-rw-r--r--ui/client-style/src/js-transition.css (renamed from web/style/js-transition.css)0
-rw-r--r--ui/client-style/src/layout.css (renamed from web/style/layout.css)0
-rw-r--r--ui/client-style/src/lib.rs10
-rw-r--r--ui/client-style/src/navbar.css (renamed from web/style/navbar.css)0
-rw-r--r--ui/client-style/src/nodecard.css (renamed from web/style/nodecard.css)0
-rw-r--r--ui/client-style/src/nodepage.css (renamed from web/style/nodepage.css)0
-rw-r--r--ui/client-style/src/player.css (renamed from web/style/player.css)0
-rw-r--r--ui/client-style/src/props.css (renamed from web/style/props.css)0
-rw-r--r--ui/client-style/src/themes.css (renamed from web/style/themes.css)0
18 files changed, 45 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index f26cc91..63a4263 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2022,6 +2022,13 @@ dependencies = [
]
[[package]]
+name = "jellyui-client-style"
+version = "0.1.0"
+dependencies = [
+ "glob",
+]
+
+[[package]]
name = "jiff"
version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index e17fdaa..20a6408 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,7 @@ members = [
"stream/types",
"ui",
"ui/client-scripts",
+ "ui/client-style",
"remuxer",
"common/object",
]
diff --git a/ui/client-scripts/Cargo.toml b/ui/client-scripts/Cargo.toml
index 1332388..c6a8d74 100644
--- a/ui/client-scripts/Cargo.toml
+++ b/ui/client-scripts/Cargo.toml
@@ -3,7 +3,5 @@ name = "jellyui-client-scripts"
version = "0.1.0"
edition = "2024"
-[dependencies]
-
[build-dependencies]
glob = "0.3.3"
diff --git a/ui/client-scripts/build.rs b/ui/client-scripts/build.rs
index 256fa21..2f3826d 100644
--- a/ui/client-scripts/build.rs
+++ b/ui/client-scripts/build.rs
@@ -15,7 +15,6 @@ fn main() {
println!("cargo:rerun-if-changed={}", file.to_str().unwrap());
}
let outpath = std::env::var("OUT_DIR").unwrap();
- // this is great :)))
let mut proc = Command::new("esbuild")
.arg("src/main.ts")
.arg("--bundle")
diff --git a/ui/client-scripts/src/jshelper b/ui/client-scripts/src/jshelper
new file mode 160000
+Subproject 26b8e17daac3ef21d97c25e55c0812bc9e59286
diff --git a/ui/client-style/Cargo.toml b/ui/client-style/Cargo.toml
new file mode 100644
index 0000000..a5db904
--- /dev/null
+++ b/ui/client-style/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "jellyui-client-style"
+version = "0.1.0"
+edition = "2024"
+
+[build-dependencies]
+glob = "0.3.3"
diff --git a/ui/client-style/build.rs b/ui/client-style/build.rs
new file mode 100644
index 0000000..8cf1404
--- /dev/null
+++ b/ui/client-style/build.rs
@@ -0,0 +1,20 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2026 metamuffin <metamuffin.org>
+*/
+
+use std::{
+ fs::{File, read_to_string},
+ path::PathBuf,
+};
+fn main() {
+ println!("cargo:rerun-if-changed=build.rs");
+ let mut out = String::new();
+ for file in glob::glob("src/**/*.ts").unwrap().map(Result::unwrap) {
+ println!("cargo:rerun-if-changed={}", file.to_str().unwrap());
+ out += &read_to_string(file).unwrap();
+ }
+ let outpath: PathBuf = std::env::var("OUT_DIR").unwrap().try_into().unwrap();
+ File::create(outpath.join("bundle.css")).unwrap();
+}
diff --git a/web/style/forms.css b/ui/client-style/src/forms.css
index dd885da..dd885da 100644
--- a/web/style/forms.css
+++ b/ui/client-style/src/forms.css
diff --git a/web/style/js-player.css b/ui/client-style/src/js-player.css
index 5c10ff9..5c10ff9 100644
--- a/web/style/js-player.css
+++ b/ui/client-style/src/js-player.css
diff --git a/web/style/js-transition.css b/ui/client-style/src/js-transition.css
index 64e9bb2..64e9bb2 100644
--- a/web/style/js-transition.css
+++ b/ui/client-style/src/js-transition.css
diff --git a/web/style/layout.css b/ui/client-style/src/layout.css
index 5c5272c..5c5272c 100644
--- a/web/style/layout.css
+++ b/ui/client-style/src/layout.css
diff --git a/ui/client-style/src/lib.rs b/ui/client-style/src/lib.rs
new file mode 100644
index 0000000..06ddce4
--- /dev/null
+++ b/ui/client-style/src/lib.rs
@@ -0,0 +1,10 @@
+/*
+ This file is part of jellything (https://codeberg.org/metamuffin/jellything)
+ which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
+ Copyright (C) 2026 metamuffin <metamuffin.org>
+*/
+use std::borrow::Cow;
+
+pub fn css_bundle() -> Cow<'static, str> {
+ include_str!(concat!(env!("OUT_DIR"), "/bundle.css")).into()
+}
diff --git a/web/style/navbar.css b/ui/client-style/src/navbar.css
index fcb3cdd..fcb3cdd 100644
--- a/web/style/navbar.css
+++ b/ui/client-style/src/navbar.css
diff --git a/web/style/nodecard.css b/ui/client-style/src/nodecard.css
index 2c0b97f..2c0b97f 100644
--- a/web/style/nodecard.css
+++ b/ui/client-style/src/nodecard.css
diff --git a/web/style/nodepage.css b/ui/client-style/src/nodepage.css
index 1a5b8ee..1a5b8ee 100644
--- a/web/style/nodepage.css
+++ b/ui/client-style/src/nodepage.css
diff --git a/web/style/player.css b/ui/client-style/src/player.css
index 4998ca2..4998ca2 100644
--- a/web/style/player.css
+++ b/ui/client-style/src/player.css
diff --git a/web/style/props.css b/ui/client-style/src/props.css
index 83b4e79..83b4e79 100644
--- a/web/style/props.css
+++ b/ui/client-style/src/props.css
diff --git a/web/style/themes.css b/ui/client-style/src/themes.css
index 18a79b5..18a79b5 100644
--- a/web/style/themes.css
+++ b/ui/client-style/src/themes.css