Merge pull request #74 from pluralsh/updated-pricing

changes to nav and pricing page
pluralsh · Feb 14, 2024 · 053bfe8 · 053bfe8
2 parents f1af9c9 + ef42cb2
commit 053bfe8
Show file tree

Hide file tree

Showing 16 changed files with 439 additions and 263 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -4,8 +4,10 @@ module.exports = {
       typescript: {}, // this loads <rootdir>/tsconfig.json to eslint
     },
   },
+  parser: '@typescript-eslint/parser',
   parserOptions: {
-    project: './tsconfig.json',
+    project: true,
+    tsconfigRootDir: __dirname,
   },
   extends: ['@pluralsh/eslint-config-typescript', 'prettier'],
   globals: {

diff --git a/.stylelintrc.yaml b/.stylelintrc.yaml
@@ -1,10 +1,18 @@
 extends:
-  - "@pluralsh/stylelint-config"
-  - "stylelint-config-prettier"
-ignoreFiles: [""]
+  - '@pluralsh/stylelint-config'
+  - 'stylelint-config-prettier'
+ignoreFiles: ['']
 rules:
+  plugin/no-unsupported-browser-features:
+    - true
+    - browsers:
+        - '> 1%'
+        - Last 4 versions
+      ignore:
+        - fontface
+      ignorePartialSupport: true
   at-rule-no-unknown:
     - true
     - ignoreAtRules:
-        - "@tailwind"
-        - "tailwind"
+        - '@tailwind'
+        - 'tailwind'
diff --git a/next.config.js b/next.config.js
@@ -47,6 +47,11 @@ module.exports = () => {
           destination: '/kubernetes-fleet-management',
           permanent: true,
         },
+        {
+          source: '/demo-login',
+          destination: '/contact-sales',
+          permanent: true,
+        },
       ]
     },
   })

diff --git a/package.json b/package.json
@@ -97,15 +97,16 @@
     "@types/node": "20.4.2",
     "@types/react-dom": "18.2.7",
     "@types/styled-components": "5.1.30",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/eslint-plugin": "7.0.1",
+    "@typescript-eslint/parser": "7.0.1",
     "autoprefixer": "10.4.14",
     "concurrently": "8.2.0",
     "cross-env": "7.0.3",
-    "eslint": "8.53.0",
-    "eslint-config-next": "14.0.2",
-    "eslint-config-prettier": "9.0.0",
+    "eslint": "8.56.0",
+    "eslint-config-next": "14.1.0",
+    "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-typescript": "3.6.1",
-    "eslint-plugin-import": "2.29.0",
+    "eslint-plugin-import": "2.29.1",
     "eslint-plugin-import-newlines": "1.3.4",
     "eslint-plugin-jsx-a11y": "6.8.0",
     "eslint-plugin-react": "7.33.2",
@@ -119,7 +120,7 @@
     "stylelint": "15.10.1",
     "stylelint-config-prettier": "9.0.5",
     "tailwindcss": "3.3.3",
-    "typescript": "5.2.2"
+    "typescript": "5.3.3"
   },
   "packageManager": "[email protected]",
   "lint-staged": {

diff --git a/pages/demo-login.tsx b/pages/demo-login.tsx
diff --git a/pages/index.tsx b/pages/index.tsx
@@ -465,17 +465,9 @@ export default function Index({
                 large
                 primary
                 as={Link}
-                href="https://app.plural.sh/signup"
+                href="/contact-sales"
               >
-                Start deploying
-              </Button>
-              <Button
-                large
-                secondary
-                as={Link}
-                href="/demo-login"
-              >
-                Explore demo environment
+                Book a demo today
               </Button>
             </div>
           }

diff --git a/pages/product.tsx b/pages/product.tsx
@@ -139,9 +139,9 @@ export default function Index({
                         secondary
                         large
                         as={Link}
-                        href="/demo-login"
+                        href="/contact-sales"
                       >
-                        Explore demo environment
+                        Book a demo
                       </Button>
                     </div>
                   }

diff --git a/pages/solutions/[solution].tsx b/pages/solutions/[solution].tsx
@@ -145,9 +145,7 @@ export default function Solution({
                           )
                       )}
                     </Checklist2>
-                    <Cta href="/demo-login">
-                      Explore our live demo environment
-                    </Cta>
+                    <Cta href="/contact-sales">Book a demo today</Cta>
                   </ShadowedCard>
                 </EqualColumn>
               </ColumnsMd>

diff --git a/src/components/FooterNav.tsx b/src/components/FooterNav.tsx
@@ -39,8 +39,8 @@ const navItems = [
         href: '/contact',
       },
       {
-        children: 'Live demo',
-        href: '/demo-login',
+        children: 'Book a demo',
+        href: '/contact-sales',
       },
     ],
   },

diff --git a/src/components/FooterValueProp.tsx b/src/components/FooterValueProp.tsx
@@ -51,9 +51,9 @@ export const FooterValueProp = styled(({ ...props }: ComponentProps<'div'>) => (
             secondary
             large
             as={Link}
-            href="/demo-login"
+            href="/contact-sales"
           >
-            Explore live demo
+            Book a demo
           </Button>
         </div>
       </EqualColumn>

diff --git a/src/components/PageHeader.tsx b/src/components/PageHeader.tsx
@@ -109,7 +109,7 @@ export function PageHeader({
           <div className="buttons">
             <Button
               as="a"
-              href="https://app.plural.sh/signup"
+              href="/contact-sales"
               primary
               fontFamily={theme.fontFamilies.sans}
             >

diff --git a/src/components/ProductValueSection.tsx b/src/components/ProductValueSection.tsx
diff --git a/src/components/page-sections/PlansFeaturesTables.tsx b/src/components/page-sections/PlansFeaturesTables.tsx
@@ -162,6 +162,9 @@ const PlansFeaturesTableSC = styled.table<{ $numPlans: number }>(
     display: 'grid',
     alignItems: 'stretch',
     gridTemplateColumns: `auto ${new Array($numPlans).fill('1fr').join(' ')}`,
+    'tbody,thead': {
+      display: 'contents',
+    },
     'tr,th,td': {
       padding: 0,
       margin: 0,
@@ -228,32 +231,35 @@ export function PlansFeaturesTable({
       $numPlans={plans.length}
       {...props}
     >
-      <tr className="columnHeads">
-        {!isOnePlan && (
-          // eslint-disable-next-line jsx-a11y/control-has-associated-label
-          <td className="tableHead">
-            <PlanHeading />
-          </td>
-        )}
-        {plans.map((plan) => (
-          <th
-            key={plan.key}
-            className="tableHead"
-            scope="col"
-            {...(isOnePlan ? { colSpan: 2, 'aria-colspan': 2 } : {})}
-          >
-            <PlanHeading plan={plan} />
-          </th>
+      <thead>
+        <tr className="columnHeads">
+          {!isOnePlan && (
+            <th className="tableHead">
+              <span className="sr-only">Feature</span>
+            </th>
+          )}
+          {plans.map((plan) => (
+            <th
+              key={plan.key}
+              className="tableHead"
+              scope="col"
+              {...(isOnePlan ? { colSpan: 2, 'aria-colspan': 2 } : {})}
+            >
+              <PlanHeading plan={plan} />
+            </th>
+          ))}
+        </tr>
+      </thead>
+      <tbody>
+        {items.map((item, i) => (
+          <PlansFeaturesRow
+            key={`${item.label}-${i}`}
+            className="tableContent"
+            plans={plans}
+            item={item}
+          />
         ))}
-      </tr>
-      {items.map((item, i) => (
-        <PlansFeaturesRow
-          key={`${item.label}-${i}`}
-          className="tableContent"
-          plans={plans}
-          item={item}
-        />
-      ))}
+      </tbody>
     </PlansFeaturesTableSC>
   )
 }