Merge branch 'staging' into fix/a380x-download

flybywiresim · Nov 10, 2024 · d769007 · d769007
2 parents 35105d4 + 6312b41
commit d769007
Show file tree

Hide file tree

Showing 23 changed files with 78 additions and 73 deletions.
diff --git a/README.md b/README.md
@@ -30,7 +30,3 @@ npm run export
 + [Next.js](https://nextjs.org) used to build our page.
 + [React](https://reactjs.org/) javascript library used to make UI.
 + [tailwindcss](https://tailwindcss.com/) low level CSS classes.
-
-##
-
-[![Powered by Vercel](https://www.datocms-assets.com/31049/1618983297-powered-by-vercel.svg)](https://vercel.com/?utm_source=[flybywiresim]&utm_campaign=oss "Powered by Vercel")
diff --git a/public/img/cloudflare-logo.png b/public/img/cloudflare-logo.png
diff --git a/public/svg/vercel.svg b/public/svg/vercel.svg
diff --git a/src/components/Navigation/Footer.tsx b/src/components/Navigation/Footer.tsx
@@ -39,10 +39,10 @@ const Footer = () => (
 
                         <div className="grid grid-cols-3 items-start gap-x-32 gap-y-5">
                             <NavWrapper label="Projects">
-                                <NavItem label="Installer" href="/" />
+                                <NavItem label="Installer" href={links.installer} />
                                 <NavItem label="A32NX" href="/projects/downloadLinks" />
                                 <NavItem label="A380X" href="/projects/a380x" />
-                                <NavItem label="EFB" href="/" />
+                                <NavItem label="EFB" href={links.efb} />
                             </NavWrapper>
 
                             <NavWrapper label="Menu">
@@ -59,6 +59,7 @@ const Footer = () => (
                                 <NavItem label="Facebook" href={links.facebook} />
                                 <NavItem label="YouTube" href={links.youtube} />
                                 <NavItem label="Twitch" href={links.twitch} />
+                                <NavItem label="Press Kit" href={links.pressKit} />
                             </NavWrapper>
                         </div>
                     </div>
@@ -70,10 +71,11 @@ const Footer = () => (
                             <a href="https://github.com/flybywiresim/" target="_blank" rel="noreferrer">Source Code</a>
                         </span>
 
-                        <a href="https://vercel.com" className="flex items-center justify-center gap-1 text-dark/50 lg:justify-end">
-                            <span className="mb-1 mr-1">Powered by</span>
-                            <Image src="/svg/vercel.svg" alt="Vercel" width={50} height={50} />
+                        <a href="https://pages.cloudflare.com/" className="flex items-center justify-center gap-1 text-dark/50 lg:justify-end">
+                            <span className="mb-1 mr-1">Runs on Cloudflare®</span>
+                            <Image src="/img/cloudflare-logo.png" alt="CloudFlare" width={146} height={50} />
                         </a>
+
                         <p className=" text-sm text-dark/50">
                             &copy; FlyByWire Simulations and its contributors 2020-
                             {new Date().getFullYear()}

diff --git a/src/constants/links.ts b/src/constants/links.ts
@@ -7,4 +7,7 @@ export const links: {[name: string]: string} = {
     facebook: 'https://www.facebook.com/FlyByWireSimulations/',
     opencollective: 'https://opencollective.com/flybywire',
     docsfaq: 'https://docs.flybywiresim.com/faq',
+    installer: 'https://flybywirecdn.com/installer/release/FlyByWire_Installer_Setup.exe',
+    efb: 'https://docs.flybywiresim.com/aircraft/common/flypados3',
+    pressKit: 'https://github.com/flybywiresim/branding',
 };
diff --git a/src/pages/downloads/index.tsx b/src/pages/downloads/index.tsx
@@ -4,6 +4,7 @@ import Section from '../../components/Utils/Section';
 import Container from '../../components/Utils/Container';
 import Button from '../../components/Button/Button';
 import DownloadLinks from '../../components/Downloads/DownloadLinks';
+import { links } from '../../constants/links';
 
 const Downloads: NextPage = () => (
     <>
@@ -25,7 +26,7 @@ const Downloads: NextPage = () => (
                         Our easy-to-use installer is the easiest way to get started with our addons. Simply launch and
                         install any addon you want, with only two clicks.
                     </p>
-                    <Link href="https://cdn.flybywiresim.com/installer/release/FlyByWire_Installer_Setup.exe">
+                    <Link href={links.installer}>
                         <Button label="Download" theme="primary" className="mt-auto" />
                     </Link>
                 </div>

diff --git a/src/pages/map/index.tsx b/src/pages/map/index.tsx
@@ -6,8 +6,8 @@ import Section from '../../components/Utils/Section';
 const LeafletMap = dynamic(() => import('../../components/Map/Map'), { ssr: false });
 
 const Map: NextPage = () => (
-    <Section theme="dark" className="w-ful relative h-96 py-0">
-        <LeafletMap className="w-full h-[100vh]" isFullPageMap />
+    <Section theme="dark" className="w-screen h-screen py-0">
+        <LeafletMap className="w-full h-full" isFullPageMap />
     </Section>
 );
 

diff --git a/src/pages/projects/index.tsx b/src/pages/projects/index.tsx
@@ -3,8 +3,7 @@ import { NextPage } from 'next';
 import Section from '../../components/Utils/Section';
 import Container from '../../components/Utils/Container';
 import Card from '../../components/Projects/Card';
-
-// const A32NX_DOWNLOAD_URL = 'https://github.com/flybywiresim/a32nx/releases/download/assets/master/A32NX-master.zip';
+import { links } from '../../constants/links';
 
 const index: NextPage = () => (
     <>
@@ -49,7 +48,7 @@ const index: NextPage = () => (
                         title="EFB"
                         category="Software"
                         description="The Electronic Flight Bag is an integrated tablet with a wide array of tools, settings and more."
-                        href="https://docs.flybywiresim.com/fbw-a32nx/feature-guides/flypados3/"
+                        href={links.efb}
                         direction="horizontal"
                     />
                 </div>

diff --git a/src/posts/a32nx-flight-model.md b/src/posts/a32nx-flight-model.md
@@ -156,19 +156,19 @@ Stay up to date with information from FlyByWire Simulations by following our soc
 
 If you require support or would like to submit a bug report please see the links below:
 
-- [Support Guide](https://docs.flybywiresim.com/fbw-a32nx/support/)
+- [Support Guide](https://docs.flybywiresim.com/aircraft/support/)
 - [Discord Support](https://discord.gg/flybywire)
 - [GitHub Issues](https://github.com/flybywiresim/a32nx/issues/new/choose)
 
 When submitting an issue or asking for support to do the following:
 
-- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/fbw-a32nx/support/reported-issues/) for common problems and workarounds.
+- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/aircraft/support/known-issues/) for common problems and workarounds.
 - Ensure that your issue has not already been reported on our GitHub.
 
-Download the latest version of the A32NX:
+Download the latest version of the A32NX & A380X:
 
 - [Installer](https://api.flybywiresim.com/installer)
-- [Standalone Versions](https://flybywiresim.com/a32nx/#download)
+- [Standalone Versions](https://flybywiresim.com/downloads/)
 
 ---
 

diff --git a/src/posts/a380x-full-speed-ahead.md b/src/posts/a380x-full-speed-ahead.md
@@ -157,19 +157,21 @@ Stay up to date with information from FlyByWire Simulations by following our soc
 
 If you require support or would like to submit a bug report please see the links below:
 
-- [Support Guide](https://docs.flybywiresim.com/fbw-a32nx/support/)
+- [Support Guide](https://docs.flybywiresim.com/aircraft/support/)
 - [Discord Support](https://discord.gg/flybywire)
 - [GitHub Issues](https://github.com/flybywiresim/a32nx/issues/new/choose)
 
 When submitting an issue or asking for support to do the following:
 
-- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/fbw-a32nx/support/reported-issues/) for common problems and workarounds.
+- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/aircraft/support/known-issues/) for common problems and workarounds.
 - Ensure that your issue has not already been reported on our GitHub.
 
-Download the latest version of the A32NX:
+Download the latest version of the A32NX & A380X:
 
 - [Installer](https://api.flybywiresim.com/installer)
-- [Standalone Versions](https://flybywiresim.com/a32nx/#download)
+- [Standalone Versions](https://flybywiresim.com/downloads/)
+
+---
 
 *Media in this article were provided by floridude, Tarek. They retain the exclusive rights.*
 

diff --git a/src/posts/all-the-downloads.md b/src/posts/all-the-downloads.md
@@ -97,16 +97,16 @@ Stay up to date with information from FlyByWire Simulations by following our soc
 
 If you require support or would like to submit a bug report please see the links below:
 
-- [Support Guide](https://docs.flybywiresim.com/fbw-a32nx/support/)
+- [Support Guide](https://docs.flybywiresim.com/aircraft/support/)
 - [Discord Support](https://discord.gg/flybywire)
 - [GitHub Issues](https://github.com/flybywiresim/a32nx/issues/new/choose)
 
 When submitting an issue or asking for support to do the following:
 
-- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/fbw-a32nx/support/reported-issues/) for common problems and workarounds.
+- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/aircraft/support/known-issues/) for common problems and workarounds.
 - Ensure that your issue has not already been reported on our GitHub.
 
-Download the latest version of the A32NX:
+Download the latest version of the A32NX & A380X:
 
 - [Installer](https://api.flybywiresim.com/installer)
-- [Standalone Versions](https://flybywiresim.com/a32nx/#download)
+- [Standalone Versions](https://flybywiresim.com/downloads/)
diff --git a/src/posts/cfms-vnav.md b/src/posts/cfms-vnav.md
@@ -91,19 +91,19 @@ Stay up to date with information from FlyByWire Simulations by following our soc
 
 If you require support or would like to submit a bug report please see the links below:
 
-- [Support Guide](https://docs.flybywiresim.com/fbw-a32nx/support/)
+- [Support Guide](https://docs.flybywiresim.com/aircraft/support/)
 - [Discord Support](https://discord.gg/flybywire)
 - [GitHub Issues](https://github.com/flybywiresim/a32nx/issues/new/choose)
 
 When submitting an issue or asking for support to do the following:
 
-- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/fbw-a32nx/support/reported-issues/) for common problems and workarounds.
+- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/aircraft/support/known-issues/) for common problems and workarounds.
 - Ensure that your issue has not already been reported on our GitHub.
 
-Download the latest version of the A32NX:
+Download the latest version of the A32NX & A380X:
 
 - [Installer](https://api.flybywiresim.com/installer)
-- [Standalone Versions](https://flybywiresim.com/a32nx/#download)
+- [Standalone Versions](https://flybywiresim.com/downloads/)
 
 ---
 

diff --git a/src/posts/cfms.md b/src/posts/cfms.md
@@ -66,19 +66,19 @@ Stay up to date with information from FlyByWire Simulations by following our soc
 
 If you require support or would like to submit a bug report please see the links below:
 
-- [Support Guide](https://docs.flybywiresim.com/fbw-a32nx/support/)
+- [Support Guide](https://docs.flybywiresim.com/aircraft/support/)
 - [Discord Support](https://discord.gg/flybywire)
 - [GitHub Issues](https://github.com/flybywiresim/a32nx/issues/new/choose)
 
 When submitting an issue or asking for support to do the following:
 
-- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/fbw-a32nx/support/reported-issues/) for common problems and workarounds.
+- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/aircraft/support/known-issues/) for common problems and workarounds.
 - Ensure that your issue has not already been reported on our GitHub.
 
-Download the latest version of the A32NX:
+Download the latest version of the A32NX & A380X:
 
 - [Installer](https://api.flybywiresim.com/installer)
-- [Standalone Versions](https://flybywiresim.com/a32nx/#download)
+- [Standalone Versions](https://flybywiresim.com/downloads/)
 
 ---
 

diff --git a/src/posts/development_notam-2021-07-13.md b/src/posts/development_notam-2021-07-13.md
@@ -119,18 +119,19 @@ Stay up to date with information from FlyByWire Simulations by following our soc
 
 If you require support or would like to submit a bug report please see the links below:
 
+- [Support Guide](https://docs.flybywiresim.com/aircraft/support/)
 - [Discord Support](https://discord.gg/flybywire)
 - [GitHub Issues](https://github.com/flybywiresim/a32nx/issues/new/choose)
 
 When submitting an issue or asking for support to do the following:
 
-- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/start/reported-issues/) for common problems and workarounds.
+- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/aircraft/support/known-issues/) for common problems and workarounds.
 - Ensure that your issue has not already been reported on our GitHub.
 
-Download the latest version of the A32NX:
+Download the latest version of the A32NX & A380X:
 
 - [Installer](https://api.flybywiresim.com/installer)
-- [Standalone Versions](https://flybywiresim.com/a32nx/#download)
+- [Standalone Versions](https://flybywiresim.com/downloads/)
 
 ---
 

diff --git a/src/posts/development_notam-2021-08.md b/src/posts/development_notam-2021-08.md
@@ -122,19 +122,19 @@ Stay up to date with information from FlyByWire Simulations by following our soc
 
 If you require support or would like to submit a bug report please see the links below:
 
-- [Support Guide](https://docs.flybywiresim.com/fbw-a32nx/support/)
+- [Support Guide](https://docs.flybywiresim.com/aircraft/support/)
 - [Discord Support](https://discord.gg/flybywire)
 - [GitHub Issues](https://github.com/flybywiresim/a32nx/issues/new/choose)
 
 When submitting an issue or asking for support to do the following:
 
-- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/fbw-a32nx/support/reported-issues/) for common problems and workarounds.
+- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/aircraft/support/known-issues/) for common problems and workarounds.
 - Ensure that your issue has not already been reported on our GitHub.
 
-Download the latest version of the A32NX:
+Download the latest version of the A32NX & A380X:
 
 - [Installer](https://api.flybywiresim.com/installer)
-- [Standalone Versions](https://flybywiresim.com/a32nx/#download)
+- [Standalone Versions](https://flybywiresim.com/downloads/)
 
 ---
 

diff --git a/src/posts/development_notam-2021-10.md b/src/posts/development_notam-2021-10.md
@@ -193,19 +193,19 @@ Stay up to date with information from FlyByWire Simulations by following our soc
 
 If you require support or would like to submit a bug report please see the links below:
 
-- [Support Guide](https://docs.flybywiresim.com/fbw-a32nx/support/)
+- [Support Guide](https://docs.flybywiresim.com/aircraft/support/)
 - [Discord Support](https://discord.gg/flybywire)
 - [GitHub Issues](https://github.com/flybywiresim/a32nx/issues/new/choose)
 
 When submitting an issue or asking for support to do the following:
 
-- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/fbw-a32nx/support/reported-issues/) for common problems and workarounds.
+- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/aircraft/support/known-issues/) for common problems and workarounds.
 - Ensure that your issue has not already been reported on our GitHub.
 
-Download the latest version of the A32NX:
+Download the latest version of the A32NX & A380X:
 
 - [Installer](https://api.flybywiresim.com/installer)
-- [Standalone Versions](https://flybywiresim.com/a32nx/#download)
+- [Standalone Versions](https://flybywiresim.com/downloads/)
 
 ---
 

diff --git a/src/posts/features-and-projects.md b/src/posts/features-and-projects.md
@@ -182,19 +182,19 @@ Stay up to date with information from FlyByWire Simulations by following our soc
 
 If you require support or would like to submit a bug report please see the links below:
 
-- [Support Guide](https://docs.flybywiresim.com/fbw-a32nx/support/)
+- [Support Guide](https://docs.flybywiresim.com/aircraft/support/)
 - [Discord Support](https://discord.gg/flybywire)
 - [GitHub Issues](https://github.com/flybywiresim/a32nx/issues/new/choose)
 
 When submitting an issue or asking for support to do the following:
 
-- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/fbw-a32nx/support/reported-issues/) for common problems and workarounds.
+- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/aircraft/support/known-issues/) for common problems and workarounds.
 - Ensure that your issue has not already been reported on our GitHub.
 
-Download the latest version of the A32NX:
+Download the latest version of the A32NX & A380X:
 
 - [Installer](https://api.flybywiresim.com/installer)
-- [Standalone Versions](https://flybywiresim.com/a32nx/#download)
+- [Standalone Versions](https://flybywiresim.com/downloads/)
 
 ---
 

diff --git a/src/posts/flypados3.md b/src/posts/flypados3.md
@@ -143,19 +143,19 @@ Stay up to date with information from FlyByWire Simulations by following our soc
 
 If you require support or would like to submit a bug report please see the links below:
 
-- [Support Guide](https://docs.flybywiresim.com/fbw-a32nx/support/)
+- [Support Guide](https://docs.flybywiresim.com/aircraft/support/)
 - [Discord Support](https://discord.gg/flybywire)
 - [GitHub Issues](https://github.com/flybywiresim/a32nx/issues/new/choose)
 
 When submitting an issue or asking for support to do the following:
 
-- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/fbw-a32nx/support/reported-issues/) for common problems and workarounds.
+- Visit our [Reported Issues Documentation](https://docs.flybywiresim.com/aircraft/support/known-issues/) for common problems and workarounds.
 - Ensure that your issue has not already been reported on our GitHub.
 
-Download the latest version of the A32NX:
+Download the latest version of the A32NX & A380X:
 
 - [Installer](https://api.flybywiresim.com/installer)
-- [Standalone Versions](https://flybywiresim.com/a32nx/#download)
+- [Standalone Versions](https://flybywiresim.com/downloads/)
 
 ---