Merge pull request #25 from appsmithorg/release

Release
This commit is contained in:
Nikhil Nandagopal 2020-08-20 21:47:49 +05:30 committed by GitHub
commit 39b947f2dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 32 additions and 25 deletions

View File

@ -3,6 +3,7 @@
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="https://res.cloudinary.com/dwpfockn8/image/upload/v1597920848/favicons/favicon-orange_pxfmdc.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<title>Appsmith</title>
<style>

View File

@ -3,3 +3,15 @@ export const CANVAS_DEFAULT_HEIGHT_PX = 1292;
export const CANVAS_DEFAULT_GRID_HEIGHT_PX = 1;
export const CANVAS_DEFAULT_GRID_WIDTH_PX = 1;
export const CANVAS_BACKGROUND_COLOR = "#FFFFFF";
export const appCardColors = [
"#A64C0C",
"#650094",
"#D4D420",
"#0BA780",
"#5BB01A",
"#2965CC",
"#4E5D78",
"#CC293F",
"#6BA3FD",
];

View File

@ -136,7 +136,7 @@ export const AUTOFIT_COLUMN = "Autofit column";
export const TIMEZONE = "Timezone";
export const ENABLE_TIME = "Enable Time";
export const EDIT_APP = "Back to editor";
export const EDIT_APP = "Edit App";
export const FORK_APP = "Fork App";
export const LIGHTNING_MENU_DATA_API = "Use data from an API";

View File

@ -96,15 +96,3 @@ export type SearchResultsProviders = {
};
export const DEFAULT_TEMPLATE_TYPE = "TEMPLATE";
export const providerBackgroundColors = [
"#0BA780",
"#929500",
"#1F97D3",
"#B32FA5",
"#1A29B1",
"#2965CC",
"#4E5D78",
"#14928B",
"#FBBEBE",
];

View File

@ -1,6 +1,5 @@
import React from "react";
import "./wdyr";
import { Helmet } from "react-helmet";
import ReactDOM from "react-dom";
import { Provider } from "react-redux";
import "./index.css";
@ -25,10 +24,6 @@ const App = () => {
autoClose={5000}
closeButton={false}
/>
<Helmet>
<meta charSet="utf-8" />
<link rel="shortcut icon" href="/favicon-orange.ico" />
</Helmet>
<AppRouter />
</ThemeProvider>
</LayersContext.Provider>

View File

@ -65,6 +65,9 @@ const ForkButton = styled(Button)`
max-width: 200px;
height: 32px;
margin: 5px 10px;
svg {
transform: rotate(-90deg);
}
`;
const ShareButton = styled(Button)`
@ -83,7 +86,7 @@ const StyledApplicationName = styled.span`
const PageTab = styled(NavLink)`
display: flex;
height: 30px;
flex: 0 0 150px;
max-width: 170px;
margin-right: 1px;
align-self: flex-end;
cursor: pointer;
@ -98,6 +101,10 @@ const PageTab = styled(NavLink)`
line-height: 20px;
letter-spacing: 0.04em;
color: #fff;
max-width: 150px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
&&&:hover {
text-decoration: none;

View File

@ -22,6 +22,10 @@ const NoResult = styled(NonIdealState)`
}
`;
const StyledDivider = styled(Divider)`
border-bottom-color: rgba(255, 255, 255, 0.1);
`;
const EntityExplorer = () => {
const searchInputRef: MutableRefObject<HTMLInputElement | null> = useRef(
null,
@ -89,7 +93,7 @@ const EntityExplorer = () => {
<Search ref={searchInputRef} clear={clearSearch} />
{!noPageEntities && explorerPageGroup}
{noResults && noResultMessage}
<Divider />
<StyledDivider />
{!noDatsourceEntities && datasourcesGroup}
</Wrapper>
);

View File

@ -27,7 +27,7 @@ export type UrlDataState = {
export type AppDataState = {
mode?: APP_MODE;
user: AuthUserState;
url: UrlDataState;
URL: UrlDataState;
};
const initialState: AppDataState = {
@ -36,7 +36,7 @@ const initialState: AppDataState = {
email: "",
id: "",
},
url: {
URL: {
queryParams: {},
protocol: "",
host: "",
@ -73,7 +73,7 @@ const appReducer = createReducer(initialState, {
) => {
return {
...state,
url: action.payload,
URL: action.payload,
};
},
});

View File

@ -8,8 +8,8 @@ import _ from "lodash";
import { ActionDataState } from "reducers/entityReducers/actionsReducer";
import * as log from "loglevel";
import { LogLevelDesc } from "loglevel";
import { providerBackgroundColors } from "constants/providerConstants";
import FeatureFlag from "utils/featureFlags";
import { appCardColors } from "constants/AppConstants";
export const createReducer = (
initialState: any,
@ -149,7 +149,7 @@ export const getColorCode = (initials: string): string => {
for (let i = 0; i < initials.length; i++) {
asciiSum += initials[i].charCodeAt(0);
}
return providerBackgroundColors[asciiSum % providerBackgroundColors.length];
return appCardColors[asciiSum % appCardColors.length];
};
export function hexToRgb(