#591 - server-providers

resources/js/components/form-successful.tsx

@@ -0,0 +1,10 @@
+import { CheckIcon } from 'lucide-react';
+import { Transition } from '@headlessui/react';
+
+export default function FormSuccessful({ successful }: { successful: boolean }) {
+  return (
+    <Transition show={successful} enter="transition ease-in-out" enterFrom="opacity-0" leave="transition ease-in-out" leaveTo="opacity-0">
+      <CheckIcon />
+    </Transition>
+  );
+}

resources/js/components/ui/badge.tsx

@@ -5,7 +5,7 @@ import { cva, type VariantProps } from 'class-variance-authority';
 import { cn } from '@/lib/utils';
 
 const badgeVariants = cva(
-  'inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-auto',
+  'uppercase inline-flex items-center justify-center rounded-md border px-2 py-0.5 text-xs font-medium w-fit whitespace-nowrap shrink-0 [&>svg]:size-3 gap-1 [&>svg]:pointer-events-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive transition-[color,box-shadow] overflow-auto',
   {
     variants: {
       variant: {

resources/js/layouts/settings/layout.tsx

@@ -1,5 +1,5 @@
 import { type BreadcrumbItem, type NavItem } from '@/types';
-import { ListIcon, UserIcon, UsersIcon } from 'lucide-react';
+import { CloudIcon, ListIcon, UserIcon, UsersIcon } from 'lucide-react';
 import { ReactNode } from 'react';
 import Layout from '@/layouts/app/layout';
 
@@ -19,6 +19,11 @@ const sidebarNavItems: NavItem[] = [
     href: route('projects'),
     icon: ListIcon,
   },
+  {
+    title: 'Server Providers',
+    href: route('server-providers'),
+    icon: CloudIcon,
+  },
 ];
 
 export default function SettingsLayout({ children, breadcrumbs }: { children: ReactNode; breadcrumbs?: BreadcrumbItem[] }) {

resources/js/pages/profile/components/update-password.tsx

@@ -1,5 +1,4 @@
 import InputError from '@/components/ui/input-error';
-import { Transition } from '@headlessui/react';
 import { useForm } from '@inertiajs/react';
 import { FormEventHandler, useRef } from 'react';
 
@@ -8,7 +7,8 @@ import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from '@/components/ui/card';
 import { Form, FormField, FormFields } from '@/components/ui/form';
-import { CheckIcon, LoaderCircleIcon } from 'lucide-react';
+import { LoaderCircleIcon } from 'lucide-react';
+import FormSuccessful from '@/components/form-successful';
 
 export default function UpdatePassword() {
   const passwordInput = useRef<HTMLInputElement>(null);
@@ -96,11 +96,9 @@ export default function UpdatePassword() {
       <CardFooter className="gap-2">
         <Button form="update-password-form" disabled={processing}>
           {processing && <LoaderCircleIcon className="animate-spin" />}
+          <FormSuccessful successful={recentlySuccessful} />
           Save password
         </Button>
-        <Transition show={recentlySuccessful} enter="transition ease-in-out" enterFrom="opacity-0" leave="transition ease-in-out" leaveTo="opacity-0">
-          <CheckIcon className="text-success" />
-        </Transition>
       </CardFooter>
     </Card>
   );

resources/js/pages/profile/components/update-profile.tsx

@@ -4,18 +4,18 @@ import { Input } from '@/components/ui/input';
 import InputError from '@/components/ui/input-error';
 import { useForm, usePage } from '@inertiajs/react';
 import { Button } from '@/components/ui/button';
-import { Transition } from '@headlessui/react';
 import type { SharedData } from '@/types';
 import { FormEventHandler } from 'react';
 import { Form, FormField, FormFields } from '@/components/ui/form';
-import { CheckIcon, LoaderCircleIcon } from 'lucide-react';
+import { LoaderCircleIcon } from 'lucide-react';
+import FormSuccessful from '@/components/form-successful';
 
 type ProfileForm = {
   name: string;
   email: string;
 };
 
-export default function UpdateUser() {
+export default function UpdateProfile() {
   const { auth } = usePage<SharedData>().props;
 
   const { data, setData, patch, errors, processing, recentlySuccessful } = useForm<Required<ProfileForm>>({
@@ -71,11 +71,9 @@ export default function UpdateUser() {
       <CardFooter className="gap-2">
         <Button form="update-profile-form" disabled={processing}>
           {processing && <LoaderCircleIcon className="animate-spin" />}
+          <FormSuccessful successful={recentlySuccessful} />
           Save
         </Button>
-        <Transition show={recentlySuccessful} enter="transition ease-in-out" enterFrom="opacity-0" leave="transition ease-in-out" leaveTo="opacity-0">
-          <CheckIcon className="text-success" />
-        </Transition>
       </CardFooter>
     </Card>
   );

resources/js/pages/profile/index.tsx

@@ -2,7 +2,7 @@ import { Head } from '@inertiajs/react';
 import SettingsLayout from '@/layouts/settings/layout';
 import Container from '@/components/container';
 import UpdatePassword from '@/pages/profile/components/update-password';
-import UpdateUser from '@/pages/profile/components/update-user';
+import UpdateProfile from '@/pages/profile/components/update-profile';
 import Heading from '@/components/heading';
 
 export default function Profile() {
@@ -11,7 +11,7 @@ export default function Profile() {
       <Head title="Profile settings" />
       <Container className="max-w-5xl">
         <Heading title="Profile settings" description="Manage your profile settings." />
-        <UpdateUser />
+        <UpdateProfile />
         <UpdatePassword />
       </Container>
     </SettingsLayout>

resources/js/pages/projects/components/project-form.tsx

@@ -10,14 +10,14 @@ import {
 } from '@/components/ui/dialog';
 import { FormEventHandler, ReactNode, useState } from 'react';
 import { Button } from '@/components/ui/button';
-import { CheckIcon, LoaderCircle } from 'lucide-react';
+import { LoaderCircle } from 'lucide-react';
 import { useForm } from '@inertiajs/react';
 import { Form, FormField, FormFields } from '@/components/ui/form';
 import { Label } from '@/components/ui/label';
 import { Input } from '@/components/ui/input';
 import InputError from '@/components/ui/input-error';
 import { Project } from '@/types/project';
-import { Transition } from '@headlessui/react';
+import FormSuccessful from '@/components/form-successful';
 
 export default function ProjectForm({ project, children }: { project?: Project; children: ReactNode }) {
   const [open, setOpen] = useState(false);
@@ -58,16 +58,7 @@ export default function ProjectForm({ project, children }: { project?: Project;
             </FormField>
           </FormFields>
         </Form>
-        <DialogFooter className="items-center">
-          <Transition
-            show={form.recentlySuccessful}
-            enter="transition ease-in-out"
-            enterFrom="opacity-0"
-            leave="transition ease-in-out"
-            leaveTo="opacity-0"
-          >
-            <CheckIcon className="text-success" />
-          </Transition>
+        <DialogFooter>
           <DialogClose asChild>
             <Button type="button" variant="outline">
               Cancel
@@ -75,6 +66,7 @@ export default function ProjectForm({ project, children }: { project?: Project;
           </DialogClose>
           <Button form="project-form" type="button" onClick={submit} disabled={form.processing}>
             {form.processing && <LoaderCircle className="animate-spin" />}
+            <FormSuccessful successful={form.recentlySuccessful} />
             Save
           </Button>
         </DialogFooter>

resources/js/pages/server-providers/components/columns.tsx

@@ -0,0 +1,185 @@
+import { ColumnDef } from '@tanstack/react-table';
+import DateTime from '@/components/date-time';
+import { ServerProvider } from '@/types/server-provider';
+import { Badge } from '@/components/ui/badge';
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@/components/ui/dialog';
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from '@/components/ui/dropdown-menu';
+import { Button } from '@/components/ui/button';
+import { useForm } from '@inertiajs/react';
+import { LoaderCircleIcon, MoreVerticalIcon } from 'lucide-react';
+import FormSuccessful from '@/components/form-successful';
+import { FormEvent, useState } from 'react';
+import InputError from '@/components/ui/input-error';
+import { Form, FormField, FormFields } from '@/components/ui/form';
+import { Label } from '@/components/ui/label';
+import { Input } from '@/components/ui/input';
+import { Checkbox } from '@/components/ui/checkbox';
+
+function Edit({ serverProvider }: { serverProvider: ServerProvider }) {
+  const [open, setOpen] = useState(false);
+  const form = useForm({
+    name: serverProvider.name,
+    global: serverProvider.global,
+  });
+
+  const submit = (e: FormEvent) => {
+    e.preventDefault();
+    form.patch(route('server-providers.update', serverProvider.id));
+  };
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>
+        <DropdownMenuItem onSelect={(e) => e.preventDefault()}>Edit</DropdownMenuItem>
+      </DialogTrigger>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Edit {serverProvider.name}</DialogTitle>
+          <DialogDescription className="sr-only">Edit server provider</DialogDescription>
+        </DialogHeader>
+        <Form id="edit-server-provider-form" className="p-4" onSubmit={submit}>
+          <FormFields>
+            <FormField>
+              <Label htmlFor="name">Name</Label>
+              <Input type="text" id="name" name="name" value={form.data.name} onChange={(e) => form.setData('name', e.target.value)} />
+              <InputError message={form.errors.name} />
+            </FormField>
+            <FormField>
+              <div className="flex items-center space-x-3">
+                <Checkbox id="global" name="global" checked={form.data.global} onClick={() => form.setData('global', !form.data.global)} />
+                <Label htmlFor="global">Is global (accessible in all projects)</Label>
+              </div>
+              <InputError message={form.errors.global} />
+            </FormField>
+          </FormFields>
+        </Form>
+        <DialogFooter>
+          <DialogClose asChild>
+            <Button variant="outline">Cancel</Button>
+          </DialogClose>
+          <Button form="edit-server-provider-form" disabled={form.processing} onClick={submit}>
+            {form.processing && <LoaderCircleIcon className="animate-spin" />}
+            <FormSuccessful successful={form.recentlySuccessful} />
+            Save
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+function Delete({ serverProvider }: { serverProvider: ServerProvider }) {
+  const [open, setOpen] = useState(false);
+  const form = useForm();
+
+  const submit = () => {
+    form.delete(route('server-providers.destroy', serverProvider.id), {
+      onSuccess: () => {
+        setOpen(false);
+      },
+    });
+  };
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>
+        <DropdownMenuItem variant="destructive" onSelect={(e) => e.preventDefault()}>
+          Delete
+        </DropdownMenuItem>
+      </DialogTrigger>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Delete {serverProvider.name}</DialogTitle>
+          <DialogDescription className="sr-only">Delete server provider</DialogDescription>
+        </DialogHeader>
+        <div className="space-y-2 p-4">
+          <p>
+            Are you sure you want to delete <strong>{serverProvider.name}</strong>?
+          </p>
+          <InputError message={form.errors.provider} />
+        </div>
+        <DialogFooter>
+          <DialogClose asChild>
+            <Button variant="outline">Cancel</Button>
+          </DialogClose>
+          <Button variant="destructive" disabled={form.processing} onClick={submit}>
+            {form.processing && <LoaderCircleIcon className="animate-spin" />}
+            <FormSuccessful successful={form.recentlySuccessful} />
+            Delete
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+export const columns: ColumnDef<ServerProvider>[] = [
+  {
+    accessorKey: 'id',
+    header: 'ID',
+    enableColumnFilter: true,
+    enableSorting: true,
+    enableHiding: true,
+  },
+  {
+    accessorKey: 'provider',
+    header: 'Provider',
+    enableColumnFilter: true,
+    enableSorting: true,
+  },
+  {
+    accessorKey: 'name',
+    header: 'Name',
+    enableColumnFilter: true,
+    enableSorting: true,
+  },
+  {
+    accessorKey: 'global',
+    header: 'Global',
+    enableColumnFilter: true,
+    enableSorting: true,
+    cell: ({ row }) => {
+      return <div>{row.original.global ? <Badge variant="success">yes</Badge> : <Badge variant="danger">no</Badge>}</div>;
+    },
+  },
+  {
+    accessorKey: 'created_at',
+    header: 'Created at',
+    enableColumnFilter: true,
+    enableSorting: true,
+    cell: ({ row }) => {
+      return <DateTime date={row.original.created_at} />;
+    },
+  },
+  {
+    id: 'actions',
+    enableColumnFilter: false,
+    enableSorting: false,
+    cell: ({ row }) => {
+      return (
+        <div className="flex items-center justify-end">
+          <DropdownMenu modal={false}>
+            <DropdownMenuTrigger asChild>
+              <Button variant="ghost" className="h-8 w-8 p-0">
+                <span className="sr-only">Open menu</span>
+                <MoreVerticalIcon />
+              </Button>
+            </DropdownMenuTrigger>
+            <DropdownMenuContent align="end">
+              <Edit serverProvider={row.original} />
+              <DropdownMenuSeparator />
+              <Delete serverProvider={row.original} />
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
+      );
+    },
+  },
+];

resources/js/pages/server-providers/components/connect-server-provider.tsx

@@ -1,4 +1,4 @@
-import { LoaderCircle, PlusIcon, WifiIcon } from 'lucide-react';
+import { LoaderCircle } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import {
   Dialog,
@@ -11,7 +11,7 @@ import {
   DialogTrigger,
 } from '@/components/ui/dialog';
 import { useForm, usePage } from '@inertiajs/react';
-import { FormEventHandler, useEffect, useState } from 'react';
+import { FormEventHandler, ReactNode, useEffect, useState } from 'react';
 import { Label } from '@/components/ui/label';
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
 import InputError from '@/components/ui/input-error';
@@ -26,16 +26,16 @@ type ServerProviderForm = {
   global: boolean;
 };
 
-export default function CreateServerProvider({
-  trigger,
+export default function ConnectServerProvider({
   providers,
   defaultProvider,
   onProviderAdded,
+  children,
 }: {
-  trigger: 'icon' | 'button';
   providers: string[];
   defaultProvider?: string;
   onProviderAdded?: () => void;
+  children: ReactNode;
 }) {
   const [open, setOpen] = useState(false);
 
@@ -65,21 +65,11 @@ export default function CreateServerProvider({
 
   return (
     <Dialog open={open} onOpenChange={setOpen}>
-      <DialogTrigger asChild>
-        <Button type="button" variant="outline">
-          {trigger === 'icon' && <WifiIcon />}
-          {trigger === 'button' && (
-            <>
-              <PlusIcon />
-              Connect
-            </>
-          )}
-        </Button>
-      </DialogTrigger>
+      <DialogTrigger asChild>{children}</DialogTrigger>
       <DialogContent className="sm:max-w-xl">
         <DialogHeader>
-          <DialogTitle>Connect</DialogTitle>
-          <DialogDescription>Connect to a new server provider</DialogDescription>
+          <DialogTitle>Connect to server provider</DialogTitle>
+          <DialogDescription className="sr-only">Connect to a new server provider</DialogDescription>
         </DialogHeader>
         <Form id="create-server-provider-form" onSubmit={submit} className="p-4">
           <FormFields>

resources/js/pages/server-providers/index.tsx

@@ -0,0 +1,41 @@
+import SettingsLayout from '@/layouts/settings/layout';
+import { Head, usePage } from '@inertiajs/react';
+import Container from '@/components/container';
+import Heading from '@/components/heading';
+import { Button } from '@/components/ui/button';
+import React from 'react';
+import ConnectServerProvider from '@/pages/server-providers/components/connect-server-provider';
+import { DataTable } from '@/components/data-table';
+import { columns } from '@/pages/server-providers/components/columns';
+import { ServerProvider } from '@/types/server-provider';
+
+type Page = {
+  serverProviders: {
+    data: ServerProvider[];
+  };
+  configs: {
+    server_providers: string[];
+  };
+};
+
+export default function ServerProviders() {
+  const page = usePage<Page>();
+
+  return (
+    <SettingsLayout>
+      <Head title="Server Providers" />
+      <Container className="max-w-5xl">
+        <div className="flex items-start justify-between">
+          <Heading title="Server Providers" description="Here you can manage all of the server provider connectinos" />
+          <div className="flex items-center gap-2">
+            <ConnectServerProvider providers={page.props.configs.server_providers}>
+              <Button>Connect</Button>
+            </ConnectServerProvider>
+          </div>
+        </div>
+
+        <DataTable columns={columns} data={page.props.serverProviders.data} />
+      </Container>
+    </SettingsLayout>
+  );
+}

resources/js/pages/servers/components/create-server.tsx

@@ -1,4 +1,4 @@
-import { ClipboardCheckIcon, ClipboardIcon, LoaderCircle, TriangleAlert } from 'lucide-react';
+import { ClipboardCheckIcon, ClipboardIcon, LoaderCircle, TriangleAlert, WifiIcon } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import { Sheet, SheetContent, SheetDescription, SheetFooter, SheetHeader, SheetTitle, SheetTrigger } from '@/components/ui/sheet';
 import { useForm, usePage } from '@inertiajs/react';
@@ -9,7 +9,7 @@ import InputError from '@/components/ui/input-error';
 import { Input } from '@/components/ui/input';
 import { Alert, AlertDescription } from '@/components/ui/alert';
 import { ServerProvider } from '@/types/server-provider';
-import CreateServerProvider from '@/pages/server-providers/components/create-server-provider';
+import ConnectServerProvider from '@/pages/server-providers/components/connect-server-provider';
 import axios from 'axios';
 import { Form, FormField, FormFields } from '@/components/ui/form';
 import type { SharedData } from '@/types';
@@ -40,9 +40,9 @@ export default function CreateServer({ children }: { children: React.ReactNode }
     port: 22,
     region: '',
     plan: '',
-    webserver: '',
-    database: '',
-    php: '',
+    webserver: 'nginx',
+    database: 'none',
+    php: 'none',
   });
 
   const submit: FormEventHandler = (e) => {
@@ -62,7 +62,7 @@ export default function CreateServer({ children }: { children: React.ReactNode }
 
   const [serverProviders, setServerProviders] = useState<ServerProvider[]>([]);
   const fetchServerProviders = async () => {
-    const serverProviders = await axios.get(route('server-providers.all'));
+    const serverProviders = await axios.get(route('server-providers.json'));
     setServerProviders(serverProviders.data);
   };
   const selectProvider = (provider: string) => {
@@ -150,12 +150,15 @@ export default function CreateServer({ children }: { children: React.ReactNode }
                       </SelectGroup>
                     </SelectContent>
                   </Select>
-                  <CreateServerProvider
-                    trigger="icon"
+                  <ConnectServerProvider
                     providers={page.props.configs.server_providers.filter((item) => item !== 'custom')}
                     defaultProvider={form.data.provider}
                     onProviderAdded={fetchServerProviders}
-                  />
+                  >
+                    <Button variant="outline">
+                      <WifiIcon />
+                    </Button>
+                  </ConnectServerProvider>
                 </div>
                 <InputError />
               </FormField>

resources/js/pages/users/components/actions.tsx

@@ -4,7 +4,7 @@ import { Button } from '@/components/ui/button';
 import { MoreVerticalIcon } from 'lucide-react';
 import DeleteUser from '@/pages/users/components/delete-user';
 import Projects from '@/pages/users/components/projects';
-import UserForm from '@/pages/users/components/form';
+import UserForm from '@/pages/users/components/user-form';
 
 export default function UserActions({ user }: { user: User }) {
   return (

resources/js/pages/users/components/user-form.tsx

@@ -10,7 +10,7 @@ import {
 } from '@/components/ui/dialog';
 import { FormEventHandler, ReactNode, useState } from 'react';
 import { Button } from '@/components/ui/button';
-import { CheckIcon, LoaderCircle } from 'lucide-react';
+import { LoaderCircle } from 'lucide-react';
 import { useForm } from '@inertiajs/react';
 import { Form, FormField, FormFields } from '@/components/ui/form';
 import { Label } from '@/components/ui/label';
@@ -18,7 +18,7 @@ import { Input } from '@/components/ui/input';
 import InputError from '@/components/ui/input-error';
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
 import { User } from '@/types/user';
-import { Transition } from '@headlessui/react';
+import FormSuccessful from '@/components/form-successful';
 
 export default function UserForm({ user, children }: { user?: User; children: ReactNode }) {
   const [open, setOpen] = useState(false);
@@ -100,15 +100,6 @@ export default function UserForm({ user, children }: { user?: User; children: Re
           </FormFields>
         </Form>
         <DialogFooter className="items-center">
-          <Transition
-            show={form.recentlySuccessful}
-            enter="transition ease-in-out"
-            enterFrom="opacity-0"
-            leave="transition ease-in-out"
-            leaveTo="opacity-0"
-          >
-            <CheckIcon className="text-success" />
-          </Transition>
           <DialogClose asChild>
             <Button type="button" variant="outline">
               Cancel
@@ -116,6 +107,7 @@ export default function UserForm({ user, children }: { user?: User; children: Re
           </DialogClose>
           <Button form="create-user-form" type="button" onClick={submit} disabled={form.processing}>
             {form.processing && <LoaderCircle className="animate-spin" />}
+            <FormSuccessful successful={form.recentlySuccessful} />
             Save
           </Button>
         </DialogFooter>

resources/js/pages/users/index.tsx

@@ -4,7 +4,7 @@ import Container from '@/components/container';
 import Heading from '@/components/heading';
 import UsersList from '@/pages/users/components/list';
 import { Button } from '@/components/ui/button';
-import UserForm from '@/pages/users/components/form';
+import UserForm from '@/pages/users/components/user-form';
 
 export default function Users() {
   return (

resources/js/types/server-provider.d.ts

@@ -1,8 +1,9 @@
 export interface ServerProvider {
   id: number;
   user_id: number;
-  name: string;
   provider: string;
+  name: string;
+  global: boolean;
   connected: boolean;
   project_id?: number;
   created_at: string;