Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Abhinav Jha 2020-01-15 04:49:36 +00:00
parent dc794f2a70
commit 536e19a568
8 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/client/src/assets/icons/widget/button.svg
View File

@ -1,3 +1,3 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M32 10C32 8.8 31.2 8 30 8H2C0.8 8 0 8.8 0 10V22C0 23.2 0.8 24 2 24H30C31.2 24 32 23.2 32 22V10ZM3.73772 17.902C4.01306 18.0233 4.33039 18.084 4.68972 18.084C5.06306 18.084 5.37806 18.0187 5.63472 17.888C5.89139 17.7527 6.08506 17.5753 6.21572 17.356C6.34639 17.1367 6.41172 16.8987 6.41172 16.642C6.41172 16.3527 6.35106 16.117 6.22972 15.935C6.10839 15.7483 5.94739 15.599 5.74672 15.487C5.54606 15.375 5.32439 15.277 5.08172 15.193C4.85306 15.1183 4.65006 15.0483 4.47272 14.983C4.29539 14.9177 4.15539 14.8383 4.05272 14.745C3.95006 14.647 3.89872 14.5163 3.89872 14.353C3.89872 14.1617 3.96406 14.017 4.09472 13.919C4.23006 13.8163 4.39572 13.7673 4.59172 13.772C4.82039 13.772 4.99772 13.8397 5.12372 13.975C5.25439 14.1057 5.32206 14.2573 5.32672 14.43H6.28572C6.27639 14.1407 6.19939 13.891 6.05472 13.681C5.91472 13.471 5.71872 13.3077 5.46672 13.191C5.21939 13.0743 4.93239 13.016 4.60572 13.016C4.28372 13.016 3.99906 13.0743 3.75172 13.191C3.50439 13.303 3.30839 13.464 3.16372 13.674C3.02372 13.8793 2.95606 14.1267 2.96072 14.416C2.96072 14.7567 3.05872 15.0297 3.25472 15.235C3.45539 15.4403 3.74472 15.6083 4.12272 15.739L4.78072 15.963C4.98606 16.033 5.14939 16.124 5.27072 16.236C5.39672 16.348 5.45972 16.5043 5.45972 16.705C5.45972 16.8963 5.38972 17.0503 5.24972 17.167C5.10972 17.279 4.92072 17.335 4.68272 17.335C4.40739 17.335 4.19039 17.258 4.03172 17.104C3.87772 16.9453 3.79606 16.7517 3.78672 16.523H2.84172C2.84639 16.8543 2.92806 17.1367 3.08672 17.37C3.24539 17.5987 3.46239 17.776 3.73772 17.902ZM8.39048 17.874C8.67981 18.014 9.00415 18.084 9.36348 18.084C9.72281 18.084 10.0495 18.014 10.3435 17.874C10.6421 17.7293 10.8801 17.5123 11.0575 17.223C11.2348 16.9337 11.3235 16.5673 11.3235 16.124V13.1H10.4275V16.131C10.4275 16.5137 10.3341 16.7983 10.1475 16.985C9.96081 17.1717 9.70648 17.265 9.38448 17.265C9.05781 17.265 8.80115 17.1717 8.61448 16.985C8.43248 16.7983 8.34148 16.5137 8.34148 16.131V13.1H7.44548V16.124C7.44548 16.5673 7.52948 16.9337 7.69748 17.223C7.87015 17.5123 8.10115 17.7293 8.39048 17.874ZM12.5181 13.1V18H13.4141V14.619L14.7791 17.3H15.4861L16.8511 14.619V18H17.7471V13.1H16.6831L15.1431 16.208L13.5821 13.1H12.5181ZM18.9778 13.1V18H21.0148C21.5281 18 21.9248 17.874 22.2048 17.622C22.4848 17.37 22.6248 17.0503 22.6248 16.663C22.6248 16.369 22.5338 16.1123 22.3518 15.893C22.1698 15.669 21.9388 15.529 21.6588 15.473C21.8968 15.4077 22.0975 15.284 22.2608 15.102C22.4288 14.9153 22.5128 14.668 22.5128 14.36C22.5128 13.9913 22.3775 13.6903 22.1068 13.457C21.8408 13.219 21.4535 13.1 20.9448 13.1H18.9778ZM20.8118 15.158H19.8738V13.821H20.7978C21.0638 13.821 21.2621 13.8817 21.3928 14.003C21.5281 14.1197 21.5958 14.2807 21.5958 14.486C21.5958 14.7007 21.5281 14.8663 21.3928 14.983C21.2575 15.0997 21.0638 15.158 20.8118 15.158ZM20.8748 17.272H19.8738V15.83H20.8608C21.1221 15.83 21.3298 15.8953 21.4838 16.026C21.6378 16.1567 21.7148 16.3363 21.7148 16.565C21.7148 16.789 21.6402 16.964 21.4908 17.09C21.3461 17.2113 21.1408 17.272 20.8748 17.272ZM23.6738 13.1V18H24.5698V13.1H23.6738ZM26.9405 13.821V18H27.8365V13.821H29.2715V13.1H25.5125V13.821H26.9405Z" fill="#F2FAFF" fill-opacity="0.9"/>
<svg width="32" height="33" viewBox="0 0 32 33" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M32 10.6658C32 9.46577 31.2 8.66577 30 8.66577H2C0.8 8.66577 0 9.46577 0 10.6658V22.6658C0 23.8658 0.8 24.6658 2 24.6658H30C31.2 24.6658 32 23.8658 32 22.6658V10.6658ZM4.27987 18.5538C4.54587 18.6844 4.85853 18.7498 5.21787 18.7498C5.58653 18.7498 5.8922 18.6844 6.13487 18.5538C6.3822 18.4231 6.56653 18.2551 6.68787 18.0498C6.8092 17.8398 6.86987 17.6181 6.86987 17.3848C6.86987 17.1094 6.8162 16.8831 6.70887 16.7058C6.6062 16.5284 6.46153 16.3838 6.27487 16.2718C6.0882 16.1598 5.8782 16.0618 5.64487 15.9778C5.36487 15.8844 5.11753 15.8028 4.90287 15.7328C4.6882 15.6581 4.5202 15.5648 4.39887 15.4528C4.2822 15.3408 4.22387 15.1798 4.22387 14.9698C4.22387 14.7224 4.30787 14.5288 4.47587 14.3888C4.64853 14.2488 4.86787 14.1811 5.13387 14.1858C5.34853 14.1858 5.52587 14.2278 5.66587 14.3118C5.81053 14.3958 5.91787 14.5054 5.98787 14.6408C6.05787 14.7714 6.09287 14.9044 6.09287 15.0398H6.70887C6.7042 14.7784 6.63653 14.5451 6.50587 14.3398C6.37987 14.1344 6.2002 13.9734 5.96687 13.8568C5.7382 13.7401 5.46753 13.6818 5.15487 13.6818C4.83753 13.6818 4.5622 13.7401 4.32887 13.8568C4.1002 13.9688 3.92287 14.1274 3.79687 14.3328C3.67087 14.5334 3.6102 14.7644 3.61487 15.0258C3.61487 15.3384 3.70587 15.5928 3.88787 15.7888C4.06987 15.9801 4.34987 16.1411 4.72787 16.2718C4.92853 16.3418 5.11987 16.4048 5.30187 16.4608C5.48853 16.5168 5.65187 16.5821 5.79187 16.6568C5.93653 16.7314 6.05087 16.8294 6.13487 16.9508C6.21887 17.0674 6.26087 17.2238 6.26087 17.4198C6.26087 17.6578 6.16987 17.8561 5.98787 18.0148C5.80587 18.1734 5.5492 18.2528 5.21787 18.2528C4.96587 18.2528 4.75353 18.2061 4.58087 18.1128C4.41287 18.0148 4.28453 17.8864 4.19587 17.7278C4.1072 17.5644 4.06287 17.3871 4.06287 17.1958H3.44687C3.44687 17.5038 3.5192 17.7744 3.66387 18.0078C3.80853 18.2411 4.01387 18.4231 4.27987 18.5538ZM8.83774 18.5538C9.11308 18.6844 9.41874 18.7498 9.75474 18.7498C10.0954 18.7498 10.4034 18.6844 10.6787 18.5538C10.9541 18.4184 11.1734 18.2108 11.3367 17.9308C11.5001 17.6508 11.5817 17.2938 11.5817 16.8598V13.7658H10.9937V16.8668C10.9937 17.3428 10.8817 17.6881 10.6577 17.9028C10.4337 18.1174 10.1374 18.2248 9.76874 18.2248C9.40008 18.2248 9.10141 18.1174 8.87274 17.9028C8.64408 17.6881 8.52974 17.3428 8.52974 16.8668V13.7658H7.94174V16.8598C7.94174 17.2938 8.02341 17.6508 8.18674 17.9308C8.35008 18.2108 8.56708 18.4184 8.83774 18.5538ZM12.8575 13.7658V18.6658H14.6355C14.9762 18.6658 15.2655 18.6074 15.5035 18.4908C15.7415 18.3694 15.9212 18.2084 16.0425 18.0078C16.1638 17.8024 16.2245 17.5761 16.2245 17.3288C16.2245 17.1281 16.1802 16.9438 16.0915 16.7758C16.0075 16.6078 15.8908 16.4678 15.7415 16.3558C15.5922 16.2438 15.4265 16.1714 15.2445 16.1388C15.4825 16.0688 15.6855 15.9428 15.8535 15.7608C16.0262 15.5788 16.1125 15.3291 16.1125 15.0118C16.1125 14.7784 16.0565 14.5684 15.9445 14.3818C15.8325 14.1904 15.6622 14.0411 15.4335 13.9338C15.2095 13.8218 14.9248 13.7658 14.5795 13.7658H12.8575ZM14.5375 15.9078H13.4455V14.2558H14.5165C14.8478 14.2558 15.0952 14.3304 15.2585 14.4798C15.4265 14.6291 15.5105 14.8274 15.5105 15.0748C15.5105 15.3361 15.4265 15.5414 15.2585 15.6908C15.0905 15.8354 14.8502 15.9078 14.5375 15.9078ZM14.5725 18.1758H13.4455V16.3768H14.5585C14.8852 16.3768 15.1442 16.4608 15.3355 16.6288C15.5268 16.7921 15.6225 17.0114 15.6225 17.2868C15.6225 17.5668 15.5315 17.7861 15.3495 17.9448C15.1675 18.0988 14.9085 18.1758 14.5725 18.1758ZM17.3484 13.7658V18.6658H17.9364V14.8228L19.5744 17.9658H20.0154L21.6534 14.8158V18.6658H22.2414V13.7658H21.5484L19.7984 17.1818L18.0344 13.7658H17.3484ZM23.5552 13.7658V18.6658H24.1432V13.7658H23.5552ZM26.6101 14.2488V18.6658H27.1981V14.2488H28.6611V13.7658H25.1471V14.2488H26.6101Z" fill="white"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

18
app/client/src/components/designSystems/blueprint/ButtonComponent.tsx
View File

@ -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]);
}
}};
}

2
app/client/src/constants/routes.ts
View File

@ -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`;

4
app/client/src/index.css
View File

@ -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;

8
app/client/src/index.tsx
View File

@ -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 = <Loader />;
@ -47,6 +51,8 @@ ReactDOM.render(
<ProtectedRoute exact path={BASE_URL} component={App} />
<ProtectedRoute path={ORG_URL} component={Organization} />
<Route path={USER_AUTH_URL} component={UserAuth} />
<Redirect exact from={BASE_LOGIN_URL} to={AUTH_LOGIN_URL} />
<Redirect exact from={BASE_SIGNUP_URL} to={SIGN_UP_URL} />
<ProtectedRoute
exact
path={APPLICATIONS_URL}

6
app/client/src/pages/Editor/Popper.tsx
View File

@ -12,7 +12,7 @@ type PopperProps = {
const PopperWrapper = styled(PaneWrapper)`
position: absolute;
z-index: 1;
z-index: 3;
max-height: ${props => 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",
},
},
},
);

2
app/client/src/pages/Editor/Sidebar.tsx
View File

@ -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`

2
app/client/src/pages/Editor/index.tsx
View File

@ -134,7 +134,7 @@ class Editor extends Component<EditorProps> {
<div className={Classes.DIALOG_FOOTER}>
<div className={Classes.DIALOG_FOOTER_ACTIONS}>
<AnchorButton
target="_blank"
target={this.props.currentApplicationId}
href={getApplicationViewerPageURL(
this.props.currentApplicationId,
this.props.currentPageId,