Fix pull from minio

This commit is contained in:
dvirlabs 2025-06-04 00:36:06 +03:00
parent fee9d2cce5
commit 36478eb507
7 changed files with 58 additions and 36 deletions

4
backend/.env Normal file
View File

@ -0,0 +1,4 @@
MINIO_ACCESS_KEY=TDJvsBmbkpUXpCw5M7LA
MINIO_SECRET_KEY=n9scR7W0MZy6FF0bznV98fSgXpdebIQjqZvEr1Yu
MINIO_ENDPOINT=s3.dvirlabs.com
MINIO_BUCKET=navix-icons

Binary file not shown.

View File

@ -1,25 +1,25 @@
sections: sections:
- apps: - apps:
- description: Dashboards - description: Dashboards
icon: http://192.168.10.118:1111/icons/grafana.svg icon: grafana.svg
name: Grafana name: Grafana
url: https://grafana.dvirlabs.com url: https://grafana.dvirlabs.com
- description: Monitoring - description: Monitoring
icon: http://192.168.10.118:1111/icons/prometheus.svg icon: prometheus.svg
name: Prometheus name: Prometheus
url: https://prometheus.dvirlabs.com url: https://prometheus.dvirlabs.com
name: Monitoring name: Monitoring
- apps: - apps:
- description: Git server - description: Git server
icon: http://192.168.10.118:1111/icons/gitea.svg icon: gitea.svg
name: Gitea name: Gitea
url: https://git.dvirlabs.com url: https://git.dvirlabs.com
- description: Container registry - description: Container registry
icon: http://192.168.10.118:1111/icons/harbor.svg icon: harbor.svg
name: Harbor name: Harbor
url: https://harbor.dvirlabs.com url: https://harbor.dvirlabs.com
- description: CI/CD - description: CI/CD
icon: http://192.168.10.118:1111/icons/woodpecker-ci.svg icon: woodpecker-ci.svg
name: Woodpecker name: Woodpecker
url: https://woodpecker.dvirlabs.com url: https://woodpecker.dvirlabs.com
name: Dev-tools name: Dev-tools

View File

@ -1,5 +1,8 @@
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import JSONResponse
import os
from dotenv import load_dotenv
import yaml import yaml
from pathlib import Path from pathlib import Path
from pydantic import BaseModel from pydantic import BaseModel
@ -17,12 +20,20 @@ app.add_middleware(
allow_headers=["*"], allow_headers=["*"],
) )
load_dotenv()
# Load ENV variables
MINIO_ENDPOINT = os.getenv("MINIO_ENDPOINT")
MINIO_ACCESS_KEY = os.getenv("MINIO_ACCESS_KEY")
MINIO_SECRET_KEY = os.getenv("MINIO_SECRET_KEY")
MINIO_BUCKET = os.getenv("MINIO_BUCKET")
# MinIO connection with access and secret keys # MinIO connection with access and secret keys
minio_client = Minio( minio_client = Minio(
"minio.dvirlabs.com", MINIO_ENDPOINT,
access_key="YOUR_MINIO_ACCESS_KEY", access_key=MINIO_ACCESS_KEY,
secret_key="YOUR_MINIO_SECRET_KEY", secret_key=MINIO_SECRET_KEY,
secure=True # Set to False if using HTTP secure=True
) )
BUCKET = "navix-icons" BUCKET = "navix-icons"
@ -76,16 +87,10 @@ def add_app(entry: AppEntry):
return {"status": "added"} return {"status": "added"}
@app.get("/icon/{filename}") @app.get("/icon/{filename}")
def get_presigned_icon_url(filename: str): def get_public_icon_url(filename: str):
try: url = f"https://{MINIO_ENDPOINT}/{MINIO_BUCKET}/{filename}"
url = minio_client.presigned_get_object( return JSONResponse(content={"url": url})
bucket_name=BUCKET,
object_name=filename,
expires=timedelta(hours=1)
)
return {"url": url}
except Exception as e:
return {"error": str(e)}
if __name__ == "__main__": if __name__ == "__main__":

View File

@ -1,25 +1,37 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import '../style/AppCard.css';
import { getIconUrl } from '../services/api'; import { getIconUrl } from '../services/api';
function AppCard({ app }) { function AppCard({ app }) {
const [iconUrl, setIconUrl] = useState(''); const [iconUrl, setIconUrl] = useState(null);
useEffect(() => { useEffect(() => {
if (app.icon) { if (app.icon) {
getIconUrl(app.icon) getIconUrl(app.icon)
.then(setIconUrl) .then((url) => {
.catch(() => setIconUrl('fallback-icon.svg')); console.log('Presigned icon URL for', app.name, ':', url);
} setIconUrl(url);
}, [app.icon]); })
.catch((err) => {
console.error(`Failed to load icon for ${app.name}:`, err);
});
}
}, [app.icon, app.name]);
return ( return (
<a href={app.url} className="app-card" target="_blank" rel="noreferrer"> <div className="app-card-wrapper">
<div className="app-icon-wrapper"> <a href={app.url} className="app-card" target="_blank" rel="noreferrer">
<img src={iconUrl} alt={app.name} className="app-icon" /> <div className="app-icon-wrapper">
</div> {iconUrl ? (
<h3>{app.name}</h3> <img src={iconUrl} alt={app.name} className="app-icon" />
<p>{app.description}</p> ) : (
</a> <span className="icon-placeholder"></span>
)}
</div>
<h3>{app.name}</h3>
<p>{app.description}</p>
</a>
</div>
); );
} }

View File

@ -18,5 +18,5 @@ export async function getIconUrl(filename) {
const res = await fetch(`/icon/${filename}`); const res = await fetch(`/icon/${filename}`);
if (!res.ok) throw new Error(`Failed to fetch icon for ${filename}`); if (!res.ok) throw new Error(`Failed to fetch icon for ${filename}`);
const data = await res.json(); const data = await res.json();
return data.url; return data.url; // ✅ must return the actual URL string
} }

View File

@ -8,6 +8,7 @@ export default defineConfig({
proxy: { proxy: {
'/apps': 'http://localhost:8000', '/apps': 'http://localhost:8000',
'/add_app': 'http://localhost:8000', '/add_app': 'http://localhost:8000',
'/icon': 'http://localhost:8000',
} }
} }
}); });