From 536e19a5680a8a6a9c879fe50f10a453a63f7270 Mon Sep 17 00:00:00 2001 From: Abhinav Jha Date: Wed, 15 Jan 2020 04:49:36 +0000 Subject: [PATCH] Redirect /login to /user/login. Button widget hover style. popper now can show up on the widget cards pane. On publishing the same app opens up. Button widget card has corrected SVG. --- app/client/src/assets/icons/widget/button.svg | 4 ++-- .../blueprint/ButtonComponent.tsx | 18 +++++++++--------- app/client/src/constants/routes.ts | 2 ++ app/client/src/index.css | 4 ++++ app/client/src/index.tsx | 8 +++++++- app/client/src/pages/Editor/Popper.tsx | 6 +++++- app/client/src/pages/Editor/Sidebar.tsx | 2 +- app/client/src/pages/Editor/index.tsx | 2 +- 8 files changed, 31 insertions(+), 15 deletions(-) diff --git a/app/client/src/assets/icons/widget/button.svg b/app/client/src/assets/icons/widget/button.svg index 93ce0da9ef..24c4944870 100644 --- a/app/client/src/assets/icons/widget/button.svg +++ b/app/client/src/assets/icons/widget/button.svg @@ -1,3 +1,3 @@ - - + + diff --git a/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx b/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx index 599d3006fa..d9e8809d16 100644 --- a/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx +++ b/app/client/src/components/designSystems/blueprint/ButtonComponent.tsx @@ -2,7 +2,7 @@ import React from "react"; import { AnchorButton, IButtonProps, MaybeElement } from "@blueprintjs/core"; import styled, { css } from "styled-components"; import { ButtonStyle } from "widgets/ButtonWidget"; -import { Theme } from "constants/DefaultTheme"; +import { Theme, darkenHover, darkenActive } from "constants/DefaultTheme"; import _ from "lodash"; import { ComponentProps } from "components/designSystems/appsmith/BaseComponent"; @@ -52,14 +52,14 @@ const ButtonWrapper = styled((props: ButtonStyleProps & IButtonProps) => ( ${ButtonColorStyles}; background-color: ${props => { if (!props.filled) return props.theme.colors.secondaryDarker; - if (props.accent !== "secondary") { - return props.theme.colors[`${props.accent}Darker`]; + if (props.accent !== "secondary" && props.accent) { + return darkenHover(props.theme.colors[props.accent]); } }}; border-color: ${props => { if (!props.filled) return; - if (props.accent !== "secondary") { - return props.theme.colors[`${props.accent}Darker`]; + if (props.accent !== "secondary" && props.accent) { + return darkenHover(props.theme.colors[props.accent]); } }}; } @@ -67,14 +67,14 @@ const ButtonWrapper = styled((props: ButtonStyleProps & IButtonProps) => ( ${ButtonColorStyles}; background-color: ${props => { if (!props.filled) return props.theme.colors.secondaryDarkest; - if (props.accent !== "secondary") { - return props.theme.colors[`${props.accent}Darkest`]; + if (props.accent !== "secondary" && props.accent) { + return darkenActive(props.theme.colors[props.accent]); } }}; border-color: ${props => { if (!props.filled) return; - if (props.accent !== "secondary") { - return props.theme.colors[`${props.accent}Darkest`]; + if (props.accent !== "secondary" && props.accent) { + return darkenActive(props.theme.colors[props.accent]); } }}; } diff --git a/app/client/src/constants/routes.ts b/app/client/src/constants/routes.ts index fde6c44f1d..155d7809a2 100644 --- a/app/client/src/constants/routes.ts +++ b/app/client/src/constants/routes.ts @@ -71,7 +71,9 @@ export const EDITOR_ROUTES = [ export const FORGOT_PASSWORD_URL = `${USER_AUTH_URL}/forgotPassword`; export const RESET_PASSWORD_URL = `${USER_AUTH_URL}/resetPassword`; +export const BASE_SIGNUP_URL = `/signup`; export const SIGN_UP_URL = `${USER_AUTH_URL}/signup`; +export const BASE_LOGIN_URL = `/login`; export const AUTH_LOGIN_URL = `${USER_AUTH_URL}/login`; export const ORG_INVITE_USERS_PAGE_URL = `${ORG_URL}/invite`; diff --git a/app/client/src/index.css b/app/client/src/index.css index 3f32c03374..9d6998e2d9 100755 --- a/app/client/src/index.css +++ b/app/client/src/index.css @@ -48,6 +48,10 @@ div.bp3-popover-arrow { display:none; } +.bp3-button.bp3-loading{ + cursor: wait !important; +} + .pace { -webkit-pointer-events: none; pointer-events: none; diff --git a/app/client/src/index.tsx b/app/client/src/index.tsx index 22e911d622..f73419382f 100755 --- a/app/client/src/index.tsx +++ b/app/client/src/index.tsx @@ -5,7 +5,7 @@ import { Provider } from "react-redux"; import Loader from "pages/common/Loader"; import "./index.css"; import * as serviceWorker from "./serviceWorker"; -import { Router, Route, Switch } from "react-router-dom"; +import { Router, Route, Switch, Redirect } from "react-router-dom"; import history from "./utils/history"; import { ThemeProvider, theme } from "constants/DefaultTheme"; import { DndProvider } from "react-dnd"; @@ -20,6 +20,10 @@ import { APPLICATIONS_URL, ORG_URL, USER_AUTH_URL, + AUTH_LOGIN_URL, + SIGN_UP_URL, + BASE_LOGIN_URL, + BASE_SIGNUP_URL, } from "constants/routes"; const loadingIndicator = ; @@ -47,6 +51,8 @@ ReactDOM.render( + + props.theme.propertyPane.height}px; width: ${props => props.theme.propertyPane.width}px; margin: ${props => props.theme.spaces[6]}px; @@ -50,6 +50,10 @@ export default (props: PopperProps) => { arrow: { enabled: false, }, + preventOverflow: { + enabled: true, + boundariesElement: "viewport", + }, }, }, ); diff --git a/app/client/src/pages/Editor/Sidebar.tsx b/app/client/src/pages/Editor/Sidebar.tsx index e7e50a5208..cb832d7a2a 100644 --- a/app/client/src/pages/Editor/Sidebar.tsx +++ b/app/client/src/pages/Editor/Sidebar.tsx @@ -10,7 +10,7 @@ const Wrapper = styled.div` grid-template-columns: 1fr 4fr; width: ${props => props.theme.sidebarWidth}; box-shadow: 0px 1px 3px ${props => props.theme.colors.paneBG}; - z-index: 20; + z-index: 3; `; const NavBar = styled.div` diff --git a/app/client/src/pages/Editor/index.tsx b/app/client/src/pages/Editor/index.tsx index 39a43df537..a841a00835 100644 --- a/app/client/src/pages/Editor/index.tsx +++ b/app/client/src/pages/Editor/index.tsx @@ -134,7 +134,7 @@ class Editor extends Component {