From abe3081df2fe0ecb95c07e723a319f4479d5984f Mon Sep 17 00:00:00 2001 From: Abhineet Jain Date: Fri, 3 Jun 2022 16:34:49 +0000 Subject: [PATCH 1/5] feat: use ConfirmDialog for ResetPasswordDialog --- .../ResetPasswordDialog.tsx | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/site/src/components/ResetPasswordDialog/ResetPasswordDialog.tsx b/site/src/components/ResetPasswordDialog/ResetPasswordDialog.tsx index 21f976291d987..9e40c67def794 100644 --- a/site/src/components/ResetPasswordDialog/ResetPasswordDialog.tsx +++ b/site/src/components/ResetPasswordDialog/ResetPasswordDialog.tsx @@ -1,11 +1,9 @@ -import DialogActions from "@material-ui/core/DialogActions" -import DialogContent from "@material-ui/core/DialogContent" import DialogContentText from "@material-ui/core/DialogContentText" import { makeStyles } from "@material-ui/core/styles" import { FC } from "react" import * as TypesGen from "../../api/typesGenerated" -import { CodeBlock } from "../CodeBlock/CodeBlock" -import { Dialog, DialogActionButtons, DialogTitle } from "../Dialog/Dialog" +import { CodeExample } from "../CodeExample/CodeExample" +import { ConfirmDialog } from "../ConfirmDialog/ConfirmDialog" export interface ResetPasswordDialogProps { open: boolean @@ -36,32 +34,34 @@ export const ResetPasswordDialog: FC = ({ }) => { const styles = useStyles() - return ( - - - - - {Language.message(user?.username)} - - - - - + const description = + <> + {Language.message(user?.username)} + + + + - - - - + return ( + ) } const useStyles = makeStyles(() => ({ codeBlock: { + marginBottom: 0, + }, + codeExample: { minHeight: "auto", userSelect: "all", width: "100%", From 3a728352e1fcef07254fc4f786d1c566c2746f1e Mon Sep 17 00:00:00 2001 From: Abhineet Jain Date: Fri, 3 Jun 2022 16:44:07 +0000 Subject: [PATCH 2/5] fix lint --- .../src/components/ResetPasswordDialog/ResetPasswordDialog.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/src/components/ResetPasswordDialog/ResetPasswordDialog.tsx b/site/src/components/ResetPasswordDialog/ResetPasswordDialog.tsx index 9e40c67def794..c6b81c77ba248 100644 --- a/site/src/components/ResetPasswordDialog/ResetPasswordDialog.tsx +++ b/site/src/components/ResetPasswordDialog/ResetPasswordDialog.tsx @@ -34,13 +34,14 @@ export const ResetPasswordDialog: FC = ({ }) => { const styles = useStyles() - const description = + const description = ( <> {Language.message(user?.username)} + ) return ( Date: Fri, 3 Jun 2022 17:15:52 +0000 Subject: [PATCH 3/5] make description typography a div --- site/src/components/ConfirmDialog/ConfirmDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/components/ConfirmDialog/ConfirmDialog.tsx b/site/src/components/ConfirmDialog/ConfirmDialog.tsx index fec223afbd2bb..093e69880b3ad 100644 --- a/site/src/components/ConfirmDialog/ConfirmDialog.tsx +++ b/site/src/components/ConfirmDialog/ConfirmDialog.tsx @@ -105,7 +105,7 @@ export const ConfirmDialog: React.FC = ({ {description && ( - + {description} )} From e3bfaa7415c1394f05c48d05587bcd17cb61e4da Mon Sep 17 00:00:00 2001 From: Abhineet Jain Date: Fri, 3 Jun 2022 17:20:35 +0000 Subject: [PATCH 4/5] use paragraph for string description, div otherwise --- site/src/components/ConfirmDialog/ConfirmDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/components/ConfirmDialog/ConfirmDialog.tsx b/site/src/components/ConfirmDialog/ConfirmDialog.tsx index 093e69880b3ad..5ee55910d2f45 100644 --- a/site/src/components/ConfirmDialog/ConfirmDialog.tsx +++ b/site/src/components/ConfirmDialog/ConfirmDialog.tsx @@ -105,7 +105,7 @@ export const ConfirmDialog: React.FC = ({ {description && ( - + {description} )} From 20902fd8a60cc2bcf4aca25c3cd2968753a569e6 Mon Sep 17 00:00:00 2001 From: Abhineet Jain Date: Fri, 3 Jun 2022 17:23:35 +0000 Subject: [PATCH 5/5] fix lint --- site/src/components/ConfirmDialog/ConfirmDialog.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/site/src/components/ConfirmDialog/ConfirmDialog.tsx b/site/src/components/ConfirmDialog/ConfirmDialog.tsx index 5ee55910d2f45..40be04bbf4efb 100644 --- a/site/src/components/ConfirmDialog/ConfirmDialog.tsx +++ b/site/src/components/ConfirmDialog/ConfirmDialog.tsx @@ -105,7 +105,11 @@ export const ConfirmDialog: React.FC = ({ {description && ( - + {description} )}