From eacb4eebd34d3b61b4bd6518e2012d5745efd7b9 Mon Sep 17 00:00:00 2001 From: Kamran Ahmed Date: Sat, 9 Nov 2019 19:31:21 +0400 Subject: [PATCH] Update upcoming roadmap and roadmap badges --- components/badges/index.js | 13 ++++++++++ components/roadmap-summary/index.js | 38 +++++++++++++++++++++-------- data/site.json | 3 ++- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/components/badges/index.js b/components/badges/index.js index 656e57221..c9faea84b 100644 --- a/components/badges/index.js +++ b/components/badges/index.js @@ -31,3 +31,16 @@ export const SecondaryBadge = styled(PrimaryBadge)` background: #696969; color: white; `; + +export const InfoBadge = styled(PrimaryBadge)` + background: #039640; + color: white; +`; + +export const BadgeLink = styled.a` + text-decoration: none; + + &:hover { + text-decoration:none; + } +`; diff --git a/components/roadmap-summary/index.js b/components/roadmap-summary/index.js index 24232045d..5ce414269 100644 --- a/components/roadmap-summary/index.js +++ b/components/roadmap-summary/index.js @@ -10,17 +10,20 @@ import { VersionLink, VersionList, } from './style'; -import SharePage from '../share-page'; - -import { BadgesList, PrimaryBadge, SecondaryBadge } from 'components/badges'; +import SharePage from 'components/share-page'; +import { BadgeLink, BadgesList, PrimaryBadge, SecondaryBadge } from 'components/badges'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faEnvelope } from '@fortawesome/free-solid-svg-icons'; +import GuideBody from 'components/guide-body'; +import siteConfig from "data/site"; const isActiveRoadmap = (loadedVersion, roadmapVersion) => ( (loadedVersion === roadmapVersion) || (loadedVersion === 'latest' && parseInt(roadmapVersion, 10) === (new Date()).getFullYear()) ); +const UpcomingGuide = require(`../../data/roadmaps/upcoming.md`).default; + const RoadmapSummary = ({ roadmap }) => (
@@ -29,14 +32,18 @@ const RoadmapSummary = ({ roadmap }) => ( { roadmap.upcoming && Upcoming Roadmap } - { roadmap.featured && Featured Roadmap } + { !roadmap.upcoming && ( + + Suggest Improvements + + ) } - + Send me Updates - + @@ -50,10 +57,21 @@ const RoadmapSummary = ({ roadmap }) => (
-
- - -
+ { + roadmap.upcoming && ( + + + + ) + } + { + !roadmap.upcoming && ( +
+ + +
+ ) + }
); diff --git a/data/site.json b/data/site.json index 4501ffc49..931c77c71 100644 --- a/data/site.json +++ b/data/site.json @@ -11,7 +11,8 @@ "repo": "https://github.com/kamranahmedse/roadmap-next", "repoData": "https://github.com/kamranahmedse/roadmap-next/tree/master/data", "addGuide": "https://github.com/kamranahmedse/roadmap-next/tree/master/contributing/guide.md", - "addRoadmap": "https://github.com/kamranahmedse/roadmap-next/tree/master/contributing/roadmap.md" + "addRoadmap": "https://github.com/kamranahmedse/roadmap-next/tree/master/contributing/roadmap.md", + "issue": "https://github.com/kamranahmedse/roadmap-next/issues/new" }, "keywords": [ "roadmap",