Browse Source

refactor: added close button back to dialog

pull/494/head
Dan Ditomaso 1 year ago
parent
commit
2cebb8eee2
  1. 2
      src/components/Dialog/DeviceNameDialog.tsx
  2. 2
      src/components/Dialog/ImportDialog.tsx
  3. 5
      src/components/Dialog/LocationResponseDialog.tsx
  4. 2
      src/components/Dialog/NewDeviceDialog.tsx
  5. 8
      src/components/Dialog/NodeDetailsDialog.tsx
  6. 2
      src/components/Dialog/NodeOptionsDialog.tsx
  7. 2
      src/components/Dialog/PKIBackupDialog.tsx
  8. 2
      src/components/Dialog/PkiRegenerateDialog.tsx
  9. 2
      src/components/Dialog/QRDialog.tsx
  10. 2
      src/components/Dialog/RebootDialog.tsx
  11. 2
      src/components/Dialog/RemoveNodeDialog.tsx
  12. 2
      src/components/Dialog/ShutdownDialog.tsx
  13. 2
      src/components/Dialog/TracerouteResponseDialog.tsx

2
src/components/Dialog/DeviceNameDialog.tsx

@ -3,6 +3,7 @@ import { create } from "@bufbuild/protobuf";
import { Button } from "@components/UI/Button.tsx"; import { Button } from "@components/UI/Button.tsx";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogDescription, DialogDescription,
DialogFooter, DialogFooter,
@ -52,6 +53,7 @@ export const DeviceNameDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>Change Device Name</DialogTitle> <DialogTitle>Change Device Name</DialogTitle>
<DialogDescription> <DialogDescription>

2
src/components/Dialog/ImportDialog.tsx

@ -3,6 +3,7 @@ import { Button } from "@components/UI/Button.tsx";
import { Checkbox } from "../UI/Checkbox/index.tsx"; import { Checkbox } from "../UI/Checkbox/index.tsx";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogDescription, DialogDescription,
DialogFooter, DialogFooter,
@ -96,6 +97,7 @@ export const ImportDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>Import Channel Set</DialogTitle> <DialogTitle>Import Channel Set</DialogTitle>
<DialogDescription> <DialogDescription>

5
src/components/Dialog/LocationResponseDialog.tsx

@ -1,6 +1,7 @@
import { useDevice } from "../../core/stores/deviceStore.ts"; import { useDevice } from "../../core/stores/deviceStore.ts";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogDescription, DialogDescription,
DialogHeader, DialogHeader,
@ -31,6 +32,7 @@ export const LocationResponseDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>{`Location: ${longName} (${shortName})`}</DialogTitle> <DialogTitle>{`Location: ${longName} (${shortName})`}</DialogTitle>
</DialogHeader> </DialogHeader>
@ -41,8 +43,7 @@ export const LocationResponseDialog = ({
Coordinates:{" "} Coordinates:{" "}
<a <a
className="text-blue-500 dark:text-blue-400" className="text-blue-500 dark:text-blue-400"
href={`https://www.openstreetmap.org/?mlat=${ href={`https://www.openstreetmap.org/?mlat=${location?.data.latitudeI / 1e7
location?.data.latitudeI / 1e7
}&mlon=${location?.data.longitudeI / 1e7}&layers=N`} }&mlon=${location?.data.longitudeI / 1e7}&layers=N`}
target="_blank" target="_blank"
rel="noreferrer" rel="noreferrer"

2
src/components/Dialog/NewDeviceDialog.tsx

@ -7,6 +7,7 @@ import { HTTP } from "@components/PageComponents/Connect/HTTP.tsx";
import { Serial } from "@components/PageComponents/Connect/Serial.tsx"; import { Serial } from "@components/PageComponents/Connect/Serial.tsx";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogHeader, DialogHeader,
DialogTitle, DialogTitle,
@ -135,6 +136,7 @@ export const NewDeviceDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>Connect New Device</DialogTitle> <DialogTitle>Connect New Device</DialogTitle>
</DialogHeader> </DialogHeader>

8
src/components/Dialog/NodeDetailsDialog.tsx

@ -8,6 +8,7 @@ import {
} from "../UI/Accordion.tsx"; } from "../UI/Accordion.tsx";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogFooter, DialogFooter,
DialogHeader, DialogHeader,
@ -36,6 +37,7 @@ export const NodeDetailsDialog = ({
? ( ? (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle> <DialogTitle>
Node Details for {device.user?.longName ?? "UNKNOWN"} ( Node Details for {device.user?.longName ?? "UNKNOWN"} (
@ -85,10 +87,8 @@ export const NodeDetailsDialog = ({
Coordinates:{" "} Coordinates:{" "}
<a <a
className="text-blue-500 dark:text-blue-400" className="text-blue-500 dark:text-blue-400"
href={`https://www.openstreetmap.org/?mlat=${ href={`https://www.openstreetmap.org/?mlat=${device.position.latitudeI / 1e7
device.position.latitudeI / 1e7 }&mlon=${device.position.longitudeI / 1e7
}&mlon=${
device.position.longitudeI / 1e7
}&layers=N`} }&layers=N`}
target="_blank" target="_blank"
rel="noreferrer" rel="noreferrer"

2
src/components/Dialog/NodeOptionsDialog.tsx

@ -3,6 +3,7 @@ import { useAppStore } from "../../core/stores/appStore.ts";
import { useDevice } from "../../core/stores/deviceStore.ts"; import { useDevice } from "../../core/stores/deviceStore.ts";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogHeader, DialogHeader,
DialogTitle, DialogTitle,
@ -72,6 +73,7 @@ export const NodeOptionsDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>{`${longName} (${shortName})`}</DialogTitle> <DialogTitle>{`${longName} (${shortName})`}</DialogTitle>
</DialogHeader> </DialogHeader>

2
src/components/Dialog/PKIBackupDialog.tsx

@ -2,6 +2,7 @@ import { useDevice } from "../../core/stores/deviceStore.ts";
import { Button } from "../UI/Button.tsx"; import { Button } from "../UI/Button.tsx";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogDescription, DialogDescription,
DialogFooter, DialogFooter,
@ -102,6 +103,7 @@ export const PkiBackupDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>Backup Keys</DialogTitle> <DialogTitle>Backup Keys</DialogTitle>
<DialogDescription> <DialogDescription>

2
src/components/Dialog/PkiRegenerateDialog.tsx

@ -1,6 +1,7 @@
import { Button } from "@components/UI/Button.tsx"; import { Button } from "@components/UI/Button.tsx";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogDescription, DialogDescription,
DialogFooter, DialogFooter,
@ -22,6 +23,7 @@ export const PkiRegenerateDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>Regenerate Key pair?</DialogTitle> <DialogTitle>Regenerate Key pair?</DialogTitle>
<DialogDescription> <DialogDescription>

2
src/components/Dialog/QRDialog.tsx

@ -2,6 +2,7 @@ import { create, toBinary } from "@bufbuild/protobuf";
import { Checkbox } from "../UI/Checkbox/index.tsx"; import { Checkbox } from "../UI/Checkbox/index.tsx";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogDescription, DialogDescription,
DialogFooter, DialogFooter,
@ -62,6 +63,7 @@ export const QRDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>Generate QR Code</DialogTitle> <DialogTitle>Generate QR Code</DialogTitle>
<DialogDescription> <DialogDescription>

2
src/components/Dialog/RebootDialog.tsx

@ -1,6 +1,7 @@
import { Button } from "@components/UI/Button.tsx"; import { Button } from "@components/UI/Button.tsx";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogDescription, DialogDescription,
DialogHeader, DialogHeader,
@ -27,6 +28,7 @@ export const RebootDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>Schedule Reboot</DialogTitle> <DialogTitle>Schedule Reboot</DialogTitle>
<DialogDescription> <DialogDescription>

2
src/components/Dialog/RemoveNodeDialog.tsx

@ -3,6 +3,7 @@ import { useDevice } from "@core/stores/deviceStore.ts";
import { Button } from "@components/UI/Button.tsx"; import { Button } from "@components/UI/Button.tsx";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogDescription, DialogDescription,
DialogFooter, DialogFooter,
@ -32,6 +33,7 @@ export const RemoveNodeDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>Remove Node?</DialogTitle> <DialogTitle>Remove Node?</DialogTitle>
<DialogDescription> <DialogDescription>

2
src/components/Dialog/ShutdownDialog.tsx

@ -1,6 +1,7 @@
import { Button } from "@components/UI/Button.tsx"; import { Button } from "@components/UI/Button.tsx";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogDescription, DialogDescription,
DialogHeader, DialogHeader,
@ -27,6 +28,7 @@ export const ShutdownDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>Schedule Shutdown</DialogTitle> <DialogTitle>Schedule Shutdown</DialogTitle>
<DialogDescription> <DialogDescription>

2
src/components/Dialog/TracerouteResponseDialog.tsx

@ -1,6 +1,7 @@
import { useDevice } from "../../core/stores/deviceStore.ts"; import { useDevice } from "../../core/stores/deviceStore.ts";
import { import {
Dialog, Dialog,
DialogClose,
DialogContent, DialogContent,
DialogDescription, DialogDescription,
DialogHeader, DialogHeader,
@ -36,6 +37,7 @@ export const TracerouteResponseDialog = ({
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent> <DialogContent>
<DialogClose />
<DialogHeader> <DialogHeader>
<DialogTitle>{`Traceroute: ${longName} (${shortName})`}</DialogTitle> <DialogTitle>{`Traceroute: ${longName} (${shortName})`}</DialogTitle>
</DialogHeader> </DialogHeader>

Loading…
Cancel
Save