update style on the forms

pomerium · nhayfield · Sep 8, 2021 · Sep 8, 2021 · Sep 8, 2021 · Sep 8, 2021
commit c8fcaa474e2e9f1f24ac1f4d6e7c3a6dd5a61274
diff --git a/assets/bin/pomerium-cli b/assets/bin/pomerium-cli
diff --git a/package.json b/package.json
@@ -266,6 +266,7 @@
  "menubar": "^9.0.5",
  "react": "^17.0.2",
  "react-dom": "^17.0.2",
+ "react-feather": "^2.0.9",
  "react-router": "5.2.0",
  "react-router-dom": "5.2.0",
  "regenerator-runtime": "^0.13.9",

diff --git a/src/components/FieldWrapper.tsx b/src/components/FieldWrapper.tsx
@@ -0,0 +1,72 @@
+import {
+ Grid,
+ makeStyles,
+ Typography,
+ SvgIcon,
+ Divider,
+ Container,
+ Tooltip,
+} from '@material-ui/core';
+import React, { FC, ReactNode } from 'react';
+import { HelpCircle } from 'react-feather';
+import { Theme } from '../utils/theme';
+
+const useStyles = makeStyles((theme: Theme) => ({
+ container: {
+ padding: theme.spacing(2),
+ },
+ innerContainer: {
+ marginBottom: theme.spacing(1),
+ },
+ labelGridItem: {
+ width: '260px',
+ paddingRight: theme.spacing(2),
+ display: `flex`,
+ flexFlow: `row wrap`,
+ },
+ questionMark: {
+ marginLeft: theme.spacing(1),
+ },
+}));
+
+type FieldWrapperProps = {
+ label: string;
+ description: string;
+ children: ReactNode;
+};
+
+const FieldWrapper: FC<FieldWrapperProps> = ({
+ label,
+ description,
+ children,
+}: FieldWrapperProps): JSX.Element => {
+ const classes = useStyles();
+
+ return (
+ <Container maxWidth={false} disableGutters className={classes.container}>
+ <Grid container className={classes.innerContainer}>
+ <Grid
+ item
+ xs={4}
+ className={classes.labelGridItem}
+ alignItems="flex-start"
+ >
+ <Typography variant="body1">{label}</Typography>
+ <sub className={classes.questionMark}>
+ <Tooltip title={description}>
+ <SvgIcon color="primary">
+ <HelpCircle width="16px" height="16px" fontSize="1em" />
+ </SvgIcon>
+ </Tooltip>
+ </sub>
+ </Grid>
+ <Grid item xs alignItems="flex-start">
+ {children}
+ </Grid>
+ </Grid>
+ <Divider />
+ </Container>
+ );
+};
+
+export default FieldWrapper;
diff --git a/src/components/TextField.tsx b/src/components/TextField.tsx
@@ -44,7 +44,7 @@ const TextField = (props: TextFieldProps): JSX.Element => {
  const classes = useStyles();
  return (
  <MuiTextField
- {...props} //
+ {...props}
  variant="outlined"
  size="small"
  color="primary"

diff --git a/src/index.html b/src/index.html
@@ -2,7 +2,7 @@
 <html>
  <head>
  <meta charset="utf-8" />
- <title>Pomerium TCP Connector</title>
+ <title>Pomerium Desktop</title>
  <meta
  name="description"
  content="Pomerium is a beyond-corp inspired, zero trust, open source identity-aware access proxy."

diff --git a/src/pages/ConnectForm.tsx b/src/pages/ConnectForm.tsx
@@ -1,14 +1,12 @@
 import {
- Button,
- FormControlLabel,
- FormGroup,
+ Button, Container,
  Grid,
  List,
  ListItem,
  makeStyles,
  Switch,
- Typography,
-} from '@material-ui/core';
+ Typography
+} from "@material-ui/core";
 import { ipcRenderer } from 'electron';
 import React, { FC, useEffect, useState } from 'react';
 import { v4 as uuidv4 } from 'uuid';
@@ -22,11 +20,12 @@ import {
  DISCONNECT,
 } from '../utils/constants';
 import TextField from '../components/TextField';
+import FieldWrapper from '../components/FieldWrapper';
 import { Theme } from '../utils/theme';
 
 const useStyles = makeStyles((theme: Theme) => ({
  container: {
- padding: theme.spacing(3),
+ padding: theme.spacing(2),
  },
  red: {
  color: 'red',
@@ -169,127 +168,141 @@ const ConnectForm: FC<Props> = () => {
  };
 
  return (
- <>
+ <Container>
  <form onSubmit={handleSubmit}>
  <Grid className={classes.container}>
- <Grid container spacing={2} alignItems="center">
+ <Grid container alignItems="flex-start">
  <Grid item xs={12}>
  <Typography variant="h3" color="textPrimary">
- Pomerium TCP Connector
+ {connectionData.channelID ? 'Edit' : 'Add'} TCP Connection
  </Typography>
  </Grid>
- <Grid item xs={12}>
- <TextField
- fullWidth
- required
- label="Destination Url"
- value={connectionData.destinationUrl}
- onChange={(evt): void => saveDestination(evt.target.value)}
- variant="outlined"
- autoFocus
- />
- </Grid>
- <Grid item xs={12}>
- <FormGroup>
- <FormControlLabel
- label="Disable TLS Verification"
- control={
- <Switch
- checked={connectionData.disableTLS}
- name="disable-tls-verification"
- color="primary"
- onChange={saveDisableTLS}
- />
- }
- />
- </FormGroup>
- </Grid>
- <Grid item xs={12}>
- <TextField
- fullWidth
- label="Local Address"
- error={errors.localAddress}
- value={connectionData.localAddress}
- onChange={(evt): void => saveLocal(evt.target.value)}
- variant="outlined"
- />
- </Grid>
- <Grid item xs={12}>
- <TextField
- fullWidth
- label="Alternate Pomerium Url"
- error={errors.pomeriumUrl}
- value={connectionData.pomeriumUrl}
- onChange={(evt): void => savePomeriumUrl(evt.target.value)}
- variant="outlined"
- />
- </Grid>
- <Grid item xs={12}>
- <TextField
- fullWidth
- label="CA File Path"
- error={errors.caFilePath}
- value={connectionData.caFilePath}
- onChange={(evt): void => saveCaFilePath(evt.target.value)}
- variant="outlined"
- />
- </Grid>
- <Grid item xs={12}>
- <TextField
- fullWidth
- label="CA File Text"
- error={errors.caFileText}
- value={connectionData.caFileText}
- onChange={(evt): void => saveCaFileText(evt.target.value)}
- variant="outlined"
- multiline
- rows={4}
- />
- </Grid>
- <Grid
- container
- spacing={4}
- alignItems="center"
- justifyContent="center"
- className={classes.buttonWrapper}
+ </Grid>
+ </Grid>
+
+ <FieldWrapper
+ description="REQUIRED. The url to connect to. The FROM field in a pomerium route."
+ label="Destination Url"
+ >
+ <TextField
+ fullWidth
+ required
+ value={connectionData.destinationUrl}
+ onChange={(evt): void => saveDestination(evt.target.value)}
+ variant="outlined"
+ autoFocus
+ />
+ </FieldWrapper>
+
+ <FieldWrapper
+ description="Skips TLS verification. No Cert Authority Needed."
+ label="Disable TLS Verification"
+ >
+ <Switch
+ checked={connectionData.disableTLS}
+ name="disable-tls-verification"
+ color="primary"
+ onChange={saveDisableTLS}
+ />
+ </FieldWrapper>
+
+ <FieldWrapper
+ description="OPTIONAL. The port or local address you want to connect to. Ex. :8888 or 127.0.0.1:8888"
+ label="Local Address"
+ >
+ <TextField
+ fullWidth
+ error={errors.localAddress}
+ value={connectionData.localAddress}
+ onChange={(evt): void => saveLocal(evt.target.value)}
+ variant="outlined"
+ />
+ </FieldWrapper>
+
+ <FieldWrapper
+ description={
+ "OPTIONAL. Pomerium Proxy Url. Useful if the Destination URL isn't publicly resolvable"
+ }
+ label="Alternate Pomerium Url"
+ >
+ <TextField
+ fullWidth
+ error={errors.pomeriumUrl}
+ value={connectionData.pomeriumUrl}
+ onChange={(evt): void => savePomeriumUrl(evt.target.value)}
+ variant="outlined"
+ />
+ </FieldWrapper>
+
+ <FieldWrapper
+ label="CA File Path"
+ description="OPTIONAL. If Pomerium is using a CA in your system's trusted keychain you can provide the path to it here."
+ >
+ <TextField
+ fullWidth
+ error={errors.caFilePath}
+ value={connectionData.caFilePath}
+ onChange={(evt): void => saveCaFilePath(evt.target.value)}
+ variant="outlined"
+ />
+ </FieldWrapper>
+
+ <FieldWrapper
+ label="CA File Text"
+ description="OPTIONAL. If Pomerium is using a CA in your system's trusted keychain you can copy/paste it here."
+ >
+ <TextField
+ fullWidth
+ error={errors.caFileText}
+ value={connectionData.caFileText}
+ onChange={(evt): void => saveCaFileText(evt.target.value)}
+ variant="outlined"
+ multiline
+ rows={4}
+ />
+ </FieldWrapper>
+ <Grid
+ container
+ spacing={4}
+ alignItems="center"
+ justifyContent="center"
+ className={classes.buttonWrapper}
+ >
+ <Grid item xs={12} sm={4}>
+ <Button
+ fullWidth
+ type="button"
+ variant="contained"
+ onClick={() => disconnect(connectionData.channelID)}
+ disabled={!connected}
+ color="primary"
  >
- <Grid item xs={12} sm={4}>
- <Button
- fullWidth
- type="button"
- variant="contained"
- onClick={() => disconnect(connectionData.channelID)}
- disabled={!connected}
- color="primary"
- >
- Disconnect
- </Button>
- </Grid>
- <Grid item xs={12} sm={4}>
- <Button
- fullWidth
- type="button"
- variant="contained"
- disabled={Object.values(errors).some(Boolean)}
- color="primary"
- onClick={connect}
- >
- Save/Connect
- </Button>
- </Grid>
- <Grid item xs={12} sm={4}>
- <Button
- fullWidth
- variant="contained"
- color="primary"
- type="button"
- onClick={clear}
- disabled={!connected}
- >
- New Connection
- </Button>
- </Grid>
- </Grid>
+ Disconnect
+ </Button>
+ </Grid>
+ <Grid item xs={12} sm={4}>
+ <Button
+ fullWidth
+ type="button"
+ variant="contained"
+ disabled={Object.values(errors).some(Boolean)}
+ color="primary"
+ onClick={connect}
+ >
+ Save/Connect
+ </Button>
+ </Grid>
+ <Grid item xs={12} sm={4}>
+ <Button
+ fullWidth
+ variant="contained"
+ color="primary"
+ type="button"
+ onClick={clear}
+ disabled={!connected}
+ >
+ New Connection
+ </Button>
  </Grid>
  </Grid>
  </form>
@@ -308,7 +321,7 @@ const ConnectForm: FC<Props> = () => {
  </List>
  </Grid>
  )}
- </>
+ </Container>
  );
 };