diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c7973801b..825ffb15a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -17,7 +17,7 @@ jobs:
persist-credentials: false
- uses: actions/setup-node@v1
with:
- node-version: 14
+ node-version: 16
- name: Setup Environment
run: |
npm install
diff --git a/components/custom-ad.tsx b/components/custom-ad.tsx
index 09c756d8f..b3c0d8ca9 100644
--- a/components/custom-ad.tsx
+++ b/components/custom-ad.tsx
@@ -1,37 +1,53 @@
+import { Box, Flex, Heading, Image, Link } from '@chakra-ui/react';
+import { getParameterByName } from '../pages/upcoming';
+
+function getPageSlug() {
+ const pathname = (typeof window !== 'undefined' ? window : {} as any)?.location?.pathname || '';
+
+ return pathname?.replace(/\//g, '');
+}
+
export const CustomAd = () => {
+ const slug = getPageSlug();
+ if (slug !== 'devops') {
+ return null;
+ }
+
+ const shouldShowAd = getParameterByName('ad');
+ if (!shouldShowAd) {
+ return null;
+ }
+
return (
-
+ Partner Content
+
+
+
);
};
diff --git a/components/footer.tsx b/components/footer.tsx
index 83bb54aa5..25116f732 100644
--- a/components/footer.tsx
+++ b/components/footer.tsx
@@ -1,6 +1,7 @@
import { Box, Container, Flex, Image, Link, Stack, Text } from '@chakra-ui/react';
import siteConfig from '../content/site.json';
import { CustomAd } from './custom-ad';
+import React from 'react';
function NavigationLinks() {
return (
@@ -62,6 +63,8 @@ export function Footer() {
+
+
);
}
diff --git a/pages/[roadmap]/index.tsx b/pages/[roadmap]/index.tsx
index be19e6bef..e374f8919 100644
--- a/pages/[roadmap]/index.tsx
+++ b/pages/[roadmap]/index.tsx
@@ -14,7 +14,7 @@ import MdRenderer from '../../components/md-renderer';
import Helmet from '../../components/helmet';
import { RoadmapPageHeader } from '../../components/roadmap/roadmap-page-header';
import { InteractiveRoadmapRenderer } from './interactive';
-import { FreeSignUp, SIGNUP_EMAIL_INPUT_NAME, SIGNUP_FORM_ACTION } from '../signup';
+import { SIGNUP_EMAIL_INPUT_NAME, SIGNUP_FORM_ACTION } from '../signup';
import { BellIcon, EmailIcon } from '@chakra-ui/icons';
import { RelatedRoadmaps } from '../../components/related-roadmaps';
@@ -107,6 +107,7 @@ export default function Roadmap(props: RoadmapPageProps) {
+
diff --git a/pages/upcoming.tsx b/pages/upcoming.tsx
index dd18213f5..82d001c07 100644
--- a/pages/upcoming.tsx
+++ b/pages/upcoming.tsx
@@ -10,7 +10,7 @@ import { SIGNUP_EMAIL_INPUT_NAME, SIGNUP_FORM_ACTION } from './signup';
import React from 'react';
import { upcomingRoadmaps } from '../components/home/featured-roadmaps-list';
-function getParameterByName(name: string, url: string = (typeof window !== 'undefined' ? window : {} as any)?.location?.href) {
+export function getParameterByName(name: string, url: string = (typeof window !== 'undefined' ? window : {} as any)?.location?.href) {
name = name.replace(/[\[\]]/g, '\\$&');
let regex = new RegExp('[?&]' + name + '(=([^]*)|&|#|$)');
diff --git a/scripts/build.sh b/scripts/build.sh
index 00264cbc1..d58ef75cb 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+set -e
+
rm -rf out
next build
next export
diff --git a/styles/carbon.css b/styles/carbon.css
deleted file mode 100644
index 783da6b3b..000000000
--- a/styles/carbon.css
+++ /dev/null
@@ -1,63 +0,0 @@
-#carbonads {
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu,
- Cantarell, "Helvetica Neue", Helvetica, Arial, sans-serif;
- position: fixed;
- bottom: 15px;
- right: 20px;
- z-index: 9999;
-}
-
-#carbonads {
- display: flex;
- max-width: 330px;
- background-color: hsl(0, 0%, 98%);
- box-shadow: 0 1px 4px 1px hsla(0, 0%, 0%, .1);
-}
-
-#carbonads a {
- color: inherit;
- text-decoration: none;
-}
-
-#carbonads a:hover {
- color: inherit;
-}
-
-#carbonads span {
- position: relative;
- display: block;
- overflow: hidden;
-}
-
-#carbonads .carbon-wrap {
- display: flex;
-}
-
-.carbon-img {
- display: block;
- margin: 0;
- line-height: 1;
-}
-
-.carbon-img img {
- display: block;
-}
-
-.carbon-text {
- font-size: 13px;
- padding: 10px;
- line-height: 1.5;
- text-align: left;
-}
-
-.carbon-poweredby {
- display: block;
- padding: 8px 10px;
- background: repeating-linear-gradient(-45deg, transparent, transparent 5px, hsla(0, 0%, 0%, .025) 5px, hsla(0, 0%, 0%, .025) 10px) hsla(203, 11%, 95%, .4);
- text-align: center;
- text-transform: uppercase;
- letter-spacing: .5px;
- font-weight: 600;
- font-size: 9px;
- line-height: 1;
-}