aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website/ts
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-12-21 08:03:06 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-12-21 08:03:06 +0800
commita67b34700e48cdf9a54c601af4ec9b9112fe4803 (patch)
treebb418b33a8e94fb0b7af3fddf20046cec4d7d22b /packages/website/ts
parentabdf91c691b924b75d71db49fba296da9c8ddcac (diff)
downloaddexon-sol-tools-a67b34700e48cdf9a54c601af4ec9b9112fe4803.tar
dexon-sol-tools-a67b34700e48cdf9a54c601af4ec9b9112fe4803.tar.gz
dexon-sol-tools-a67b34700e48cdf9a54c601af4ec9b9112fe4803.tar.bz2
dexon-sol-tools-a67b34700e48cdf9a54c601af4ec9b9112fe4803.tar.lz
dexon-sol-tools-a67b34700e48cdf9a54c601af4ec9b9112fe4803.tar.xz
dexon-sol-tools-a67b34700e48cdf9a54c601af4ec9b9112fe4803.tar.zst
dexon-sol-tools-a67b34700e48cdf9a54c601af4ec9b9112fe4803.zip
feat: remove @next directory from all imports
Diffstat (limited to 'packages/website/ts')
-rw-r--r--packages/website/ts/components/aboutPageLayout.tsx12
-rw-r--r--packages/website/ts/components/banner.tsx10
-rw-r--r--packages/website/ts/components/blockIconLink.tsx4
-rw-r--r--packages/website/ts/components/button.tsx2
-rw-r--r--packages/website/ts/components/definition.tsx6
-rw-r--r--packages/website/ts/components/dropdowns/dropdown_developers.tsx8
-rw-r--r--packages/website/ts/components/dropdowns/dropdown_products.tsx2
-rw-r--r--packages/website/ts/components/footer.tsx6
-rw-r--r--packages/website/ts/components/header.tsx16
-rw-r--r--packages/website/ts/components/hero.tsx2
-rw-r--r--packages/website/ts/components/icon.tsx6
-rw-r--r--packages/website/ts/components/logo.tsx4
-rw-r--r--packages/website/ts/components/mobileNav.tsx2
-rw-r--r--packages/website/ts/components/modals/modal_contact.tsx10
-rw-r--r--packages/website/ts/components/newsletter_form.tsx2
-rw-r--r--packages/website/ts/components/sections/landing/about.tsx8
-rw-r--r--packages/website/ts/components/sections/landing/clients.tsx28
-rw-r--r--packages/website/ts/components/sections/landing/cta.tsx8
-rw-r--r--packages/website/ts/components/sections/landing/hero.tsx8
-rw-r--r--packages/website/ts/components/siteWrap.tsx6
-rw-r--r--packages/website/ts/components/slider/slider.tsx4
-rw-r--r--packages/website/ts/components/text.tsx2
-rw-r--r--packages/website/ts/constants/globalStyle.tsx2
-rw-r--r--packages/website/ts/index.tsx18
-rw-r--r--packages/website/ts/pages/about/jobs.tsx8
-rw-r--r--packages/website/ts/pages/about/mission.tsx12
-rw-r--r--packages/website/ts/pages/about/press.tsx16
-rw-r--r--packages/website/ts/pages/about/team.tsx68
-rw-r--r--packages/website/ts/pages/community.tsx20
-rw-r--r--packages/website/ts/pages/ecosystem.tsx10
-rw-r--r--packages/website/ts/pages/instant.tsx18
-rw-r--r--packages/website/ts/pages/instant/code_demo.tsx2
-rw-r--r--packages/website/ts/pages/instant/config_generator.tsx8
-rw-r--r--packages/website/ts/pages/instant/config_generator_address_input.tsx2
-rw-r--r--packages/website/ts/pages/instant/configurator.tsx10
-rw-r--r--packages/website/ts/pages/instant/fee_percentage_slider.tsx2
-rw-r--r--packages/website/ts/pages/landing.tsx12
-rw-r--r--packages/website/ts/pages/launch_kit.tsx14
-rw-r--r--packages/website/ts/pages/market_maker.tsx14
-rw-r--r--packages/website/ts/pages/why.tsx16
40 files changed, 204 insertions, 204 deletions
diff --git a/packages/website/ts/components/aboutPageLayout.tsx b/packages/website/ts/components/aboutPageLayout.tsx
index 86a94ae2b..a2fd9dd72 100644
--- a/packages/website/ts/components/aboutPageLayout.tsx
+++ b/packages/website/ts/components/aboutPageLayout.tsx
@@ -2,13 +2,13 @@ import * as _ from 'lodash';
import * as React from 'react';
import styled from 'styled-components';
-import { Button } from 'ts/@next/components/button';
-import { ChapterLink } from 'ts/@next/components/chapter_link';
-import { Column, Section } from 'ts/@next/components/newLayout';
-import { SiteWrap } from 'ts/@next/components/siteWrap';
-import { Heading, Paragraph } from 'ts/@next/components/text';
+import { Button } from 'ts/components/button';
+import { ChapterLink } from 'ts/components/chapter_link';
+import { Column, Section } from 'ts/components/newLayout';
+import { SiteWrap } from 'ts/components/siteWrap';
+import { Heading, Paragraph } from 'ts/components/text';
-import { addFadeInAnimation } from 'ts/@next/constants/animations';
+import { addFadeInAnimation } from 'ts/constants/animations';
import { WebsitePaths } from 'ts/types';
interface Props {
diff --git a/packages/website/ts/components/banner.tsx b/packages/website/ts/components/banner.tsx
index 6c4d94dc5..76fc1d09e 100644
--- a/packages/website/ts/components/banner.tsx
+++ b/packages/website/ts/components/banner.tsx
@@ -3,11 +3,11 @@ import styled from 'styled-components';
import { colors } from 'ts/style/colors';
-import { Button } from 'ts/@next/components/button';
-import { ThemeInterface } from 'ts/@next/components/siteWrap';
-import { Paragraph } from 'ts/@next/components/text';
+import { Button } from 'ts/components/button';
+import { ThemeInterface } from 'ts/components/siteWrap';
+import { Paragraph } from 'ts/components/text';
-import { Column, Section } from 'ts/@next/components/newLayout';
+import { Column, Section } from 'ts/components/newLayout';
interface Props {
heading?: string;
@@ -129,7 +129,7 @@ const Border =
`
position: absolute;
background-image: ${props =>
- props.isBottom ? 'url(/images/@next/banner/bottomofcta.png);' : 'url(/images/@next/banner/topofcta.png);'};
+ props.isBottom ? 'url(/images/banner/bottomofcta.png);' : 'url(/images/banner/topofcta.png);'};
background-position: ${props => (props.isBottom ? 'left top' : 'left bottom')};
left: 0;
width: calc(100% + 214px);
diff --git a/packages/website/ts/components/blockIconLink.tsx b/packages/website/ts/components/blockIconLink.tsx
index 8d66a4afa..ff7712595 100644
--- a/packages/website/ts/components/blockIconLink.tsx
+++ b/packages/website/ts/components/blockIconLink.tsx
@@ -3,8 +3,8 @@ import * as React from 'react';
import { match, withRouter } from 'react-router-dom';
import styled from 'styled-components';
-import { Button } from 'ts/@next/components/button';
-import { Icon } from 'ts/@next/components/icon';
+import { Button } from 'ts/components/button';
+import { Icon } from 'ts/components/icon';
interface BaseComponentProps {
icon?: string;
diff --git a/packages/website/ts/components/button.tsx b/packages/website/ts/components/button.tsx
index 348f1b7b4..c9785e48c 100644
--- a/packages/website/ts/components/button.tsx
+++ b/packages/website/ts/components/button.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import { Link as ReactRouterLink } from 'react-router-dom';
import styled from 'styled-components';
-import { ThemeInterface } from 'ts/@next/components/siteWrap';
+import { ThemeInterface } from 'ts/components/siteWrap';
import { colors } from 'ts/style/colors';
diff --git a/packages/website/ts/components/definition.tsx b/packages/website/ts/components/definition.tsx
index 8adef8d54..c7fac5177 100644
--- a/packages/website/ts/components/definition.tsx
+++ b/packages/website/ts/components/definition.tsx
@@ -1,9 +1,9 @@
import * as React from 'react';
import styled from 'styled-components';
-import { Button } from 'ts/@next/components/button';
-import { Icon } from 'ts/@next/components/icon';
-import { Heading, Paragraph } from 'ts/@next/components/text';
+import { Button } from 'ts/components/button';
+import { Icon } from 'ts/components/icon';
+import { Heading, Paragraph } from 'ts/components/text';
interface Action {
label: string;
diff --git a/packages/website/ts/components/dropdowns/dropdown_developers.tsx b/packages/website/ts/components/dropdowns/dropdown_developers.tsx
index 96d88846b..dc6b70d21 100644
--- a/packages/website/ts/components/dropdowns/dropdown_developers.tsx
+++ b/packages/website/ts/components/dropdowns/dropdown_developers.tsx
@@ -3,10 +3,10 @@ import * as _ from 'lodash';
import * as React from 'react';
import styled, { withTheme } from 'styled-components';
-import { Button } from 'ts/@next/components/button';
-import { Column, FlexWrap, WrapGrid } from 'ts/@next/components/newLayout';
-import { ThemeValuesInterface } from 'ts/@next/components/siteWrap';
-import { Heading } from 'ts/@next/components/text';
+import { Button } from 'ts/components/button';
+import { Column, FlexWrap, WrapGrid } from 'ts/components/newLayout';
+import { ThemeValuesInterface } from 'ts/components/siteWrap';
+import { Heading } from 'ts/components/text';
import { WebsitePaths } from 'ts/types';
import { constants } from 'ts/utils/constants';
diff --git a/packages/website/ts/components/dropdowns/dropdown_products.tsx b/packages/website/ts/components/dropdowns/dropdown_products.tsx
index 886cee44a..93fd1a4fe 100644
--- a/packages/website/ts/components/dropdowns/dropdown_products.tsx
+++ b/packages/website/ts/components/dropdowns/dropdown_products.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
import { Link } from 'react-router-dom';
import styled from 'styled-components';
-import { Heading, Paragraph } from 'ts/@next/components/text';
+import { Heading, Paragraph } from 'ts/components/text';
import { WebsitePaths } from 'ts/types';
const navData = [
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx
index b30a0cc5e..3765a32ca 100644
--- a/packages/website/ts/components/footer.tsx
+++ b/packages/website/ts/components/footer.tsx
@@ -4,9 +4,9 @@ import * as React from 'react';
import MediaQuery from 'react-responsive';
import styled from 'styled-components';
-import { Logo } from 'ts/@next/components/logo';
-import { Column, FlexWrap, WrapGrid } from 'ts/@next/components/newLayout';
-import { NewsletterForm } from 'ts/@next/components/newsletter_form';
+import { Logo } from 'ts/components/logo';
+import { Column, FlexWrap, WrapGrid } from 'ts/components/newLayout';
+import { NewsletterForm } from 'ts/components/newsletter_form';
import { WebsitePaths } from 'ts/types';
import { constants } from 'ts/utils/constants';
diff --git a/packages/website/ts/components/header.tsx b/packages/website/ts/components/header.tsx
index e886923df..90e097070 100644
--- a/packages/website/ts/components/header.tsx
+++ b/packages/website/ts/components/header.tsx
@@ -6,14 +6,14 @@ import styled, { css, withTheme } from 'styled-components';
import Headroom from 'react-headroom';
-import { Button } from 'ts/@next/components/button';
-import { DropdownDevelopers } from 'ts/@next/components/dropdowns/dropdown_developers';
-import { DropdownProducts } from 'ts/@next/components/dropdowns/dropdown_products';
-import { Hamburger } from 'ts/@next/components/hamburger';
-import { Logo } from 'ts/@next/components/logo';
-import { MobileNav } from 'ts/@next/components/mobileNav';
-import { FlexWrap } from 'ts/@next/components/newLayout';
-import { ThemeValuesInterface } from 'ts/@next/components/siteWrap';
+import { Button } from 'ts/components/button';
+import { DropdownDevelopers } from 'ts/components/dropdowns/dropdown_developers';
+import { DropdownProducts } from 'ts/components/dropdowns/dropdown_products';
+import { Hamburger } from 'ts/components/hamburger';
+import { Logo } from 'ts/components/logo';
+import { MobileNav } from 'ts/components/mobileNav';
+import { FlexWrap } from 'ts/components/newLayout';
+import { ThemeValuesInterface } from 'ts/components/siteWrap';
import { WebsitePaths } from 'ts/types';
import { constants } from 'ts/utils/constants';
diff --git a/packages/website/ts/components/hero.tsx b/packages/website/ts/components/hero.tsx
index 4c8874d3e..a662ee3a5 100644
--- a/packages/website/ts/components/hero.tsx
+++ b/packages/website/ts/components/hero.tsx
@@ -1,7 +1,7 @@
import * as React from 'react';
import styled from 'styled-components';
-import { addFadeInAnimation } from 'ts/@next/constants/animations';
+import { addFadeInAnimation } from 'ts/constants/animations';
interface Props {
title: string;
diff --git a/packages/website/ts/components/icon.tsx b/packages/website/ts/components/icon.tsx
index fc9d488f9..165e999b9 100644
--- a/packages/website/ts/components/icon.tsx
+++ b/packages/website/ts/components/icon.tsx
@@ -2,8 +2,8 @@ import * as React from 'react';
import Loadable from 'react-loadable';
import styled from 'styled-components';
-import { Paragraph } from 'ts/@next/components/text';
-import { getCSSPadding, PaddingInterface } from 'ts/@next/constants/utilities';
+import { Paragraph } from 'ts/components/text';
+import { getCSSPadding, PaddingInterface } from 'ts/constants/utilities';
interface IconProps extends PaddingInterface {
name?: string;
@@ -14,7 +14,7 @@ interface IconProps extends PaddingInterface {
export const Icon: React.FunctionComponent<IconProps> = (props: IconProps) => {
if (props.name && !props.component) {
const IconSVG = Loadable({
- loader: async () => import(/* webpackChunkName: "icon" */ `ts/@next/icons/illustrations/${props.name}.svg`),
+ loader: async () => import(/* webpackChunkName: "icon" */ `ts/icons/illustrations/${props.name}.svg`),
loading: () => <Paragraph>Loading</Paragraph>,
});
diff --git a/packages/website/ts/components/logo.tsx b/packages/website/ts/components/logo.tsx
index 227d48ee0..19aeb901e 100644
--- a/packages/website/ts/components/logo.tsx
+++ b/packages/website/ts/components/logo.tsx
@@ -1,8 +1,8 @@
import * as React from 'react';
import styled from 'styled-components';
-import { ThemeInterface } from 'ts/@next/components/siteWrap';
-import LogoIcon from 'ts/@next/icons/logo-with-type.svg';
+import { ThemeInterface } from 'ts/components/siteWrap';
+import LogoIcon from 'ts/icons/logo-with-type.svg';
interface LogoInterface {
theme?: ThemeInterface;
diff --git a/packages/website/ts/components/mobileNav.tsx b/packages/website/ts/components/mobileNav.tsx
index 13cf46fca..573d21596 100644
--- a/packages/website/ts/components/mobileNav.tsx
+++ b/packages/website/ts/components/mobileNav.tsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
import { Link } from 'react-router-dom';
-import { WrapGrid, WrapProps } from 'ts/@next/components/newLayout';
+import { WrapGrid, WrapProps } from 'ts/components/newLayout';
import { WebsitePaths } from 'ts/types';
interface Props {
diff --git a/packages/website/ts/components/modals/modal_contact.tsx b/packages/website/ts/components/modals/modal_contact.tsx
index b97baf5e7..d9c276584 100644
--- a/packages/website/ts/components/modals/modal_contact.tsx
+++ b/packages/website/ts/components/modals/modal_contact.tsx
@@ -7,11 +7,11 @@ import { colors } from 'ts/style/colors';
import { DialogContent, DialogOverlay } from '@reach/dialog';
import '@reach/dialog/styles.css';
-import { Button } from 'ts/@next/components/button';
-import { Icon } from 'ts/@next/components/icon';
-import { Input, InputWidth } from 'ts/@next/components/modals/input';
-import { Heading, Paragraph } from 'ts/@next/components/text';
-import { GlobalStyle } from 'ts/@next/constants/globalStyle';
+import { Button } from 'ts/components/button';
+import { Icon } from 'ts/components/icon';
+import { Input, InputWidth } from 'ts/components/modals/input';
+import { Heading, Paragraph } from 'ts/components/text';
+import { GlobalStyle } from 'ts/constants/globalStyle';
interface Props {
theme?: GlobalStyle;
diff --git a/packages/website/ts/components/newsletter_form.tsx b/packages/website/ts/components/newsletter_form.tsx
index 8572ccc5f..4a7abb7ec 100644
--- a/packages/website/ts/components/newsletter_form.tsx
+++ b/packages/website/ts/components/newsletter_form.tsx
@@ -1,7 +1,7 @@
import * as React from 'react';
import styled, { withTheme } from 'styled-components';
-import { ThemeValuesInterface } from 'ts/@next/components/siteWrap';
+import { ThemeValuesInterface } from 'ts/components/siteWrap';
import { colors } from 'ts/style/colors';
import { errorReporter } from 'ts/utils/error_reporter';
diff --git a/packages/website/ts/components/sections/landing/about.tsx b/packages/website/ts/components/sections/landing/about.tsx
index 7b51b0d13..9c369d83a 100644
--- a/packages/website/ts/components/sections/landing/about.tsx
+++ b/packages/website/ts/components/sections/landing/about.tsx
@@ -1,10 +1,10 @@
import * as React from 'react';
import styled from 'styled-components';
-import { Button } from 'ts/@next/components/button';
-import { Icon, InlineIconWrap } from 'ts/@next/components/icon';
-import { Column, FlexWrap, Section } from 'ts/@next/components/newLayout';
-import { Paragraph } from 'ts/@next/components/text';
+import { Button } from 'ts/components/button';
+import { Icon, InlineIconWrap } from 'ts/components/icon';
+import { Column, FlexWrap, Section } from 'ts/components/newLayout';
+import { Paragraph } from 'ts/components/text';
import { WebsitePaths } from 'ts/types';
interface FigureProps {
diff --git a/packages/website/ts/components/sections/landing/clients.tsx b/packages/website/ts/components/sections/landing/clients.tsx
index 4170fde46..9a68fbf4c 100644
--- a/packages/website/ts/components/sections/landing/clients.tsx
+++ b/packages/website/ts/components/sections/landing/clients.tsx
@@ -1,9 +1,9 @@
import * as _ from 'lodash';
import * as React from 'react';
import styled from 'styled-components';
-import { Heading } from 'ts/@next/components/text';
+import { Heading } from 'ts/components/text';
-import { Section, WrapGrid } from 'ts/@next/components/newLayout';
+import { Section, WrapGrid } from 'ts/components/newLayout';
interface ProjectLogo {
name: string;
@@ -18,57 +18,57 @@ interface StyledProjectInterface {
const projects: ProjectLogo[] = [
{
name: 'Radar Relay',
- imageUrl: 'images/@next/clients/radar-relay.svg',
+ imageUrl: 'images/clients/radar-relay.svg',
persistOnMobile: true,
},
{
name: 'Paradex',
- imageUrl: 'images/@next/clients/paradex.svg',
+ imageUrl: 'images/clients/paradex.svg',
persistOnMobile: true,
},
{
name: 'Star Bit Ex',
- imageUrl: 'images/@next/clients/starbitex.svg',
+ imageUrl: 'images/clients/starbitex.svg',
},
{
name: 'LedgerDex',
- imageUrl: 'images/@next/clients/ledgerdex.svg',
+ imageUrl: 'images/clients/ledgerdex.svg',
},
{
name: 'OpenRelay',
- imageUrl: 'images/@next/clients/openrelay.svg',
+ imageUrl: 'images/clients/openrelay.svg',
persistOnMobile: true,
},
{
name: 'Bamboo Relay',
- imageUrl: 'images/@next/clients/bamboo.svg',
+ imageUrl: 'images/clients/bamboo.svg',
persistOnMobile: true,
},
{
name: 'dEX',
- imageUrl: 'images/@next/clients/ercdex.svg',
+ imageUrl: 'images/clients/ercdex.svg',
persistOnMobile: true,
},
{
name: 'emoon',
- imageUrl: 'images/@next/clients/emoon.svg',
+ imageUrl: 'images/clients/emoon.svg',
persistOnMobile: true,
},
{
name: 'Gods Unchained',
- imageUrl: 'images/@next/clients/godsUnchained.svg',
+ imageUrl: 'images/clients/godsUnchained.svg',
},
{
name: 'Instex',
- imageUrl: 'images/@next/clients/instex.svg',
+ imageUrl: 'images/clients/instex.svg',
},
{
name: 'Lake Trade',
- imageUrl: 'images/@next/clients/laketrade.svg',
+ imageUrl: 'images/clients/laketrade.svg',
},
{
name: 'Veil',
- imageUrl: 'images/@next/clients/veil.svg',
+ imageUrl: 'images/clients/veil.svg',
},
];
diff --git a/packages/website/ts/components/sections/landing/cta.tsx b/packages/website/ts/components/sections/landing/cta.tsx
index ec7f5d961..ec5a58a58 100644
--- a/packages/website/ts/components/sections/landing/cta.tsx
+++ b/packages/website/ts/components/sections/landing/cta.tsx
@@ -1,10 +1,10 @@
import * as React from 'react';
-import { BlockIconLink } from 'ts/@next/components/blockIconLink';
-import { Section } from 'ts/@next/components/newLayout';
+import { BlockIconLink } from 'ts/components/blockIconLink';
+import { Section } from 'ts/components/newLayout';
-import { AnimatedChatIcon } from 'ts/@next/components/animatedChatIcon';
-import { AnimatedCompassIcon } from 'ts/@next/components/animatedCompassIcon';
+import { AnimatedChatIcon } from 'ts/components/animatedChatIcon';
+import { AnimatedCompassIcon } from 'ts/components/animatedCompassIcon';
import { WebsitePaths } from 'ts/types';
interface Props {
diff --git a/packages/website/ts/components/sections/landing/hero.tsx b/packages/website/ts/components/sections/landing/hero.tsx
index cf67ad66d..489757286 100644
--- a/packages/website/ts/components/sections/landing/hero.tsx
+++ b/packages/website/ts/components/sections/landing/hero.tsx
@@ -1,10 +1,10 @@
import * as React from 'react';
-import { Button } from 'ts/@next/components/button';
-import { Hero } from 'ts/@next/components/hero';
-import { LandingAnimation } from 'ts/@next/components/heroImage';
+import { Button } from 'ts/components/button';
+import { Hero } from 'ts/components/hero';
+import { LandingAnimation } from 'ts/components/heroImage';
-import { HeroAnimation } from 'ts/@next/components/heroAnimation';
+import { HeroAnimation } from 'ts/components/heroAnimation';
import { WebsitePaths } from 'ts/types';
export const SectionLandingHero = () => (
diff --git a/packages/website/ts/components/siteWrap.tsx b/packages/website/ts/components/siteWrap.tsx
index 75cb9a268..316896dbb 100644
--- a/packages/website/ts/components/siteWrap.tsx
+++ b/packages/website/ts/components/siteWrap.tsx
@@ -3,9 +3,9 @@ import styled, { ThemeProvider } from 'styled-components';
import { colors } from 'ts/style/colors';
-import { Footer } from 'ts/@next/components/footer';
-import { Header } from 'ts/@next/components/header';
-import { GlobalStyles } from 'ts/@next/constants/globalStyle';
+import { Footer } from 'ts/components/footer';
+import { Header } from 'ts/components/header';
+import { GlobalStyles } from 'ts/constants/globalStyle';
interface Props {
theme?: 'dark' | 'light' | 'gray';
diff --git a/packages/website/ts/components/slider/slider.tsx b/packages/website/ts/components/slider/slider.tsx
index 33a352b9f..f0a29f894 100644
--- a/packages/website/ts/components/slider/slider.tsx
+++ b/packages/website/ts/components/slider/slider.tsx
@@ -4,8 +4,8 @@ import styled from 'styled-components';
import { colors } from 'ts/style/colors';
-import { Icon } from 'ts/@next/components/icon';
-import { Heading, Paragraph } from 'ts/@next/components/text';
+import { Icon } from 'ts/components/icon';
+import { Heading, Paragraph } from 'ts/components/text';
interface SliderProps {}
diff --git a/packages/website/ts/components/text.tsx b/packages/website/ts/components/text.tsx
index 9f6ed9e7a..10f272e73 100644
--- a/packages/website/ts/components/text.tsx
+++ b/packages/website/ts/components/text.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
import styled from 'styled-components';
-import { getCSSPadding, PaddingInterface } from 'ts/@next/constants/utilities';
+import { getCSSPadding, PaddingInterface } from 'ts/constants/utilities';
interface BaseTextInterface extends PaddingInterface {
size?: 'default' | 'medium' | 'large' | 'small' | number;
diff --git a/packages/website/ts/constants/globalStyle.tsx b/packages/website/ts/constants/globalStyle.tsx
index b095fafb5..5abb758c5 100644
--- a/packages/website/ts/constants/globalStyle.tsx
+++ b/packages/website/ts/constants/globalStyle.tsx
@@ -1,5 +1,5 @@
import { createGlobalStyle, withTheme } from 'styled-components';
-import { cssReset } from 'ts/@next/constants/cssReset';
+import { cssReset } from 'ts/constants/cssReset';
export interface GlobalStyle {
theme: {
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 3f0c1c28c..df77e4b76 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -16,15 +16,15 @@ import { WebsiteLegacyPaths, WebsitePaths } from 'ts/types';
import { muiTheme } from 'ts/utils/mui_theme';
// Next (new website) routes. We should rename them later
-import { NextAboutJobs } from 'ts/@next/pages/about/jobs';
-import { NextAboutMission } from 'ts/@next/pages/about/mission';
-import { NextAboutPress } from 'ts/@next/pages/about/press';
-import { NextAboutTeam } from 'ts/@next/pages/about/team';
-import { NextEcosystem } from 'ts/@next/pages/ecosystem';
-import { Next0xInstant } from 'ts/@next/pages/instant';
-import { NextLanding } from 'ts/@next/pages/landing';
-import { NextLaunchKit } from 'ts/@next/pages/launch_kit';
-import { NextWhy } from 'ts/@next/pages/why';
+import { NextAboutJobs } from 'ts/pages/about/jobs';
+import { NextAboutMission } from 'ts/pages/about/mission';
+import { NextAboutPress } from 'ts/pages/about/press';
+import { NextAboutTeam } from 'ts/pages/about/team';
+import { NextEcosystem } from 'ts/pages/ecosystem';
+import { Next0xInstant } from 'ts/pages/instant';
+import { NextLanding } from 'ts/pages/landing';
+import { NextLaunchKit } from 'ts/pages/launch_kit';
+import { NextWhy } from 'ts/pages/why';
// Check if we've introduced an update that requires us to clear the tradeHistory local storage entries
tradeHistoryStorage.clearIfRequired();
diff --git a/packages/website/ts/pages/about/jobs.tsx b/packages/website/ts/pages/about/jobs.tsx
index 2fd2c7619..648190380 100644
--- a/packages/website/ts/pages/about/jobs.tsx
+++ b/packages/website/ts/pages/about/jobs.tsx
@@ -3,9 +3,9 @@ import * as React from 'react';
import DocumentTitle from 'react-document-title';
import styled from 'styled-components';
-import { AboutPageLayout } from 'ts/@next/components/aboutPageLayout';
-import { Column, FlexWrap, Section } from 'ts/@next/components/newLayout';
-import { Heading, Paragraph } from 'ts/@next/components/text';
+import { AboutPageLayout } from 'ts/components/aboutPageLayout';
+import { Column, FlexWrap, Section } from 'ts/components/newLayout';
+import { Heading, Paragraph } from 'ts/components/text';
import { WebsiteBackendJobInfo } from 'ts/types';
import { backendClient } from 'ts/utils/backend_client';
import { constants } from 'ts/utils/constants';
@@ -117,7 +117,7 @@ export class NextAboutJobs extends React.Component<NextAboutJobsProps, NextAbout
<Column maxWidth="600px">
<ImageWrap>
- <img src="/images/@next/jobs/map@2x.png" height="365" alt="Map of community" />
+ <img src="/images/jobs/map@2x.png" height="365" alt="Map of community" />
</ImageWrap>
</Column>
</Section>
diff --git a/packages/website/ts/pages/about/mission.tsx b/packages/website/ts/pages/about/mission.tsx
index 2e6530edd..ab8949fae 100644
--- a/packages/website/ts/pages/about/mission.tsx
+++ b/packages/website/ts/pages/about/mission.tsx
@@ -3,11 +3,11 @@ import * as React from 'react';
import DocumentTitle from 'react-document-title';
import styled from 'styled-components';
-import { AboutPageLayout } from 'ts/@next/components/aboutPageLayout';
-import { Definition } from 'ts/@next/components/definition';
-import { Image } from 'ts/@next/components/image';
-import { Column, Section } from 'ts/@next/components/newLayout';
-import { Heading } from 'ts/@next/components/text';
+import { AboutPageLayout } from 'ts/components/aboutPageLayout';
+import { Definition } from 'ts/components/definition';
+import { Image } from 'ts/components/image';
+import { Column, Section } from 'ts/components/newLayout';
+import { Heading } from 'ts/components/text';
import { constants } from 'ts/utils/constants';
const values = [
@@ -41,7 +41,7 @@ export const NextAboutMission = () => (
<DocumentTitle title="Our Mission - 0x" />
<Section isFullWidth={true} isPadded={false}>
<FullWidthImage>
- <Image src="/images/@next/about/about-office.png" alt="0x Offices" isCentered={true} />
+ <Image src="/images/about/about-office.png" alt="0x Offices" isCentered={true} />
</FullWidthImage>
</Section>
diff --git a/packages/website/ts/pages/about/press.tsx b/packages/website/ts/pages/about/press.tsx
index 030ee4c14..03003d656 100644
--- a/packages/website/ts/pages/about/press.tsx
+++ b/packages/website/ts/pages/about/press.tsx
@@ -3,10 +3,10 @@ import * as React from 'react';
import DocumentTitle from 'react-document-title';
import styled from 'styled-components';
-import { AboutPageLayout } from 'ts/@next/components/aboutPageLayout';
-import { Button } from 'ts/@next/components/button';
-import { Column, FlexWrap } from 'ts/@next/components/newLayout';
-import { Paragraph } from 'ts/@next/components/text';
+import { AboutPageLayout } from 'ts/components/aboutPageLayout';
+import { Button } from 'ts/components/button';
+import { Column, FlexWrap } from 'ts/components/newLayout';
+import { Paragraph } from 'ts/components/text';
interface HighlightProps {
logo: string;
@@ -21,7 +21,7 @@ interface HighlightItemProps {
const highlights: HighlightProps[] = [
{
- logo: '/images/@next/press/logo-forbes.png',
+ logo: '/images/press/logo-forbes.png',
title: 'Forbes',
text:
'0x Instant is aiming to aid businesses and developers such as news sites, crypto wallets, dApps or price trackers to monetize or add a new revenue stream to their existing pipeline.',
@@ -29,21 +29,21 @@ const highlights: HighlightProps[] = [
'https://www.forbes.com/sites/rebeccacampbell1/2018/12/06/0x-launches-instant-delivers-an-easy-and-flexible-way-to-buy-crypto-tokens/#bfb73a843561',
},
{
- logo: '/images/@next/press/logo-venturebeat.png',
+ logo: '/images/press/logo-venturebeat.png',
title: 'VentureBeat',
text: '0x leads the way for ‘tokenization’ of the world, and collectible game items are next',
href:
'https://venturebeat.com/2018/09/24/0x-leads-the-way-for-tokenization-of-the-world-and-collectible-game-items-are-next/',
},
{
- logo: '/images/@next/press/logo-fortune.png',
+ logo: '/images/press/logo-fortune.png',
title: 'Fortune',
text:
'In the future, many traditional investments like real estate and corporate shares will come in the form of digital tokens that are bought and transferred on a blockchain.',
href: 'http://fortune.com/2018/09/06/0x-harbor-blockchain/',
},
{
- logo: '/images/@next/press/logo-techcrunch.png',
+ logo: '/images/press/logo-techcrunch.png',
title: 'TechCrunch',
text:
'0x allows any developer to quickly build their own decentralized cryptocurrency exchange and decide their own fees.',
diff --git a/packages/website/ts/pages/about/team.tsx b/packages/website/ts/pages/about/team.tsx
index 7177964be..41d6c2cf8 100644
--- a/packages/website/ts/pages/about/team.tsx
+++ b/packages/website/ts/pages/about/team.tsx
@@ -5,9 +5,9 @@ import styled from 'styled-components';
import { colors } from 'ts/style/colors';
-import { AboutPageLayout } from 'ts/@next/components/aboutPageLayout';
-import { Column, Section } from 'ts/@next/components/newLayout';
-import { Heading, Paragraph } from 'ts/@next/components/text';
+import { AboutPageLayout } from 'ts/components/aboutPageLayout';
+import { Column, Section } from 'ts/components/newLayout';
+import { Heading, Paragraph } from 'ts/components/text';
import { WebsitePaths } from 'ts/types';
interface TeamMember {
@@ -18,132 +18,132 @@ interface TeamMember {
const team: TeamMember[] = [
{
- imageUrl: '/images/@next/team/willw.jpg',
+ imageUrl: '/images/team/willw.jpg',
name: 'Will Warren',
title: 'co-founder & CEO',
},
{
- imageUrl: '/images/@next/team/amirb.jpg',
+ imageUrl: '/images/team/amirb.jpg',
name: 'Amir Bandeali',
title: 'Co-founder & CTO',
},
{
- imageUrl: '/images/@next/team/fabiob.jpg',
+ imageUrl: '/images/team/fabiob.jpg',
name: 'Fabio Berger',
title: 'senior engineer',
},
{
- imageUrl: '/images/@next/team/alexv.jpg',
+ imageUrl: '/images/team/alexv.jpg',
name: 'Alex Xu',
title: 'Director of operations',
},
{
- imageUrl: '/images/@next/team/leonidL.jpg',
+ imageUrl: '/images/team/leonidL.jpg',
name: 'Leonid Logvinov',
title: 'engineer',
},
{
- imageUrl: '/images/@next/team/benb.jpg',
+ imageUrl: '/images/team/benb.jpg',
name: 'Ben Burns',
title: 'designer',
},
{
- imageUrl: '/images/@next/team/brandonm.jpg',
+ imageUrl: '/images/team/brandonm.jpg',
name: 'Brandon Millman',
title: 'senior engineer',
},
{
- imageUrl: '/images/@next/team/toms.jpg',
+ imageUrl: '/images/team/toms.jpg',
name: 'Tom Schmidt',
title: 'product manager',
},
{
- imageUrl: '/images/@next/team/jacobe.jpg',
+ imageUrl: '/images/team/jacobe.jpg',
name: 'Jacob Evans',
title: 'ecosystem engineer',
},
{
- imageUrl: '/images/@next/team/blake.jpg',
+ imageUrl: '/images/team/blake.jpg',
name: 'Blake Henderson',
title: 'ecosystem programs lead',
},
{
- imageUrl: '/images/@next/team/zack.jpg',
+ imageUrl: '/images/team/zack.jpg',
name: 'Zack Skelly',
title: 'lead recruiter',
},
{
- imageUrl: '/images/@next/team/greg.jpg',
+ imageUrl: '/images/team/greg.jpg',
name: 'Greg Hysen',
title: 'blockchain engineer',
},
{
- imageUrl: '/images/@next/team/remcoB.jpg',
+ imageUrl: '/images/team/remcoB.jpg',
name: 'Remco Bloemen',
title: 'technical fellow',
},
{
- imageUrl: '/images/@next/team/francesco.jpg',
+ imageUrl: '/images/team/francesco.jpg',
name: 'Francesco Agosti',
title: 'engineer',
},
{
- imageUrl: '/images/@next/team/melo.jpg',
+ imageUrl: '/images/team/melo.jpg',
name: 'Mel Oberto',
title: 'people operations associate',
},
{
- imageUrl: '/images/@next/team/alexb.jpg',
+ imageUrl: '/images/team/alexb.jpg',
name: 'Alex Browne',
title: 'engineer in residence',
},
{
- imageUrl: '/images/@next/team/peterz.jpg',
+ imageUrl: '/images/team/peterz.jpg',
name: 'Peter Zeitz',
title: 'research fellow',
},
{
- imageUrl: '/images/@next/team/chrisk.jpg',
+ imageUrl: '/images/team/chrisk.jpg',
name: 'Chris Kalani',
title: 'director of design',
},
{
- imageUrl: '/images/@next/team/clayr.jpg',
+ imageUrl: '/images/team/clayr.jpg',
name: 'Clay Robbins',
title: 'ecosystem development lead',
},
{
- imageUrl: '/images/@next/team/mattt.jpg',
+ imageUrl: '/images/team/mattt.jpg',
name: 'Matt Taylor',
title: 'marketing lead',
},
{
- imageUrl: '/images/@next/team/eugenea.jpg',
+ imageUrl: '/images/team/eugenea.jpg',
name: 'Eugene Aumson',
title: 'engineer',
},
{
- imageUrl: '/images/@next/team/weijew.jpg',
+ imageUrl: '/images/team/weijew.jpg',
name: 'Weijie Wu',
title: 'research fellow',
},
{
- imageUrl: '/images/@next/team/rahuls.jpg',
+ imageUrl: '/images/team/rahuls.jpg',
name: 'Rahul Singireddy',
title: 'relayer success manager',
},
{
- imageUrl: '/images/@next/team/jasons.jpg',
+ imageUrl: '/images/team/jasons.jpg',
name: 'Jason Somensatto',
title: 'strategic legal counsel',
},
{
- imageUrl: '/images/@next/team/steveK.jpg',
+ imageUrl: '/images/team/steveK.jpg',
name: 'Steve Klebanoff',
title: 'senior engineer',
},
{
- imageUrl: '/images/@next/team/xianny.jpg',
+ imageUrl: '/images/team/xianny.jpg',
name: 'Xianny Ng',
title: 'engineer',
},
@@ -151,27 +151,27 @@ const team: TeamMember[] = [
const advisors: TeamMember[] = [
{
- imageUrl: '/images/@next/team/advisors/frede.jpg',
+ imageUrl: '/images/team/advisors/frede.jpg',
name: 'Fred Ehrsam',
title: 'Advisor',
},
{
- imageUrl: '/images/@next/team/advisors/olafc.jpg',
+ imageUrl: '/images/team/advisors/olafc.jpg',
name: 'Olaf Carlson-Wee',
title: 'Advisor',
},
{
- imageUrl: '/images/@next/team/advisors/joeyk.jpg',
+ imageUrl: '/images/team/advisors/joeyk.jpg',
name: 'Joey Krug',
title: 'Advisor',
},
{
- imageUrl: '/images/@next/team/advisors/lindax.jpg',
+ imageUrl: '/images/team/advisors/lindax.jpg',
name: 'Linda Xie',
title: 'Advisor',
},
{
- imageUrl: '/images/@next/team/advisors/davids.jpg',
+ imageUrl: '/images/team/advisors/davids.jpg',
name: 'David Sacks',
title: 'Advisor',
},
diff --git a/packages/website/ts/pages/community.tsx b/packages/website/ts/pages/community.tsx
index a259e3438..7c02fed82 100644
--- a/packages/website/ts/pages/community.tsx
+++ b/packages/website/ts/pages/community.tsx
@@ -4,13 +4,13 @@ import styled from 'styled-components';
import { colors } from 'ts/style/colors';
-import { Banner } from 'ts/@next/components/banner';
-import { Button } from 'ts/@next/components/button';
-import { Icon } from 'ts/@next/components/icon';
-import { ModalContact } from 'ts/@next/components/modals/modal_contact';
-import { Column, Section, WrapGrid } from 'ts/@next/components/newLayout';
-import { SiteWrap } from 'ts/@next/components/siteWrap';
-import { Heading, Paragraph } from 'ts/@next/components/text';
+import { Banner } from 'ts/components/banner';
+import { Button } from 'ts/components/button';
+import { Icon } from 'ts/components/icon';
+import { ModalContact } from 'ts/components/modals/modal_contact';
+import { Column, Section, WrapGrid } from 'ts/components/newLayout';
+import { SiteWrap } from 'ts/components/siteWrap';
+import { Heading, Paragraph } from 'ts/components/text';
interface EventProps {
title: string;
@@ -30,19 +30,19 @@ const events: EventProps[] = [
{
title: '0x London Meetup',
date: 'October 20th 2018',
- imageUrl: '/images/@next/events/london.jpg',
+ imageUrl: '/images/events/london.jpg',
signupUrl: '#',
},
{
title: '0x Berlin Meetup',
date: 'October 20th 2018',
- imageUrl: '/images/@next/events/berlin.jpg',
+ imageUrl: '/images/events/berlin.jpg',
signupUrl: '#',
},
{
title: '0x San Francisco Meetup',
date: 'October 20th 2018',
- imageUrl: '/images/@next/events/sf.jpg',
+ imageUrl: '/images/events/sf.jpg',
signupUrl: '#',
},
];
diff --git a/packages/website/ts/pages/ecosystem.tsx b/packages/website/ts/pages/ecosystem.tsx
index f78bd3bdc..8e367b21f 100644
--- a/packages/website/ts/pages/ecosystem.tsx
+++ b/packages/website/ts/pages/ecosystem.tsx
@@ -5,11 +5,11 @@ import styled from 'styled-components';
import { colors } from 'ts/style/colors';
-import { Button } from 'ts/@next/components/button';
-import { Icon } from 'ts/@next/components/icon';
-import { Column, Section, WrapGrid } from 'ts/@next/components/newLayout';
-import { SiteWrap } from 'ts/@next/components/siteWrap';
-import { Heading, Paragraph } from 'ts/@next/components/text';
+import { Button } from 'ts/components/button';
+import { Icon } from 'ts/components/icon';
+import { Column, Section, WrapGrid } from 'ts/components/newLayout';
+import { SiteWrap } from 'ts/components/siteWrap';
+import { Heading, Paragraph } from 'ts/components/text';
import { constants } from 'ts/utils/constants';
interface BenefitProps {
diff --git a/packages/website/ts/pages/instant.tsx b/packages/website/ts/pages/instant.tsx
index d08fd566a..b97bb35a4 100644
--- a/packages/website/ts/pages/instant.tsx
+++ b/packages/website/ts/pages/instant.tsx
@@ -4,14 +4,14 @@ import * as React from 'react';
import DocumentTitle from 'react-document-title';
import styled, { keyframes } from 'styled-components';
-import { Banner } from 'ts/@next/components/banner';
-import { Button } from 'ts/@next/components/button';
-import { Definition } from 'ts/@next/components/definition';
-import { Hero } from 'ts/@next/components/hero';
-import { Section, SectionProps } from 'ts/@next/components/newLayout';
-import { SiteWrap } from 'ts/@next/components/siteWrap';
-import { Heading, Paragraph } from 'ts/@next/components/text';
-import { Configurator } from 'ts/@next/pages/instant/configurator';
+import { Banner } from 'ts/components/banner';
+import { Button } from 'ts/components/button';
+import { Definition } from 'ts/components/definition';
+import { Hero } from 'ts/components/hero';
+import { Section, SectionProps } from 'ts/components/newLayout';
+import { SiteWrap } from 'ts/components/siteWrap';
+import { Heading, Paragraph } from 'ts/components/text';
+import { Configurator } from 'ts/pages/instant/configurator';
import { colors } from 'ts/style/colors';
import { WebsitePaths } from 'ts/types';
import { utils } from 'ts/utils/utils';
@@ -100,7 +100,7 @@ export class Next0xInstant extends React.Component<Props> {
<div>
{[...Array(18)].map((item, index) => (
<Card key={`card-${index}`} index={index}>
- <img src={`/images/@next/0x-instant/widget-${index % 6 + 1}.png`} />
+ <img src={`/images/0x-instant/widget-${index % 6 + 1}.png`} />
</Card>
))}
</div>
diff --git a/packages/website/ts/pages/instant/code_demo.tsx b/packages/website/ts/pages/instant/code_demo.tsx
index 4a3022df5..c59f148b8 100644
--- a/packages/website/ts/pages/instant/code_demo.tsx
+++ b/packages/website/ts/pages/instant/code_demo.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import * as CopyToClipboard from 'react-copy-to-clipboard';
import SyntaxHighlighter from 'react-syntax-highlighter';
-import { Button } from 'ts/@next/components/button';
+import { Button } from 'ts/components/button';
import { Container } from 'ts/components/ui/container';
import { styled } from 'ts/style/theme';
import { zIndex } from 'ts/style/z_index';
diff --git a/packages/website/ts/pages/instant/config_generator.tsx b/packages/website/ts/pages/instant/config_generator.tsx
index 3f00e33e2..024d37b51 100644
--- a/packages/website/ts/pages/instant/config_generator.tsx
+++ b/packages/website/ts/pages/instant/config_generator.tsx
@@ -6,8 +6,8 @@ import * as _ from 'lodash';
import * as React from 'react';
import styled from 'styled-components';
-import { ConfigGeneratorAddressInput } from 'ts/@next/pages/instant/config_generator_address_input';
-import { FeePercentageSlider } from 'ts/@next/pages/instant/fee_percentage_slider';
+import { ConfigGeneratorAddressInput } from 'ts/pages/instant/config_generator_address_input';
+import { FeePercentageSlider } from 'ts/pages/instant/fee_percentage_slider';
import { CheckMark } from 'ts/components/ui/check_mark';
import { Container } from 'ts/components/ui/container';
import { MultiSelect } from 'ts/components/ui/multi_select';
@@ -18,8 +18,8 @@ import { WebsitePaths } from 'ts/types';
import { constants } from 'ts/utils/constants';
// New components
-import { Heading } from 'ts/@next/components/text';
-import { Select, SelectItemConfig } from 'ts/@next/pages/instant/select';
+import { Heading } from 'ts/components/text';
+import { Select, SelectItemConfig } from 'ts/pages/instant/select';
import { assetMetaDataMap } from '../../../../../instant/src/data/asset_meta_data_map';
import { ERC20AssetMetaData, ZeroExInstantBaseConfig } from '../../../../../instant/src/types';
diff --git a/packages/website/ts/pages/instant/config_generator_address_input.tsx b/packages/website/ts/pages/instant/config_generator_address_input.tsx
index 9b0e9b1d1..890e39da6 100644
--- a/packages/website/ts/pages/instant/config_generator_address_input.tsx
+++ b/packages/website/ts/pages/instant/config_generator_address_input.tsx
@@ -7,7 +7,7 @@ import { colors } from 'ts/style/colors';
import { Container } from 'ts/components/ui/container';
-import { Paragraph } from 'ts/@next/components/text';
+import { Paragraph } from 'ts/components/text';
export interface ConfigGeneratorAddressInputProps {
value?: string;
diff --git a/packages/website/ts/pages/instant/configurator.tsx b/packages/website/ts/pages/instant/configurator.tsx
index 7c67e6333..c5f7b06a5 100644
--- a/packages/website/ts/pages/instant/configurator.tsx
+++ b/packages/website/ts/pages/instant/configurator.tsx
@@ -2,12 +2,12 @@ import * as _ from 'lodash';
import * as React from 'react';
import styled from 'styled-components';
-import { CodeDemo } from 'ts/@next/pages/instant/code_demo';
-import { ConfigGenerator } from 'ts/@next/pages/instant/config_generator';
+import { CodeDemo } from 'ts/pages/instant/code_demo';
+import { ConfigGenerator } from 'ts/pages/instant/config_generator';
-import { Link } from 'ts/@next/components/link';
-import { Column, FlexWrap } from 'ts/@next/components/newLayout';
-import { Heading } from 'ts/@next/components/text';
+import { Link } from 'ts/components/link';
+import { Column, FlexWrap } from 'ts/components/newLayout';
+import { Heading } from 'ts/components/text';
import { WebsitePaths } from 'ts/types';
import { ZeroExInstantBaseConfig } from '../../../../../instant/src/types';
diff --git a/packages/website/ts/pages/instant/fee_percentage_slider.tsx b/packages/website/ts/pages/instant/fee_percentage_slider.tsx
index 5775d6dfb..c4d9f908f 100644
--- a/packages/website/ts/pages/instant/fee_percentage_slider.tsx
+++ b/packages/website/ts/pages/instant/fee_percentage_slider.tsx
@@ -1,7 +1,7 @@
import Slider from 'rc-slider';
import * as React from 'react';
import styled from 'styled-components';
-import 'ts/@next/pages/instant/rc-slider.css';
+import 'ts/pages/instant/rc-slider.css';
import { colors } from 'ts/style/colors';
diff --git a/packages/website/ts/pages/landing.tsx b/packages/website/ts/pages/landing.tsx
index 4d47fefd9..b47d34dce 100644
--- a/packages/website/ts/pages/landing.tsx
+++ b/packages/website/ts/pages/landing.tsx
@@ -1,13 +1,13 @@
import * as React from 'react';
import DocumentTitle from 'react-document-title';
-import { SectionLandingAbout } from 'ts/@next/components/sections/landing/about';
-import { SectionLandingClients } from 'ts/@next/components/sections/landing/clients';
-import { SectionLandingCta } from 'ts/@next/components/sections/landing/cta';
-import { SectionLandingHero } from 'ts/@next/components/sections/landing/hero';
-import { SiteWrap } from 'ts/@next/components/siteWrap';
+import { SectionLandingAbout } from 'ts/components/sections/landing/about';
+import { SectionLandingClients } from 'ts/components/sections/landing/clients';
+import { SectionLandingCta } from 'ts/components/sections/landing/cta';
+import { SectionLandingHero } from 'ts/components/sections/landing/hero';
+import { SiteWrap } from 'ts/components/siteWrap';
-import { ModalContact } from 'ts/@next/components/modals/modal_contact';
+import { ModalContact } from 'ts/components/modals/modal_contact';
interface Props {
theme: {
diff --git a/packages/website/ts/pages/launch_kit.tsx b/packages/website/ts/pages/launch_kit.tsx
index 605bce91c..dd4de4d99 100644
--- a/packages/website/ts/pages/launch_kit.tsx
+++ b/packages/website/ts/pages/launch_kit.tsx
@@ -2,15 +2,15 @@ import * as _ from 'lodash';
import * as React from 'react';
import DocumentTitle from 'react-document-title';
-import { Hero } from 'ts/@next/components/hero';
+import { Hero } from 'ts/components/hero';
-import { Banner } from 'ts/@next/components/banner';
-import { Button } from 'ts/@next/components/button';
-import { Definition } from 'ts/@next/components/definition';
-import { Icon } from 'ts/@next/components/icon';
-import { SiteWrap } from 'ts/@next/components/siteWrap';
+import { Banner } from 'ts/components/banner';
+import { Button } from 'ts/components/button';
+import { Definition } from 'ts/components/definition';
+import { Icon } from 'ts/components/icon';
+import { SiteWrap } from 'ts/components/siteWrap';
-import { Section } from 'ts/@next/components/newLayout';
+import { Section } from 'ts/components/newLayout';
import { constants } from 'ts/utils/constants';
import { ModalContact } from '../components/modals/modal_contact';
diff --git a/packages/website/ts/pages/market_maker.tsx b/packages/website/ts/pages/market_maker.tsx
index e2d3c75c4..55566c798 100644
--- a/packages/website/ts/pages/market_maker.tsx
+++ b/packages/website/ts/pages/market_maker.tsx
@@ -1,13 +1,13 @@
import * as _ from 'lodash';
import * as React from 'react';
-import { Banner } from 'ts/@next/components/banner';
-import { Button } from 'ts/@next/components/button';
-import { Definition } from 'ts/@next/components/definition';
-import { Hero } from 'ts/@next/components/hero';
-import { ModalContact } from 'ts/@next/components/modals/modal_contact';
-import { Section } from 'ts/@next/components/newLayout';
-import { SiteWrap } from 'ts/@next/components/siteWrap';
+import { Banner } from 'ts/components/banner';
+import { Button } from 'ts/components/button';
+import { Definition } from 'ts/components/definition';
+import { Hero } from 'ts/components/hero';
+import { ModalContact } from 'ts/components/modals/modal_contact';
+import { Section } from 'ts/components/newLayout';
+import { SiteWrap } from 'ts/components/siteWrap';
const offersData = [
{
diff --git a/packages/website/ts/pages/why.tsx b/packages/website/ts/pages/why.tsx
index cdf7960c2..197ce5fc9 100644
--- a/packages/website/ts/pages/why.tsx
+++ b/packages/website/ts/pages/why.tsx
@@ -4,14 +4,14 @@ import DocumentTitle from 'react-document-title';
import ScrollableAnchor, { configureAnchors } from 'react-scrollable-anchor';
import styled from 'styled-components';
-import { Banner } from 'ts/@next/components/banner';
-import { Button } from 'ts/@next/components/button';
-import { Definition } from 'ts/@next/components/definition';
-import { Hero } from 'ts/@next/components/hero';
-import { Column, Section, WrapSticky } from 'ts/@next/components/newLayout';
-import { SiteWrap } from 'ts/@next/components/siteWrap';
-import { Slide, Slider } from 'ts/@next/components/slider/slider';
-import { Heading } from 'ts/@next/components/text';
+import { Banner } from 'ts/components/banner';
+import { Button } from 'ts/components/button';
+import { Definition } from 'ts/components/definition';
+import { Hero } from 'ts/components/hero';
+import { Column, Section, WrapSticky } from 'ts/components/newLayout';
+import { SiteWrap } from 'ts/components/siteWrap';
+import { Slide, Slider } from 'ts/components/slider/slider';
+import { Heading } from 'ts/components/text';
import { ModalContact } from '../components/modals/modal_contact';