From 13dd72cc0c2ff6a14cfbcf7de6f06e7475653421 Mon Sep 17 00:00:00 2001 From: Steve Fenton <99181436+steve-fenton-octopus@users.noreply.github.com> Date: Fri, 1 Sep 2023 13:34:38 +0100 Subject: [PATCH] Extend the footer links --- package.json | 4 +- pnpm-lock.yaml | 146 ++++++++++++-- src/data/footer.ts | 184 ++++++++++++++---- .../accelerator/components/Copyright.astro | 2 +- 4 files changed, 289 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 4b3fa3b5fb..9db58b2439 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ "dependencies": { "@astrojs/mdx": "^1.0.0", "astro": "^3.0.3", - "astro-accelerator": "^0.3.1", - "astro-accelerator-utils": "^0.2.39", + "astro-accelerator": "^0.3.4", + "astro-accelerator-utils": "^0.3.0", "hast-util-from-selector": "^3.0.0", "remark-directive": "^2.0.1", "remark-heading-id": "^1.0.1" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index be03474e8f..64b9f012fe 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,11 +12,11 @@ dependencies: specifier: ^3.0.3 version: 3.0.3 astro-accelerator: - specifier: ^0.3.1 - version: 0.3.1 + specifier: ^0.3.4 + version: 0.3.4 astro-accelerator-utils: - specifier: ^0.2.39 - version: 0.2.39 + specifier: ^0.3.0 + version: 0.3.0 hast-util-from-selector: specifier: ^3.0.0 version: 3.0.0 @@ -73,6 +73,29 @@ packages: - supports-color dev: false + /@astrojs/markdown-remark@3.0.0(astro@3.0.5): + resolution: {integrity: sha512-s8I49Je4++ImgYAgwL32HgN8m6we2qz3RtBpN4AjObMODPwDylmzUHZksD8Toy31q/P59ED3MuwphqOGm9l03w==} + peerDependencies: + astro: ^3.0.0 + dependencies: + '@astrojs/prism': 3.0.0 + astro: 3.0.5 + github-slugger: 2.0.0 + import-meta-resolve: 3.0.0 + rehype-raw: 6.1.1 + rehype-stringify: 9.0.4 + remark-gfm: 3.0.1 + remark-parse: 10.0.2 + remark-rehype: 10.1.0 + remark-smartypants: 2.0.0 + shiki: 0.14.3 + unified: 10.1.2 + unist-util-visit: 4.1.2 + vfile: 5.3.7 + transitivePeerDependencies: + - supports-color + dev: false + /@astrojs/mdx@1.0.0(astro@3.0.3): resolution: {integrity: sha512-Gmeleci8o4X7dST9E85c1+k273zcKW8cSFgZLTwU5K4dC0qHfY/EaDKHWrtzOB2wjZlT1JDRzTJ68LJYGrF2OA==} engines: {node: '>=18.14.1'} @@ -102,6 +125,35 @@ packages: - supports-color dev: false + /@astrojs/mdx@1.0.0(astro@3.0.5): + resolution: {integrity: sha512-Gmeleci8o4X7dST9E85c1+k273zcKW8cSFgZLTwU5K4dC0qHfY/EaDKHWrtzOB2wjZlT1JDRzTJ68LJYGrF2OA==} + engines: {node: '>=18.14.1'} + peerDependencies: + astro: ^3.0.0 + dependencies: + '@astrojs/markdown-remark': 3.0.0(astro@3.0.5) + '@astrojs/prism': 3.0.0 + '@mdx-js/mdx': 2.3.0 + acorn: 8.10.0 + astro: 3.0.5 + es-module-lexer: 1.3.0 + estree-util-visit: 1.2.1 + github-slugger: 2.0.0 + gray-matter: 4.0.3 + hast-util-to-html: 8.0.4 + kleur: 4.1.5 + rehype-raw: 6.1.1 + remark-frontmatter: 4.0.1 + remark-gfm: 3.0.1 + remark-smartypants: 2.0.0 + shiki: 0.14.3 + source-map: 0.7.4 + unist-util-visit: 4.1.2 + vfile: 5.3.7 + transitivePeerDependencies: + - supports-color + dev: false + /@astrojs/prism@3.0.0: resolution: {integrity: sha512-g61lZupWq1bYbcBnYZqdjndShr/J3l/oFobBKPA3+qMat146zce3nz2kdO4giGbhYDt4gYdhmoBz0vZJ4sIurQ==} engines: {node: '>=18.14.1'} @@ -1021,17 +1073,17 @@ packages: hasBin: true dev: false - /astro-accelerator-utils@0.2.39: - resolution: {integrity: sha512-8akM88AxoPkw7FDs8J8rm9A2jxthn2/tiBTnQsr6lhw+y5md/hDQokqiSMNCVaS5L7M99EaI46CyE3DEYdw1pg==} + /astro-accelerator-utils@0.3.0: + resolution: {integrity: sha512-qN1EiESBi4GXBO5hvNINtNaOBbPMIYrFUhq7ouFXfCxJ01+WYy0FyST3p+JclB3AxhaFTCs1zzLuTA4IFKlo/Q==} dev: false - /astro-accelerator@0.3.1: - resolution: {integrity: sha512-gsJVAkCPZ3tBviWXPTBqNK1eBGmGpvxWEoPi3dtDvE/K8jayMm4RHSdV4/yge4US66CfeSx8J153kvLbcOb9Gw==} + /astro-accelerator@0.3.4: + resolution: {integrity: sha512-lmpRFoYhTJRfCbaqxl/65e1WbzIfgSwgg91vMWOK97ea99nw/dD5s9ZIlt18jlS42AYHam8aGYTObZKI8Cfssg==} engines: {node: '>=18.14.1', pnpm: '>=8.6.12'} dependencies: - '@astrojs/mdx': 1.0.0(astro@3.0.3) - astro: 3.0.3 - astro-accelerator-utils: 0.2.39 + '@astrojs/mdx': 1.0.0(astro@3.0.5) + astro: 3.0.5 + astro-accelerator-utils: 0.3.0 csv: 6.3.3 hast-util-from-selector: 3.0.0 html-to-text: 9.0.5 @@ -1121,6 +1173,78 @@ packages: - terser dev: false + /astro@3.0.5: + resolution: {integrity: sha512-g6WOl39HyzQJhPSkcO+Tvm3aZ2ZumfAPnxyhnFKmFRDOI78a59iW9EdRl9TbLH6Cinj2CQiOBATfGiR2FU4EXg==} + engines: {node: '>=18.14.1', npm: '>=6.14.0'} + hasBin: true + dependencies: + '@astrojs/compiler': 2.0.1 + '@astrojs/internal-helpers': 0.2.0 + '@astrojs/markdown-remark': 3.0.0(astro@3.0.5) + '@astrojs/telemetry': 3.0.0 + '@babel/core': 7.22.11 + '@babel/generator': 7.22.10 + '@babel/parser': 7.22.14 + '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.22.11) + '@babel/traverse': 7.22.11 + '@babel/types': 7.22.11 + '@types/babel__core': 7.20.1 + acorn: 8.10.0 + boxen: 7.1.1 + chokidar: 3.5.3 + ci-info: 3.8.0 + clsx: 2.0.0 + common-ancestor-path: 1.0.1 + cookie: 0.5.0 + debug: 4.3.4 + devalue: 4.3.2 + diff: 5.1.0 + es-module-lexer: 1.3.0 + esbuild: 0.19.2 + estree-walker: 3.0.3 + execa: 8.0.1 + fast-glob: 3.3.1 + github-slugger: 2.0.0 + gray-matter: 4.0.3 + html-escaper: 3.0.3 + http-cache-semantics: 4.1.1 + js-yaml: 4.1.0 + kleur: 4.1.5 + magic-string: 0.30.3 + mime: 3.0.0 + ora: 7.0.1 + p-limit: 4.0.0 + path-to-regexp: 6.2.1 + preferred-pm: 3.1.1 + prompts: 2.4.2 + rehype: 12.0.1 + resolve: 1.22.4 + semver: 7.5.4 + server-destroy: 1.0.1 + sharp: 0.32.5 + shiki: 0.14.3 + string-width: 6.1.0 + strip-ansi: 7.1.0 + tsconfig-resolver: 3.0.1 + undici: 5.23.0 + unist-util-visit: 4.1.2 + vfile: 5.3.7 + vite: 4.4.9 + vitefu: 0.2.4(vite@4.4.9) + which-pm: 2.1.1 + yargs-parser: 21.1.1 + zod: 3.21.1 + transitivePeerDependencies: + - '@types/node' + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + dev: false + /b4a@1.6.4: resolution: {integrity: sha512-fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw==} dev: false diff --git a/src/data/footer.ts b/src/data/footer.ts index c4fe887e52..8167cab173 100644 --- a/src/data/footer.ts +++ b/src/data/footer.ts @@ -1,42 +1,160 @@ -import type { NavPage } from 'astro-accelerator-utils/types/NavPage'; +import type { MenuItem } from 'astro-accelerator-utils/types/NavPage'; -export const menu: (NavPage | 'categories' | 'tags' | 'toptags')[] = [ +export const menu: (MenuItem | 'categories' | 'tags' | 'toptags')[] = [ { title: '', - url: '', - ariaCurrent: false, - isOpen: false, order: 1, - section: '', - children: [] }, - 'categories', - 'toptags', { - title: 'Quick Links', - url: '', - ariaCurrent: false, - isOpen: false, - order: 1, - section: '', - children: [{ - title: 'Octopus Slack Community', - url: 'https://oc.to/DevOpsMicrosite', - ariaCurrent: false, - isOpen: false, - order: 1, - section: '', - children: [] - },{ - title: 'Octopus Deploy', - url: 'https://octopus.com', - ariaCurrent: false, - isOpen: false, - order: 1, - section: '', - children: [] - }] -}]; + title: 'Product', + order: 2, + children: [ + { + title: 'Features', + url: 'https://octopus.com/features', + order: 1, + }, + { + title: 'Tenanted deployments', + url: 'https://octopus.com/use-case/tenanted-deployments', + order: 2, + }, + { + title: 'Container deployments', + url: 'https://octopus.com/use-case/container-deployments', + order: 3, + }, + { + title: 'What\'s new', + url: 'https://octopus.com/whatsnew', + order: 4, + }, + { + title: 'Roadmap', + url: 'https://roadmap.octopus.com/tabs/2-planned', + order: 5, + }, + { + title: 'Octopus vs. Azure DevOps', + url: 'https://octopus.com/azure-devops', + order: 6, + }, + { + title: 'Octopus vs. Jenkins', + url: 'https://octopus.com/jenkins', + order: 7, + }, + ] + }, + { + title: 'Learn', + order: 3, + children: [ + { + title: 'Getting started', + url: '/docs/getting-started', + order: 1, + }, + { + title: 'Guides', + url: 'https://octopus.com/docs/guides', + order: 2, + }, + { + title: 'DevOps handbook', + url: 'https://octopus.com/devops/', + order: 3, + }, + { + title: 'Deployments', + url: '/docs/deployment-process', + order: 4, + }, + { + title: 'Runbooks', + url: '/docs/runbooks', + order: 5, + }, + { + title: 'Training videos', + url: 'https://www.youtube.com/playlist?list=PLAGskdGvlaw268i2ZTPC1ZrxwFjjKIdKH', + order: 6, + }, + ] + }, + { + title: 'Help', + order: 4, + children: [ + { + title: 'Contact', + url: 'https://octopus.com/company/contact', + order: 1, + }, + { + title: 'Help and support', + url: 'https://octopus.com/support', + order: 2, + }, + { + title: 'Community', + url: 'https://octopus.com/community', + order: 3, + }, + { + title: 'Discussion forum', + url: 'https://help.octopus.com/', + order: 4, + }, + { + title: 'Upgrade and renew', + url: 'https://octopus.com/upgrade', + order: 5, + }, + ] + }, + { + title: 'About us', + order: 5, + children: [ + { + title: 'Company', + url: 'https://octopus.com/company', + order: 1, + }, + { + title: 'Partners', + url: 'https://octopus.com/partners', + order: 2, + }, + { + title: 'Careers', + url: 'https://octopus.com/company/careers', + order: 3, + }, + { + title: 'Trust center', + url: 'https://octopus.com/company/trust', + order: 4, + }, + { + title: 'Security', + url: 'https://octopus.com/docs/security', + order: 5, + }, + { + title: 'Webinars and events', + url: 'https://octopus.com/events', + order: 6, + }, + { + title: 'Stickers and swag', + url: 'https://shop.octopus.com/', + order: 7, + }, + ] + }, +]; /* See navigation.ts diff --git a/src/themes/accelerator/components/Copyright.astro b/src/themes/accelerator/components/Copyright.astro index b30ae40efd..7e71776f91 100644 --- a/src/themes/accelerator/components/Copyright.astro +++ b/src/themes/accelerator/components/Copyright.astro @@ -22,7 +22,7 @@ const _ = Lang(lang); // Logic stats.stop(); --- -

{ _(Translations.footer.copyright) } © { new Date().getFullYear() } { SITE.owner }

+

{ _(Translations.footer.copyright) } © { new Date().getFullYear() + ' ' + SITE.owner }

\ No newline at end of file