From 042aff2f8711e20c2ff099d5d7ae0caab8f0b337 Mon Sep 17 00:00:00 2001 From: Eric Lewis Date: Mon, 26 Feb 2024 11:56:51 -0500 Subject: [PATCH] temp (?) fix build revert this if needed --- .../frontend/src/components/DatePicker.tsx | 7 ++- packages/frontend/src/components/Sidebar.tsx | 6 +-- .../src/components/projects/ProjectCard.tsx | 24 ++++++---- .../components/projects/ProjectSearchBar.tsx | 19 ++++++-- .../projects/create/ConnectAccount.tsx | 10 +++- .../create/ConnectAccountTabPanel.tsx | 6 +-- .../src/components/projects/create/Deploy.tsx | 9 +++- .../components/projects/create/DeployStep.tsx | 8 +++- .../projects/create/ProjectRepoCard.tsx | 4 +- .../projects/create/RepositoryList.tsx | 3 +- .../projects/create/TemplateCard.tsx | 8 +++- .../projects/project/ActivityCard.tsx | 19 ++++++-- .../deployments/AssignDomainDialog.tsx | 9 ++-- .../deployments/DeploymentDetailsCard.tsx | 47 ++++++++++++------- .../deployments/DeploymentDialogBodyCard.tsx | 8 ++-- .../project/deployments/FilterForm.tsx | 1 + .../settings/AddEnvironmentVariableRow.tsx | 9 +++- .../project/settings/AddMemberDialog.tsx | 29 ++++++++---- .../project/settings/DeleteProjectDialog.tsx | 21 ++++++--- .../settings/DisplayEnvironmentVariables.tsx | 6 +-- .../projects/project/settings/DomainCard.tsx | 22 ++++++--- .../project/settings/EditDomainDialog.tsx | 39 ++++++++++----- .../settings/EditEnvironmentVariableRow.tsx | 14 ++++-- .../projects/project/settings/MemberCard.tsx | 4 +- .../project/settings/RepoConnectedSection.tsx | 11 +++-- .../projects/project/settings/SetupDomain.tsx | 13 +++-- .../projects/project/settings/WebhookCard.tsx | 4 +- .../src/components/shared/AsyncSelect.tsx | 2 +- .../src/components/shared/ConfirmDialog.tsx | 22 ++++++--- .../frontend/src/layouts/ProjectSearch.tsx | 12 +++-- .../frontend/src/pages/org-slug/index.tsx | 6 ++- .../src/pages/org-slug/projects/Create.tsx | 6 ++- .../src/pages/org-slug/projects/Id.tsx | 44 +++++++++++++---- .../org-slug/projects/create/Template.tsx | 2 +- .../org-slug/projects/create/success/Id.tsx | 20 ++++++-- .../projects/create/template/index.tsx | 7 ++- .../org-slug/projects/id/Deployments.tsx | 7 ++- .../pages/org-slug/projects/id/Overview.tsx | 15 ++++-- .../pages/org-slug/projects/id/Settings.tsx | 4 +- .../org-slug/projects/id/settings/Domains.tsx | 11 ++++- .../id/settings/EnvironmentVariables.tsx | 17 +++++-- .../org-slug/projects/id/settings/General.tsx | 45 ++++++++++++++---- .../org-slug/projects/id/settings/Git.tsx | 30 +++++++----- .../org-slug/projects/id/settings/Members.tsx | 5 +- .../id/settings/domains/add/Config.tsx | 13 +++-- .../id/settings/domains/add/index.tsx | 12 +++-- 46 files changed, 459 insertions(+), 181 deletions(-) diff --git a/packages/frontend/src/components/DatePicker.tsx b/packages/frontend/src/components/DatePicker.tsx index 59114bb0..45ad389f 100644 --- a/packages/frontend/src/components/DatePicker.tsx +++ b/packages/frontend/src/components/DatePicker.tsx @@ -126,7 +126,8 @@ const DatePicker = ({ crossOrigin={undefined} /> - + {/* TODO: Figure out what placeholder is for */} + {mode === 'single' && (
+ {/* TODO: Figure out what placeholder is for */} + {/* TODO: Figure out what placeholder is for */} diff --git a/packages/frontend/src/components/Sidebar.tsx b/packages/frontend/src/components/Sidebar.tsx index ded6f604..18f823b1 100644 --- a/packages/frontend/src/components/Sidebar.tsx +++ b/packages/frontend/src/components/Sidebar.tsx @@ -52,7 +52,7 @@ const Sidebar = () => {
^
{organizations[index!]?.name} - Organization + Organization
)} @@ -70,7 +70,7 @@ const Sidebar = () => { to={`/${orgSlug}`} className={({ isActive }) => (isActive ? 'text-blue-500' : '')} > - Projects + Projects
@@ -78,7 +78,7 @@ const Sidebar = () => { to={`/${orgSlug}/settings`} className={({ isActive }) => (isActive ? 'text-blue-500' : '')} > - Settings + Settings
diff --git a/packages/frontend/src/components/projects/ProjectCard.tsx b/packages/frontend/src/components/projects/ProjectCard.tsx index 0d94a777..157a0ed4 100644 --- a/packages/frontend/src/components/projects/ProjectCard.tsx +++ b/packages/frontend/src/components/projects/ProjectCard.tsx @@ -21,11 +21,15 @@ const ProjectCard: React.FC = ({ project }) => { return (
- +
- {project.name} - + {project.name} + {project.deployments[0]?.domain?.name ?? 'No Production Deployment'} @@ -35,25 +39,27 @@ const ProjectCard: React.FC = ({ project }) => { - - ^ Project settings - ^ Delete project + + ^ Project settings + + ^ Delete project +
{project.deployments.length > 0 ? ( <> - + ^ {project.deployments[0].commitMessage} - + {relativeTimeMs(project.deployments[0].createdAt)} on ^  {project.deployments[0].branch} ) : ( - + No Production deployment )} diff --git a/packages/frontend/src/components/projects/ProjectSearchBar.tsx b/packages/frontend/src/components/projects/ProjectSearchBar.tsx index 6d695b66..56249356 100644 --- a/packages/frontend/src/components/projects/ProjectSearchBar.tsx +++ b/packages/frontend/src/components/projects/ProjectSearchBar.tsx @@ -71,12 +71,13 @@ const ProjectSearchBar = ({ onChange }: ProjectsSearchProps) => { className={`absolute w-1/2 max-h-52 -mt-1 overflow-y-auto ${ (!inputValue || !isOpen) && 'hidden' }`} + placeholder={''} > {items.length ? ( <>
- + Suggestions
@@ -84,19 +85,25 @@ const ProjectSearchBar = ({ onChange }: ProjectsSearchProps) => { - - + +
- + {item.name} {item.organization.name} @@ -106,7 +113,9 @@ const ProjectSearchBar = ({ onChange }: ProjectsSearchProps) => { ) : (
- ^ No projects matching this name + + ^ No projects matching this name +
)} diff --git a/packages/frontend/src/components/projects/create/ConnectAccount.tsx b/packages/frontend/src/components/projects/create/ConnectAccount.tsx index 11a5e5d2..ac22a0eb 100644 --- a/packages/frontend/src/components/projects/create/ConnectAccount.tsx +++ b/packages/frontend/src/components/projects/create/ConnectAccount.tsx @@ -46,9 +46,15 @@ const ConnectAccount = ({ onAuth: onToken }: ConnectAccountInterface) => { width={1000} height={1000} > - + {/* TODO: figure out what placeholder is for */} + - + {/* TODO: figure out what placeholder is for */} +
diff --git a/packages/frontend/src/components/projects/create/ConnectAccountTabPanel.tsx b/packages/frontend/src/components/projects/create/ConnectAccountTabPanel.tsx index d46d495a..37730d8d 100644 --- a/packages/frontend/src/components/projects/create/ConnectAccountTabPanel.tsx +++ b/packages/frontend/src/components/projects/create/ConnectAccountTabPanel.tsx @@ -5,11 +5,11 @@ import { Tabs, TabsHeader, Tab } from '@material-tailwind/react'; const ConnectAccountTabPanel = () => { return ( - - + + Import a repository - + Start with a template diff --git a/packages/frontend/src/components/projects/create/Deploy.tsx b/packages/frontend/src/components/projects/create/Deploy.tsx index 5e16aa34..51f949e8 100644 --- a/packages/frontend/src/components/projects/create/Deploy.tsx +++ b/packages/frontend/src/components/projects/create/Deploy.tsx @@ -43,7 +43,12 @@ const Deploy = () => {
-
@@ -55,7 +60,7 @@ const Deploy = () => { handleConfirm={handleCancel} color="red" > - + This will halt the deployment and you will have to start the process from scratch. diff --git a/packages/frontend/src/components/projects/create/DeployStep.tsx b/packages/frontend/src/components/projects/create/DeployStep.tsx index ce466b32..1aae9c0c 100644 --- a/packages/frontend/src/components/projects/create/DeployStep.tsx +++ b/packages/frontend/src/components/projects/create/DeployStep.tsx @@ -62,7 +62,12 @@ const DeployStep = ({
{processLogs.map((log, key) => { return ( - + {log} ); @@ -75,6 +80,7 @@ const DeployStep = ({ toast.success('Logs copied'); }} color="blue" + placeholder={''} > ^ Copy log diff --git a/packages/frontend/src/components/projects/create/ProjectRepoCard.tsx b/packages/frontend/src/components/projects/create/ProjectRepoCard.tsx index 59a9d57d..c3e88b9a 100644 --- a/packages/frontend/src/components/projects/create/ProjectRepoCard.tsx +++ b/packages/frontend/src/components/projects/create/ProjectRepoCard.tsx @@ -66,7 +66,9 @@ const ProjectRepoCard: React.FC = ({ repository }) => { ) : (
- {'>'} + + {'>'} +
)}
diff --git a/packages/frontend/src/components/projects/create/RepositoryList.tsx b/packages/frontend/src/components/projects/create/RepositoryList.tsx index d0f360bb..8b29967e 100644 --- a/packages/frontend/src/components/projects/create/RepositoryList.tsx +++ b/packages/frontend/src/components/projects/create/RepositoryList.tsx @@ -136,11 +136,12 @@ const RepositoryList = ({ octokit }: RepositoryListProps) => { ) : (
- No repository found + No repository found diff --git a/packages/frontend/src/components/projects/create/TemplateCard.tsx b/packages/frontend/src/components/projects/create/TemplateCard.tsx index bf6e7f29..3625b64b 100644 --- a/packages/frontend/src/components/projects/create/TemplateCard.tsx +++ b/packages/frontend/src/components/projects/create/TemplateCard.tsx @@ -18,11 +18,15 @@ interface TemplateCardProps { const CardDetails = ({ template }: { template: TemplateDetails }) => { return (
- + {template.icon} {template.name}
- + {'>'}
diff --git a/packages/frontend/src/components/projects/project/ActivityCard.tsx b/packages/frontend/src/components/projects/project/ActivityCard.tsx index ffc987d3..5fa5ae82 100644 --- a/packages/frontend/src/components/projects/project/ActivityCard.tsx +++ b/packages/frontend/src/components/projects/project/ActivityCard.tsx @@ -13,20 +13,29 @@ const ActivityCard = ({ activity }: ActivityCardProps) => { return (
- +
- {activity.commit.author?.name} - + {activity.commit.author?.name} + {relativeTimeISO(activity.commit.author!.date!)} ^{' '} {activity.branch.name} - + {activity.commit.message}
- + {'>'}
diff --git a/packages/frontend/src/components/projects/project/deployments/AssignDomainDialog.tsx b/packages/frontend/src/components/projects/project/deployments/AssignDomainDialog.tsx index 79dba9c4..4a4597fa 100644 --- a/packages/frontend/src/components/projects/project/deployments/AssignDomainDialog.tsx +++ b/packages/frontend/src/components/projects/project/deployments/AssignDomainDialog.tsx @@ -17,9 +17,9 @@ interface AssignDomainProps { const AssignDomainDialog = ({ open, handleOpen }: AssignDomainProps) => { return ( - - Assign Domain - + + Assign Domain + In order to assign a domain to your production deployments, configure it in the{' '} {/* TODO: Fix selection of project settings tab on navigation to domains */} @@ -36,12 +36,13 @@ const AssignDomainDialog = ({ open, handleOpen }: AssignDomainProps) => { theme={atomOneLight} /> - + diff --git a/packages/frontend/src/components/projects/project/deployments/DeploymentDetailsCard.tsx b/packages/frontend/src/components/projects/project/deployments/DeploymentDetailsCard.tsx index f76f32e2..e191fe8c 100644 --- a/packages/frontend/src/components/projects/project/deployments/DeploymentDetailsCard.tsx +++ b/packages/frontend/src/components/projects/project/deployments/DeploymentDetailsCard.tsx @@ -93,10 +93,12 @@ const DeploymentDetailsCard = ({
{deployment.url && ( - {deployment.url} + + {deployment.url} + )}
- + {deployment.environment === Environment.Production ? `Production ${deployment.isCurrent ? '(Current)' : ''}` : 'Preview'} @@ -111,14 +113,16 @@ const DeploymentDetailsCard = ({ />
- ^ {deployment.branch} - + + ^ {deployment.branch} + + ^ {deployment.commitHash.substring(0, SHORT_COMMIT_HASH_LENGTH)}{' '} {deployment.commitMessage}
- + ^ {relativeTimeMs(deployment.createdAt)} ^{' '} {formatAddress(deployment.createdBy.name ?? '')} @@ -128,18 +132,22 @@ const DeploymentDetailsCard = ({ - + - ^ Visit + + ^ Visit + setAssignDomainDialog(!assignDomainDialog)} + placeholder={''} > ^ Assign domain setChangeToProduction(!changeToProduction)} disabled={!(deployment.environment !== Environment.Production)} + placeholder={''} > ^ Change to production @@ -152,6 +160,7 @@ const DeploymentDetailsCard = ({ deployment.isCurrent ) } + placeholder={''} > ^ Redeploy to production @@ -162,6 +171,7 @@ const DeploymentDetailsCard = ({ deployment.environment !== Environment.Production || !Boolean(currentDeployment) } + placeholder={''} > ^ Rollback to this version @@ -180,17 +190,22 @@ const DeploymentDetailsCard = ({ }} >
- + Upon confirmation, this deployment will be changed to production. - + The new deployment will be associated with these domains: {prodBranchDomains.length > 0 && prodBranchDomains.map((value) => { return ( - + ^ {value.name} ); @@ -209,16 +224,16 @@ const DeploymentDetailsCard = ({ }} >
- + Upon confirmation, new deployment will be created with the same source code as current deployment. - + These domains will point to your new deployment: {deployment.domain?.name && ( - + {deployment.domain?.name} )} @@ -237,7 +252,7 @@ const DeploymentDetailsCard = ({ }} >
- + Upon confirmation, this deployment will replace your current deployment @@ -255,10 +270,10 @@ const DeploymentDetailsCard = ({ color: 'orange', }} /> - + These domains will point to your new deployment: - + ^ {currentDeployment.domain?.name}
diff --git a/packages/frontend/src/components/projects/project/deployments/DeploymentDialogBodyCard.tsx b/packages/frontend/src/components/projects/project/deployments/DeploymentDialogBodyCard.tsx index 316551cb..a8b40b8b 100644 --- a/packages/frontend/src/components/projects/project/deployments/DeploymentDialogBodyCard.tsx +++ b/packages/frontend/src/components/projects/project/deployments/DeploymentDialogBodyCard.tsx @@ -20,7 +20,7 @@ const DeploymentDialogBodyCard = ({ deployment, }: DeploymentDialogBodyCardProps) => { return ( - + {chip && ( )} {deployment.url && ( - + {deployment.url} )} - + ^ {deployment.branch} ^{' '} {deployment.commitHash.substring(0, SHORT_COMMIT_HASH_LENGTH)}{' '} {deployment.commitMessage} - + ^ {relativeTimeMs(deployment.createdAt)} ^{' '} {formatAddress(deployment.createdBy.name ?? '')} diff --git a/packages/frontend/src/components/projects/project/deployments/FilterForm.tsx b/packages/frontend/src/components/projects/project/deployments/FilterForm.tsx index 8846b47c..c28c6218 100644 --- a/packages/frontend/src/components/projects/project/deployments/FilterForm.tsx +++ b/packages/frontend/src/components/projects/project/deployments/FilterForm.tsx @@ -77,6 +77,7 @@ const FilterForm = ({ value, onChange }: FilterFormProps) => { onClick={() => setSelectedStatus(StatusOptions.ALL_STATUS)} className="rounded-full" size="sm" + placeholder={''} > X diff --git a/packages/frontend/src/components/projects/project/settings/AddEnvironmentVariableRow.tsx b/packages/frontend/src/components/projects/project/settings/AddEnvironmentVariableRow.tsx index 2d2a3bf9..cb93f260 100644 --- a/packages/frontend/src/components/projects/project/settings/AddEnvironmentVariableRow.tsx +++ b/packages/frontend/src/components/projects/project/settings/AddEnvironmentVariableRow.tsx @@ -21,7 +21,9 @@ const AddEnvironmentVariableRow = ({ return (
- Key + + Key +
- Value + + Value + onDelete()} disabled={isDeleteDisabled} + placeholder={''} > {'>'} diff --git a/packages/frontend/src/components/projects/project/settings/AddMemberDialog.tsx b/packages/frontend/src/components/projects/project/settings/AddMemberDialog.tsx index f631e4ce..cd564e81 100644 --- a/packages/frontend/src/components/projects/project/settings/AddMemberDialog.tsx +++ b/packages/frontend/src/components/projects/project/settings/AddMemberDialog.tsx @@ -61,23 +61,26 @@ const AddMemberDialog = ({ }, []); return ( - - + +
Add member
- - + + We will send an invitation link to this email address. - Email address + + Email address + - Permissions - + + Permissions + + You can change this later if required. - - diff --git a/packages/frontend/src/components/projects/project/settings/DeleteProjectDialog.tsx b/packages/frontend/src/components/projects/project/settings/DeleteProjectDialog.tsx index 5f603d4b..b7169d39 100644 --- a/packages/frontend/src/components/projects/project/settings/DeleteProjectDialog.tsx +++ b/packages/frontend/src/components/projects/project/settings/DeleteProjectDialog.tsx @@ -53,20 +53,21 @@ const DeleteProjectDialog = ({ }, [client, project, handleOpen]); return ( - - + +
Delete project?
 - - + + Deleting your project is irreversible. Enter your project’s name  ({project.name}) @@ -80,12 +81,17 @@ const DeleteProjectDialog = ({ validate: (value) => value === project.name, })} /> - + ^ Deleting your project is irreversible. - - diff --git a/packages/frontend/src/components/projects/project/settings/DisplayEnvironmentVariables.tsx b/packages/frontend/src/components/projects/project/settings/DisplayEnvironmentVariables.tsx index 49e14c5e..20a70d8c 100644 --- a/packages/frontend/src/components/projects/project/settings/DisplayEnvironmentVariables.tsx +++ b/packages/frontend/src/components/projects/project/settings/DisplayEnvironmentVariables.tsx @@ -29,11 +29,11 @@ const DisplayEnvironmentVariables = ({
{variables.length === 0 ? ( - - + + No environment variables added yet. - + Once you add them, they’ll show up here. diff --git a/packages/frontend/src/components/projects/project/settings/DomainCard.tsx b/packages/frontend/src/components/projects/project/settings/DomainCard.tsx index 4cfd4967..c5f657eb 100644 --- a/packages/frontend/src/components/projects/project/settings/DomainCard.tsx +++ b/packages/frontend/src/components/projects/project/settings/DomainCard.tsx @@ -68,7 +68,7 @@ const DomainCard = ({ <>
- + ^ {domain.name} - + { setEditDialogOpen((preVal) => !preVal); }} + placeholder={''} > ^ Edit domain setDeleteDialogOpen((preVal) => !preVal)} + placeholder={''} > ^ Delete domain @@ -127,7 +129,7 @@ const DomainCard = ({ }} color="red" > - + Once deleted, the project{' '} {project.name} @@ -140,15 +142,21 @@ const DomainCard = ({
- Production + + Production + {domain.status === DomainStatus.Pending && ( - + {refreshStatus === RefreshStatus.IDLE ? ( - + ^ Add these records to your domain and refresh to check ) : refreshStatus === RefreshStatus.CHECKING ? ( - + ^ Checking records for {domain.name} ) : ( diff --git a/packages/frontend/src/components/projects/project/settings/EditDomainDialog.tsx b/packages/frontend/src/components/projects/project/settings/EditDomainDialog.tsx index b9d2866c..b5984acb 100644 --- a/packages/frontend/src/components/projects/project/settings/EditDomainDialog.tsx +++ b/packages/frontend/src/components/projects/project/settings/EditDomainDialog.tsx @@ -122,27 +122,32 @@ const EditDomainDialog = ({ }, [domain]); return ( - - + +
Edit domain
 - - Domain name + + + Domain name + - Redirect to + + Redirect to + ( - {redirectOptions.map((option, key) => ( - - diff --git a/packages/frontend/src/components/projects/project/settings/EditEnvironmentVariableRow.tsx b/packages/frontend/src/components/projects/project/settings/EditEnvironmentVariableRow.tsx index f8a87352..c15c142e 100644 --- a/packages/frontend/src/components/projects/project/settings/EditEnvironmentVariableRow.tsx +++ b/packages/frontend/src/components/projects/project/settings/EditEnvironmentVariableRow.tsx @@ -84,7 +84,9 @@ const EditEnvironmentVariableRow = ({ <>
- Key + + Key +
- Value + + Value + {'S'} @@ -125,6 +130,7 @@ const EditEnvironmentVariableRow = ({ reset(); setEdit((preVal) => !preVal); }} + placeholder={''} > {'C'} @@ -138,6 +144,7 @@ const EditEnvironmentVariableRow = ({ onClick={() => { setEdit((preVal) => !preVal); }} + placeholder={''} > {'E'} @@ -146,6 +153,7 @@ const EditEnvironmentVariableRow = ({ setDeleteDialogOpen((preVal) => !preVal)} + placeholder={''} > {'D'} @@ -162,7 +170,7 @@ const EditEnvironmentVariableRow = ({ handleConfirm={removeEnvironmentVariableHandler} color="red" > - + Are you sure you want to delete the variable  {variable.key}? diff --git a/packages/frontend/src/components/projects/project/settings/MemberCard.tsx b/packages/frontend/src/components/projects/project/settings/MemberCard.tsx index bd7e5c3b..715d8bf4 100644 --- a/packages/frontend/src/components/projects/project/settings/MemberCard.tsx +++ b/packages/frontend/src/components/projects/project/settings/MemberCard.tsx @@ -104,6 +104,7 @@ const MemberCard = ({ selected={(_, index) => ( {DROPDOWN_OPTIONS[index!]?.label} )} + placeholder={''} > {DROPDOWN_OPTIONS.map((permission, key) => (