Groq and OR switch without save
All checks were successful
Android Build Final Fixed / build-android (push) Successful in 7m8s
All checks were successful
Android Build Final Fixed / build-android (push) Successful in 7m8s
This commit is contained in:
@@ -33,6 +33,10 @@ struct StringArgs {
|
||||
struct UrlsArgs {
|
||||
urls: Vec<String>,
|
||||
}
|
||||
#[derive(Serialize)]
|
||||
struct AiArgs {
|
||||
provider: String,
|
||||
}
|
||||
|
||||
#[function_component(News)]
|
||||
pub fn news() -> Html {
|
||||
@@ -40,12 +44,14 @@ pub fn news() -> Html {
|
||||
let error_msg = use_state(|| None::<String>);
|
||||
let show_config = use_state(|| false);
|
||||
let current_mode = use_state(|| NewsMode::Ai);
|
||||
let ai_provider = use_state(|| "openrouter".to_string());
|
||||
let rss_urls = use_state(Vec::<String>::new);
|
||||
|
||||
let api_key_ref = use_node_ref();
|
||||
let or_key_ref = use_node_ref();
|
||||
let groq_key_ref = use_node_ref();
|
||||
let new_url_ref = use_node_ref();
|
||||
|
||||
// Init: Konfiguration laden
|
||||
// Init: RSS laden
|
||||
{
|
||||
let rss_urls = rss_urls.clone();
|
||||
use_effect_with((), move |_| {
|
||||
@@ -60,23 +66,27 @@ pub fn news() -> Html {
|
||||
});
|
||||
}
|
||||
|
||||
// News laden Funktion
|
||||
let load_news = {
|
||||
let articles = articles.clone();
|
||||
let error_msg = error_msg.clone();
|
||||
let mode = *current_mode;
|
||||
let provider = (*ai_provider).clone();
|
||||
Callback::from(move |_| {
|
||||
let articles = articles.clone();
|
||||
let error_msg = error_msg.clone();
|
||||
let provider = provider.clone();
|
||||
articles.set(None);
|
||||
error_msg.set(None);
|
||||
spawn_local(async move {
|
||||
let cmd = if mode == NewsMode::Ai {
|
||||
"fetch_ai_news"
|
||||
let (cmd, args) = if mode == NewsMode::Ai {
|
||||
(
|
||||
"fetch_ai_news",
|
||||
serde_wasm_bindgen::to_value(&AiArgs { provider }).unwrap(),
|
||||
)
|
||||
} else {
|
||||
"fetch_rss_news"
|
||||
("fetch_rss_news", JsValue::NULL)
|
||||
};
|
||||
match invoke(cmd, JsValue::NULL).await {
|
||||
match invoke(cmd, args).await {
|
||||
Ok(res) => {
|
||||
let data = serde_wasm_bindgen::from_value::<Vec<NewsArticle>>(res)
|
||||
.unwrap_or_default();
|
||||
@@ -88,22 +98,30 @@ pub fn news() -> Html {
|
||||
})
|
||||
};
|
||||
|
||||
// Automatisches Laden bei Modus-Wechsel
|
||||
// Auto-Reload bei Switch
|
||||
{
|
||||
let load_news = load_news.clone();
|
||||
use_effect_with((*current_mode).clone(), move |_| {
|
||||
load_news.emit(MouseEvent::new("click").unwrap());
|
||||
|| ()
|
||||
});
|
||||
use_effect_with(
|
||||
((*current_mode).clone(), (*ai_provider).clone()),
|
||||
move |_| {
|
||||
load_news.emit(MouseEvent::new("click").unwrap());
|
||||
|| ()
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
let save_settings = {
|
||||
let rss_urls = rss_urls.clone();
|
||||
let api_key_ref = api_key_ref.clone();
|
||||
let or_ref = or_key_ref.clone();
|
||||
let groq_ref = groq_key_ref.clone();
|
||||
let show_config = show_config.clone();
|
||||
let load_news = load_news.clone();
|
||||
Callback::from(move |_| {
|
||||
let key = api_key_ref
|
||||
let or_key = or_ref
|
||||
.cast::<HtmlInputElement>()
|
||||
.map(|i| i.value())
|
||||
.unwrap_or_default();
|
||||
let groq_key = groq_ref
|
||||
.cast::<HtmlInputElement>()
|
||||
.map(|i| i.value())
|
||||
.unwrap_or_default();
|
||||
@@ -113,7 +131,12 @@ pub fn news() -> Html {
|
||||
spawn_local(async move {
|
||||
let _ = invoke(
|
||||
"save_openrouter_key",
|
||||
serde_wasm_bindgen::to_value(&StringArgs { key }).unwrap(),
|
||||
serde_wasm_bindgen::to_value(&StringArgs { key: or_key }).unwrap(),
|
||||
)
|
||||
.await;
|
||||
let _ = invoke(
|
||||
"save_groq_key",
|
||||
serde_wasm_bindgen::to_value(&StringArgs { key: groq_key }).unwrap(),
|
||||
)
|
||||
.await;
|
||||
let _ = invoke(
|
||||
@@ -131,20 +154,24 @@ pub fn news() -> Html {
|
||||
<div class="feed-container">
|
||||
<div class="feed-header">
|
||||
<div class="header-main">
|
||||
<h1>{ if *current_mode == NewsMode::Ai { "📰 KI News" } else { "📻 RSS Feeds" } }</h1>
|
||||
<h1>{ if *current_mode == NewsMode::Ai { "📰 KI News" } else { "📻 RSS" } }</h1>
|
||||
<div class="mode-toggle">
|
||||
<button
|
||||
class={if *current_mode == NewsMode::Ai { "toggle-btn active" } else { "toggle-btn" }}
|
||||
onclick={let m = current_mode.clone(); move |_| m.set(NewsMode::Ai)}>
|
||||
{"KI"}
|
||||
</button>
|
||||
<button
|
||||
class={if *current_mode == NewsMode::Rss { "toggle-btn active" } else { "toggle-btn" }}
|
||||
onclick={let m = current_mode.clone(); move |_| m.set(NewsMode::Rss)}>
|
||||
{"RSS"}
|
||||
</button>
|
||||
<button class={if *current_mode == NewsMode::Ai { "toggle-btn active" } else { "toggle-btn" }}
|
||||
onclick={let m = current_mode.clone(); move |_| m.set(NewsMode::Ai)}>{"KI"}</button>
|
||||
<button class={if *current_mode == NewsMode::Rss { "toggle-btn active" } else { "toggle-btn" }}
|
||||
onclick={let m = current_mode.clone(); move |_| m.set(NewsMode::Rss)}>{"RSS"}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
if *current_mode == NewsMode::Ai {
|
||||
<div class="provider-switch">
|
||||
<button class={if *ai_provider == "openrouter" { "prov-btn active" } else { "prov-btn" }}
|
||||
onclick={let p = ai_provider.clone(); move |_| p.set("openrouter".into())}>{"OR"}</button>
|
||||
<button class={if *ai_provider == "groq" { "prov-btn active" } else { "prov-btn" }}
|
||||
onclick={let p = ai_provider.clone(); move |_| p.set("groq".into())}>{"Groq"}</button>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="header-actions">
|
||||
<button class="action-btn" onclick={let sc = show_config.clone(); move |_| sc.set(!*sc)}>{"⚙️"}</button>
|
||||
<button class="action-btn" onclick={load_news.clone()}>{"🔄"}</button>
|
||||
@@ -154,14 +181,17 @@ pub fn news() -> Html {
|
||||
if *show_config {
|
||||
<div class="config-panel">
|
||||
<div class="config-section">
|
||||
<label>{"OPENROUTER API KEY"}</label>
|
||||
<input ref={api_key_ref} type="password" class="config-input" placeholder="sk-..." />
|
||||
<label>{"OpenRouter Key"}</label>
|
||||
<input ref={or_key_ref} type="password" class="config-input" placeholder="sk-or-..." />
|
||||
</div>
|
||||
<div class="config-section">
|
||||
<label>{"Groq Key"}</label>
|
||||
<input ref={groq_key_ref} type="password" class="config-input" placeholder="gsk-..." />
|
||||
</div>
|
||||
|
||||
<div class="config-section">
|
||||
<label>{"RSS FEEDS"}</label>
|
||||
<div class="rss-input-row">
|
||||
<input ref={new_url_ref.clone()} type="text" class="config-input" placeholder="URL hinzufügen..." />
|
||||
<input ref={new_url_ref.clone()} type="text" class="config-input" placeholder="URL..." />
|
||||
<button class="add-btn" onclick={
|
||||
let rss_urls = rss_urls.clone();
|
||||
let new_url_ref = new_url_ref.clone();
|
||||
@@ -178,21 +208,6 @@ pub fn news() -> Html {
|
||||
}
|
||||
}>{"+"}</button>
|
||||
</div>
|
||||
<div class="rss-list-scroll">
|
||||
{ for (*rss_urls).iter().enumerate().map(|(i, url)| html! {
|
||||
<div class="rss-url-entry" key={i}>
|
||||
<span class="url-text">{url}</span>
|
||||
<button class="delete-btn" onclick={
|
||||
let rss_urls = rss_urls.clone();
|
||||
move |_| {
|
||||
let mut list = (*rss_urls).clone();
|
||||
list.remove(i);
|
||||
rss_urls.set(list);
|
||||
}
|
||||
}>{"✕"}</button>
|
||||
</div>
|
||||
}) }
|
||||
</div>
|
||||
</div>
|
||||
<button class="save-master-btn" onclick={save_settings}>{"Alles Speichern"}</button>
|
||||
</div>
|
||||
@@ -202,11 +217,7 @@ pub fn news() -> Html {
|
||||
{ if let Some(msg) = (*error_msg).clone() {
|
||||
html! { <div class="error-box">{ format!("⚠️ Error: {}", msg) }</div> }
|
||||
} else if let Some(list) = (*articles).clone() {
|
||||
if list.is_empty() {
|
||||
html! { <p class="empty-msg">{"Keine Nachrichten gefunden. Überprüfe deine Feeds."}</p> }
|
||||
} else {
|
||||
html! { for list.iter().map(|a| html! { <NewsCard article={a.clone()} /> }) }
|
||||
}
|
||||
html! { for list.iter().map(|a| html! { <NewsCard article={a.clone()} /> }) }
|
||||
} else {
|
||||
html! { <div class="loading-spinner">{"Lade Nachrichten..."}</div> }
|
||||
} }
|
||||
@@ -231,7 +242,6 @@ pub fn news_card(props: &NewsCardProps) -> Html {
|
||||
md_html::push_html(&mut out, parser);
|
||||
out
|
||||
};
|
||||
|
||||
html! {
|
||||
<div class="post-card">
|
||||
<div class="post-header">
|
||||
|
||||
Reference in New Issue
Block a user