diff --git a/e b/e index e73ba57ddf5a4..86e13aefaed73 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit e73ba57ddf5a40503648b1d89f9a62f7764c9b72 +Subproject commit 86e13aefaed73ffd46a3b18964331f3302302a3c diff --git a/web/dist/app/app.41168bda625ce8b55795.js b/web/dist/app/app.3230b522f504136bd5a7.js similarity index 99% rename from web/dist/app/app.41168bda625ce8b55795.js rename to web/dist/app/app.3230b522f504136bd5a7.js index fc525f634078c..a7ea91c23e597 100644 --- a/web/dist/app/app.41168bda625ce8b55795.js +++ b/web/dist/app/app.3230b522f504136bd5a7.js @@ -3065,7 +3065,7 @@ limitations under the License. -var MSG_INFO_LOGIN_SUCCESS = 'Login was successful, you can close this window and continue using tsh.'; +var MSG_INFO_LOGIN_SUCCESS = 'Login successful'; var MSG_ERROR_LOGIN_FAILED = 'Login unsuccessful. Please try again, if the problem persists, contact your system administrator.'; var MSG_ERROR_DEFAULT = 'Internal Error'; var MSG_ERROR_NOT_FOUND = '404 Not Found'; @@ -3093,7 +3093,7 @@ var InfoPage = documentTitle_withDocTitle("Info", function (_ref) { return react_default.a.createElement(msgPage_SuccessfulLogin, null); } - return react_default.a.createElement(msgPage_InfoBox, null); + return null; }); var ErrorPage = documentTitle_withDocTitle("Error", function (_ref2) { @@ -3129,12 +3129,8 @@ var msgPage_Box = function Box(props) { ); }; -var msgPage_InfoBox = function InfoBox(props) { - return react_default.a.createElement(msgPage_Box, msgPage_extends({ iconClass: 'fa fa-smile-o' }, props)); -}; - var msgPage_ErrorBox = function ErrorBox(props) { - return react_default.a.createElement(msgPage_Box, msgPage_extends({ iconClass: 'fa fa-frown-o' }, props)); + return react_default.a.createElement(msgPage_Box, msgPage_extends({ iconClass: 'fa fa-exclamation-triangle' }, props)); }; var msgPage_ErrorBoxDetails = function ErrorBoxDetails(_ref3) { @@ -3237,16 +3233,28 @@ var msgPage_LoginFailed = function LoginFailed(_ref6) { var msgPage_SuccessfulLogin = function SuccessfulLogin() { return react_default.a.createElement( - msgPage_InfoBox, - null, + msgPage_Box, + { iconClass: 'fa fa-check-circle m-b-md' }, react_default.a.createElement( 'h1', null, MSG_INFO_LOGIN_SUCCESS + ), + react_default.a.createElement( + 'p', + { className: 'm-t', style: successfulLoginStyles }, + 'You have successfully signed into your account. You can close this window and continue using the product.' ) ); }; +var successfulLoginStyles = { + textAlign: "center", + maxWidth: "500px", + marginLeft: "auto", + marginRight: "auto" +}; + // CONCATENATED MODULE: ./src/app/components/user/invite.jsx var invite_createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); diff --git a/web/dist/index.html b/web/dist/index.html index 8b13f1e680ea9..49e46dca1bc36 100644 --- a/web/dist/index.html +++ b/web/dist/index.html @@ -11,5 +11,5 @@
- + diff --git a/web/src/app/components/msgPage.jsx b/web/src/app/components/msgPage.jsx index aa8a27237f098..fcd465b2fffda 100644 --- a/web/src/app/components/msgPage.jsx +++ b/web/src/app/components/msgPage.jsx @@ -17,7 +17,7 @@ limitations under the License. import React from 'react'; import { withDocTitle } from './documentTitle'; -export const MSG_INFO_LOGIN_SUCCESS = 'Login was successful, you can close this window and continue using tsh.'; +export const MSG_INFO_LOGIN_SUCCESS = 'Login successful'; export const MSG_ERROR_LOGIN_FAILED = 'Login unsuccessful. Please try again, if the problem persists, contact your system administrator.'; export const MSG_ERROR_DEFAULT = 'Internal Error'; export const MSG_ERROR_NOT_FOUND = '404 Not Found'; @@ -43,7 +43,7 @@ const InfoPage = withDocTitle("Info", ({ params }) => { return } - return + return null; }) const ErrorPage = withDocTitle("Error", ({ params, location }) => { @@ -72,12 +72,8 @@ const Box = props => ( ) -const InfoBox = props => ( - -) - const ErrorBox = props => ( - + ) const ErrorBoxDetails = ({ message='' }) => ( @@ -127,11 +123,23 @@ const LoginFailed = ({ message }) => ( ) const SuccessfulLogin = () => ( - +

{MSG_INFO_LOGIN_SUCCESS}

-
+

+ You have successfully signed into your account. + You can close this window and continue using the product. +

+
) +const successfulLoginStyles = { + textAlign: "center", + maxWidth: "500px", + marginLeft: "auto", + marginRight: "auto", +} + + export { ErrorPage, InfoPage,