Compare commits
35 Commits
feature/an
...
v0.1.1
| Author | SHA1 | Date | |
|---|---|---|---|
| f18285b853 | |||
| 88e7d0cf6b | |||
| 6a11a0e0d7 | |||
| f2d36798ba | |||
| 6b89925ab8 | |||
| edefcab01c | |||
| c41394e116 | |||
| c6c00d1e4b | |||
| c00e9c83c9 | |||
| 0f9d28de61 | |||
| 432185a92d | |||
| 89509418be | |||
| bd7306ecf2 | |||
| c5053e70db | |||
| c744f3bcc5 | |||
| 174da803ec | |||
| ca9e360bfd | |||
| 4b4331cd0c | |||
| 20f6191385 | |||
| 523046bb3a | |||
| c18df2143a | |||
| 3789859d90 | |||
| e2710a81b3 | |||
| d32532274f | |||
| 6301be3be0 | |||
| f365cb00a0 | |||
| 935a50d677 | |||
| 51fc52125d | |||
| 3c04fd7f24 | |||
| 5ff05d6550 | |||
| 9d84ee39f1 | |||
| 2180187df7 | |||
| d682adda6f | |||
| 65e8c25599 | |||
| 7b7e769904 |
106
.gitea/workflows/android.yaml
Normal file
106
.gitea/workflows/android.yaml
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
name: Android Build Final Fixed
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
tags: ["v*"] # Triggert bei v0.1.0, v1.0, etc.
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-android:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
container:
|
||||||
|
image: node:20-bookworm
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout Main Project
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
submodules: false
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Manual Clone easy-nostr
|
||||||
|
run: |
|
||||||
|
git clone https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@gitea.malxte.de/Bytemalte/easy-nostr.git src-tauri/easy-nostr
|
||||||
|
|
||||||
|
- name: Install System Dependencies
|
||||||
|
run: |
|
||||||
|
apt-get update
|
||||||
|
apt-get install -y build-essential curl wget file libssl-dev pkg-config openjdk-17-jdk git unzip libgtk-3-dev webkit2gtk-4.1 libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev python3
|
||||||
|
|
||||||
|
- name: Install Rust & Targets
|
||||||
|
run: |
|
||||||
|
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
||||||
|
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
|
||||||
|
export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
|
rustup target add aarch64-linux-android wasm32-unknown-unknown
|
||||||
|
|
||||||
|
- name: Install Trunk & Tauri-CLI
|
||||||
|
run: |
|
||||||
|
wget -qO- https://github.com/trunk-rs/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- -C /usr/local/bin
|
||||||
|
wget -qO- https://github.com/tauri-apps/tauri/releases/latest/download/cargo-tauri-x86_64-unknown-linux-gnu.tgz | tar -xzf- -C /usr/local/bin
|
||||||
|
chmod +x /usr/local/bin/trunk /usr/local/bin/cargo-tauri
|
||||||
|
|
||||||
|
- name: Setup Android SDK
|
||||||
|
run: |
|
||||||
|
export ANDROID_HOME=$HOME/android-sdk
|
||||||
|
mkdir -p $ANDROID_HOME/cmdline-tools
|
||||||
|
cd $ANDROID_HOME/cmdline-tools
|
||||||
|
wget -q https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip
|
||||||
|
unzip -q commandlinetools-linux-9477386_latest.zip
|
||||||
|
mv cmdline-tools latest
|
||||||
|
yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME "platform-tools" "platforms;android-33" "build-tools;33.0.1" "ndk;25.1.8937393"
|
||||||
|
echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV
|
||||||
|
echo "NDK_HOME=$ANDROID_HOME/ndk/25.1.8937393" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Build and Compile
|
||||||
|
run: |
|
||||||
|
export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
|
export ANDROID_HOME=$HOME/android-sdk
|
||||||
|
export NDK_HOME=$ANDROID_HOME/ndk/25.1.8937393
|
||||||
|
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
|
||||||
|
|
||||||
|
# 1. Frontend bauen
|
||||||
|
trunk build --release
|
||||||
|
|
||||||
|
# 2. Android Build
|
||||||
|
if [ ! -d "src-tauri/gen/android" ]; then
|
||||||
|
cargo-tauri android init
|
||||||
|
fi
|
||||||
|
cargo-tauri android build --target aarch64 --apk true
|
||||||
|
|
||||||
|
# 3. APK manuell signieren
|
||||||
|
echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | tr -d '[:space:]' > keystore.b64
|
||||||
|
base64 -d keystore.b64 > release.keystore
|
||||||
|
|
||||||
|
UNSIGNED_APK=$(find src-tauri/gen/android/app/build/outputs/apk/universal/release -name "*-unsigned.apk" | head -n 1)
|
||||||
|
APKSIGNER=$(find $ANDROID_HOME/build-tools -name apksigner | sort -r | head -n 1)
|
||||||
|
|
||||||
|
$APKSIGNER sign --ks release.keystore \
|
||||||
|
--ks-type PKCS12 \
|
||||||
|
--ks-key-alias "${{ secrets.ANDROID_KEY_ALIAS }}" \
|
||||||
|
--ks-pass pass:"${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" \
|
||||||
|
--key-pass pass:"${{ secrets.ANDROID_KEY_PASSWORD }}" \
|
||||||
|
--v4-signing-enabled true \
|
||||||
|
--out Marstemedia-Signed.apk \
|
||||||
|
"$UNSIGNED_APK"
|
||||||
|
|
||||||
|
echo "Signierung erfolgreich!"
|
||||||
|
env:
|
||||||
|
JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
|
||||||
|
|
||||||
|
- name: Upload Artifact
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: Marstemedia-Signed
|
||||||
|
path: Marstemedia-Signed.apk
|
||||||
|
|
||||||
|
- name: Create Gitea Release
|
||||||
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
files: Marstemedia-Signed.apk
|
||||||
|
# Gitea braucht manchmal explizit den Namen/Body
|
||||||
|
name: "Release ${{ github.ref_name }}"
|
||||||
|
draft: false
|
||||||
|
prerelease: false
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
|||||||
/target/
|
/target/
|
||||||
/Cargo.lock
|
/Cargo.lock
|
||||||
/.jj/
|
/.jj/
|
||||||
|
my-release-key.keystore
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ easy-nostr = { path = "./easy-nostr" }
|
|||||||
tokio = { version = "1", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
feed-rs = "2.3.1"
|
feed-rs = "2.3.1"
|
||||||
ron = "0.8"
|
ron = "0.8"
|
||||||
|
nostr-sdk = "0.44.1"
|
||||||
|
|
||||||
# FIX: default-features entfernt und rustls-tls hinzugefügt
|
# FIX: default-features entfernt und rustls-tls hinzugefügt
|
||||||
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
|
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
use easy_nostr::EasyNostr;
|
use easy_nostr::EasyNostr;
|
||||||
use serde::Serialize;
|
use nostr_sdk::prelude::{Keys, ToBech32};
|
||||||
|
use serde::Serialize; // Import für die Schlüssel-Generierung
|
||||||
|
|
||||||
// Diese Struktur ist für den Transport zum Frontend (JSON)
|
// Diese Struktur ist für den Transport zum Frontend (JSON)
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
@@ -11,12 +12,20 @@ pub struct LocalPost {
|
|||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn fetch_nostr_posts() -> Result<Vec<LocalPost>, String> {
|
pub async fn fetch_nostr_posts() -> Result<Vec<LocalPost>, String> {
|
||||||
// 1. Verbindung aufbauen
|
// 1. Temporären Einweg-Schlüssel generieren
|
||||||
let easy = EasyNostr::new("nsec1fkhszd5sv8yp6g966qdh5kuph25g4nn9pa2k5rwpuglt6rde8u8qwr3r87")
|
// Das erzeugt ein Schlüsselpaar im RAM, das nach dem Funktionsaufruf verschwindet.
|
||||||
|
let random_keys = Keys::generate();
|
||||||
|
let temp_nsec = random_keys
|
||||||
|
.secret_key()
|
||||||
|
.to_bech32()
|
||||||
|
.map_err(|e| format!("Fehler beim Generieren des Keys: {}", e))?;
|
||||||
|
|
||||||
|
// 2. Verbindung mit dem temporären Key aufbauen
|
||||||
|
let easy = EasyNostr::new(&temp_nsec)
|
||||||
.await
|
.await
|
||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
// 2. Relays hinzufügen
|
// 3. Relays hinzufügen
|
||||||
easy.add_relays(vec![
|
easy.add_relays(vec![
|
||||||
"wss://relay.damus.io",
|
"wss://relay.damus.io",
|
||||||
"wss://nos.lol",
|
"wss://nos.lol",
|
||||||
@@ -25,16 +34,16 @@ pub async fn fetch_nostr_posts() -> Result<Vec<LocalPost>, String> {
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
// 3. Posts von der Library holen
|
// 4. Posts von der Library holen
|
||||||
let raw_posts = easy.get_random_posts().await.map_err(|e| e.to_string())?;
|
let raw_posts = easy.get_random_posts().await.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
// 4. Mappen: Library-Typ -> Unser serialisierbarer Typ
|
// 5. Mappen: Library-Typ -> Unser serialisierbarer Typ
|
||||||
let mapped_posts = raw_posts
|
let mapped_posts = raw_posts
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|p| LocalPost {
|
.map(|p| LocalPost {
|
||||||
content: p.content,
|
content: p.content,
|
||||||
author: p.author.to_string(),
|
author: p.author.to_string(),
|
||||||
created_at: p.created_at.as_secs(), // Hier geändert von as_u64()
|
created_at: p.created_at.as_secs(),
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ pub fn run() {
|
|||||||
news::save_rss_urls, // Geändert von save_rss_url zu save_rss_urls
|
news::save_rss_urls, // Geändert von save_rss_url zu save_rss_urls
|
||||||
news::fetch_ai_news,
|
news::fetch_ai_news,
|
||||||
news::fetch_rss_news,
|
news::fetch_rss_news,
|
||||||
|
news::save_groq_key,
|
||||||
])
|
])
|
||||||
.run(tauri::generate_context!())
|
.run(tauri::generate_context!())
|
||||||
.expect("error while running tauri application");
|
.expect("error while running tauri application");
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ pub struct RssConfig {
|
|||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct NewsState {
|
pub struct NewsState {
|
||||||
pub openrouter_key: Mutex<String>,
|
pub openrouter_key: Mutex<String>,
|
||||||
|
pub groq_key: Mutex<String>,
|
||||||
pub rss_config: Mutex<RssConfig>,
|
pub rss_config: Mutex<RssConfig>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,40 +38,38 @@ pub async fn save_openrouter_key(key: String, state: State<'_, NewsState>) -> Re
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub async fn save_groq_key(key: String, state: State<'_, NewsState>) -> Result<(), String> {
|
||||||
|
let mut lock = state.groq_key.lock().map_err(|_| "Lock failed")?;
|
||||||
|
*lock = key.trim().to_string();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn load_rss_config(
|
pub async fn load_rss_config(
|
||||||
app: AppHandle,
|
app: AppHandle,
|
||||||
state: State<'_, NewsState>,
|
state: State<'_, NewsState>,
|
||||||
) -> Result<Vec<String>, String> {
|
) -> Result<Vec<String>, String> {
|
||||||
let path = get_config_path(&app);
|
let path = get_config_path(&app);
|
||||||
|
|
||||||
// Initialisierung mit Standard-Feeds, falls Datei nicht existiert
|
|
||||||
if !path.exists() {
|
if !path.exists() {
|
||||||
let default_urls = vec![
|
let default_urls = vec![
|
||||||
"https://www.nasa.gov/news-release/feed/".to_string(),
|
"https://www.nasa.gov/news-release/feed/".to_string(),
|
||||||
"https://www.heise.de/rss/heise-atom.xml".to_string(),
|
"https://www.heise.de/rss/heise-atom.xml".to_string(),
|
||||||
];
|
];
|
||||||
|
|
||||||
let config = RssConfig {
|
let config = RssConfig {
|
||||||
urls: default_urls.clone(),
|
urls: default_urls.clone(),
|
||||||
};
|
};
|
||||||
|
|
||||||
if let Some(parent) = path.parent() {
|
if let Some(parent) = path.parent() {
|
||||||
fs::create_dir_all(parent).map_err(|e| e.to_string())?;
|
fs::create_dir_all(parent).map_err(|e| e.to_string())?;
|
||||||
}
|
}
|
||||||
|
|
||||||
let ron_str = ron::to_string(&config).map_err(|e| e.to_string())?;
|
let ron_str = ron::to_string(&config).map_err(|e| e.to_string())?;
|
||||||
fs::write(&path, ron_str).map_err(|e| e.to_string())?;
|
fs::write(&path, ron_str).map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
let mut lock = state.rss_config.lock().unwrap();
|
let mut lock = state.rss_config.lock().unwrap();
|
||||||
lock.urls = default_urls.clone();
|
lock.urls = default_urls.clone();
|
||||||
|
|
||||||
return Ok(default_urls);
|
return Ok(default_urls);
|
||||||
}
|
}
|
||||||
|
|
||||||
let content = fs::read_to_string(path).map_err(|e| e.to_string())?;
|
let content = fs::read_to_string(path).map_err(|e| e.to_string())?;
|
||||||
let config: RssConfig = ron::from_str(&content).map_err(|e| e.to_string())?;
|
let config: RssConfig = ron::from_str(&content).map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
let mut lock = state.rss_config.lock().unwrap();
|
let mut lock = state.rss_config.lock().unwrap();
|
||||||
*lock = config.clone();
|
*lock = config.clone();
|
||||||
Ok(config.urls)
|
Ok(config.urls)
|
||||||
@@ -84,40 +83,59 @@ pub async fn save_rss_urls(
|
|||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
let config = RssConfig { urls };
|
let config = RssConfig { urls };
|
||||||
let path = get_config_path(&app);
|
let path = get_config_path(&app);
|
||||||
|
|
||||||
if let Some(parent) = path.parent() {
|
if let Some(parent) = path.parent() {
|
||||||
fs::create_dir_all(parent).map_err(|e| e.to_string())?;
|
fs::create_dir_all(parent).map_err(|e| e.to_string())?;
|
||||||
}
|
}
|
||||||
|
|
||||||
let ron_str = ron::to_string(&config).map_err(|e| e.to_string())?;
|
let ron_str = ron::to_string(&config).map_err(|e| e.to_string())?;
|
||||||
fs::write(path, ron_str).map_err(|e| e.to_string())?;
|
fs::write(path, ron_str).map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
let mut lock = state.rss_config.lock().unwrap();
|
let mut lock = state.rss_config.lock().unwrap();
|
||||||
*lock = config;
|
*lock = config;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn fetch_ai_news(state: State<'_, NewsState>) -> Result<Vec<NewsArticle>, String> {
|
pub async fn fetch_ai_news(
|
||||||
let key = state
|
provider: String,
|
||||||
.openrouter_key
|
state: State<'_, NewsState>,
|
||||||
.lock()
|
) -> Result<Vec<NewsArticle>, String> {
|
||||||
.map_err(|_| "Lock failed")?
|
let (key, url, model, author) = match provider.as_str() {
|
||||||
.clone();
|
"groq" => {
|
||||||
|
let k = state.groq_key.lock().map_err(|_| "Lock failed")?.clone();
|
||||||
|
(
|
||||||
|
k,
|
||||||
|
"https://api.groq.com/openai/v1/chat/completions",
|
||||||
|
"llama-3.1-8b-instant",
|
||||||
|
"Groq AI",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
let k = state
|
||||||
|
.openrouter_key
|
||||||
|
.lock()
|
||||||
|
.map_err(|_| "Lock failed")?
|
||||||
|
.clone();
|
||||||
|
(
|
||||||
|
k,
|
||||||
|
"https://openrouter.ai/api/v1/chat/completions",
|
||||||
|
"openai/gpt-oss-20b:free:online",
|
||||||
|
"OpenRouter AI",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
if key.is_empty() {
|
if key.is_empty() {
|
||||||
return Err("API Key fehlt.".into());
|
return Err(format!("API Key für {} fehlt.", author));
|
||||||
}
|
}
|
||||||
|
|
||||||
let client = reqwest::Client::new();
|
let client = reqwest::Client::new();
|
||||||
let response = client
|
let response = client
|
||||||
.post("https://openrouter.ai/api/v1/chat/completions")
|
.post(url)
|
||||||
.header("Authorization", format!("Bearer {}", key))
|
.header("Authorization", format!("Bearer {}", key))
|
||||||
.json(&serde_json::json!({
|
.json(&serde_json::json!({
|
||||||
"model": "minimax/minimax-m2.1",
|
"model": model,
|
||||||
"messages": [
|
"messages": [
|
||||||
{"role": "system", "content": "Kurze News, 1-2 Sätze, Deutsch."},
|
{"role": "system", "content": "Kurze Tech-News, 1-2 Sätze, Deutsch. Nutze Markdown."},
|
||||||
{"role": "user", "content": "Tech-News."}
|
{"role": "user", "content": "Was gibt es neues in der Tech-Welt?"}
|
||||||
]
|
]
|
||||||
}))
|
}))
|
||||||
.send()
|
.send()
|
||||||
@@ -127,12 +145,12 @@ pub async fn fetch_ai_news(state: State<'_, NewsState>) -> Result<Vec<NewsArticl
|
|||||||
let json: serde_json::Value = response.json().await.map_err(|e| e.to_string())?;
|
let json: serde_json::Value = response.json().await.map_err(|e| e.to_string())?;
|
||||||
let content = json["choices"][0]["message"]["content"]
|
let content = json["choices"][0]["message"]["content"]
|
||||||
.as_str()
|
.as_str()
|
||||||
.unwrap_or("Fehler")
|
.unwrap_or("Fehler beim Abrufen der Inhalte")
|
||||||
.to_string();
|
.to_string();
|
||||||
|
|
||||||
Ok(vec![NewsArticle {
|
Ok(vec![NewsArticle {
|
||||||
content,
|
content,
|
||||||
author: "OpenRouter AI".into(),
|
author: author.into(),
|
||||||
created_at: "Gerade eben".into(),
|
created_at: "Gerade eben".into(),
|
||||||
}])
|
}])
|
||||||
}
|
}
|
||||||
@@ -151,7 +169,6 @@ pub async fn fetch_rss_news(state: State<'_, NewsState>) -> Result<Vec<NewsArtic
|
|||||||
.title
|
.title
|
||||||
.map(|t| t.content)
|
.map(|t| t.content)
|
||||||
.unwrap_or_else(|| "RSS".into());
|
.unwrap_or_else(|| "RSS".into());
|
||||||
|
|
||||||
for entry in feed.entries.into_iter().take(3) {
|
for entry in feed.entries.into_iter().take(3) {
|
||||||
let date = entry
|
let date = entry
|
||||||
.published
|
.published
|
||||||
|
|||||||
@@ -33,6 +33,10 @@ struct StringArgs {
|
|||||||
struct UrlsArgs {
|
struct UrlsArgs {
|
||||||
urls: Vec<String>,
|
urls: Vec<String>,
|
||||||
}
|
}
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct AiArgs {
|
||||||
|
provider: String,
|
||||||
|
}
|
||||||
|
|
||||||
#[function_component(News)]
|
#[function_component(News)]
|
||||||
pub fn news() -> Html {
|
pub fn news() -> Html {
|
||||||
@@ -40,12 +44,14 @@ pub fn news() -> Html {
|
|||||||
let error_msg = use_state(|| None::<String>);
|
let error_msg = use_state(|| None::<String>);
|
||||||
let show_config = use_state(|| false);
|
let show_config = use_state(|| false);
|
||||||
let current_mode = use_state(|| NewsMode::Ai);
|
let current_mode = use_state(|| NewsMode::Ai);
|
||||||
|
let ai_provider = use_state(|| "openrouter".to_string());
|
||||||
let rss_urls = use_state(Vec::<String>::new);
|
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();
|
let new_url_ref = use_node_ref();
|
||||||
|
|
||||||
// Init: Konfiguration laden
|
// Init: RSS laden
|
||||||
{
|
{
|
||||||
let rss_urls = rss_urls.clone();
|
let rss_urls = rss_urls.clone();
|
||||||
use_effect_with((), move |_| {
|
use_effect_with((), move |_| {
|
||||||
@@ -60,23 +66,27 @@ pub fn news() -> Html {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// News laden Funktion
|
|
||||||
let load_news = {
|
let load_news = {
|
||||||
let articles = articles.clone();
|
let articles = articles.clone();
|
||||||
let error_msg = error_msg.clone();
|
let error_msg = error_msg.clone();
|
||||||
let mode = *current_mode;
|
let mode = *current_mode;
|
||||||
|
let provider = (*ai_provider).clone();
|
||||||
Callback::from(move |_| {
|
Callback::from(move |_| {
|
||||||
let articles = articles.clone();
|
let articles = articles.clone();
|
||||||
let error_msg = error_msg.clone();
|
let error_msg = error_msg.clone();
|
||||||
|
let provider = provider.clone();
|
||||||
articles.set(None);
|
articles.set(None);
|
||||||
error_msg.set(None);
|
error_msg.set(None);
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
let cmd = if mode == NewsMode::Ai {
|
let (cmd, args) = if mode == NewsMode::Ai {
|
||||||
"fetch_ai_news"
|
(
|
||||||
|
"fetch_ai_news",
|
||||||
|
serde_wasm_bindgen::to_value(&AiArgs { provider }).unwrap(),
|
||||||
|
)
|
||||||
} else {
|
} else {
|
||||||
"fetch_rss_news"
|
("fetch_rss_news", JsValue::NULL)
|
||||||
};
|
};
|
||||||
match invoke(cmd, JsValue::NULL).await {
|
match invoke(cmd, args).await {
|
||||||
Ok(res) => {
|
Ok(res) => {
|
||||||
let data = serde_wasm_bindgen::from_value::<Vec<NewsArticle>>(res)
|
let data = serde_wasm_bindgen::from_value::<Vec<NewsArticle>>(res)
|
||||||
.unwrap_or_default();
|
.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();
|
let load_news = load_news.clone();
|
||||||
use_effect_with((*current_mode).clone(), move |_| {
|
use_effect_with(
|
||||||
load_news.emit(MouseEvent::new("click").unwrap());
|
((*current_mode).clone(), (*ai_provider).clone()),
|
||||||
|| ()
|
move |_| {
|
||||||
});
|
load_news.emit(MouseEvent::new("click").unwrap());
|
||||||
|
|| ()
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
let save_settings = {
|
let save_settings = {
|
||||||
let rss_urls = rss_urls.clone();
|
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 show_config = show_config.clone();
|
||||||
let load_news = load_news.clone();
|
let load_news = load_news.clone();
|
||||||
Callback::from(move |_| {
|
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>()
|
.cast::<HtmlInputElement>()
|
||||||
.map(|i| i.value())
|
.map(|i| i.value())
|
||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
@@ -113,7 +131,12 @@ pub fn news() -> Html {
|
|||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
let _ = invoke(
|
let _ = invoke(
|
||||||
"save_openrouter_key",
|
"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;
|
.await;
|
||||||
let _ = invoke(
|
let _ = invoke(
|
||||||
@@ -131,20 +154,24 @@ pub fn news() -> Html {
|
|||||||
<div class="feed-container">
|
<div class="feed-container">
|
||||||
<div class="feed-header">
|
<div class="feed-header">
|
||||||
<div class="header-main">
|
<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">
|
<div class="mode-toggle">
|
||||||
<button
|
<button class={if *current_mode == NewsMode::Ai { "toggle-btn active" } else { "toggle-btn" }}
|
||||||
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>
|
||||||
onclick={let m = current_mode.clone(); move |_| m.set(NewsMode::Ai)}>
|
<button class={if *current_mode == NewsMode::Rss { "toggle-btn active" } else { "toggle-btn" }}
|
||||||
{"KI"}
|
onclick={let m = current_mode.clone(); move |_| m.set(NewsMode::Rss)}>{"RSS"}</button>
|
||||||
</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>
|
||||||
</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">
|
<div class="header-actions">
|
||||||
<button class="action-btn" onclick={let sc = show_config.clone(); move |_| sc.set(!*sc)}>{"⚙️"}</button>
|
<button class="action-btn" onclick={let sc = show_config.clone(); move |_| sc.set(!*sc)}>{"⚙️"}</button>
|
||||||
<button class="action-btn" onclick={load_news.clone()}>{"🔄"}</button>
|
<button class="action-btn" onclick={load_news.clone()}>{"🔄"}</button>
|
||||||
@@ -154,14 +181,17 @@ pub fn news() -> Html {
|
|||||||
if *show_config {
|
if *show_config {
|
||||||
<div class="config-panel">
|
<div class="config-panel">
|
||||||
<div class="config-section">
|
<div class="config-section">
|
||||||
<label>{"OPENROUTER API KEY"}</label>
|
<label>{"OpenRouter Key"}</label>
|
||||||
<input ref={api_key_ref} type="password" class="config-input" placeholder="sk-..." />
|
<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>
|
||||||
|
|
||||||
<div class="config-section">
|
<div class="config-section">
|
||||||
<label>{"RSS FEEDS"}</label>
|
<label>{"RSS FEEDS"}</label>
|
||||||
<div class="rss-input-row">
|
<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={
|
<button class="add-btn" onclick={
|
||||||
let rss_urls = rss_urls.clone();
|
let rss_urls = rss_urls.clone();
|
||||||
let new_url_ref = new_url_ref.clone();
|
let new_url_ref = new_url_ref.clone();
|
||||||
@@ -178,21 +208,6 @@ pub fn news() -> Html {
|
|||||||
}
|
}
|
||||||
}>{"+"}</button>
|
}>{"+"}</button>
|
||||||
</div>
|
</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>
|
</div>
|
||||||
<button class="save-master-btn" onclick={save_settings}>{"Alles Speichern"}</button>
|
<button class="save-master-btn" onclick={save_settings}>{"Alles Speichern"}</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -202,11 +217,7 @@ pub fn news() -> Html {
|
|||||||
{ if let Some(msg) = (*error_msg).clone() {
|
{ if let Some(msg) = (*error_msg).clone() {
|
||||||
html! { <div class="error-box">{ format!("⚠️ Error: {}", msg) }</div> }
|
html! { <div class="error-box">{ format!("⚠️ Error: {}", msg) }</div> }
|
||||||
} else if let Some(list) = (*articles).clone() {
|
} else if let Some(list) = (*articles).clone() {
|
||||||
if list.is_empty() {
|
html! { for list.iter().map(|a| html! { <NewsCard article={a.clone()} /> }) }
|
||||||
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()} /> }) }
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
html! { <div class="loading-spinner">{"Lade Nachrichten..."}</div> }
|
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);
|
md_html::push_html(&mut out, parser);
|
||||||
out
|
out
|
||||||
};
|
};
|
||||||
|
|
||||||
html! {
|
html! {
|
||||||
<div class="post-card">
|
<div class="post-card">
|
||||||
<div class="post-header">
|
<div class="post-header">
|
||||||
|
|||||||
85
styles.css
85
styles.css
@@ -434,3 +434,88 @@ html {
|
|||||||
border-radius: 12px;
|
border-radius: 12px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* --- AI Provider Switch (Neu) --- */
|
||||||
|
.provider-switch {
|
||||||
|
display: flex;
|
||||||
|
background: rgba(255, 255, 255, 0.05);
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 3px;
|
||||||
|
border: 1px solid rgba(255, 255, 255, 0.08);
|
||||||
|
/* Zwischen h1 und den Icons positionieren */
|
||||||
|
margin: 0 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.prov-btn {
|
||||||
|
border: none;
|
||||||
|
background: transparent;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
padding: 6px 14px;
|
||||||
|
border-radius: 9px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 0.75rem;
|
||||||
|
font-weight: 700;
|
||||||
|
transition: all 0.2s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.prov-btn.active {
|
||||||
|
background: var(--accent-color);
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Config Section Refinement --- */
|
||||||
|
.config-section {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.config-section label {
|
||||||
|
display: block;
|
||||||
|
font-size: 0.7rem;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin-bottom: 6px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 0.5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Markdown Content Styling --- */
|
||||||
|
.markdown-body {
|
||||||
|
font-size: 0.95rem;
|
||||||
|
color: var(--text-primary);
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.markdown-body h3 {
|
||||||
|
margin-top: 0;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
font-size: 1.15rem;
|
||||||
|
color: #ffffff;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.markdown-body p {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Status Indicators --- */
|
||||||
|
.loading-spinner {
|
||||||
|
text-align: center;
|
||||||
|
padding: 40px;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
font-style: italic;
|
||||||
|
animation: pulse-subtle 2s infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.empty-msg {
|
||||||
|
text-align: center;
|
||||||
|
color: var(--text-secondary);
|
||||||
|
margin-top: 40px;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Layout Adjustment für Provider Switch --- */
|
||||||
|
.header-main {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user