From b2e371017f43e24d6078f084947ad96d2a91ba46 Mon Sep 17 00:00:00 2001
From: Dhruv Bhanushali <dhruv_b@live.com>
Date: Thu, 13 Jan 2022 13:36:21 +0400
Subject: [PATCH] Combine layouts into one

---
 src/layouts/default.vue         | 24 +++++++++++-------
 src/layouts/with-nav-search.vue | 43 ---------------------------------
 src/pages/about.vue             |  1 -
 src/pages/audio/_id.vue         |  1 -
 src/pages/extension.vue         |  1 -
 src/pages/feedback.vue          |  1 -
 src/pages/image/_id.vue         |  1 -
 src/pages/meta-search.vue       |  1 -
 src/pages/search-help.vue       |  1 -
 src/pages/sources.vue           |  1 -
 10 files changed, 15 insertions(+), 60 deletions(-)
 delete mode 100644 src/layouts/with-nav-search.vue

diff --git a/src/layouts/default.vue b/src/layouts/default.vue
index 29abdb8ad1..7d27e0439b 100644
--- a/src/layouts/default.vue
+++ b/src/layouts/default.vue
@@ -8,19 +8,25 @@
     </main>
   </div>
 </template>
+
 <script>
-import iframeHeight from '~/mixins/iframe-height'
+import { useContext } from '@nuxtjs/composition-api'
 
-import { NAV } from '~/constants/store-modules'
 import VHeader from '~/components/VHeader/VHeader.vue'
-
-import { useContext } from '@nuxtjs/composition-api'
+import MigrationNotice from '~/components/MigrationNotice.vue'
 import TranslationStatusBanner from '~/components/TranslationStatusBanner.vue'
 
-const embeddedPage = {
-  name: 'embedded',
-  components: { VHeader, TranslationStatusBanner },
-  layout: 'embedded',
+import iframeHeight from '~/mixins/iframe-height'
+import { NAV } from '~/constants/store-modules'
+
+const defaultLayout = {
+  name: 'default',
+  components: {
+    VHeader,
+    MigrationNotice,
+    TranslationStatusBanner,
+  },
+  layout: 'default',
   mixins: [iframeHeight],
   head() {
     return this.$nuxtI18nHead({ addSeoAttributes: true, addDirAttribute: true })
@@ -34,5 +40,5 @@ const embeddedPage = {
     }
   },
 }
-export default embeddedPage
+export default defaultLayout
 </script>
diff --git a/src/layouts/with-nav-search.vue b/src/layouts/with-nav-search.vue
deleted file mode 100644
index 239daa569c..0000000000
--- a/src/layouts/with-nav-search.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-  <div class="app">
-    <MigrationNotice v-show="isReferredFromCc" />
-    <TranslationStatusBanner />
-    <VHeader />
-    <main class="embedded">
-      <Nuxt />
-    </main>
-  </div>
-</template>
-<script>
-import iframeHeight from '~/mixins/iframe-height'
-
-import { NAV } from '~/constants/store-modules'
-import MigrationNotice from '~/components/MigrationNotice.vue'
-import VHeader from '~/components/VHeader/VHeader.vue'
-
-import TranslationStatusBanner from '~/components/TranslationStatusBanner.vue'
-import { useContext } from '@nuxtjs/composition-api'
-
-const embeddedWithNavSearch = {
-  name: 'embedded-with-nav-search',
-  components: {
-    MigrationNotice,
-    TranslationStatusBanner,
-    VHeader,
-  },
-  layout: 'embedded-with-nav-search',
-  mixins: [iframeHeight],
-  head() {
-    return this.$nuxtI18nHead({ addSeoAttributes: true, addDirAttribute: true })
-  },
-  setup() {
-    const { store } = useContext()
-    const isReferredFromCc = store.state[NAV].isReferredFromCc
-
-    return {
-      isReferredFromCc,
-    }
-  },
-}
-export default embeddedWithNavSearch
-</script>
diff --git a/src/pages/about.vue b/src/pages/about.vue
index a1d950ad0a..cc484c06ee 100644
--- a/src/pages/about.vue
+++ b/src/pages/about.vue
@@ -98,7 +98,6 @@
 <script>
 const AboutPage = {
   name: 'about-page',
-  layout: 'with-nav-search',
 }
 
 export default AboutPage
diff --git a/src/pages/audio/_id.vue b/src/pages/audio/_id.vue
index 5460897894..51d5a3950a 100644
--- a/src/pages/audio/_id.vue
+++ b/src/pages/audio/_id.vue
@@ -34,7 +34,6 @@ import { MEDIA } from '~/constants/store-modules'
 const AudioDetailPage = {
   name: 'AudioDetailPage',
   mixins: [iframeHeight],
-  layout: 'with-nav-search',
   data() {
     return {
       thumbnailURL: null,
diff --git a/src/pages/extension.vue b/src/pages/extension.vue
index e62b6d9be3..7e32b77179 100644
--- a/src/pages/extension.vue
+++ b/src/pages/extension.vue
@@ -75,7 +75,6 @@ import feature3 from '~/assets/screenshots/extension_feat_3.png'
 const AboutPage = {
   name: 'about-page',
   components: { ExtensionBrowsers },
-  layout: 'with-nav-search',
   data() {
     const features = [
       { key: 'search', image: feature1 },
diff --git a/src/pages/feedback.vue b/src/pages/feedback.vue
index 92eed38ff6..82e8144c37 100644
--- a/src/pages/feedback.vue
+++ b/src/pages/feedback.vue
@@ -71,7 +71,6 @@ const suggestionForm =
 
 export const FeedbackPage = {
   name: 'feedback-page',
-  layout: 'with-nav-search',
   data() {
     return {
       activeTab: 0,
diff --git a/src/pages/image/_id.vue b/src/pages/image/_id.vue
index 8b9957675a..fc0d1f1901 100644
--- a/src/pages/image/_id.vue
+++ b/src/pages/image/_id.vue
@@ -25,7 +25,6 @@ import VPhotoDetails from '~/components/ImageDetails/VPhotoDetails.vue'
 const PhotoDetailPage = {
   name: 'PhotoDetailPage',
   components: { RelatedImages, VPhotoDetails },
-  layout: 'with-nav-search',
   data() {
     return {
       breadCrumbURL: '',
diff --git a/src/pages/meta-search.vue b/src/pages/meta-search.vue
index 61468fd523..b4b63af0fb 100644
--- a/src/pages/meta-search.vue
+++ b/src/pages/meta-search.vue
@@ -118,7 +118,6 @@
 <script>
 export default {
   name: 'MetaSearchPage',
-  layout: 'with-nav-search',
 }
 </script>
 
diff --git a/src/pages/search-help.vue b/src/pages/search-help.vue
index 91527e845d..a893712f94 100644
--- a/src/pages/search-help.vue
+++ b/src/pages/search-help.vue
@@ -255,7 +255,6 @@
 <script>
 const SearchHelpPage = {
   name: 'search-help-page',
-  layout: 'with-nav-search',
   methods: {
     providerSearchLink(providerCode) {
       return `https://search.creativecommons.org/search?q=provider%3A%20"${providerCode}"`
diff --git a/src/pages/sources.vue b/src/pages/sources.vue
index 0c3fd66566..72e5374831 100644
--- a/src/pages/sources.vue
+++ b/src/pages/sources.vue
@@ -151,7 +151,6 @@ const ARABIC_NUMERAL_LOCALES = ['ar', 'fa', 'ur', 'ckb', 'ps']
 
 const SourcePage = {
   name: 'source-page',
-  layout: 'with-nav-search',
   data() {
     return {
       sort: {