diff --git a/rust/src/model/rainy.rs b/rust/src/model/rainy.rs index 14bdfee..85d49f2 100644 --- a/rust/src/model/rainy.rs +++ b/rust/src/model/rainy.rs @@ -9,6 +9,8 @@ pub struct V1Package { pub owner: String, pub package_url: String, pub is_deprecated: bool, + pub has_nsfw_content: bool, + pub categories: Vec, pub versions: Vec, } diff --git a/rust/src/pkg.rs b/rust/src/pkg.rs index 04431b5..3f8b6ea 100644 --- a/rust/src/pkg.rs +++ b/rust/src/pkg.rs @@ -49,7 +49,9 @@ pub struct Remote { pub package_url: String, pub download_url: String, pub deprecated: bool, - pub dependencies: BTreeSet + pub nsfw: bool, + pub categories: Vec, + pub dependencies: BTreeSet, } impl Package { @@ -70,7 +72,9 @@ impl Package { package_url: p.package_url, download_url: v.download_url, deprecated: p.is_deprecated, + nsfw: p.has_nsfw_content, version: v.version_number, + categories: p.categories, dependencies: Self::sanitize_deps(v.dependencies) }) }) diff --git a/src/components/App.vue b/src/components/App.vue index 6e19c80..e59d2d5 100644 --- a/src/components/App.vue +++ b/src/components/App.vue @@ -24,8 +24,7 @@ const general = useGeneralStore(); pkg.setupListeners(); const currentTab: Ref = ref(3); -const searchPkg = ref(''); -const searchCfg = ref(''); +const pkgSearchTerm = ref(''); const isProfileDisabled = computed(() => prf.current === null); @@ -34,7 +33,7 @@ onMounted(async () => { general.dirs = d as Dirs; }); - const fetch_promise = pkg.fetch(); + const fetch_promise = pkg.fetch(true); await Promise.all([prf.reloadList(), prf.reload()]); @@ -65,7 +64,10 @@ onMounted(async () => {
-
{ >
-
- - - - +
+ + + + + +
+
@@ -100,10 +111,10 @@ onMounted(async () => { - + - + diff --git a/src/components/ModStore.vue b/src/components/ModStore.vue index 04e5d09..cb2156e 100644 --- a/src/components/ModStore.vue +++ b/src/components/ModStore.vue @@ -1,5 +1,8 @@