felixfoertsch/agw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge push + standort into one section with switches, move unfollow buttons to dev settings

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Felix Förtsch
2026-03-02 22:50:13 +01:00
parent 9f691c711b
commit 22bf485b76
3 changed files with 100 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/features/settings/components/settings-page.tsx
+75 -82
View File
@@ -25,7 +25,7 @@ export function SettingsPage() {
const deviceId = useDeviceId()
const { needRefresh, checkForUpdate, applyUpdate } = usePwaUpdate()
const push = usePush()
const { follows, follow, unfollowAll } = useFollows()
const { follow, unfollowAllTopics, unfollowAllPoliticians } = useFollows()
const [checking, setChecking] = useState(false)
const [loading, setLoading] = useState(false)
const [result, setResult] = useState<GeoResult | null>(null)
@@ -93,18 +93,16 @@ export function SettingsPage() {
return (
<div className="px-4 py-4 space-y-6 pb-4">
{/* --- Notifications --- */}
{VAPID_PUBLIC_KEY && (
<section>
<h2 className="text-sm font-semibold text-muted-foreground uppercase tracking-wide mb-2">
Benachrichtigungen
</h2>
<Card className="py-0 gap-0">
<CardContent className="p-0 divide-y divide-border">
{push.permission === "denied" ? (
{/* --- Permissions: Push + Location --- */}
<section>
<h2 className="text-sm font-semibold text-muted-foreground uppercase tracking-wide mb-2">Berechtigungen</h2>
<Card className="py-0 gap-0">
<CardContent className="p-0 divide-y divide-border">
{VAPID_PUBLIC_KEY &&
(push.permission === "denied" ? (
<div className="px-4 py-3">
<span className="text-destructive text-sm">
Benachrichtigungen sind blockiert. Bitte in den Systemeinstellungen aktivieren.
Push blockiert — bitte in den Systemeinstellungen aktivieren.
</span>
</div>
) : (
@@ -122,80 +120,57 @@ export function SettingsPage() {
}}
/>
</div>
)}
{!standalone && (
<button
type="button"
className="w-full flex items-center justify-between px-4 py-3 text-sm hover:bg-muted transition-colors"
onClick={() => setShowGuide(true)}
))}
<div className="flex items-center justify-between px-4 py-3">
<div>
<span className="text-sm" id="location-label">
Standort
</span>
{loading && (
<span className="ml-2 text-xs text-muted-foreground">
{hasLocation ? "Aktualisiere…" : "Erkenne…"}
</span>
)}
</div>
<Switch
checked={!!hasLocation}
disabled={loading}
aria-labelledby="location-label"
onCheckedChange={(checked) => {
if (checked) detect(false)
else handleClearCache()
}}
/>
</div>
{errorMsg && (
<div className="px-4 py-3">
<span className="text-destructive text-sm">{errorMsg}</span>
</div>
)}
{!standalone && (
<button
type="button"
className="w-full flex items-center justify-between px-4 py-3 text-sm hover:bg-muted transition-colors"
onClick={() => setShowGuide(true)}
>
Einrichtung auf dem iPhone
<svg
xmlns="http://www.w3.org/2000/svg"
className="w-4 h-4 text-muted-foreground"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
strokeWidth={2}
aria-hidden="true"
>
Einrichtung auf dem iPhone
<svg
xmlns="http://www.w3.org/2000/svg"
className="w-4 h-4 text-muted-foreground"
fill="none"
viewBox="0 0 24 24"
stroke="currentColor"
strokeWidth={2}
aria-hidden="true"
>
<path strokeLinecap="round" strokeLinejoin="round" d="M9 5l7 7-7 7" />
</svg>
</button>
)}
</CardContent>
</Card>
</section>
)}
{/* --- Location --- */}
<section>
<h2 className="text-sm font-semibold text-muted-foreground uppercase tracking-wide mb-2">Standort</h2>
{loading && (
<div className="flex items-center justify-center h-16 mb-3">
<div className="w-6 h-6 border-3 border-primary border-t-transparent rounded-full animate-spin" />
<span className="ml-3 text-sm text-muted-foreground">{hasLocation ? "Aktualisiere…" : "Erkenne…"}</span>
</div>
)}
{errorMsg && (
<div className="mb-3 p-3 bg-destructive/10 rounded-lg text-destructive text-sm" role="alert">
{errorMsg}
</div>
)}
<div className="flex flex-col gap-2">
{!hasLocation && !loading && (
<Button size="lg" onClick={() => detect(false)}>
Standort erkennen
</Button>
)}
{hasLocation && (
<>
<Button size="sm" variant="outline" onClick={() => detect(true)} disabled={loading}>
Abgeordnete neu laden
</Button>
<Button size="sm" variant="outline" onClick={handleClearCache} disabled={loading}>
Cache löschen
</Button>
</>
)}
</div>
<path strokeLinecap="round" strokeLinejoin="round" d="M9 5l7 7-7 7" />
</svg>
</button>
)}
</CardContent>
</Card>
</section>
{/* --- Follows --- */}
{follows.length > 0 && (
<section>
<h2 className="text-sm font-semibold text-muted-foreground uppercase tracking-wide mb-2">Follows</h2>
<div className="flex flex-col gap-2">
<Button size="sm" variant="outline" onClick={unfollowAll}>
Allen Themen und Abgeordneten entfolgen ({follows.length})
</Button>
</div>
</section>
)}
{/* --- App Update --- */}
<section>
<h2 className="text-sm font-semibold text-muted-foreground uppercase tracking-wide mb-2">App-Update</h2>
@@ -325,6 +300,12 @@ export function SettingsPage() {
</Button>
</div>
</div>
<div className="flex items-center justify-between px-4 py-3">
<span className="text-sm">Allen Themen entfolgen</span>
<Button size="sm" variant="outline" onClick={unfollowAllTopics}>
Entfolgen
</Button>
</div>
<div className="flex items-center justify-between px-4 py-3">
<span className="text-sm">Alle Abgeordnete folgen</span>
<div className="flex items-center gap-2">
@@ -349,6 +330,18 @@ export function SettingsPage() {
</Button>
</div>
</div>
<div className="flex items-center justify-between px-4 py-3">
<span className="text-sm">Allen Abgeordneten entfolgen</span>
<Button size="sm" variant="outline" onClick={unfollowAllPoliticians}>
Entfolgen
</Button>
</div>
<div className="flex items-center justify-between px-4 py-3">
<span className="text-sm">Abgeordnete neu laden</span>
<Button size="sm" variant="outline" onClick={() => detect(true)} disabled={loading || !hasLocation}>
Neu laden
</Button>
</div>
</CardContent>
</Card>
</section>