commit 29e57a4e966ba4badf36e9b26c021e4e7fee7ca8 · nonbinary.computer/weaver

+10

Cargo.lock

··· 1815 1815 ] 1816 1816 1817 1817 [[package]] 1818 + name = "dioxus-free-icons" 1819 + version = "0.10.0" 1820 + source = "registry+https://github.com/rust-lang/crates.io-index" 1821 + checksum = "28d356e0f9edad0930bc1cc76744360c0ecca020cb943acaadf42cb774f28284" 1822 + dependencies = [ 1823 + "dioxus", 1824 + ] 1825 + 1826 + [[package]] 1818 1827 name = "dioxus-fullstack" 1819 1828 version = "0.7.1" 1820 1829 source = "registry+https://github.com/rust-lang/crates.io-index" ··· 8623 8632 "diesel", 8624 8633 "diesel_migrations", 8625 8634 "dioxus", 8635 + "dioxus-free-icons", 8626 8636 "dioxus-primitives", 8627 8637 "jacquard", 8628 8638 "jacquard-axum",

+9

crates/weaver-api/lexicons/sh_weaver_notebook_theme.json

··· 57 57 "description": "Reference to a dark colour scheme", 58 58 "ref": "com.atproto.repo.strongRef" 59 59 }, 60 + "defaultTheme": { 61 + "type": "string", 62 + "default": "auto", 63 + "enum": [ 64 + "light", 65 + "dark", 66 + "auto" 67 + ] 68 + }, 60 69 "fonts": { 61 70 "type": "object", 62 71 "required": [

+55 -13

crates/weaver-api/src/sh_weaver/notebook/theme.rs

··· 338 338 }), 339 339 ); 340 340 map.insert( 341 + ::jacquard_common::smol_str::SmolStr::new_static( 342 + "defaultTheme", 343 + ), 344 + ::jacquard_lexicon::lexicon::LexObjectProperty::String(::jacquard_lexicon::lexicon::LexString { 345 + description: None, 346 + format: None, 347 + default: None, 348 + min_length: None, 349 + max_length: None, 350 + min_graphemes: None, 351 + max_graphemes: None, 352 + r#enum: None, 353 + r#const: None, 354 + known_values: None, 355 + }), 356 + ); 357 + map.insert( 341 358 ::jacquard_common::smol_str::SmolStr::new_static("fonts"), 342 359 ::jacquard_lexicon::lexicon::LexObjectProperty::Object(::jacquard_lexicon::lexicon::LexObject { 343 360 description: None, ··· 546 563 /// Reference to a dark colour scheme 547 564 #[serde(borrow)] 548 565 pub dark_scheme: crate::com_atproto::repo::strong_ref::StrongRef<'a>, 566 + #[serde(skip_serializing_if = "std::option::Option::is_none")] 567 + #[serde(borrow)] 568 + pub default_theme: Option<jacquard_common::CowStr<'a>>, 549 569 #[serde(borrow)] 550 570 pub fonts: ThemeFonts<'a>, 551 571 /// Syntax highlighting theme for light mode ··· 676 696 __unsafe_private_named: ( 677 697 ::core::option::Option<ThemeDarkCodeTheme<'a>>, 678 698 ::core::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>, 699 + ::core::option::Option<jacquard_common::CowStr<'a>>, 679 700 ::core::option::Option<ThemeFonts<'a>>, 680 701 ::core::option::Option<ThemeLightCodeTheme<'a>>, 681 702 ::core::option::Option<crate::com_atproto::repo::strong_ref::StrongRef<'a>>, ··· 696 717 pub fn new() -> Self { 697 718 ThemeBuilder { 698 719 _phantom_state: ::core::marker::PhantomData, 699 - __unsafe_private_named: (None, None, None, None, None, None), 720 + __unsafe_private_named: (None, None, None, None, None, None, None), 700 721 _phantom: ::core::marker::PhantomData, 701 722 } 702 723 } ··· 740 761 } 741 762 } 742 763 764 + impl<'a, S: theme_state::State> ThemeBuilder<'a, S> { 765 + /// Set the `defaultTheme` field (optional) 766 + pub fn default_theme( 767 + mut self, 768 + value: impl Into<Option<jacquard_common::CowStr<'a>>>, 769 + ) -> Self { 770 + self.__unsafe_private_named.2 = value.into(); 771 + self 772 + } 773 + /// Set the `defaultTheme` field to an Option value (optional) 774 + pub fn maybe_default_theme( 775 + mut self, 776 + value: Option<jacquard_common::CowStr<'a>>, 777 + ) -> Self { 778 + self.__unsafe_private_named.2 = value; 779 + self 780 + } 781 + } 782 + 743 783 impl<'a, S> ThemeBuilder<'a, S> 744 784 where 745 785 S: theme_state::State, ··· 750 790 mut self, 751 791 value: impl Into<ThemeFonts<'a>>, 752 792 ) -> ThemeBuilder<'a, theme_state::SetFonts<S>> { 753 - self.__unsafe_private_named.2 = ::core::option::Option::Some(value.into()); 793 + self.__unsafe_private_named.3 = ::core::option::Option::Some(value.into()); 754 794 ThemeBuilder { 755 795 _phantom_state: ::core::marker::PhantomData, 756 796 __unsafe_private_named: self.__unsafe_private_named, ··· 769 809 mut self, 770 810 value: impl Into<ThemeLightCodeTheme<'a>>, 771 811 ) -> ThemeBuilder<'a, theme_state::SetLightCodeTheme<S>> { 772 - self.__unsafe_private_named.3 = ::core::option::Option::Some(value.into()); 812 + self.__unsafe_private_named.4 = ::core::option::Option::Some(value.into()); 773 813 ThemeBuilder { 774 814 _phantom_state: ::core::marker::PhantomData, 775 815 __unsafe_private_named: self.__unsafe_private_named, ··· 788 828 mut self, 789 829 value: impl Into<crate::com_atproto::repo::strong_ref::StrongRef<'a>>, 790 830 ) -> ThemeBuilder<'a, theme_state::SetLightScheme<S>> { 791 - self.__unsafe_private_named.4 = ::core::option::Option::Some(value.into()); 831 + self.__unsafe_private_named.5 = ::core::option::Option::Some(value.into()); 792 832 ThemeBuilder { 793 833 _phantom_state: ::core::marker::PhantomData, 794 834 __unsafe_private_named: self.__unsafe_private_named, ··· 807 847 mut self, 808 848 value: impl Into<ThemeSpacing<'a>>, 809 849 ) -> ThemeBuilder<'a, theme_state::SetSpacing<S>> { 810 - self.__unsafe_private_named.5 = ::core::option::Option::Some(value.into()); 850 + self.__unsafe_private_named.6 = ::core::option::Option::Some(value.into()); 811 851 ThemeBuilder { 812 852 _phantom_state: ::core::marker::PhantomData, 813 853 __unsafe_private_named: self.__unsafe_private_named, ··· 831 871 Theme { 832 872 dark_code_theme: self.__unsafe_private_named.0.unwrap(), 833 873 dark_scheme: self.__unsafe_private_named.1.unwrap(), 834 - fonts: self.__unsafe_private_named.2.unwrap(), 835 - light_code_theme: self.__unsafe_private_named.3.unwrap(), 836 - light_scheme: self.__unsafe_private_named.4.unwrap(), 837 - spacing: self.__unsafe_private_named.5.unwrap(), 874 + default_theme: self.__unsafe_private_named.2, 875 + fonts: self.__unsafe_private_named.3.unwrap(), 876 + light_code_theme: self.__unsafe_private_named.4.unwrap(), 877 + light_scheme: self.__unsafe_private_named.5.unwrap(), 878 + spacing: self.__unsafe_private_named.6.unwrap(), 838 879 extra_data: Default::default(), 839 880 } 840 881 } ··· 849 890 Theme { 850 891 dark_code_theme: self.__unsafe_private_named.0.unwrap(), 851 892 dark_scheme: self.__unsafe_private_named.1.unwrap(), 852 - fonts: self.__unsafe_private_named.2.unwrap(), 853 - light_code_theme: self.__unsafe_private_named.3.unwrap(), 854 - light_scheme: self.__unsafe_private_named.4.unwrap(), 855 - spacing: self.__unsafe_private_named.5.unwrap(), 893 + default_theme: self.__unsafe_private_named.2, 894 + fonts: self.__unsafe_private_named.3.unwrap(), 895 + light_code_theme: self.__unsafe_private_named.4.unwrap(), 896 + light_scheme: self.__unsafe_private_named.5.unwrap(), 897 + spacing: self.__unsafe_private_named.6.unwrap(), 856 898 extra_data: Some(extra_data), 857 899 } 858 900 }

+1 -1

crates/weaver-app/Cargo.toml

··· 38 38 serde = { version = "1.0", features = ["derive"] } 39 39 serde_json = "1.0" 40 40 reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } 41 - 41 + dioxus-free-icons = { version = "0.10.0" } 42 42 diesel = { version = "2.3", features = ["sqlite", "returning_clauses_for_sqlite_3_35", "chrono", "serde_json"] } 43 43 diesel_migrations = { version = "2.3", features = ["sqlite"] } 44 44

crates/weaver-app/assets/fonts/ioskeley-mono/IoskeleyMono-Bold.woff2