diff --git a/gatsby-node.js b/gatsby-node.js index c0b9b3b74..58a9c5cd0 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -119,6 +119,10 @@ exports.sourceNodes = async ({ actions }) => { path: `${baseUrl}/submenu-products-developer-tools`, name: "ProductsDevTools" }, + { + path: `${baseUrl}/submenu-pricing-primary`, + name: "PricingPrimary" + }, { path: `${baseUrl}/submenu-community-primary`, name: "CommunityPrimary" diff --git a/src/components/2_molecules/navigation/communityFeatured.js b/src/components/2_molecules/navigation/communityFeatured.js new file mode 100644 index 000000000..55d99fcc0 --- /dev/null +++ b/src/components/2_molecules/navigation/communityFeatured.js @@ -0,0 +1,51 @@ +import React from "react"; + +const styles = { + color: '#ffffff' +}; + +const CommunityFeaturedNav = () => ( +
+
Featured
+ + + +
+
+ New One Click App:
+ Nextcloud +
+
Open source productivity and storage management platform.
+ + Deploy App + +
+
+
+); + +export default CommunityFeaturedNav; diff --git a/src/components/2_molecules/navigation/communityMenus.js b/src/components/2_molecules/navigation/communityMenus.js index 6eb92d5bd..d2e965130 100644 --- a/src/components/2_molecules/navigation/communityMenus.js +++ b/src/components/2_molecules/navigation/communityMenus.js @@ -1,5 +1,6 @@ import React from "react"; +import CommunityFeatured from "./CommunityFeatured"; import CommunityPrimary from "./communityPrimary"; import CommunityServices from "./communityServices"; @@ -7,13 +8,13 @@ const CommunityMenus = () => ( diff --git a/src/components/2_molecules/navigation/pricingFeatured.js b/src/components/2_molecules/navigation/pricingFeatured.js new file mode 100644 index 000000000..2b6a52592 --- /dev/null +++ b/src/components/2_molecules/navigation/pricingFeatured.js @@ -0,0 +1,43 @@ +import React from "react"; +const styles = { + borderWidth: 2, + borderColor: '#ededf4' +}; + +const PricingFeaturedNav = () => ( +
+
Featured
+ + +
+
+ Total Cost of Ownership Calculator +
+
+ Migrating from on-premises or between cloud providers for hosting, cloud storage, or cloud computing? +
+ + Launch Calculator + +
+
+
+); + +export default PricingFeaturedNav; diff --git a/src/components/2_molecules/navigation/pricingMenus.js b/src/components/2_molecules/navigation/pricingMenus.js new file mode 100644 index 000000000..632ef70f3 --- /dev/null +++ b/src/components/2_molecules/navigation/pricingMenus.js @@ -0,0 +1,19 @@ +import React from "react"; + +import PricingFeatured from "./pricingFeatured"; +import PricingPrimary from "./pricingPrimary"; + +const PricingMenus = () => ( + +); + +export default PricingMenus; diff --git a/src/components/2_molecules/navigation/pricingPrimary.js b/src/components/2_molecules/navigation/pricingPrimary.js new file mode 100644 index 000000000..92e868d21 --- /dev/null +++ b/src/components/2_molecules/navigation/pricingPrimary.js @@ -0,0 +1,46 @@ +import React from "react"; +import { StaticQuery, graphql } from "gatsby"; +import Col from "./col"; + +const PricingPrimary = ({ data }) => { + return ( + + {data.allPricingPrimary.edges.map((link, i) => { + const node = link.node; + return ( +
  • + + + {node.title} + + +
  • + ); + })} + + ); +}; + +export default props => ( + } + /> +); diff --git a/src/components/2_molecules/navigation/primaryNav.js b/src/components/2_molecules/navigation/primaryNav.js index e7e6564a7..8eab89024 100644 --- a/src/components/2_molecules/navigation/primaryNav.js +++ b/src/components/2_molecules/navigation/primaryNav.js @@ -123,9 +123,9 @@ class MainSiteNav extends React.Component { -
  • - - +
  • + + Pricing @@ -144,13 +144,6 @@ class MainSiteNav extends React.Component {
  • -
  • - - - Search - - -
  • diff --git a/src/components/2_molecules/navigation/productsFeatured.js b/src/components/2_molecules/navigation/productsFeatured.js index a6b3e8ee1..7bd26d6e4 100644 --- a/src/components/2_molecules/navigation/productsFeatured.js +++ b/src/components/2_molecules/navigation/productsFeatured.js @@ -1,64 +1,50 @@ import React from "react"; -import { StaticQuery, graphql } from "gatsby"; -import Col from "./col"; - -const _ = require("lodash"); - -const ProductsFeaturedNav = ({ data }) => { - return ( - - {data.allProductsFeatured.edges.map((link, i) => { - const node = link.node; - return ( -
  • - - {node.title} - - {node.title} - - {node.description} - - - -
  • - ); - })} - - ); +const styles1 = { + borderWidth: 2, + borderColor: '#ededf4' +}; +const styles2 = { + alignSelf: 'flex-end', + marginBottom: -24, + marginLeft: -24, + marginRight: -24, + maxWidth: '50%' }; -export default props => ( - } - /> +const ProductsFeaturedNav = () => ( + +
    +
    Featured
    + + +
    +
    + GPUs have landed in Mumbai! +
    +
    + On-demand GPUs for machine learning, scientific computing, and video processing. +
    + + Try Today + +
    +
    +
    ); + +export default ProductsFeaturedNav; diff --git a/src/components/2_molecules/navigation/productsMenus.js b/src/components/2_molecules/navigation/productsMenus.js index 036fe6fb1..a8453e56f 100644 --- a/src/components/2_molecules/navigation/productsMenus.js +++ b/src/components/2_molecules/navigation/productsMenus.js @@ -1,5 +1,6 @@ import React from "react"; +import ProductsFeatured from "./ProductsFeatured"; import ProductsCompute from "./productsCompute"; import ProductsStorage from "./productsStorage"; import ProductsServices from "./productsServices"; @@ -9,6 +10,14 @@ import ProductsDevTools from "./productsDevTools"; const ProductMenus = () => ( ); diff --git a/src/components/2_molecules/navigation/utilityNav.js b/src/components/2_molecules/navigation/utilityNav.js index 616420f2b..e9c2e3b5e 100644 --- a/src/components/2_molecules/navigation/utilityNav.js +++ b/src/components/2_molecules/navigation/utilityNav.js @@ -11,6 +11,18 @@ const MainSiteGlobalMenu = ({ data }) => { className="o-menu__list" aria-expanded="false" > +
  • + + + Search + + +
  • {data.allHeaderUtility.edges.map(link => { const node = link.node; return ( diff --git a/src/components/2_molecules/navigation/whyFeatured.js b/src/components/2_molecules/navigation/whyFeatured.js new file mode 100644 index 000000000..0ef6a69a7 --- /dev/null +++ b/src/components/2_molecules/navigation/whyFeatured.js @@ -0,0 +1,45 @@ +import React from "react"; + +const styles = { + color: '#ffffff' +}; + +const WhyFeaturedNav = () => ( +
    +
    Featured
    + + +
    +
    + Craft of Code: +
    + Cloudnet +
    +
    + Reliability Allows Customers (and Cloudnet) To Do What They Love +
    + + Read Cloudnet's Story + +
    +
    +
    +); + +export default WhyFeaturedNav; diff --git a/src/components/2_molecules/navigation/whyMenus.js b/src/components/2_molecules/navigation/whyMenus.js index 29e15100c..281722a48 100644 --- a/src/components/2_molecules/navigation/whyMenus.js +++ b/src/components/2_molecules/navigation/whyMenus.js @@ -1,5 +1,5 @@ import React from "react"; - +import WhyFeatured from "./WhyFeatured"; import WhyPrimary from "./whyPrimary"; import WhyServices from "./whyServices"; @@ -7,13 +7,13 @@ const whyMenus = () => ( diff --git a/src/components/3_organisms/footer-nav.js b/src/components/3_organisms/footer-nav.js index ee30902da..d3a3ebc62 100644 --- a/src/components/3_organisms/footer-nav.js +++ b/src/components/3_organisms/footer-nav.js @@ -349,14 +349,21 @@ const FooterNav = () => (
  • - Pricing + Pricing List
  • - Pricing Estimator + Cloud Estimator + + +
  • +
  • + + + TCO Calculator
  • @@ -442,6 +449,13 @@ const FooterNav = () => ( +
  • + + + Beta Program + + +
  • diff --git a/src/components/3_organisms/header.js b/src/components/3_organisms/header.js index e6745cb9e..a7f420fef 100644 --- a/src/components/3_organisms/header.js +++ b/src/components/3_organisms/header.js @@ -6,6 +6,7 @@ import UtilityMobile from "../2_molecules/navigation/utilityMobile"; import WhyMenus from "../2_molecules/navigation/whyMenus"; import ProductsMenus from "../2_molecules/navigation/productsMenus"; +import PricingMenus from "../2_molecules/navigation/pricingMenus"; import CommunityMenus from "../2_molecules/navigation/communityMenus"; const Header = () => ( @@ -39,6 +40,7 @@ const Header = () => ( +