@dargmuesli/nuxt-vio 3.0.0-beta.2 → 3.0.0-beta.21

package/plugins/dayjs.ts

@@ -1,4 +1,4 @@
-import dayjs, { extend, locale } from 'dayjs'
+import dayjs from 'dayjs'
 
 // workaround for [1]
 import de from 'dayjs/locale/de'
@@ -10,13 +10,13 @@ import timezone from 'dayjs/plugin/timezone'
 import utc from 'dayjs/plugin/utc'
 
 export default defineNuxtPlugin((_nuxtApp) => {
-  extend(isSameOrBefore)
-  extend(localizedFormat)
-  extend(timezone)
-  extend(utc)
+  dayjs.extend(isSameOrBefore)
+  dayjs.extend(localizedFormat)
+  dayjs.extend(timezone)
+  dayjs.extend(utc)
 
   // workaround for [1]
-  locale(de)
+  dayjs.locale(de)
   // dayjs.locale(en) makes `format` error
 
   return {

package/plugins/gtag.client.ts

@@ -10,7 +10,10 @@ export default defineNuxtPlugin((nuxtApp) => {
     {
       bootstrap: !!cookieControl.cookiesEnabledIds.value?.includes('ga'),
       config: {
-        id: config.public.googleAnalyticsId,
+        id: config.public.vio.googleAnalyticsId,
+        params: {
+          cookie_flags: 'secure;samesite=strict',
+        },
       },
     },
     router,

package/server/middleware/headers.ts

@@ -21,7 +21,7 @@ export default defineEventHandler(async (event) => {
 //   );
 // };
 
-const setRequestHeader = (event: H3Event, name: string, value: string) => {
+const setRequestHeader = (event: H3Event, name: string, value?: string) => {
   event.node.req.headers[name] = value
 }
 

package/server/tsconfig.json

@@ -1,3 +1,3 @@
 {
-  "extends": "../.nuxt/tsconfig.server.json"
+  "extends": "../.playground/.nuxt/tsconfig.server.json"
 }

package/server/utils/util.ts

@@ -0,0 +1,2 @@
+export const getCspAsString = (csp = {} as Record<string, Array<string>>) =>
+  Object.keys(csp).reduce((p, c) => (p += `${c} ${csp[c].join(' ')};`), '')

package/store/auth.ts

@@ -0,0 +1,32 @@
+import { decodeJwt, JWTPayload } from 'jose'
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+export const useVioAuthStore = defineStore('vio-auth', () => {
+  const jwt = ref<string>()
+  const jwtDecoded = ref<JWTPayload>()
+  const signedInUsername = ref<string>()
+
+  const jwtRemove = () => jwtSet(undefined)
+
+  const jwtSet = (jwtNew?: string) => {
+    const jwtDecodedNew = jwtNew !== undefined ? decodeJwt(jwtNew) : undefined
+
+    jwt.value = jwtNew
+    jwtDecoded.value = jwtDecodedNew
+    signedInUsername.value =
+      jwtDecodedNew?.role === 'vio_account' &&
+      jwtDecodedNew.exp !== undefined &&
+      jwtDecodedNew.exp > Math.floor(Date.now() / 1000)
+        ? (jwtDecodedNew.username as string | undefined)
+        : undefined
+  }
+
+  return {
+    jwt,
+    jwtDecoded,
+    signedInUsername,
+    jwtRemove,
+    jwtSet,
+  }
+})

package/tailwind.config.ts

@@ -1,8 +1,8 @@
-import { Config } from 'tailwindcss'
-import colors from 'tailwindcss/colors'
-import { PluginAPI } from 'tailwindcss/types/config'
 import formsPlugin from '@tailwindcss/forms'
 import typographyPlugin from '@tailwindcss/typography'
+import type { Config } from 'tailwindcss'
+import colors from 'tailwindcss/colors'
+import type { PluginAPI } from 'tailwindcss/types/config'
 
 const heading = (theme: PluginAPI['theme']): Record<string, string> => ({
   fontWeight: theme('fontWeight.bold'),

package/types/api.d.ts

@@ -0,0 +1,9 @@
+import type { CombinedError } from '@urql/core'
+
+export type ApiData = ComputedRef<{
+  data?: Object
+  errors: BackendError[]
+  isFetching: boolean
+}>
+
+export type BackendError = CombinedError | { errcode: string; message: string }

package/types/fetch.d.ts

@@ -0,0 +1,8 @@
+export interface StrapiResult<T> {
+  data: CollectionItem<T>[]
+  meta: {
+    pagination: {
+      total: number
+    }
+  }
+}

package/types/modules/gql.d.ts

@@ -0,0 +1,6 @@
+declare module '*.gql' {
+  import { DocumentNode } from 'graphql'
+
+  const content: DocumentNode
+  export default content
+}

package/types/modules/graphql.d.ts

@@ -0,0 +1,6 @@
+declare module '*.graphql' {
+  import { DocumentNode } from 'graphql'
+
+  const content: DocumentNode
+  export default content
+}

package/utils/constants.ts

@@ -1,5 +1,15 @@
 export const SITE_NAME = 'Vio'
 
+export const BASE_URL =
+  (process.env.NUXT_PUBLIC_STACK_DOMAIN ? 'https' : 'http') +
+  '://' +
+  (process.env.NUXT_PUBLIC_STACK_DOMAIN ||
+    `${process.env.HOST || 'localhost'}:${
+      !process.env.NODE_ENV || process.env.NODE_ENV === 'development'
+        ? '3000'
+        : '3001'
+    }`)
+export const CACHE_VERSION = 'bOXMwoKlJr'
 export const COOKIE_PREFIX = SITE_NAME.toLocaleLowerCase()
 export const COOKIE_SEPARATOR = '_'
 export const FETCH_RETRY_AMOUNT = 3
@@ -29,3 +39,44 @@ export const I18N_VUE_CONFIG = {
 export const TIMEZONE_COOKIE_NAME = [COOKIE_PREFIX, 'tz'].join(COOKIE_SEPARATOR)
 export const TIMEZONE_HEADER_KEY = `X-${SITE_NAME}-Timezone`
 export const VALIDATION_SUGGESTION_TITLE_LENGTH_MAXIMUM = 300
+export const VIO_NUXT_BASE_CONFIG = ({
+  baseUrl,
+  siteName,
+  stagingHost,
+}: {
+  baseUrl?: string
+  siteName: string
+  stagingHost?: string
+}) =>
+  ({
+    app: {
+      head: {
+        title: SITE_NAME, // fallback data to prevent invalid html at generation
+      },
+    },
+    runtimeConfig: {
+      public: {
+        i18n: {
+          ...(baseUrl ? { baseUrl } : {}),
+        },
+        vio: {
+          ...(stagingHost
+            ? {
+                stagingHost:
+                  process.env.NODE_ENV !== 'production' &&
+                  !process.env.NUXT_PUBLIC_STACK_DOMAIN
+                    ? stagingHost
+                    : undefined,
+              }
+            : {}),
+        },
+      },
+    },
+
+    // modules
+    i18n: I18N_MODULE_CONFIG, // `langDir`, `lazy` and `locales` must be configured to extend a layer having lazy-loaded translations (https://v8.i18n.nuxtjs.org/guide/layers#locales)
+    site: {
+      name: siteName,
+      ...(baseUrl ? { url: baseUrl } : {}),
+    },
+  }) as Parameters<typeof defineNuxtConfig>[0]

package/utils/networking.ts

@@ -60,9 +60,6 @@ export const getCombinedErrorMessages = (
   return errorMessages
 }
 
-export const getCspAsString = (csp = {} as Record<string, Array<string>>) =>
-  Object.keys(csp).reduce((p, c) => (p += `${c} ${csp[c].join(' ')};`), '')
-
 export const getDomainTldPort = (host: string) => {
   const hostParts = host.split('.')
 
@@ -80,10 +77,48 @@ export const getHost = (req: IncomingMessage) => {
   return req.headers.host
 }
 
-export const getTimezone = async (event: H3Event) =>
-  getCookie(event, TIMEZONE_COOKIE_NAME) ||
-  (
-    await ofetch(
+export const getServiceHref = ({
+  host,
+  isSsr = true,
+  name,
+  port,
+  stagingHost,
+}: {
+  host: string
+  isSsr?: boolean
+  name?: string
+  port?: number
+  stagingHost?: string
+}) => {
+  const nameSubdomain = name?.replaceAll('_', '-')
+  const nameSubdomainString = nameSubdomain ? `${nameSubdomain}.` : ''
+  const portString = port ? `:${port}` : ''
+
+  if (stagingHost) {
+    return `https://${nameSubdomainString}${stagingHost}`
+  } else if (isSsr && process.server) {
+    return `http://${name}${portString}`
+  } else {
+    return `https://${nameSubdomainString}${getDomainTldPort(host)}`
+  }
+}
+
+export const getTimezone = async (event: H3Event) => {
+  const timezoneCookie = getCookie(event, TIMEZONE_COOKIE_NAME)
+
+  if (timezoneCookie) {
+    return timezoneCookie
+  }
+
+  if (event.node.req.headers['x-real-ip']) {
+    const ipApiResult = await ofetch<{ timezone: string }>(
       `http://ip-api.com/json/${event.node.req.headers['x-real-ip']}`,
-    )
-  ).timezone
+    ).catch(() => {})
+
+    if (ipApiResult) {
+      return ipApiResult.timezone
+    }
+  }
+
+  return undefined
+}

package/utils/routing.ts

@@ -1,2 +1,4 @@
-export const append = (path: string, pathToAppend: string) =>
-  path + (path.endsWith('/') ? '' : '/') + pathToAppend
+import { RouteLocationRaw } from '#vue-router'
+
+export const append = (path: string, pathToAppend?: RouteLocationRaw) =>
+  path + (path.endsWith('/') ? '' : '/') + (pathToAppend ?? '')