From 87fe4ddfa94ed8dfa678cf5cb3151342b053f4ba Mon Sep 17 00:00:00 2001 From: l5io Date: Tue, 17 Dec 2024 00:52:37 +0000 Subject: [PATCH 1/3] Updated feature data from spreadsheet Signed-off-by: l5io --- src/sections/Pricing/feature_data.json | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/sections/Pricing/feature_data.json b/src/sections/Pricing/feature_data.json index 89598b8f374d..be2cc59fa0d6 100644 --- a/src/sections/Pricing/feature_data.json +++ b/src/sections/Pricing/feature_data.json @@ -949,11 +949,11 @@ "category": "Catalog", "functionOrder": "708", "function": "Approve Catalog Request", - "feature": "Change management through a process of curation of content to be published in the catalog.", + "feature": "Change management for the curation of content published in the catalog.", "subscription_tier": "Enterprise", "comparison_tiers": { "free": "", - "teamDesigner": "x", + "teamDesigner": "", "teamOperator": "", "enterprise": "x" }, @@ -1119,22 +1119,6 @@ }, "docs": "https://docs.layer5.io/cloud/getting-started/getting-started-with-layer5-account/#7-viewing-your-layer5-profile" }, - { - "theme": "", - "categoryOrder": "9", - "category": "Managed Service Provider", - "functionOrder": "905", - "function": "Multi-tenancy", - "feature": "Hierarchical permissioning. Enforcement of tenancy.", - "subscription_tier": "", - "comparison_tiers": { - "free": "", - "teamDesigner": "", - "teamOperator": "", - "enterprise": "" - }, - "docs": "" - }, { "theme": "", "categoryOrder": "10", @@ -1163,7 +1147,7 @@ "free": "", "teamDesigner": "x", "teamOperator": "x", - "enterprise": "" + "enterprise": "x" }, "docs": "" }, From 8cfa914e2beba35de0d8f7ad681b8a16059f0eee Mon Sep 17 00:00:00 2001 From: l5io Date: Thu, 19 Dec 2024 00:50:51 +0000 Subject: [PATCH 2/3] Updated feature data from spreadsheet Signed-off-by: l5io --- src/sections/Pricing/feature_data.json | 32 -------------------------- 1 file changed, 32 deletions(-) diff --git a/src/sections/Pricing/feature_data.json b/src/sections/Pricing/feature_data.json index be2cc59fa0d6..a6710a672626 100644 --- a/src/sections/Pricing/feature_data.json +++ b/src/sections/Pricing/feature_data.json @@ -959,38 +959,6 @@ }, "docs": "https://docs.layer5.io/cloud/catalog/" }, - { - "theme": "", - "categoryOrder": "7", - "category": "Catalog", - "functionOrder": "709", - "function": "Single and multiple approvers", - "feature": "", - "subscription_tier": "", - "comparison_tiers": { - "free": "", - "teamDesigner": "", - "teamOperator": "", - "enterprise": "" - }, - "docs": "https://docs.layer5.io/cloud/catalog/" - }, - { - "theme": "", - "categoryOrder": "7", - "category": "Catalog", - "functionOrder": "710", - "function": "Import Filter", - "feature": "Import a publish WASM filter", - "subscription_tier": "", - "comparison_tiers": { - "free": "", - "teamDesigner": "", - "teamOperator": "", - "enterprise": "" - }, - "docs": "https://docs.meshery.io/guides/configuration-management/filter-management" - }, { "theme": "", "categoryOrder": "", From 3994c4aa56979aee8b33ab433166341964502f72 Mon Sep 17 00:00:00 2001 From: Shivam Gupta Date: Sun, 29 Dec 2024 12:43:47 +0000 Subject: [PATCH 3/3] resolve conflict issue Signed-off-by: Shivam Gupta --- src/components/Related-Posts/index.js | 4 ++-- src/components/Related-Resources/index.js | 4 ++-- src/sections/Community/slider.js | 4 ++-- src/sections/Home/Partners-home/index.js | 4 ++-- src/sections/Home/So-Special-Section/index.js | 4 ++-- src/sections/Learn/Books-grid/index.js | 4 ++-- src/sections/Learn/LearnPage-Sections/workshops.js | 4 ++-- src/sections/Meshery/Features-section/index.js | 4 ++-- .../Meshery/Meshery-integrations/Integration.style.js | 4 ++-- src/sections/Meshery/meshery-operator/index.js | 6 +++--- src/sections/Pricing/review-slider.js | 4 ++-- src/sections/Projects/Image-Hub/index.js | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/components/Related-Posts/index.js b/src/components/Related-Posts/index.js index 95e09e8fd8ca..040e38a34c98 100644 --- a/src/components/Related-Posts/index.js +++ b/src/components/Related-Posts/index.js @@ -1,3 +1,5 @@ +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; import React from "react"; import { Link } from "gatsby"; import { IoIosArrowRoundForward } from "@react-icons/all-files/io/IoIosArrowRoundForward"; @@ -5,8 +7,6 @@ import Card from "../Card"; import RelatedPostsWrapper from "./relatedPosts.style"; import { Col } from "../../reusecore/Layout"; import Slider from "react-slick"; -import "slick-carousel/slick/slick.css"; -import "slick-carousel/slick/slick-theme.css"; import useHasMounted from "../../utils/useHasMounted"; const RelatedPosts = props => { diff --git a/src/components/Related-Resources/index.js b/src/components/Related-Resources/index.js index 2f717aa5c847..8739581a4d4b 100644 --- a/src/components/Related-Resources/index.js +++ b/src/components/Related-Resources/index.js @@ -1,3 +1,5 @@ +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; import React from "react"; import { Link } from "gatsby"; import { IoIosArrowRoundForward } from "@react-icons/all-files/io/IoIosArrowRoundForward"; @@ -5,8 +7,6 @@ import Card from "../Card"; import RelatedResourcesWrapper from "./relatedResources.style"; import { Col } from "../../reusecore/Layout"; import Slider from "react-slick"; -import "slick-carousel/slick/slick.css"; -import "slick-carousel/slick/slick-theme.css"; import useHasMounted from "../../utils/useHasMounted"; const RelatedResources = props => { diff --git a/src/sections/Community/slider.js b/src/sections/Community/slider.js index 862ef223b348..859f323122b9 100644 --- a/src/sections/Community/slider.js +++ b/src/sections/Community/slider.js @@ -1,8 +1,8 @@ +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; import React from "react"; import Slider from "react-slick"; import styled from "styled-components"; -import "slick-carousel/slick/slick.css"; -import "slick-carousel/slick/slick-theme.css"; import { useStaticQuery, graphql } from "gatsby"; diff --git a/src/sections/Home/Partners-home/index.js b/src/sections/Home/Partners-home/index.js index abf636babcdc..b91262a93dc3 100644 --- a/src/sections/Home/Partners-home/index.js +++ b/src/sections/Home/Partners-home/index.js @@ -1,3 +1,5 @@ +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; import React from "react"; import { Container, Row } from "../../../reusecore/Layout"; import SectionTitle from "../../../reusecore/SectionTitle"; @@ -5,8 +7,6 @@ import PartnerItemWrapper from "./partnerSection.style"; import { Link } from "gatsby"; import { partners } from "./partners-home-data"; import Slider from "react-slick"; -import "slick-carousel/slick/slick.css"; -import "slick-carousel/slick/slick-theme.css"; const settings = { initialSlide: 1, diff --git a/src/sections/Home/So-Special-Section/index.js b/src/sections/Home/So-Special-Section/index.js index 92f87301128d..0474474f4749 100644 --- a/src/sections/Home/So-Special-Section/index.js +++ b/src/sections/Home/So-Special-Section/index.js @@ -1,7 +1,7 @@ -import React from "react"; -import Slider from "react-slick"; import "slick-carousel/slick/slick.css"; import "slick-carousel/slick/slick-theme.css"; +import React from "react"; +import Slider from "react-slick"; import SoSpecialWrapper from "./so-special-style"; import Button from "../../../reusecore/Button"; diff --git a/src/sections/Learn/Books-grid/index.js b/src/sections/Learn/Books-grid/index.js index d898f3c0e208..10f8313a8488 100644 --- a/src/sections/Learn/Books-grid/index.js +++ b/src/sections/Learn/Books-grid/index.js @@ -1,10 +1,10 @@ +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; import React from "react"; import { graphql, useStaticQuery } from "gatsby"; import PageHeader from "../../../reusecore/PageHeader"; import { Link } from "gatsby"; import Slider from "react-slick"; -import "slick-carousel/slick/slick.css"; -import "slick-carousel/slick/slick-theme.css"; import { BooksPageWrapper } from "./BooksGrid.style"; const BooksPage = ({ hide_path }) => { diff --git a/src/sections/Learn/LearnPage-Sections/workshops.js b/src/sections/Learn/LearnPage-Sections/workshops.js index af7175e20091..e7b8e90a0974 100644 --- a/src/sections/Learn/LearnPage-Sections/workshops.js +++ b/src/sections/Learn/LearnPage-Sections/workshops.js @@ -1,11 +1,11 @@ +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; import React from "react"; import { graphql, useStaticQuery, Link } from "gatsby"; import { Row, Col } from "../../../reusecore/Layout"; import Button from "../../../reusecore/Button"; import { feedbackData } from "./feedbackData"; import Slider from "react-slick"; -import "slick-carousel/slick/slick.css"; -import "slick-carousel/slick/slick-theme.css"; import { FiArrowRight } from "@react-icons/all-files/fi/FiArrowRight"; import { FiArrowLeft } from "@react-icons/all-files/fi/FiArrowLeft"; import styled from "styled-components"; diff --git a/src/sections/Meshery/Features-section/index.js b/src/sections/Meshery/Features-section/index.js index 5f8f33648442..00c9744d426b 100644 --- a/src/sections/Meshery/Features-section/index.js +++ b/src/sections/Meshery/Features-section/index.js @@ -1,9 +1,9 @@ +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; import React from "react"; import { Row, Col } from "../../../reusecore/Layout"; import Button from "../../../reusecore/Button"; import Slider from "react-slick"; -import "slick-carousel/slick/slick.css"; -import "slick-carousel/slick/slick-theme.css"; import Slide1 from "../images/service mesh performance example.gif"; import Slide2 from "../images/meshery_benchmark_screen.webp"; import Slide3 from "../images/meshery-configuration-management.webp"; diff --git a/src/sections/Meshery/Meshery-integrations/Integration.style.js b/src/sections/Meshery/Meshery-integrations/Integration.style.js index 7c7ee84326d2..60b595b5be5e 100755 --- a/src/sections/Meshery/Meshery-integrations/Integration.style.js +++ b/src/sections/Meshery/Meshery-integrations/Integration.style.js @@ -1,7 +1,7 @@ -import styled from "styled-components"; -import Slider from "react-slick"; import "slick-carousel/slick/slick.css"; import "slick-carousel/slick/slick-theme.css"; +import styled from "styled-components"; +import Slider from "react-slick"; export const HoneycombGrid = styled.div` .heading { diff --git a/src/sections/Meshery/meshery-operator/index.js b/src/sections/Meshery/meshery-operator/index.js index 13617d323278..3ef3a3c5bc81 100644 --- a/src/sections/Meshery/meshery-operator/index.js +++ b/src/sections/Meshery/meshery-operator/index.js @@ -1,12 +1,12 @@ -import React from "react"; + +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css";import React from "react"; import { StaticImage } from "gatsby-plugin-image"; import MesheryOperatorWrapper from "./mesheryoperator.style"; import { Container, Row, Col } from "../../../reusecore/Layout"; import Slider from "react-slick"; -import "slick-carousel/slick/slick.css"; -import "slick-carousel/slick/slick-theme.css"; import SubscribeSection from "../../../sections/subscribe/subscribe"; import Deployment from "./deployment.svg"; diff --git a/src/sections/Pricing/review-slider.js b/src/sections/Pricing/review-slider.js index 5acb8d09d61c..58f2a76e84f2 100644 --- a/src/sections/Pricing/review-slider.js +++ b/src/sections/Pricing/review-slider.js @@ -1,9 +1,9 @@ +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; import React from "react"; import styled from "styled-components"; import Customers from "../../reusecore/Blockquote/Blockquote-image"; import Slider from "react-slick"; -import "slick-carousel/slick/slick.css"; -import "slick-carousel/slick/slick-theme.css"; import Maxi from "../../collections/members/maximiliano-churichi/Maximiliano-Churichi.webp"; import Otto from "../../collections/members/otto-van-der-schaaf/otto-van-der-schaaf.webp"; import Nic from "../../collections/members/nicholas-jackson/nic-jackson.webp"; diff --git a/src/sections/Projects/Image-Hub/index.js b/src/sections/Projects/Image-Hub/index.js index 197da9b1642d..7ccdcc359a30 100644 --- a/src/sections/Projects/Image-Hub/index.js +++ b/src/sections/Projects/Image-Hub/index.js @@ -1,3 +1,5 @@ +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; import React from "react"; @@ -6,8 +8,6 @@ import ImageHubWrapper from "./imageHub.style"; import { Container } from "../../../reusecore/Layout"; import Button from "../../../reusecore/Button"; import Slider from "react-slick"; -import "slick-carousel/slick/slick.css"; -import "slick-carousel/slick/slick-theme.css"; import VintageBox from "../../../reusecore/VintageBox";