Merge branch 'master' into feature/integration

# Conflicts:
#	yarn.lock

app/client/.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

app/client/.gitignore

@@ -22,3 +22,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+/out

app/client/.nvmrc

@@ -0,0 +1 @@
+lts/dubnium

app/client/.prettierignore

@@ -0,0 +1,5 @@
+build/
+node_modules/
+package-lock.json
+yarn.lock
+package.json

app/client/.prettierrc

@@ -0,0 +1,9 @@
+{
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": false,
+  "trailingComma": "all",
+  "parser": "typescript"
+}

app/client/package.json

@@ -2,6 +2,10 @@
   "name": "appsmith",
   "version": "0.1.0",
   "private": true,
+  "engines": {
+    "node": "10.16.3",
+    "npm": "6.9.0"
+  },
   "dependencies": {
     "@blueprintjs/core": "^3.11.0",
     "@blueprintjs/datetime": "^3.6.0",
@@ -27,8 +31,8 @@
     "normalizr": "^3.3.0",
     "prettier": "^1.16.0",
     "react": "^16.7.0",
-    "react-dnd": "^7.0.2",
-    "react-dnd-html5-backend": "^7.0.2",
+    "react-dnd": "^9.3.4",
+    "react-dnd-html5-backend": "^9.3.4",
     "react-dom": "^16.7.0",
     "react-redux": "^6.0.0",
     "react-router": "^4.3.1",

app/client/src/constants/DefaultTheme.tsx

@@ -20,7 +20,7 @@ export interface IFontInterface {
 export interface IThemeInterface {
   primaryColor: Color
   secondaryColor: Color
-  ascentColor: Color
+  accentColor: Color
   headerFont: IFontInterface,
   titleFont: IFontInterface,
   subTitleFont: IFontInterface
@@ -35,7 +35,7 @@ const defaultFont: IFontInterface = {
 export const theme = {
   primaryColor: Colors.FullBlack,
   secondaryColor: Colors.FullWhite,
-  ascentColor: Colors.FullBlack,
+  accentColor: Colors.FullBlack,
   headerFont: defaultFont,
   titleFont: defaultFont,
   subTitleFont: defaultFont

app/client/src/editorComponents/ContainerComponent.tsx

@@ -4,8 +4,8 @@ import styled from "../constants/DefaultTheme"
 import React from "react"
 
 export const Container = styled("div")<IContainerProps>`
-  display: "flex"
-  flexDirection: ${props => {
+  display: flex;
+  flex-direction: ${props => {
     return props.orientation === "HORIZONTAL" ? "row" : "column"
   }};
   background: ${props => props.style.backgroundColor};

app/client/tsconfig.json

@@ -6,6 +6,7 @@
       "dom.iterable",
       "esnext"
     ],
+    "outDir": "./out/js/src",
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -20,6 +21,6 @@
     "jsx": "preserve"
   },
   "include": [
-    "src"
+    "./src/**/*"
   ]
 }