From 4281dd90820a72db99b9b653d87298f4823724c1 Mon Sep 17 00:00:00 2001 From: Davor <davor.ivankovic@init.hr> Date: Sat, 6 Aug 2022 13:04:22 +0200 Subject: [PATCH] small refactor --- .../AppInstallModal/AppInstallModal.tsx | 36 +++++++------- .../apps/components/GeneralTab/GeneralTab.tsx | 48 +++++++++---------- 2 files changed, 40 insertions(+), 44 deletions(-) diff --git a/src/modules/apps/components/AppInstallModal/AppInstallModal.tsx b/src/modules/apps/components/AppInstallModal/AppInstallModal.tsx index 42d0ad48..57bca8ad 100644 --- a/src/modules/apps/components/AppInstallModal/AppInstallModal.tsx +++ b/src/modules/apps/components/AppInstallModal/AppInstallModal.tsx @@ -63,30 +63,28 @@ export const AppInstallModal = ({ open, onClose, appSlug }: AppInstallModalProps }; return ( - <> - <Modal onClose={handleClose} open={open} onSave={handleSave} isLoading={appLoading} useCancelButton> - <div className="bg-white px-4"> - <div className="space-y-10 divide-y divide-gray-200"> + <Modal onClose={handleClose} open={open} onSave={handleSave} isLoading={appLoading} useCancelButton> + <div className="bg-white px-4"> + <div className="space-y-10 divide-y divide-gray-200"> + <div> <div> - <div> - <h3 className="text-lg leading-6 font-medium text-gray-900">Install app {appName}</h3> - </div> + <h3 className="text-lg leading-6 font-medium text-gray-900">Install app {appName}</h3> + </div> - <div className="mt-6 grid grid-cols-1 gap-y-6 gap-x-4 sm:grid-cols-6"> - <div className="sm:col-span-3"> - <Input - control={control} - name="subdomain" - label="Subdomain" - onKeyPress={handleKeyPress} - required={false} - /> - </div> + <div className="mt-6 grid grid-cols-1 gap-y-6 gap-x-4 sm:grid-cols-6"> + <div className="sm:col-span-3"> + <Input + control={control} + name="subdomain" + label="Subdomain" + onKeyPress={handleKeyPress} + required={false} + /> </div> </div> </div> </div> - </Modal> - </> + </div> + </Modal> ); }; diff --git a/src/modules/apps/components/GeneralTab/GeneralTab.tsx b/src/modules/apps/components/GeneralTab/GeneralTab.tsx index 2d7a8ec7..9b7054dd 100644 --- a/src/modules/apps/components/GeneralTab/GeneralTab.tsx +++ b/src/modules/apps/components/GeneralTab/GeneralTab.tsx @@ -29,33 +29,31 @@ export const GeneralTab = () => { }; return ( - <> - <form onSubmit={handleSubmit(onSubmit)}> - <div className="py-4"> - <div className="md:grid md:grid-cols-3 md:gap-6"> - <div className="md:col-span-2"> - <h3 className="text-lg font-medium leading-6 text-gray-900">Automatic updates</h3> - <p className="mt-1 text-sm text-gray-500"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla et nibh sit amet mauris faucibus molestie - gravida at orci. - </p> - </div> - <div className="my-auto ml-auto"> - <Switch control={control} name="automaticUpdates" /> - </div> + <form onSubmit={handleSubmit(onSubmit)}> + <div className="py-4"> + <div className="md:grid md:grid-cols-3 md:gap-6"> + <div className="md:col-span-2"> + <h3 className="text-lg font-medium leading-6 text-gray-900">Automatic updates</h3> + <p className="mt-1 text-sm text-gray-500"> + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla et nibh sit amet mauris faucibus molestie + gravida at orci. + </p> </div> - </div> - <div className="py-3 sm:flex"> - <div className="ml-auto sm:flex sm:flex-row-reverse"> - <button - type="submit" - className="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-primary-600 text-base font-medium text-white hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 sm:ml-3 sm:w-auto sm:text-sm" - > - Save changes - </button> + <div className="my-auto ml-auto"> + <Switch control={control} name="automaticUpdates" /> </div> </div> - </form> - </> + </div> + <div className="py-3 sm:flex"> + <div className="ml-auto sm:flex sm:flex-row-reverse"> + <button + type="submit" + className="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-primary-600 text-base font-medium text-white hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500 sm:ml-3 sm:w-auto sm:text-sm" + > + Save changes + </button> + </div> + </div> + </form> ); }; -- GitLab