Embed redesign - release 1 (codesandbox#2791)

* create new vscode theme for new redesign

* remove dead code

* tiny polish for missing tab styles

* copy sidebar border

* Fix bad merge

* Get tokens + styled-system going

[skip ci]

* get sidebar sections in [skip ci]

* add stats to sandbox info

* linter oh linter

* drone is confused, i need a commit

* get the border right

* who knew dot object mutates object!

* sync the sidebar border color

* [WIP] [skip ci] get sandboxed version working in app

* sync font size scale with dannys

* fix stats design

* add hover styles for section with icon

* get the right icons to work

* lint ignore ts import

* make the linter happy-ish

* delete old file tree whoop!

* add dependencies

* remove old open in sandbox link

* bring the app back

* Fix usage of filetree in share modal

* use line height 24

* bring back legacy filetree for share modal

* compat mode for header

* sync theme with danny

* fix file tree icon alignment

* reduce header height

* add border to header back

* match selection background for editor

* customise tab borders

* Make tabs respect vscode theme

* add tabs border for embed

* hide title when sidebar already shows it

* add Open sandbox button

* Redesign icons in header

* hack hover styles for Tab

* make open sandbox margin adjustable

* Fix bad merge

* lol remove debug statement!!

Author: siddharthkp

packages/app/package.json

@@ -73,6 +73,7 @@
     "@codesandbox/template-icons": "^1.0.1",
     "@emmetio/codemirror-plugin": "^0.3.5",
     "@sentry/webpack-plugin": "^1.8.0",
+    "@styled-system/css": "^5.0.23",
     "@svgr/core": "^2.4.1",
     "@typeform/embed": "^0.12.0",
     "@types/rc-slider": "^8.6.5",
@@ -107,6 +108,7 @@
     "date-fns": "^2.4.1",
     "date-fns-tz": "^1.0.7",
     "debug": "^2.6.8",
+    "dot-object": "^1.9.0",
     "downshift": "^1.0.0-rc.14",
     "eslint-plugin-react-hooks": "1.6.0",
     "eslint-plugin-vue": "^4.2.2",

packages/app/src/app/pages/Sandbox/Editor/Content/Tabs/Tab/elements.ts

@@ -11,11 +11,11 @@ export const Container = styled.div<{
   justify-content: center;
   align-items: center;
   line-height: 1;
-  height: calc(100% - 1px);
+  height: 100%;
   font-size: 0.875rem;
   cursor: pointer;
 
-  border-bottom: 1px solid transparent;
+  border-bottom: 1px solid ${props => props.theme['tab.border']};
 
   padding: 0 1rem;
   padding-left: 0.75rem;
@@ -42,7 +42,7 @@ export const Container = styled.div<{
     css`
       background-color: ${props.theme['tab.activeBackground'] ||
         props.theme.background2};
-      border-color: ${props.theme.secondary};
+      border-color: ${props.theme['tab.activeBorder']};
       color: ${props.theme['tab.activeForeground'] ||
         props.theme['editor.foreground'] ||
         'white'};

packages/app/src/app/pages/common/Modals/ShareModal/index.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { inject, observer } from 'app/componentConnectors';
-import Files from 'embed/components/Files';
+import Files from 'embed/components/legacy/Files';
 import QRCode from 'qrcode.react';
 import { getSandboxName } from '@codesandbox/common/lib/utils/get-sandbox-name';
 import track from '@codesandbox/common/lib/utils/analytics';

packages/app/src/embed/components/App/elements.js

@@ -33,6 +33,6 @@ export const Moving = styled.div`
     left: 250px;
     transform: inherit;
     box-shadow: none;
-    border-left: 1px solid ${props => props.theme.background4};
+    border-left: 1px solid ${props => props.theme.colors.sideBar.border};
   }
 `;

packages/app/src/embed/components/App/index.js

@@ -16,6 +16,7 @@ import { SubTitle } from 'app/components/SubTitle';
 import Header from '../Header';
 import Content from '../Content';
 import Sidebar from '../Sidebar';
+import EditorLink from '../EditorLink';
 import { Container, Fullscreen, Moving } from './elements';
 
 // Okay, this looks veeeery strange, we need this because Webpack has a bug currently
@@ -403,11 +404,17 @@ export default class App extends React.PureComponent<
     return (
       <Fullscreen sidebarOpen={this.state.sidebarOpen}>
         {sandbox && (
-          <Sidebar
-            setCurrentModule={this.setCurrentModule}
-            currentModule={this.getCurrentModuleFromPath(sandbox).id}
-            sandbox={sandbox}
-          />
+          <>
+            <Sidebar
+              setCurrentModule={this.setCurrentModule}
+              currentModule={this.getCurrentModuleFromPath(sandbox).id}
+              sandbox={sandbox}
+            />
+            <EditorLink
+              sandbox={sandbox}
+              previewVisible={this.state.showPreview}
+            />
+          </>
         )}
         <Moving sidebarOpen={this.state.sidebarOpen}>{this.content()}</Moving>
       </Fullscreen>

packages/app/src/embed/components/Content/elements.ts

@@ -3,15 +3,18 @@ import styled from 'styled-components';
 export const Container = styled.div`
   display: flex;
   position: relative;
-  background-color: ${props => props.theme.background2};
-  height: calc(100% - 2.5rem);
+  background-color: ${props => props.theme['editor.background']};
+  /* compatibility mode for the redesign, the header is smaller now*/
+  height: calc(100% - 32px);
 `;
 
 export const Tabs = styled.div`
   display: flex;
   height: 35px;
   min-height: 35px;
-  background-color: rgba(0, 0, 0, 0.3);
+  background-color: ${props => props.theme['tab.inactiveBackground']};
+  /* shadow instead of border to align with the border of the child tab */
+  box-shadow: inset 0px -1px 0 ${props => props.theme['sideBar.border']};
   overflow-x: auto;
   font-size: 0.875rem;
 
@@ -21,6 +24,13 @@ export const Tabs = styled.div`
   &::-webkit-scrollbar {
     height: 2px; // Safari and Chrome
   }
+
+  /* override children, bad but vscode doesnt support
+     tab.hoverForeground :shrug:
+  */
+  > div:hover > div {
+    color: white !important;
+  }
 `;
 
 export const Split = styled.div<{

packages/app/src/embed/components/EditorLink/elements.js

@@ -1,24 +1,26 @@
-// @flow
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
+import css from '@styled-system/css';
 
-export const Text = styled.span`
-  color: white;
-  ${({ small }) =>
-    small &&
-    css`
-      @media (max-width: 620px) {
-        display: none;
-      }
-    `};
-`;
+export const Button = styled.a(props =>
+  css({
+    position: 'absolute',
+    bottom: props.previewVisible ? 32 + 16 : 16,
+    right: 16,
+    zIndex: 99,
 
-export const EditText = styled.a`
-  text-decoration: none;
-  display: flex;
-  align-items: center;
-  color: white;
+    fontSize: 3,
+    lineHeight: '32px',
+    fontWeight: 'medium',
+    border: '1px solid',
+    borderColor: 'grays.500',
+    color: 'white',
+    backgroundColor: 'grays.700',
+    borderRadius: 4,
+    paddingX: 3,
+    textDecoration: 'none',
 
-  svg {
-    margin-left: 0.5rem;
-  }
-`;
+    ':hover': {
+      backgroundColor: 'grays.500',
+    },
+  })
+);

packages/app/src/embed/components/EditorLink/index.js

@@ -1,25 +1,19 @@
-// @flow
-
 import React from 'react';
-import type { Sandbox } from '@codesandbox/common/lib/types';
-
-import Logo from '@codesandbox/common/lib/components/Logo';
-
 import { sandboxUrl } from '@codesandbox/common/lib/utils/url-generator';
 
-import { Text, EditText } from './elements';
+import { Button } from './elements';
 
-function EditorLink({ sandbox, small }: { sandbox: Sandbox, small?: boolean }) {
+function EditorLink({ sandbox, previewVisible }) {
   return (
-    <EditText
-      small={small}
+    <Button
+      id="openinsandbox"
       target="_blank"
       rel="noopener noreferrer"
       href={`${sandboxUrl(sandbox)}?from-embed`}
+      previewVisible={previewVisible}
     >
-      <Text small={small}>Open In CodeSandbox</Text>
-      <Logo />
-    </EditText>
+      Open Sandbox
+    </Button>
   );
 }
 

packages/app/src/embed/components/Header/elements.js

@@ -1,45 +1,30 @@
-// @flow
-import styled, { css } from 'styled-components';
-import MenuIconSVG from 'react-icons/lib/md/menu';
-import { Button as RealButton } from '@codesandbox/common/lib/components/Button';
+import styled from 'styled-components';
+import css from '@styled-system/css';
+
+import {
+  MenuIconSVG,
+  HeartIconSVG,
+  LinkIconSVG,
+  PreviewViewIconSVG,
+  EditorViewIconSVG,
+  SplitViewIconSVG,
+} from './icons';
 
 import { SIDEBAR_SHOW_SCREEN_SIZE } from '../../util/constants';
 
-export const CodeSandboxButton = styled(RealButton)`
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 147px;
-  padding: 0.4em 0.7em;
-
-  @media (max-width: 510px) {
-    padding: 0.2em;
-    background-color: transparent;
-    border-color: transparent;
-
-    width: auto;
-    font-size: 1.4rem;
-  }
-`;
-
 export const Container = styled.div`
   position: relative;
   display: flex;
   flex-direction: row;
   align-items: center;
-  height: 3rem;
+
   padding: 0 1rem;
   box-sizing: border-box;
-  border-bottom: 1px solid ${props => props.theme.background.darken(0.3)};
-  background-color: ${props => props.theme.background};
-`;
+  background-color: ${props => props.theme['editor.background']};
 
-export const MenuIcon = styled(MenuIconSVG)`
-  font-size: 2rem;
-  color: rgba(255, 255, 255, 0.7);
-  margin-right: 1rem;
-  cursor: pointer;
-  z-index: 10;
+  /* compatibility mode for the redesign */
+  height: calc(32px + 1px);
+  border-bottom: 1px solid ${props => props.theme['sideBar.border']};
 `;
 
 export const LeftAligned = styled.div`
@@ -82,6 +67,13 @@ export const Title = styled.div`
   overflow: hidden;
   flex: 1;
 
+  /* compatibility mode for the redesign */
+  font-size: 13px;
+
+  @media (min-width: ${SIDEBAR_SHOW_SCREEN_SIZE}px) {
+    display: none;
+  }
+
   @media (max-width: 450px) {
     display: none;
   }
@@ -94,51 +86,60 @@ export const OnlyShowWideText = styled.span`
   }
 `;
 
-export const Button = styled.button`
-  display: flex;
-  align-items: center;
-  font-family: Roboto;
-  transition: 0.3s ease all;
-  background-color: transparent;
-  border: transparent;
-  font-size: 0.875rem;
-  font-weight: 500;
-
-  color: ${props => props.color || 'rgb(64, 169, 243)'};
-  border-radius: 4px;
-  margin-right: 0.75rem;
-  padding: 0.4rem 0.4rem;
-  text-decoration: none;
-  cursor: pointer;
-
-  svg {
-    margin-right: 0.1rem;
-  }
-
-  &:hover {
-    background-color: ${props => props.color || 'rgb(64, 169, 243)'};
-    color: ${props =>
-      props.invertedHover ? props.theme.background2 : 'white'};
-  }
-
-  ${props =>
-    props.hideSmall &&
-    css`
-      @media (max-width: ${props.hideSmall}px) {
-        display: none;
-      }
-    `};
-
-  @media (max-width: 486px) {
-    height: 100%;
-    border: 0;
-    margin-right: -1rem;
-    &:last-child {
-      margin-right: -1rem;
-    }
-    padding: 0 1rem;
-    border-radius: 0;
-    font-size: 1.5rem;
-    background-color: transparent;
-  }
-`;
+export const Button = styled.button(
+  css({
+    // reset button properties
+    background: 'transparent',
+    border: 'none',
+
+    color: 'grays.400',
+
+    height: '100%',
+    display: 'flex',
+    alignItems: 'center',
+
+    paddingX: 2,
+    cursor: 'pointer',
+
+    '&:hover': {
+      svg: {
+        color: 'white',
+      },
+    },
+  })
+);
+
+export const MenuIcon = styled(MenuIconSVG)(
+  css({
+    color: 'grays.400',
+    marginRight: 2,
+    cursor: 'pointer',
+    zIndex: 10,
+  })
+);
+
+export const LinkIcon = styled(LinkIconSVG)(css({}));
+
+export const HeartIcon = styled(HeartIconSVG)(props =>
+  css({
+    color: props.liked ? 'reds.300' : 'grays.400',
+  })
+);
+
+const ModeStyleStyles = props =>
+  css({
+    color: props.active ? 'white' : 'grays.400',
+    borderRadius: 2,
+    cursor: 'pointer',
+    marginX: 1,
+    ':hover': {
+      color: 'white',
+    },
+    path: {
+      transition: theme => 'fill ' + theme.speed[2],
+    },
+  });
+
+export const EditorViewIcon = styled(EditorViewIconSVG)(ModeStyleStyles);
+export const SplitViewIcon = styled(SplitViewIconSVG)(ModeStyleStyles);
+export const PreviewViewIcon = styled(PreviewViewIconSVG)(ModeStyleStyles);