From bfeb9f4e86f5db96b8db04545ed9c628ac1d0dba Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 7 Jul 2020 23:23:16 +0200 Subject: [PATCH] minor text changes --- interface/package-lock.json | 57 ++++++++++++------- interface/package.json | 2 +- interface/src/SignIn.tsx | 10 ++-- interface/src/ap/APSettingsForm.tsx | 4 +- .../src/authentication/AuthenticatedRoute.tsx | 2 +- .../src/authentication/Authentication.ts | 20 +++---- .../src/components/FullScreenLoading.tsx | 2 +- interface/src/components/RestController.tsx | 4 +- interface/src/components/SingleUpload.tsx | 5 +- .../src/security/SecuritySettingsForm.tsx | 2 +- 10 files changed, 60 insertions(+), 48 deletions(-) diff --git a/interface/package-lock.json b/interface/package-lock.json index 32aaeb8d5..c7d43fed2 100644 --- a/interface/package-lock.json +++ b/interface/package-lock.json @@ -5204,9 +5204,9 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, "eventemitter3": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", - "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", + "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==" }, "events": { "version": "3.1.0", @@ -5714,9 +5714,22 @@ } }, "follow-redirects": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz", - "integrity": "sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg==" + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.10.0.tgz", + "integrity": "sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ==", + "requires": { + "debug": "^3.0.0" + }, + "dependencies": { + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "requires": { + "ms": "^2.1.1" + } + } + } }, "for-in": { "version": "1.0.2", @@ -6293,9 +6306,9 @@ "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=" }, "http-proxy": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", - "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", + "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", "requires": { "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", @@ -8202,9 +8215,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" }, "minipass": { "version": "3.1.1", @@ -8300,11 +8313,11 @@ } }, "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { - "minimist": "^1.2.5" + "minimist": "0.0.8" } }, "moment": { @@ -8540,9 +8553,9 @@ } }, "notistack": { - "version": "0.9.16", - "resolved": "https://registry.npmjs.org/notistack/-/notistack-0.9.16.tgz", - "integrity": "sha512-+q1KKj2XkU+mKnbp9PbVkRLSLfVYnPJGi+MHT+N9Pm3nZUMVtbjDFodwdv/RoEldvkXKCROnecayUFMwLOiIQA==", + "version": "0.9.17", + "resolved": "https://registry.npmjs.org/notistack/-/notistack-0.9.17.tgz", + "integrity": "sha512-nypTN6sEe+q98wMaxF/UwatA1yAq948+bZOo9JKYR+tU65DW0ipWyx8DseJ3UJYvb6VDD+Fqo83qwayQ46bEEA==", "requires": { "clsx": "^1.1.0", "hoist-non-react-statics": "^3.3.0" @@ -9134,9 +9147,9 @@ "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" }, "portfinder": { - "version": "1.0.26", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz", - "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==", + "version": "1.0.25", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz", + "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==", "requires": { "async": "^2.6.2", "debug": "^3.1.1", diff --git a/interface/package.json b/interface/package.json index 33331e951..eb4c77cf1 100644 --- a/interface/package.json +++ b/interface/package.json @@ -18,7 +18,7 @@ "lodash": "^4.17.15", "mime-types": "^2.1.25", "moment": "^2.26.0", - "notistack": "^0.9.16", + "notistack": "^0.9.17", "react": "^16.13.1", "react-dom": "^16.13.1", "react-dropzone": "^11.0.1", diff --git a/interface/src/SignIn.tsx b/interface/src/SignIn.tsx index 85cf0317a..e4df446fb 100644 --- a/interface/src/SignIn.tsx +++ b/interface/src/SignIn.tsx @@ -11,7 +11,7 @@ import {PasswordValidator} from './components'; import { PROJECT_NAME, SIGN_IN_ENDPOINT } from './api'; const styles = (theme: Theme) => createStyles({ - loginPage: { + signInPage: { display: "flex", height: "100vh", margin: "auto", @@ -20,7 +20,7 @@ const styles = (theme: Theme) => createStyles({ flexDirection: "column", maxWidth: theme.breakpoints.values.sm }, - loginPanel: { + signInPanel: { textAlign: "center", padding: theme.spacing(2), paddingTop: "200px", @@ -81,7 +81,7 @@ class SignIn extends Component { if (response.status === 200) { return response.json(); } else if (response.status === 401) { - throw Error("Invalid login details."); + throw Error("Invalid credentials."); } else { throw Error("Invalid status code: " + response.status); } @@ -100,8 +100,8 @@ class SignIn extends Component { const { username, password, processing } = this.state; const { classes } = this.props; return ( -
- +
+ {PROJECT_NAME} { margin="normal" /> ); } Authentication.storeLoginRedirect(location); - enqueueSnackbar("Please log in to continue.", { variant: 'info' }); + enqueueSnackbar("Please sign in to continue.", { variant: 'info' }); return ( ); diff --git a/interface/src/authentication/Authentication.ts b/interface/src/authentication/Authentication.ts index 015098eda..4c8749348 100644 --- a/interface/src/authentication/Authentication.ts +++ b/interface/src/authentication/Authentication.ts @@ -5,8 +5,8 @@ import { Features } from '../features/types'; import { getDefaultRoute } from '../AppRouting'; export const ACCESS_TOKEN = 'access_token'; -export const LOGIN_PATHNAME = 'loginPathname'; -export const LOGIN_SEARCH = 'loginSearch'; +export const SIGN_IN_PATHNAME = 'signInPathname'; +export const SIGN_IN_SEARCH = 'signInSearch'; /** * Fallback to sessionStorage if localStorage is absent. WebView may not have local storage enabled. @@ -17,23 +17,23 @@ export function getStorage() { export function storeLoginRedirect(location?: H.Location) { if (location) { - getStorage().setItem(LOGIN_PATHNAME, location.pathname); - getStorage().setItem(LOGIN_SEARCH, location.search); + getStorage().setItem(SIGN_IN_PATHNAME, location.pathname); + getStorage().setItem(SIGN_IN_SEARCH, location.search); } } export function clearLoginRedirect() { - getStorage().removeItem(LOGIN_PATHNAME); - getStorage().removeItem(LOGIN_SEARCH); + getStorage().removeItem(SIGN_IN_PATHNAME); + getStorage().removeItem(SIGN_IN_SEARCH); } export function fetchLoginRedirect(features: Features): H.LocationDescriptorObject { - const loginPathname = getStorage().getItem(LOGIN_PATHNAME); - const loginSearch = getStorage().getItem(LOGIN_SEARCH); + const signInPathname = getStorage().getItem(SIGN_IN_PATHNAME); + const signInSearch = getStorage().getItem(SIGN_IN_SEARCH); clearLoginRedirect(); return { - pathname: loginPathname || getDefaultRoute(features), - search: (loginPathname && loginSearch) || undefined + pathname: signInPathname || getDefaultRoute(features), + search: (signInPathname && signInSearch) || undefined }; } diff --git a/interface/src/components/FullScreenLoading.tsx b/interface/src/components/FullScreenLoading.tsx index 43a34fea2..d08d90466 100644 --- a/interface/src/components/FullScreenLoading.tsx +++ b/interface/src/components/FullScreenLoading.tsx @@ -23,7 +23,7 @@ const FullScreenLoading = () => {
- Loading … + Loading…
) diff --git a/interface/src/components/RestController.tsx b/interface/src/components/RestController.tsx index 4b32508f5..c9751c6a1 100644 --- a/interface/src/components/RestController.tsx +++ b/interface/src/components/RestController.tsx @@ -84,11 +84,11 @@ export function restController>(endpointUrl: } throw Error("Invalid status code: " + response.status); }).then(json => { - this.props.enqueueSnackbar("Changes successfully applied.", { variant: 'success' }); + this.props.enqueueSnackbar("Update successful.", { variant: 'success' }); this.setState({ data: json, loading: false }); }).catch(error => { const errorMessage = error.message || "Unknown error"; - this.props.enqueueSnackbar("Problem saving: " + errorMessage, { variant: 'error' }); + this.props.enqueueSnackbar("Problem updating: " + errorMessage, { variant: 'error' }); this.setState({ data: undefined, loading: false, errorMessage }); }); } diff --git a/interface/src/components/SingleUpload.tsx b/interface/src/components/SingleUpload.tsx index c16a62633..2dd7bfa88 100644 --- a/interface/src/components/SingleUpload.tsx +++ b/interface/src/components/SingleUpload.tsx @@ -5,7 +5,6 @@ import { makeStyles, createStyles } from '@material-ui/styles'; import CloudUploadIcon from '@material-ui/icons/CloudUpload'; import CancelIcon from '@material-ui/icons/Cancel'; import { Theme, Box, Typography, LinearProgress, Button } from '@material-ui/core'; -import ErrorButton from './ErrorButton'; interface SingleUploadStyleProps extends DropzoneState { uploading: boolean; @@ -84,9 +83,9 @@ const SingleUpload: FC = ({ onDrop, onCancel, accept, uploadi {renderProgress(progress)} - } variant="contained" color="primary" onClick={onCancel}> + )} diff --git a/interface/src/security/SecuritySettingsForm.tsx b/interface/src/security/SecuritySettingsForm.tsx index 1d3ac3753..991b40034 100644 --- a/interface/src/security/SecuritySettingsForm.tsx +++ b/interface/src/security/SecuritySettingsForm.tsx @@ -35,7 +35,7 @@ class SecuritySettingsForm extends React.Component { /> - If you modify the JWT Secret, all users will be logged out. + The JWT secret is used to sign authentication tokens. If you modify the JWT Secret, all users will be signed out.