Merge branch 'stage' into feature/2479-custom-roles

zesty-io · Dec 6, 2024 · f087aad · f087aad
2 parents 0157d99 + 7a9aa57
commit f087aad
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 52 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,5 +4,5 @@
    "editor.defaultFormatter": "esbenp.prettier-vscode",
    "editor.codeActionsOnSave": {
       "source.fixAll.format": "never"
-   }
+   },
 }
diff --git a/next.config.js b/next.config.js
@@ -1,4 +1,5 @@
 const zestyConfig = require('./zesty.config.json');
+const { docsRedirects } = require('./src/config/redirects');
 
 module.exports = {
   trailingSlash: true,
@@ -14,4 +15,8 @@ module.exports = {
     ],
   },
   swcMinify: true,
+
+  async redirects() {
+    return [...docsRedirects];
+  },
 };
diff --git a/src/config/redirects.js b/src/config/redirects.js
@@ -0,0 +1,49 @@
+const docsRedirects = [
+  {
+    source: '/docs/instances/api-reference/:path*',
+    destination: 'https://docs.zesty.io/reference/instances-api-reference',
+    permanent: true,
+  },
+  {
+    source: '/docs/authentication/api-reference/:path*',
+    destination: 'https://docs.zesty.io/reference/authentication-api-reference',
+    permanent: true,
+  },
+  {
+    source: '/docs/accounts/api-reference/:path*',
+    destination: 'https://docs.zesty.io/reference/accounts-api-reference',
+    permanent: true,
+  },
+  {
+    source: '/docs/parsley/api-reference/:path*',
+    destination: 'https://docs.zesty.io/docs/parsley',
+    permanent: true,
+  },
+  {
+    source: '/docs/media/api-reference/manager/:path*',
+    destination: 'https://docs.zesty.io/reference/media-manager-api-reference',
+    permanent: true,
+  },
+  {
+    source: '/docs/media/api-reference/storage/:path*',
+    destination: 'https://docs.zesty.io/reference/media-storage-api-reference',
+    permanent: true,
+  },
+  {
+    source: '/docs/media/api-reference/modify/:path*',
+    destination: 'https://docs.zesty.io/reference/media-modify-api-reference',
+    permanent: true,
+  },
+  {
+    source: '/docs/media/api-reference/resolver/:path*',
+    destination: 'https://docs.zesty.io/reference/media-resolver-api-reference',
+    permanent: true,
+  },
+  {
+    source: '/docs/media/api-reference/:path*',
+    destination: 'https://docs.zesty.io/reference/media-api-reference',
+    permanent: true,
+  },
+];
+
+module.exports = { docsRedirects };
diff --git a/src/pages/docs/index.js b/src/pages/docs/index.js
@@ -165,19 +165,19 @@ const cardData = [
     title: 'Instances API',
     description:
       'A collection of available REST endpoints scoped to your unique instance.',
-    link: '/docs/instances/api-reference/',
+    link: 'https://docs.zesty.io/reference/instances-api-reference',
   },
   {
     title: 'Authentication API',
     description:
       'Auth API is used to authenticate users with Zesty.io, which returns a token that grants to access services like Instances API, Accounts API, and Media API. Auth was setup as a stand alone service so it can connect to many services in our infrastructure.',
-    link: '/docs/authentication/api-reference/',
+    link: 'https://docs.zesty.io/reference/authentication-api-reference',
   },
   {
     title: 'Accounts API',
     description:
       'API used to control management of users, roles, instances, and teams.',
-    link: '/docs/accounts/api-reference/',
+    link: 'https://docs.zesty.io/reference/accounts-api-reference',
   },
   {
     title: 'Guides',

diff --git a/src/revamp/ui/GetDemoSection/index.js b/src/revamp/ui/GetDemoSection/index.js
@@ -19,11 +19,7 @@ import useGetDynamicData from './useGetDynamicData';
 import { useRouter } from 'next/router';
 import ZestyImage from 'blocks/Image/ZestyImage';
 
-const acorns =
-    'https://storage.googleapis.com/assets.zesty.io/website/images/assets/demo/Acorns%20Logo.svg',
-  bjs = `https://storage.googleapis.com/assets.zesty.io/website/images/assets/demo/BJ's%20Logo.svg`,
-  rocketLeague = `https://storage.googleapis.com/assets.zesty.io/website/images/assets/demo/Horizontal_Text.svg`,
-  cornershop = `https://storage.googleapis.com/assets.zesty.io/website/images/assets/demo/Logo_de_Cornershop%201.svg`,
+const rocketLeague = `https://storage.googleapis.com/assets.zesty.io/website/images/assets/demo/Horizontal_Text.svg`,
   phoenixSuns = `https://storage.googleapis.com/assets.zesty.io/website/images/assets/demo/Phoenix%20Suns.svg`,
   singlife = `https://storage.googleapis.com/assets.zesty.io/website/images/assets/demo/Singlife%20Logo.svg`,
   sony = `https://storage.googleapis.com/assets.zesty.io/website/images/assets/demo/Sony%20Logo.svg`,
@@ -369,14 +365,6 @@ export function Logos({ invert = false, alignLeft }) {
           height="32px"
           alt={generateAlt('Singlife')}
         />
-        <img
-          style={{ filter: invert ? 'invert(0.5)' : 'none' }}
-          loading="lazy"
-          src={acorns}
-          width="94px"
-          height="32px"
-          alt={generateAlt('Acorns')}
-        />
         <img
           style={{ filter: invert ? 'invert(0.5)' : 'none' }}
           loading="lazy"
@@ -393,22 +381,6 @@ export function Logos({ invert = false, alignLeft }) {
           height="32px"
           alt={generateAlt('Wattpad')}
         />
-        <img
-          style={{ filter: invert ? 'invert(0.5)' : 'none' }}
-          loading="lazy"
-          src={cornershop}
-          width="96.69px"
-          height="32px"
-          alt={generateAlt('Corner Shop')}
-        />
-        <img
-          style={{ filter: invert ? 'invert(0.5)' : 'none' }}
-          loading="lazy"
-          src={bjs}
-          width="36.48px"
-          height="32px"
-          alt={generateAlt('Bjs')}
-        />
       </Stack>
     </Stack>
   );

diff --git a/src/revamp/ui/HeroV2/index.js b/src/revamp/ui/HeroV2/index.js
@@ -9,12 +9,11 @@ import Logos from './Logos';
 
 const media =
     'https://kfg6bckb.media.zestyio.com/Zesty-io-2023-Homepage-Graphic.webp',
-  acorns = 'https://kfg6bckb.media.zestyio.com/acornsHero.svg',
-  bjs = 'https://kfg6bckb.media.zestyio.com/bjsHero.svg',
   phoenixSuns = 'https://kfg6bckb.media.zestyio.com/phoenixSunsHero.svg',
-  rocketLeague = 'https://kfg6bckb.media.zestyio.com/rocketLeagueHero.svg',
   singlife = 'https://kfg6bckb.media.zestyio.com/singlifeHero.svg',
-  sony = 'https://kfg6bckb.media.zestyio.com/sonyHero.svg';
+  sony = 'https://kfg6bckb.media.zestyio.com/sonyHero.svg',
+  wattpad = 'https://kfg6bckb.media.zestyio.com/wattpadHero.png?height=32',
+  tsa = 'https://kfg6bckb.media.zestyio.com/theSalvationArmyHero.png?height=32';
 
 const logos = [
   {
@@ -24,13 +23,6 @@ const logos = [
     title: 'Sony',
     alt: generateAlt('Sony'),
   },
-  {
-    src: rocketLeague,
-    width: 88.35,
-    height: 32,
-    title: 'Rocket League',
-    alt: generateAlt('Rocket League'),
-  },
   {
     src: singlife,
     width: 102.12,
@@ -39,18 +31,18 @@ const logos = [
     alt: generateAlt('Singlife'),
   },
   {
-    src: acorns,
-    width: 94,
+    src: wattpad,
+    width: 'auto',
     height: 32,
-    title: 'Acorns',
-    alt: generateAlt('Acorns'),
+    title: 'Wattpad',
+    alt: generateAlt('Wattpad'),
   },
   {
-    src: bjs,
-    width: 36.48,
+    src: tsa,
+    width: 'auto',
     height: 32,
-    title: 'Bjs',
-    alt: generateAlt('Bjs'),
+    title: 'The Salvation Army',
+    alt: generateAlt('The Salvation Army'),
   },
   {
     src: phoenixSuns,