From 731d68d53dda8d1b319d1624ba2da04b8891e5d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Fri, 6 Jan 2023 20:38:40 +0100
Subject: [PATCH] fix: hydration problem on default layout (#831)

---
 layouts/default.vue      | 4 ++--
 pages/settings/index.vue | 6 ------
 service-worker/sw.ts     | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index 2c09b010..bff152d8 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -47,7 +47,7 @@ const showUserPicker = logicAnd(
           </slot>
         </div>
       </aside>
-      <div w-full min-h-screen :class="wideLayout ? 'xl:w-full sm:w-600px' : 'sm:w-600px md:shrink-0'" border-base>
+      <div w-full min-h-screen :class="isHydrated && wideLayout ? 'xl:w-full sm:w-600px' : 'sm:w-600px md:shrink-0'" border-base>
         <div min-h="[calc(100vh-3.5rem)]" sm:min-h-screen>
           <slot />
         </div>
@@ -56,7 +56,7 @@ const showUserPicker = logicAnd(
           <NavBottom v-if="isHydrated" />
         </div>
       </div>
-      <aside v-if="!wideLayout" class="hidden sm:none lg:block w-1/4 zen-hide">
+      <aside v-if="isHydrated && !wideLayout" class="hidden sm:none lg:block w-1/4 zen-hide">
         <div sticky top-0 h-screen flex="~ col" gap-2 py3 ms-2>
           <slot name="right">
             <div flex-auto />
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
index a325c796..c0ee6207 100644
--- a/pages/settings/index.vue
+++ b/pages/settings/index.vue
@@ -1,9 +1,3 @@
-<script setup>
-definePageMeta({
-  wideLayout: true,
-})
-</script>
-
 <template>
   <div min-h-screen flex justify-center items-center>
     <div text-center flex="~ col gap-2" items-center>
diff --git a/service-worker/sw.ts b/service-worker/sw.ts
index d1f9a5a8..c2553a53 100644
--- a/service-worker/sw.ts
+++ b/service-worker/sw.ts
@@ -5,14 +5,11 @@ import { NavigationRoute, registerRoute } from 'workbox-routing'
 import { CacheableResponsePlugin } from 'workbox-cacheable-response'
 import { StaleWhileRevalidate } from 'workbox-strategies'
 import { ExpirationPlugin } from 'workbox-expiration'
-// import * as navigationPreload from 'workbox-navigation-preload'
+
 import { onNotificationClick, onPush } from './web-push-notifications'
 
 declare const self: ServiceWorkerGlobalScope
 
-// if (import.meta.env.PROD)
-//   navigationPreload.enable()
-
 self.addEventListener('message', (event) => {
   if (event.data && event.data.type === 'SKIP_WAITING')
     self.skipWaiting()