Merge pull request #110 from cds-snc/alpha-banner

feat: add alpha banner to each page above header
cds-snc · Jul 5, 2022 · f0694de · f0694de
2 parents fd10e1e + c41e085
commit f0694de
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/app/components/Header.vue b/app/components/Header.vue
@@ -14,6 +14,7 @@
       </div>
     </div> -->
     <!-- CDS Banner-->
+    <Banner />
 
     <!-- <nav class="bg-white border-cds-yellow border-t-2 text-black"> -->
     <nav class="bg-white text-black">

diff --git a/app/layouts/expandedSearch.vue b/app/layouts/expandedSearch.vue
@@ -1,9 +1,8 @@
 <template>
   <div class="flex flex-col min-h-screen">
+    <!-- <Banner /> -->
     <Header />
     <main class="flex-grow">
-      <Banner />
-      <!-- <BannerSearch /> -->
       <div class="max-w-7xl mx-auto px-4">
         <Nuxt />
       </div>

diff --git a/app/nuxt.config.js b/app/nuxt.config.js
@@ -187,6 +187,7 @@ module.exports = {
         name: 'English',
         dir: 'ltr',
         domain: process.env.DOMAIN_EN,
+        // For local testing
         // domain: 'en.learning-resources:8080',
       },
       {
@@ -195,6 +196,7 @@ module.exports = {
         file: 'fr.json',
         name: 'Français',
         domain: process.env.DOMAIN_FR,
+        // For local testing
         // domain: 'fr.learning-resources:8080',
       },
     ],

diff --git a/app/pages/fr/index.vue b/app/pages/fr/index.vue
@@ -130,7 +130,7 @@ export default {
   async asyncData({ $axios, payload }) {
     // Contentful --
 
-    const contentfulEndpoint = `https://graphql.contentful.com/content/v1/spaces/${process.env.CTF_SPACE_ID}`;
+    const contentfulEndpoint = `https://graphql.contentful.com/content/v1/spaces/${process.env.CTF_SPACE_ID}`
 
     // const locale = app.i18n.locale + '-CA'
 

diff --git a/app/pages/index.vue b/app/pages/index.vue
@@ -126,8 +126,7 @@ export default {
   layout: 'expandedSearch',
 
   async asyncData({ $axios, payload }) {
-
-    const contentfulEndpoint = `https://graphql.contentful.com/content/v1/spaces/${process.env.CTF_SPACE_ID}`;
+    const contentfulEndpoint = `https://graphql.contentful.com/content/v1/spaces/${process.env.CTF_SPACE_ID}`
 
     // const locale = app.i18n.locale + '-CA'
 

diff --git a/app/pages/resource/_resource.vue b/app/pages/resource/_resource.vue
@@ -43,6 +43,7 @@ import { documentToHtmlString } from '@contentful/rich-text-html-renderer'
 import { BLOCKS } from '@contentful/rich-text-types'
 
 export default {
+  layout: 'expandedSearch',
   // Hooks ------------------------------------------------------------------------------------------------------------
 
   async asyncData({ app, params, $axios, store, payload }) {

diff --git a/app/pages/topic/_topic.vue b/app/pages/topic/_topic.vue
@@ -81,6 +81,8 @@ export default {
     },
   },
 
+  layout: 'expandedSearch',
+
   // Hooks ------------------------------------------------------------------------------------------------------------
 
   async asyncData({ app, params, $axios, store, payload }) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,6 +81,8 @@ export default { @@
         },
       },
+      layout: 'expandedSearch',
       // Hooks ------------------------------------------------------------------------------------------------------------
       async asyncData({ app, params, $axios, store, payload }) {
@@ Expand Down @@