Merge pull request #434 from zen-browser/revert-429-fix/video

Revert "Implement lazy loading of videos"

astro.config.mjs

@@ -18,5 +18,5 @@ export default defineConfig({
   site: 'https://zen-browser.app',
   redirects: {
     '/themes/[...slug]': '/mods/[...slug]',
-  }
+  },
 })

src/components/Features.astro

@@ -1,5 +1,7 @@
 ---
+import Title from '../components/Title.astro'
 import Description from '../components/Description.astro'
+import { Image } from 'astro:assets'
 
 import browserSidebar from '../assets/browser-sidebar.webm'
 import browserWorkspaces from '../assets/browser-workspaces.webm'
@@ -8,8 +10,7 @@ import browserGlance from '../assets/browser-glance.webm'
 import browserSplitViews from '../assets/browser-splitview.webm'
 
 import { motion } from 'motion/react'
-import { getTitleAnimation } from '../animations'
-import Video from './Video.astro'
+import { getTitleAnimation, getZoomInAnimation } from '../animations'
 ---
 
 <section
@@ -46,15 +47,14 @@ import Video from './Video.astro'
           organized.
         </p>
       </div>
-      <Video
+      <video
         src={browserWorkspaces}
         autoplay
         loop
         muted
         playsinline
         preload="none"
-        class="rounded-xl border-4 border-white object-cover shadow"
-      />
+        class="rounded-xl border-4 border-white object-cover shadow"></video>
     </div>
     <div class="long-feature xl:!flex-row-reverse">
       <div class="lg:p-24">
@@ -66,15 +66,14 @@ import Video from './Video.astro'
           distractions.
         </p>
       </div>
-      <Video
+      <video
         src={browserCompactMode}
         autoplay
         loop
         muted
         playsinline
         preload="none"
-        class="rounded-xl border-4 border-white object-cover shadow"
-      />
+        class="rounded-xl border-4 border-white object-cover shadow"></video>
     </div>
     <div class="long-feature">
       <div class="lg:p-24">
@@ -88,15 +87,14 @@ import Video from './Video.astro'
           opening them.
         </p>
       </div>
-      <Video
+      <video
         src={browserGlance}
         autoplay
         loop
         muted
         playsinline
         preload="none"
-        class="rounded-xl border-4 border-white object-cover shadow"
-      />
+        class="rounded-xl border-4 border-white object-cover shadow"></video>
     </div>
     <div class="long-feature xl:!flex-row-reverse">
       <div class="lg:p-24">
@@ -109,15 +107,14 @@ import Video from './Video.astro'
           Zen's split view feature allows you to view multiple tabs at once.
         </p>
       </div>
-      <Video
+      <video
         src={browserSplitViews}
         autoplay
         loop
         muted
         playsinline
         preload="none"
-        class="rounded-xl border-4 border-white object-cover shadow"
-      />
+        class="rounded-xl border-4 border-white object-cover shadow"></video>
     </div>
     <div class="long-feature">
       <div class="lg:p-24">
@@ -128,15 +125,14 @@ import Video from './Video.astro'
           Zen's sidebar feature allows you to view all your tabs in one place.
         </p>
       </div>
-      <Video
+      <video
         src={browserSidebar}
         autoplay
         loop
         muted
         playsinline
         preload="none"
-        class="rounded-xl border-4 border-white object-cover shadow"
-      />
+        class="rounded-xl border-4 border-white object-cover shadow"></video>
     </div>
   </div>
 </section>

src/components/NavBar.astro

@@ -12,7 +12,7 @@ import {
 } from 'astro-navbar'
 import { ArrowRight, ChevronDown, Download, DownloadCloud } from 'lucide-astro'
 import Logo from './Logo.astro'
-import ThemeSwitch from './ThemeSwitch.astro'
+import { ThemeSwitch } from 'free-astro-components'
 ---
 
 <nav
@@ -112,7 +112,7 @@ import ThemeSwitch from './ThemeSwitch.astro'
       </div>
       <div class="ml-auto flex gap-2">
         <div id="theme-switcher" class="ml-auto md:mr-2">
-          <ThemeSwitch />
+          <ThemeSwitch label="" class="px-1 py-2" />
         </div>
         <Button href="/download" class="ml-auto" isPrimary>
           <span class="hidden items-center gap-2 md:flex">

src/components/ThemeSwitch.astro

@@ -1,33 +0,0 @@
----
-interface Props {
-  label?: string
-  class?: string
-}
-
-const { label = 'Toggle theme', class: className, ...rest } = Astro.props
-import SunIcon from '../icons/SunIcon.astro'
-import MoonIcon from '../icons/MoonIcon.astro'
----
-
-<button
-  id="theme-toggle"
-  type="button"
-  class:list={['rounded-lg p-2.5 outline-none', className]}
-  aria-label={label}
-  {...rest}
->
-  <SunIcon class="hidden size-5 dark:block" />
-  <MoonIcon class="size-5 dark:hidden" />
-</button>
-
-<script>
-  document.addEventListener('astro:page-load', () => {
-    const themeToggleBtn = document.getElementById('theme-toggle')
-    themeToggleBtn?.addEventListener('click', () => {
-      const currentTheme = document.documentElement.dataset.theme
-      const newTheme = currentTheme === 'dark' ? 'light' : 'dark'
-      localStorage.theme = newTheme
-      document.documentElement.dataset.theme = newTheme
-    })
-  })
-</script>

src/components/Video.astro

@@ -1,42 +0,0 @@
----
-const { src, class: className, ...rest } = Astro.props
-const type = src.split('.').pop() || 'webm'
----
-
-<video
-  class:list={['w-full', className]}
-  data-src={src}
-  preload="none"
-  {...rest}
->
-  <source src="" type={`video/${type}`} />
-</video>
-
-<script>
-  document.addEventListener('astro:page-load', () => {
-    const videos = document.querySelectorAll('video[data-src]')
-
-    const loadVideo = (video: HTMLVideoElement) => {
-      const source = video.querySelector('source')
-      const dataSrc = video.getAttribute('data-src')
-      if (dataSrc && source) {
-        source.src = dataSrc
-        video.load()
-        video.removeAttribute('data-src')
-      }
-    }
-
-    const observer = new IntersectionObserver((entries) => {
-      entries.forEach((entry) => {
-        if (entry.isIntersecting) {
-          loadVideo(entry.target as HTMLVideoElement)
-          observer.unobserve(entry.target)
-        }
-      })
-    })
-
-    videos.forEach((video) => {
-      observer.observe(video)
-    })
-  })
-</script>

src/icons/MoonIcon.astro

@@ -1,9 +0,0 @@
----
-const { class: className, ...rest } = Astro.props
----
-
-<svg class={className} viewBox="0 0 24 24" {...rest}>
-  <path
-    d="M10.719 2.082c-2.572 2.028-4.719 5.212-4.719 9.918 0 4.569 1.938 7.798 4.548 9.895-4.829-.705-8.548-4.874-8.548-9.895 0-5.08 3.808-9.288 8.719-9.918zm1.281-2.082c-6.617 0-12 5.383-12 12s5.383 12 12 12c1.894 0 3.87-.333 5.37-1.179-3.453-.613-9.37-3.367-9.37-10.821 0-7.555 6.422-10.317 9.37-10.821-1.74-.682-3.476-1.179-5.37-1.179zm0 10.999c1.437.438 2.562 1.564 2.999 3.001.44-1.437 1.565-2.562 3.001-3-1.436-.439-2.561-1.563-3.001-3-.437 1.436-1.562 2.561-2.999 2.999zm8.001.001c.958.293 1.707 1.042 2 2.001.291-.959 1.042-1.709 1.999-2.001-.957-.292-1.707-1.042-2-2-.293.958-1.042 1.708-1.999 2zm-1-9c-.437 1.437-1.563 2.562-2.998 3.001 1.438.44 2.561 1.564 3.001 3.002.437-1.438 1.563-2.563 2.996-3.002-1.433-.437-2.559-1.564-2.999-3.001z"
-    fill="currentColor"></path>
-</svg>

src/icons/SunIcon.astro

@@ -1,9 +0,0 @@
----
-const { class: className, ...rest } = Astro.props
----
-
-<svg class={className} viewBox="0 0 24 24" {...rest}>
-  <path
-    d="M12 9c1.654 0 3 1.346 3 3s-1.346 3-3 3-3-1.346-3-3 1.346-3 3-3zm0-2c-2.762 0-5 2.238-5 5s2.238 5 5 5 5-2.238 5-5-2.238-5-5-5zm-4.184-.599l-3.593-3.594-1.415 1.414 3.595 3.595c.401-.537.876-1.013 1.413-1.415zm4.184-1.401c.34 0 .672.033 1 .08v-5.08h-2v5.08c.328-.047.66-.08 1-.08zm5.598 2.815l3.595-3.595-1.414-1.414-3.595 3.595c.537.402 1.012.878 1.414 1.414zm-12.598 4.185c0-.34.033-.672.08-1h-5.08v2h5.08c-.047-.328-.08-.66-.08-1zm11.185 5.598l3.594 3.593 1.415-1.414-3.594-3.593c-.403.536-.879 1.012-1.415 1.414zm-9.784-1.414l-3.593 3.593 1.414 1.414 3.593-3.593c-.536-.402-1.011-.877-1.414-1.414zm12.519-5.184c.047.328.08.66.08 1s-.033.672-.08 1h5.08v-2h-5.08zm-6.92 8c-.34 0-.672-.033-1-.08v5.08h2v-5.08c-.328.047-.66.08-1 .08z"
-    fill="currentColor"></path>
-</svg>

src/layouts/Layout.astro

@@ -7,32 +7,29 @@ const { title } = Astro.props
 import '@fontsource/bricolage-grotesque/400.css'
 import NavBar from '../components/NavBar.astro'
 import Footer from '../components/Footer.astro'
-import { ClientRouter } from 'astro:transitions'
 ---
 
 <script is:inline>
-  function setDarkMode(document) {
-    let theme = localStorage.theme
+  const theme = (() => {
+    if (typeof localStorage !== 'undefined' && localStorage.getItem('theme')) {
+      return localStorage.getItem('theme') ?? 'light'
+    }
+    if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
+      return 'dark'
+    }
+    return 'light'
+  })()
 
-    if (theme === undefined) {
-      theme = window.matchMedia('(prefers-color-scheme: dark)').matches
-        ? 'dark'
-        : 'light'
+  if (theme === 'light') {
+    document.documentElement.setAttribute('data-theme', 'light')
+  } else {
+    document.documentElement.setAttribute('data-theme', 'dark')
   }
 
-    localStorage.theme = theme
-
-    document.documentElement.dataset.theme = theme
-  }
-
-  setDarkMode(document)
-
-  document.addEventListener('astro:before-swap', (event) => {
-    setDarkMode(event.newDocument)
-  })
+  window.localStorage.setItem('theme', theme)
 </script>
 
-<html lang="en" transition:name="root" transition:animate="none">
+<html lang="en">
   <head>
     <meta charset="UTF-8" />
     <meta
@@ -72,7 +69,6 @@ import { ClientRouter } from 'astro:transitions'
       title="Zen Browser Release Notes"
       href={`${Astro.url.origin}/feed.xml`}
     />
-    <ClientRouter />
   </head>
   <body
     class="overflow-x-hidden bg-paper font-['bricolage-grotesque'] text-dark"

src/pages/download.astro

@@ -261,7 +261,6 @@ const appleIcon = icon({ prefix: 'fab', iconName: 'apple' })
   </main>
 </Layout>
 <script>
-  document.addEventListener('astro:page-load', () => {
   const releases = {
     macos: {
       intel: 'zen.macos-x86_64.dmg',
@@ -354,9 +353,7 @@ const appleIcon = icon({ prefix: 'fab', iconName: 'apple' })
         "input[type='radio']:checked",
       ) as HTMLInputElement
       selectedArch = selectedRadio.value
-        document
-          .getElementById('linux-target-download')
-          ?.classList.add('hidden')
+      document.getElementById('linux-target-download')?.classList.add('hidden')
 
       const linuxDownload = document.getElementById(
         'form-linux-download',
@@ -391,9 +388,7 @@ const appleIcon = icon({ prefix: 'fab', iconName: 'apple' })
     if (selectedArch) {
       // Go back to architecture selection
       if (selectedOS === 'linux') {
-          document
-            .getElementById('form-linux-download')
-            ?.classList.add('hidden')
+        document.getElementById('form-linux-download')?.classList.add('hidden')
         document
           .getElementById('linux-target-download')
           ?.classList.remove('hidden')
@@ -409,9 +404,7 @@ const appleIcon = icon({ prefix: 'fab', iconName: 'apple' })
     } else if (selectedOS) {
       // Go back to OS selection
       if (selectedOS === 'macos') {
-          document
-            .getElementById('form-macos-download')
-            ?.classList.add('hidden')
+        document.getElementById('form-macos-download')?.classList.add('hidden')
       } else if (selectedOS === 'linux') {
         document
           .getElementById('linux-target-download')
@@ -519,7 +512,6 @@ const appleIcon = icon({ prefix: 'fab', iconName: 'apple' })
     })
 
   filloutDefaultOS()
-  })
 </script>
 <style is:global>
   @keyframes fadeIn {