Api changes

This commit is contained in:
Owen Schwartz
2024-10-19 18:47:41 -04:00
parent 94da55450e
commit 0fa3382cda
20 changed files with 319 additions and 154 deletions

View File

@@ -1,18 +0,0 @@
import { Separator } from "@/components/ui/separator"
import { AccountForm } from "@/components/account-form"
export default function SettingsAccountPage() {
return (
<div className="space-y-6">
<div>
<h3 className="text-lg font-medium">Account</h3>
<p className="text-sm text-muted-foreground">
Update your account settings. Set your preferred language and
timezone.
</p>
</div>
<Separator />
<AccountForm />
</div>
)
}

View File

@@ -1,18 +0,0 @@
import { Separator } from "@/components/ui/separator"
import { AppearanceForm } from "@/components/appearance-form"
export default function SettingsAppearancePage() {
return (
<div className="space-y-6">
<div>
<h3 className="text-lg font-medium">Appearance</h3>
<p className="text-sm text-muted-foreground">
Customize the appearance of the app. Automatically switch between day
and night themes.
</p>
</div>
<Separator />
<AppearanceForm />
</div>
)
}

View File

@@ -5,20 +5,19 @@ import { useResourceContext } from "@app/hooks/useResourceContext";
const sidebarNavItems = [
{
title: "General",
title: "Create",
href: "/{orgId}/resources/{resourceId}",
},
// {
// title: "Appearance",
// href: "/{orgId}/resources/{resourceId}/appearance",
// },
{
title: "Targets",
href: "/{orgId}/resources/{resourceId}/targets",
},
// {
// title: "Notifications",
// href: "/{orgId}/resources/{resourceId}/notifications",
// },
]
export function ClientLayout({ isCreate, children }: { isCreate: boolean; children: React.ReactNode }) {
const { resource } = useResourceContext();
return (<div className="hidden space-y-6 0 pb-16 md:block">

View File

@@ -1,17 +0,0 @@
import { Separator } from "@/components/ui/separator"
import { DisplayForm } from "@/components/display-form"
export default function SettingsDisplayPage() {
return (
<div className="space-y-6">
<div>
<h3 className="text-lg font-medium">Display</h3>
<p className="text-sm text-muted-foreground">
Turn items on or off to control what&apos;s displayed in the app.
</p>
</div>
<Separator />
<DisplayForm />
</div>
)
}

View File

@@ -20,21 +20,6 @@ export const metadata: Metadata = {
description: "Advanced form example using react-hook-form and Zod.",
};
const sidebarNavItems = [
{
title: "Profile",
href: "/{orgId}/resources/{resourceId}",
},
// {
// title: "Appearance",
// href: "/{orgId}/resources/{resourceId}/appearance",
// },
// {
// title: "Notifications",
// href: "/{orgId}/resources/{resourceId}/notifications",
// },
]
interface SettingsLayoutProps {
children: React.ReactNode;
params: { resourceId: string; orgId: string };

View File

@@ -1,17 +0,0 @@
import { Separator } from "@/components/ui/separator"
import { NotificationsForm } from "@/components/notifications-form"
export default function SettingsNotificationsPage() {
return (
<div className="space-y-6">
<div>
<h3 className="text-lg font-medium">Notifications</h3>
<p className="text-sm text-muted-foreground">
Configure how you receive notifications.
</p>
</div>
<Separator />
<NotificationsForm />
</div>
)
}

View File

@@ -0,0 +1,198 @@
"use client"
import { useEffect, useState } from "react"
import { PlusCircle, Trash2, Server, Globe, Cpu, Power } from "lucide-react"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"
import { Input } from "@/components/ui/input"
import { Label } from "@/components/ui/label"
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"
import { Switch } from "@/components/ui/switch"
import { Badge } from "@/components/ui/badge"
import api from "@app/api"
import { AxiosResponse } from "axios"
import { ListTargetsResponse } from "@server/routers/target/listTargets"
export default function ReverseProxyTargets({ params }: { params: { resourceId: string } }) {
const [targets, setTargets] = useState<ListTargetsResponse["targets"]>([])
const [nextId, setNextId] = useState(1)
useEffect(() => {
if (typeof window !== "undefined") {
const fetchSites = async () => {
const res = await api.get<AxiosResponse<ListTargetsResponse>>(`/resource/${params.resourceId}/targets`);
setTargets(res.data.data.targets);
};
fetchSites();
}
}, []);
const [newTarget, setNewTarget] = useState({
resourceId: params.resourceId,
ip: "",
method: "GET",
port: 80,
protocol: "http",
})
const addTarget = async () => {
const res = await api.put(`/resource/${params.resourceId}/target`, {
...newTarget,
resourceId: undefined
})
.catch((err) => {
console.error(err)
});
setTargets([...targets, { ...newTarget, targetId: nextId, enabled: true }])
setNextId(nextId + 1)
setNewTarget({
resourceId: params.resourceId,
ip: "",
method: "GET",
port: 80,
protocol: "http",
})
}
const removeTarget = async (targetId: number) => {
setTargets(targets.filter((target) => target.targetId !== targetId))
const res = await api.delete(`/target/${targetId}`)
}
const toggleTarget = (targetId: number) => {
setTargets(
targets.map((target) =>
target.targetId === targetId ? { ...target, enabled: !target.enabled } : target
)
)
const res = api.post(`/target/${targetId}`, { enabled: !targets.find((target) => target.targetId === targetId)?.enabled })
// Add a visual feedback
const targetElement = document.getElementById(`target-${targetId}`)
if (targetElement) {
targetElement.classList.add('scale-105', 'transition-transform')
setTimeout(() => {
targetElement.classList.remove('scale-105', 'transition-transform')
}, 200)
}
}
return (
<div className="space-y-6">
{/* <Card>
<CardHeader> */}
{/* <CardTitle>Add New Target</CardTitle>
</CardHeader>
<CardContent> */}
<form
onSubmit={(e) => {
e.preventDefault()
addTarget()
}}
className="space-y-4"
>
<div className="grid grid-cols-2 gap-4">
<div className="space-y-2">
<Label htmlFor="ip">IP Address</Label>
<Input
id="ip"
value={newTarget.ip}
onChange={(e) => setNewTarget({ ...newTarget, ip: e.target.value })}
required
/>
</div>
<div className="space-y-2">
<Label htmlFor="method">Method</Label>
<Select
value={newTarget.method}
onValueChange={(value) => setNewTarget({ ...newTarget, method: value })}
>
<SelectTrigger id="method">
<SelectValue placeholder="Select method" />
</SelectTrigger>
<SelectContent>
<SelectItem value="GET">GET</SelectItem>
<SelectItem value="POST">POST</SelectItem>
<SelectItem value="PUT">PUT</SelectItem>
<SelectItem value="DELETE">DELETE</SelectItem>
</SelectContent>
</Select>
</div>
<div className="space-y-2">
<Label htmlFor="port">Port</Label>
<Input
id="port"
type="number"
value={newTarget.port}
onChange={(e) => setNewTarget({ ...newTarget, port: parseInt(e.target.value) })}
required
/>
</div>
<div className="space-y-2">
<Label htmlFor="protocol">Protocol</Label>
<Select
value={newTarget.protocol}
onValueChange={(value) => setNewTarget({ ...newTarget, protocol: value })}
>
<SelectTrigger id="protocol">
<SelectValue placeholder="Select protocol" />
</SelectTrigger>
<SelectContent>
<SelectItem value="http">HTTP</SelectItem>
<SelectItem value="https">HTTPS</SelectItem>
</SelectContent>
</Select>
</div>
</div>
<Button type="submit">
<PlusCircle className="mr-2 h-4 w-4" /> Add Target
</Button>
</form>
{/* </CardContent>
</Card> */}
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
{targets.map((target) => (
<Card key={target.targetId} id={`target-${target.targetId}`} >
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
<CardTitle className="text-sm font-medium flex items-center">
<Server className="mr-2 h-4 w-4" />
Target {target.targetId}
</CardTitle>
<Switch
checked={target.enabled}
onCheckedChange={() => toggleTarget(target.targetId)}
/>
</CardHeader>
<CardContent>
<div className="grid gap-2">
<div className="flex items-center">
<Globe className="mr-2 h-4 w-4 text-muted-foreground" />
<span className="text-sm">{target.ip}:{target.port}</span>
</div>
<div className="flex items-center">
<Cpu className="mr-2 h-4 w-4 text-muted-foreground" />
<span className="text-sm">{target.resourceId}</span>
</div>
<div className="flex items-center space-x-2">
<Badge variant={target.enabled ? "default" : "secondary"}>{target.method}</Badge>
<Badge variant={target.enabled ? "default" : "secondary"}>{target.protocol?.toUpperCase()}</Badge>
</div>
</div>
<Button
variant="destructive"
size="sm"
className="mt-4 w-full"
onClick={() => removeTarget(target.targetId)}
>
<Trash2 className="mr-2 h-4 w-4" /> Remove
</Button>
</CardContent>
</Card>
))}
</div>
</div>
)
}

View File

@@ -11,11 +11,11 @@ type ResourcesPageProps = {
export default async function Page({ params }: ResourcesPageProps) {
let resources: ListResourcesResponse["resources"] = [];
try {
// const res = await internal.get<AxiosResponse<ListResourcesResponse>>(
// `/org/${params.orgId}/resources`,
// authCookieHeader(),
// );
// resources = res.data.data.resources;
const res = await internal.get<AxiosResponse<ListResourcesResponse>>(
`/org/${params.orgId}/resources`,
authCookieHeader(),
);
resources = res.data.data.resources;
} catch (e) {
console.error("Error fetching resources", e);
}

View File

@@ -32,6 +32,7 @@ export function ResourceProvider({ children, resource: serverResource }: Resourc
} catch (error) {
console.error(error);
toast({
variant: "destructive",
title: "Error updating resource...",
})
}

View File

@@ -32,6 +32,7 @@ export function SiteProvider({ children, site: serverSite }: SiteProviderProps)
} catch (error) {
console.error(error);
toast({
variant: "destructive",
title: "Error updating site...",
})
}