Merge develop into main (#127)

* Merge main into develop (#122) Co-authored-by: Victor Chanil Park <[email protected]> * fix: eslint config * chore: add proposals link * fix: remove class from proposals link * feat: SEO (#125) * links * Temporary Unavailability of Web Editor Support (#130) * fix: add error handling for platform detection in download page * feat: add web editor support flag --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Victor Chanil Park <[email protected]> Co-authored-by: reflexguru <[email protected]> Co-authored-by: Arjan Dikhoff <[email protected]> Co-authored-by: Charlotte <[email protected]>
Redot-Engine · Oct 19, 2024 · 0c1146d · 0c1146d
1 parent 502def8
commit 0c1146d
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 31 deletions.
diff --git a/app.vue b/app.vue
@@ -10,6 +10,10 @@ useHead({
       name: "description",
       content: "Open source game engine for everyone. No strings attached.",
     },
+    {
+      name: "google-site-verification",
+      content: "Gsmu73HojIdCvaz-xl2dv8faF4tzOrti6gZMNqigOyM",
+    },
   ],
   htmlAttrs: {
     lang: "en",

diff --git a/components/DownloadPage/DownloadPageHero.vue b/components/DownloadPage/DownloadPageHero.vue
@@ -9,7 +9,7 @@
       </div>
       <span class="download-hero__description">
         Download Redot Engine, the powerful platform for building 2D and 3D
-        cross-platform games and interactive <br />
+        cross-platform games and interactive <br>
         experiences.
       </span>
       <div class="download-hero__buttons">

diff --git a/components/DownloadPage/DownloadPageSection.vue b/components/DownloadPage/DownloadPageSection.vue
@@ -9,7 +9,7 @@
             alt="Requirements"
             class="download-section__image"
             src="/img/download/requirements.avif"
-          />
+          >
         </div>
 
         <div class="download-section__requirements__container-text">
@@ -21,7 +21,7 @@
             <p class="download-section__description">
               Recommended: Vulkan 1.0 compatible hardware Minimal: OpenGL 3.3 /
               OpenGL ES 3.0 compatible hardware Additional requirements for the
-              .NET version: <br />
+              .NET version: <br>
               <NuxtLink
                 aria-label=".net download"
                 class="download-section__link"
@@ -39,7 +39,7 @@
             alt="Requirements"
             class="download-section__image"
             src="/img/seo/banner.avif"
-          />
+          >
         </div>
         <div class="download-section__redot__container-text">
           <div class="download-section__text">
@@ -52,7 +52,7 @@
             </p>
           </div>
           <div class="download-section__button">
-            <LinkButton href="https://docs-latest.redotengine.org/about/introduction#about-redot-engine" type="outline" aria-label="learn more"> Learn More &rarr; </LinkButton>
+            <LinkButton aria-label="learn more" href="https://docs-latest.redotengine.org/about/introduction#about-redot-engine" type="outline"> Learn More &rarr; </LinkButton>
           </div>
         </div>
       </div>

diff --git a/components/DownloadPage/DownloadPageSupportedPlatforms.vue b/components/DownloadPage/DownloadPageSupportedPlatforms.vue
@@ -15,6 +15,7 @@
           label="Android"
         />
         <DownloadPageSupportedPlatformsItem
+          v-if="useFeatureFlags().webEditorSupport"
           class="download-supported-platforms__web-editor"
           href="https://download.redotengine.org/release/4.4/android-editor.zip"
           icon="/img/download/web-editor.svg"

diff --git a/components/Footer.vue b/components/Footer.vue
@@ -33,7 +33,7 @@ const links = useLinks();
         </div>
 
         <div class="footer-column">
-          <SectionTitle variant="h2"  small>Project</SectionTitle>
+          <SectionTitle variant="h2" small>Project</SectionTitle>
 
           <NuxtLink aria-label="news" class="footer-link" href="/news">News</NuxtLink>
           <NuxtLink :href="links.contribute" aria-label="contribution guidelines" class="footer-link">Contribution Guidelines</NuxtLink>
@@ -42,7 +42,7 @@ const links = useLinks();
         </div>
 
         <div class="footer-column">
-          <SectionTitle variant="h2"  small>Resources</SectionTitle>
+          <SectionTitle variant="h2" small>Resources</SectionTitle>
 
           <NuxtLink v-if="!featureFlags.minimal" class="footer-link" href="#">Assets</NuxtLink>
           <NuxtLink :href="links.pressKit" aria-label="press kit" class="footer-link">Press Kit</NuxtLink>

diff --git a/components/Header.vue b/components/Header.vue
@@ -78,6 +78,12 @@ onMounted(() => {
             class="header-link"
             href="/news"
           >News</NuxtLink>
+          <NuxtLink
+            key="proposals"
+            :href="links.proposals"
+            aria-label="proposals-link"
+            class="header-link"
+          >Proposals</NuxtLink>
           <NuxtLink
             v-if="!featureFlags.minimal"
             key="assets"
@@ -101,7 +107,7 @@ onMounted(() => {
             Donate
             <Icon name="heart" />
           </LinkButton>
-          <LinkButton href="/download" aria-label="download" type="red">
+          <LinkButton aria-label="download" href="/download" type="red">
             Download
             <Icon name="arrow" />
           </LinkButton>

diff --git a/components/MainPage/MainPageHero.vue b/components/MainPage/MainPageHero.vue
@@ -32,18 +32,16 @@ onUnmounted(() => {
           class="hero-center-logo"
           fetchpriority="high"
           src="~/assets/images/redot-logo-white.svg"
-        />
-
-        <SectionTitle small
-          >Open‑source game engine for&nbsp;everyone.</SectionTitle
         >
 
+        <SectionTitle small>Open‑source game engine for&nbsp;everyone.</SectionTitle>
+
         <SectionDescription>No strings attached.</SectionDescription>
 
         <LinkButton
-          href="/download"
           aria-label="download"
           class="hero-center-button"
+          href="/download"
           type="red"
         >
           Download
@@ -54,30 +52,30 @@ onUnmounted(() => {
       <div class="hero-center hero-center--socials">
         <NuxtLink :href="links.githubUrl" aria-label="github-url" class="social-info">
           <div class="social-icon">
-            <img alt="GitHub" src="~/assets/images/social-github.svg" />
+            <img alt="GitHub" src="~/assets/images/social-github.svg">
           </div>
-          4.2k<br v-if="isMobile" />
+          4.2k<br v-if="isMobile">
           stars
         </NuxtLink>
         <NuxtLink :href="links.discordUrl" aria-label="discord-url" class="social-info">
           <div class="social-icon">
-            <img alt="Discord" src="~/assets/images/social-discord.svg" />
+            <img alt="Discord" src="~/assets/images/social-discord.svg">
           </div>
-          9.1k<br v-if="isMobile" />
+          9.1k<br v-if="isMobile">
           members
         </NuxtLink>
         <NuxtLink :href="links.twitterUrl" aria-label="twitter-url" class="social-info">
           <div class="social-icon">
-            <img alt="Twitter" src="~/assets/images/social-twitter.svg" />
+            <img alt="Twitter" src="~/assets/images/social-twitter.svg">
           </div>
-          20.6k<br v-if="isMobile" />
+          20.6k<br v-if="isMobile">
           followers
         </NuxtLink>
         <NuxtLink :href="links.redditUrl" aria-label="reddit-url" class="social-info">
           <div class="social-icon">
-            <img alt="Reddit" src="~/assets/images/social-reddit.svg" />
+            <img alt="Reddit" src="~/assets/images/social-reddit.svg">
           </div>
-          771<br v-if="isMobile" />
+          771<br v-if="isMobile">
           members
         </NuxtLink>
       </div>

diff --git a/composables/useFeatureFlags.ts b/composables/useFeatureFlags.ts
@@ -1,6 +1,7 @@
 const flags = {
   minimal: true,
   macSupport: false,
+  webEditorSupport: false,
 };
 
 export function useFeatureFlags() {

diff --git a/composables/useLinks.ts b/composables/useLinks.ts
@@ -4,8 +4,9 @@ export const useLinks = () => ({
   discordUrl: "https://discord.gg/redot",
   twitterUrl: "https://x.com/redotengine",
   redditUrl: "https://www.reddit.com/r/RedotGameEngineMain/",
-  pressKit: "https://download.redotengine.org/web/Redot%20Engine%20-%20Brand%20Kit%20(v.1FINAL).zip",
+  pressKit: "https://download.redotengine.org/web/Redot%20Engine%20-%20Brand%20Kit%20(v.1.1).zip",
   documentation: "https://docs.redotengine.org/",
+  proposals: "https://proposals.redotengine.org/",
   contribute: "https://docs.redotengine.org/contributing/how_to_contribute",
   websiteGithubUrl: "https://github.com/Redot-Engine/redot-landing-page",
 });
diff --git a/eslint.config.js b/eslint.config.js
@@ -60,4 +60,7 @@ export default [
       "comma-dangle": ["error", "always-multiline"], // Enforce trailing commas in arrays, objects, etc.
     },
   },
+  {
+    ignores: [".nuxt/*", ".output/*"],
+  },
 ];
diff --git a/pages/download/index.vue b/pages/download/index.vue
@@ -9,23 +9,32 @@ const router = useRouter();
 const platform = ref("");
 
 const platformMapping = {
-  "windows": "windows",
-  "macos": "mac",
-  "ios": "mac",
-  "linux": "linux",
-  "androidos": "android",
+  windows: "windows",
+  macos: "mac",
+  ios: "mac",
+  linux: "linux",
+  androidos: "android",
 };
 
 const redirectToPlatform = () => {
   const browser = detect();
-  const rawPlatform = browser.os.toLowerCase().replace(/\d+/g, "").trim().replace(/\s+/g, "");
-
+  if (!browser) {
+    console.error("Unable to detect browser");
+    return;
+  }
+
+  const rawPlatform =
+      browser.os?.toLowerCase().replace(/\d+/g, "").trim().replace(/\s+/g, "") ||
+      "";
   platform.value = platformMapping[rawPlatform] || rawPlatform;
 
-  router.push(`/download/${platform.value}`);
+  if (platform.value) {
+    router.push(`/download/${platform.value}`);
+  } else {
+    console.error("Unable to determine platform");
+  }
 };
 
-
 onMounted(redirectToPlatform);
 </script>