diff --git a/helpers/astro/request.js b/helpers/astro/request.js index 56dd4b1..48301ba 100644 --- a/helpers/astro/request.js +++ b/helpers/astro/request.js @@ -1,4 +1,4 @@ -import { getNetlifyRedirect } from '~/helpers/config.js' +import { getNetlifyRedirect } from '~/helpers/config-node.js' export async function catchRedirectResponse ( Astro ) { const requestUrl = new URL( Astro.request.url ) diff --git a/helpers/config.js b/helpers/config-node.js similarity index 66% rename from helpers/config.js rename to helpers/config-node.js index e5592ca..685c5a2 100644 --- a/helpers/config.js +++ b/helpers/config-node.js @@ -1,11 +1,115 @@ import TOML from '@iarna/toml' import fs from 'fs-extra' -import nuxtConfig from '~/nuxt.config.js' - +import pkg from '~/package.json' import { getSiteUrl } from '~/helpers/url.js' -export const nuxtHead = nuxtConfig.head + +export const siteUrl = getSiteUrl() + +export const nuxtHead = { + // this htmlAttrs you need + htmlAttrs: { + lang: 'en', + }, + title: 'Does It ARM', + description: pkg.description, + + meta: [ + { charset: 'utf-8' }, + { + name: 'viewport', + content: 'width=device-width, initial-scale=1' + }, + { + hid: 'description', + name: 'description', + content: pkg.description + }, + { + 'property': 'og:image', + 'content': `${ siteUrl }/images/og-image.png` + }, + { + 'property': 'og:image:width', + 'content': '1200' + }, + { + 'property': 'og:image:height', + 'content': '627' + }, + { + 'property': 'og:image:alt', + 'content': 'Does It ARM Logo' + }, + + // Twitter Card + { + 'property': 'twitter:card', + 'content': 'summary' + }, + { + 'property': 'twitter:title', + 'content': 'Does It ARM' + }, + { + 'property': 'twitter:description', + 'content': pkg.description + }, + { + 'property': 'twitter:url', + 'content': `${ siteUrl }` + }, + { + 'property': 'twitter:image', + 'content': `${ siteUrl }/images/mark.png` + } + ], + link: [ + // Favicon + { + rel: 'icon', + type: 'image/x-icon', + href: '/favicon.ico' + }, + + // Gtag Preconnect + { + rel: 'preconnect', + href: 'https://www.googletagmanager.com' + }, + + // Carbon Preconnects + { + rel: 'preconnect', + href: 'https://cdn.carbonads.com' + }, + { + rel: 'preconnect', + href: 'https://srv.carbonads.net' + }, + { + rel: 'preconnect', + href: 'https://cdn4.buysellads.net' + }, + ], + + script: [ + // // Carbon Ads + // // https://sell.buysellads.com/zones/1294/ad-tags#z=js + // { + // // + // src: 'https://cdn.carbonads.com/carbon.js?serve=CK7DVK3M&placement=doesitarmcom', + // async: true, + // type: 'text/javascript', + // id: '_carbonads_js', + // class: 'include-on-static carbon-inline-wide', + // body: true + // } + ] +} + + export async function getNetlifyConfig () { const configPath = './netlify.toml' diff --git a/helpers/listing-page.js b/helpers/listing-page.js index 66be718..1e03b87 100644 --- a/helpers/listing-page.js +++ b/helpers/listing-page.js @@ -7,7 +7,7 @@ import { getAppType } from './app-derived.js' import { buildVideoStructuredData } from './structured-data.js' -import { nuxtHead } from './config.js' +import { nuxtHead } from '~/helpers/config-node.js' import { getPartPartsFromUrl } from './url.js' diff --git a/nuxt.config.js b/nuxt.config.js index 2a72b7e..ee04190 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -5,6 +5,7 @@ import { getSiteUrl } from '~/helpers/url.js' import { publicRuntimeConfig } from '~/helpers/public-runtime-config.mjs' + const siteUrl = getSiteUrl() @@ -42,107 +43,7 @@ export default { /* ** Headers of the page */ - head: { - // this htmlAttrs you need - htmlAttrs: { - lang: 'en', - }, - title: 'Does It ARM', - description: pkg.description, - - meta: [ - { charset: 'utf-8' }, - { - name: 'viewport', - content: 'width=device-width, initial-scale=1' - }, - { - hid: 'description', - name: 'description', - content: pkg.description - }, - { - 'property': 'og:image', - 'content': `${ siteUrl }/images/og-image.png` - }, - { - 'property': 'og:image:width', - 'content': '1200' - }, - { - 'property': 'og:image:height', - 'content': '627' - }, - { - 'property': 'og:image:alt', - 'content': 'Does It ARM Logo' - }, - - // Twitter Card - { - 'property': 'twitter:card', - 'content': 'summary' - }, - { - 'property': 'twitter:title', - 'content': 'Does It ARM' - }, - { - 'property': 'twitter:description', - 'content': pkg.description - }, - { - 'property': 'twitter:url', - 'content': `${ siteUrl }` - }, - { - 'property': 'twitter:image', - 'content': `${ siteUrl }/images/mark.png` - } - ], - link: [ - // Favicon - { - rel: 'icon', - type: 'image/x-icon', - href: '/favicon.ico' - }, - - // Gtag Preconnect - { - rel: 'preconnect', - href: 'https://www.googletagmanager.com' - }, - - // Carbon Preconnects - { - rel: 'preconnect', - href: 'https://cdn.carbonads.com' - }, - { - rel: 'preconnect', - href: 'https://srv.carbonads.net' - }, - { - rel: 'preconnect', - href: 'https://cdn4.buysellads.net' - }, - ], - - script: [ - // // Carbon Ads - // // https://sell.buysellads.com/zones/1294/ad-tags#z=js - // { - // // - // src: 'https://cdn.carbonads.com/carbon.js?serve=CK7DVK3M&placement=doesitarmcom', - // async: true, - // type: 'text/javascript', - // id: '_carbonads_js', - // class: 'include-on-static carbon-inline-wide', - // body: true - // } - ] - }, + head: , /* ** Customize the progress-bar color diff --git a/src/layouts/default.astro b/src/layouts/default.astro index 64b7941..772f912 100644 --- a/src/layouts/default.astro +++ b/src/layouts/default.astro @@ -1,7 +1,7 @@ --- import '~/assets/css/tailwind.css' -import { PageHead } from '~/helpers/config.js' +import { PageHead } from '~/helpers/config-node.js' import VueBaseLayout from '../../layouts/base.vue' diff --git a/test/listings/index.js b/test/listings/index.js index e36f88d..d4c8d39 100644 --- a/test/listings/index.js +++ b/test/listings/index.js @@ -11,7 +11,7 @@ import { ListingDetails } from '~/helpers/listing-page.js' import { headPropertyTypes } from '~/test/helpers/head.js' -import { PageHead } from '~/helpers/config.js' +import { PageHead } from '~/helpers/config-node.js'