@edgedev/create-edge-app 1.1.23 → 1.1.26

package/edge/composables/global.ts

@@ -0,0 +1,519 @@
+// DO NOT EDIT
+
+const route = useRoute()
+
+const edgeState = reactive({
+  currentOrganization: '',
+  organizationDocPath: '',
+  organizations: [],
+  changeTracker: {},
+  user: null,
+  userRoles: [],
+  lastPaginatedDoc: null,
+  subscribedStatus: null,
+  showLeftPanel: {} as Record<string, boolean>,
+  menuItems: [],
+  isAdminCollections: [] as string[],
+  redirectRoute: '',
+  isEmulator: false,
+  blockEditorTheme: '',
+  blockEditorSite: '',
+  cmsPageWithUnsavedChanges: null,
+  devOverride: false,
+})
+
+const setOrganization = async (organization: string, edgeFirebase: any) => {
+  if (organization) {
+    edgeState.changeTracker = {}
+    localStorage.setItem('organizationID', organization)
+    edgeState.currentOrganization = organization
+    await edgeFirebase.startUsersSnapshot(`organizations/${organization}`)
+    edgeState.organizationDocPath = `organizations/${organization}`
+    if (import.meta.env.VITE_FIREBASE_EMULATOR_FIRESTORE) {
+      edgeState.isEmulator = true
+    }
+  }
+}
+
+const showLeftPanel = (show: boolean) => {
+  edgeState.showLeftPanel[route.path] = show
+}
+
+const getSubscribedStatus = (org: any) => {
+  let isSubscribed = true
+  let status = ''
+  let description = ''
+  let color = ''
+  let icon = ''
+
+  if (!org || !org.stripeSubscription) {
+    isSubscribed = false
+    status = 'Not Subscribed'
+    description = 'No subscription found.'
+    color = 'bg-red-900'
+    icon = 'AlertCircle'
+  }
+  else {
+    const subscription = org.stripeSubscription
+
+    if (!subscription || subscription === 'canceled') {
+      isSubscribed = false
+      status = 'Canceled'
+      description = 'The subscription has been canceled.'
+      color = 'bg-red-600'
+      icon = 'X'
+    }
+    else {
+      switch (subscription) {
+        case 'trialing':
+          status = 'Trial'
+          description = 'The subscription is currently in a trial period.'
+          color = 'bg-green-600'
+          icon = 'Check'
+          break
+        case 'active':
+          status = 'Active'
+          description = 'The subscription is in good standing.'
+          color = 'bg-green-600'
+          icon = 'Check'
+          break
+        case 'incomplete':
+          status = 'Incomplete'
+          description = 'A successful payment needs to be made within 23 hours to activate the subscription.'
+          color = 'bg-amber-500'
+          icon = 'Hourglass'
+          break
+        case 'incomplete_expired':
+          status = 'Incomplete Expired'
+          description = 'The initial payment on the subscription failed and no successful payment was made within 23 hours of creating the subscription.'
+          color = 'bg-red-600'
+          icon = 'AlertCircle'
+          break
+        case 'past_due':
+          status = 'Past Due'
+          description = 'Payment on the latest finalized invoice either failed or wasn’t attempted.'
+          color = 'bg-red-600'
+          icon = 'AlertCircle'
+          break
+        case 'unpaid':
+          status = 'Unpaid'
+          description = 'The latest invoice hasn’t been paid but the subscription remains in place.'
+          color = 'bg-red-600'
+          icon = 'AlertCircle'
+          break
+        case 'paused':
+          status = 'Paused'
+          description = 'The subscription has ended its trial period without a default payment method.'
+          color = 'bg-amber-500'
+          icon = 'PauseCircle'
+          break
+        default:
+          status = 'Unknown'
+          description = 'The subscription status is unknown.'
+          color = 'bg-red-600'
+          icon = 'AlertCircle'
+          break
+      }
+    }
+  }
+
+  return {
+    isSubscribed,
+    status,
+    description,
+    color,
+    icon,
+  }
+}
+
+const isDarkMode = () => {
+  if (window.matchMedia) {
+    const darkMode = window.matchMedia('(prefers-color-scheme: dark)')
+    return darkMode.matches
+  }
+  return false
+}
+
+const generateShortId = () => {
+  return Math.random().toString(36).substr(2, 6)
+}
+
+const objHas = (obj: any, key: string): boolean => {
+  if (obj === null || obj === undefined) {
+    return false
+  }
+  return Object.prototype.hasOwnProperty.call(obj, key)
+}
+
+const getOrganizations = async (edgeFirebase: any) => {
+  console.log('getOrganizations')
+  const orgs: any = []
+  if (edgeFirebase.user.loggedIn) {
+    for (const role of edgeFirebase.user.roles) {
+      const segments = role.collectionPath.split('-')
+      if (segments[0] === 'organizations') {
+        await edgeFirebase.startDocumentSnapshot('organizations', segments[1])
+        let org = await edgeFirebase.getDocData('organizations', segments[1])
+        if (!org?.name) {
+          org = { name: 'Organization', docId: segments[1] }
+        }
+        if (!orgs.some((o: { docId: string }) => o.docId === org.docId)) {
+          orgs.push(org)
+        }
+      }
+    }
+  }
+  edgeState.organizations = orgs
+  console.log('Organizations:', edgeState.organizations)
+}
+
+const dupObject = (obj: any): any => {
+  // console.log('Duplicating object:', obj)
+  return JSON.parse(JSON.stringify(obj))
+}
+
+const currentOrganizationObject = computed(() => {
+  const edgeFirebase: any = inject('edgeFirebase')
+  if (edgeState.organizations.length > 0) {
+    if (edgeState.currentOrganization && edgeFirebase?.data[`organizations/${edgeState.currentOrganization}`]) {
+      return edgeFirebase?.data[`organizations/${edgeState.currentOrganization}`]
+    }
+  }
+  return ''
+})
+
+const edgeRules = {
+  forms: (value: any) => {
+    if (!value.length) {
+      return 'You must setup at least one form.'
+    }
+    return true
+  },
+  submits: (value: any) => {
+    if (!value.length) {
+      return 'You must setup at least one submit.'
+    }
+    return true
+  },
+  gptFunctionName: (value: string) => {
+    const pattern = /^[a-zA-Z0-9_-]{1,64}$/
+    return pattern.test(value) || 'The function name must be 1-64 characters and can only contain letters, numbers, underscores, and dashes.'
+  },
+  endpoint: (value: string) => {
+    const urlPattern = /^https?:\/\/(?!:\/\/)([a-zA-Z0-9]+\.)?[a-zA-Z0-9][a-zA-Z0-9-]+(\.[a-zA-Z]{2,6})?(:\d{1,5})?(\/[^\s]*)?$/i
+    if (!urlPattern.test(value)) {
+      return `"${value}" is not a valid URL. The URL must include the protocol (http or https) and the path.`
+    }
+    return true
+  },
+  domains: (value: string) => {
+    const domainPattern = /^https?:\/\/(?!:\/\/)([a-zA-Z0-9]+\.)?[a-zA-Z0-9][a-zA-Z0-9-]+(\.[a-zA-Z]{2,6})?(:\d{1,5})?$/i
+    const localhostPattern = /^https?:\/\/localhost(:\d{1,5})?$/i
+    const ipAddressPattern = /^https?:\/\/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(:\d{1,5})?$/
+    const domains = value.split(',')
+    for (const domain of domains) {
+      if (
+        !domainPattern.test(domain)
+              && !localhostPattern.test(domain)
+              && !ipAddressPattern.test(domain)
+      ) {
+        return `"${domain}" is not a valid domain or IP address. The domain or IP address must include the protocol (http or https).`
+      }
+    }
+    return true
+  },
+  required: (value: any) => {
+    if (typeof value === 'string' && !value) {
+      return 'This field is required.'
+    }
+    else if (Array.isArray(value) && value.length === 0) {
+      return 'This field is required.'
+    }
+    else if (typeof value === 'object' && value !== null && Object.keys(value).length === 0) {
+      return 'This field is required.'
+    }
+    else if (typeof value === 'boolean' && !value) {
+      return 'This field is required.'
+    }
+    return true
+  },
+  email: (value: string) => {
+    const pattern = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+    return pattern.test(value) || 'Invalid e-mail.'
+  },
+  emailOrField: (value: string) => {
+    const pattern = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+    return pattern.test(value) || (value.startsWith('{{') && value.endsWith('}}')) || `Invalid e-mail or field. If you want to use a field, it must be wrapped in double curly braces, e.g. {{${value}}}`
+  },
+  toEmails: (value: string) => {
+    const pattern = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+    const emails = value.split(',')
+    for (const email of emails) {
+      if (!pattern.test(email)) {
+        return `"${email}" is not a valid email address`
+      }
+    }
+    return true
+  },
+  emailsOrFields: (value: string) => {
+    const pattern = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+    const emails = value.split(',')
+    for (const email of emails) {
+      if (!pattern.test(email) && !(email.startsWith('{{') && email.endsWith('}}'))) {
+        return `"${email}" is not a valid email address or field. If you want to use a field, it must be wrapped in double curly braces, e.g. {{${email}}}`
+      }
+    }
+    return true
+  },
+  password: (value: string) => {
+    const pattern = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/
+    return pattern.test(value) || 'Password must have at least 8 characters, including uppercase and lowercase letters, numbers, and a special character'
+  },
+}
+
+const edgeLogOut = async (edgeFirebase: any) => {
+  edgeState.currentOrganization = ''
+  edgeState.organizationDocPath = ''
+  edgeState.organizations = []
+  edgeState.changeTracker = {}
+  edgeState.user = null
+  nextTick(async () => {
+    await edgeFirebase.logOut()
+    window.location.reload()
+  })
+}
+
+const orgUserRoles = (orgId: string) => {
+  orgId = orgId.replaceAll('/', '-')
+  const orgPath = `organizations-${orgId}`
+  const newData = JSON.parse(JSON.stringify(edgeState.userRoles))
+
+  for (let i = 0; i < newData.length; i++) {
+    const roles = newData[i].roles
+    for (let j = 0; j < roles.length; j++) {
+      const role = roles[j]
+      role.collectionPath = role.collectionPath.replace(/organizationDocPath/g, orgPath)
+    }
+  }
+
+  return newData
+}
+
+interface UserRoleType {
+  name: string
+  roles: { collectionPath: string; role: string }[]
+}
+
+interface RoleType {
+  collectionPath: string
+  role: string
+}
+
+const getRoleName = (roles: RoleType[], orgId: string) => {
+  const userRoles: UserRoleType[] = orgUserRoles(orgId)
+  for (const user of userRoles) {
+    let match = true
+    for (const userRole of user.roles) {
+      if (!roles.some(role => role.collectionPath === userRole.collectionPath && role.role === userRole.role)) {
+        match = false
+        break
+      }
+    }
+    if (match) {
+      return user.name
+    }
+  }
+  return 'Unknown'
+}
+
+const isAdminGlobal = (edgeFirebase: any) => computed(() => {
+  const roleCompares = dupObject(edgeState.isAdminCollections)
+  roleCompares.push(`organizations-${edgeState.currentOrganization}`)
+  console.log('roles compare')
+  console.log(roleCompares)
+  for (const compare of roleCompares) {
+    const orgRole = edgeFirebase?.user?.roles.find((role: any) =>
+      role.collectionPath === compare.replaceAll('/', '-'),
+    )
+    if (orgRole && orgRole.role === 'admin') {
+      return true
+    }
+  }
+  return false
+})
+
+interface MenuItem {
+  to: string
+  icon?: string
+  submenu?: SubMenuItem[]
+}
+
+interface SubMenuItem {
+  to: string
+  icon?: string
+}
+
+interface BestMatch {
+  icon: string
+  len: number
+}
+
+const iconFromMenu = (route: { path: string }): string => {
+  const normalize = (p: string): string => {
+    if (!p)
+      return '/'
+    const cleaned = p.replace(/\/+$/, '')
+    return cleaned.length ? cleaned : '/'
+  }
+
+  const current = normalize(route.path)
+  let best: BestMatch = { icon: 'LayoutDashboard', len: -1 }
+
+  for (const item of (edgeState.menuItems || []) as MenuItem[]) {
+    const parentTo = normalize(item.to)
+
+    // 1) Exact submenu match first (wins even if sub.to === item.to)
+    if (Array.isArray(item.submenu)) {
+      for (const sub of item.submenu) {
+        const subTo = normalize(sub.to)
+        if (subTo === current) {
+          return sub.icon || item.icon || 'LayoutDashboard'
+        }
+        // Track most specific submenu prefix match
+        if (current.startsWith(subTo) && subTo.length > best.len) {
+          best = { icon: sub.icon || item.icon || 'LayoutDashboard', len: subTo.length }
+        }
+      }
+    }
+
+    // 2) Exact parent match (only if no exact submenu already returned)
+    if (parentTo === current) {
+      return item.icon || 'LayoutDashboard'
+    }
+
+    // 3) Track most specific parent prefix match
+    if (current.startsWith(parentTo) && parentTo.length > best.len) {
+      best = { icon: item.icon || 'LayoutDashboard', len: parentTo.length }
+    }
+  }
+
+  // 4) Fallback
+  return best.icon
+}
+const toBool = (v: any): boolean => v === true || v === 'true' || v === 1 || v === '1'
+const DEV_OVERRIDE_KEY = 'edgeDevOverride'
+
+const devOverrideEnabled = (): boolean => {
+  if (edgeState.devOverride)
+    return true
+  if (typeof window === 'undefined')
+    return edgeState.devOverride
+  try {
+    return localStorage.getItem(DEV_OVERRIDE_KEY) === '1'
+  }
+  catch (error) {
+    console.warn('dev override read failed', error)
+    return false
+  }
+}
+
+const syncDevOverride = () => {
+  if (typeof window === 'undefined')
+    return
+  edgeState.devOverride = devOverrideEnabled()
+}
+
+const allowMenuItem = (item: any, isAdmin: boolean) => {
+  // const config = useRuntimeConfig()
+  const isDev = process.dev || devOverrideEnabled()
+  const adminOnly = toBool(item.adminOnly)
+  const devOnly = toBool(item.devOnly)
+  console.log('allowMenuItem', { item, isAdmin, isDev, adminOnly, devOnly })
+  const override = toBool(item.override)
+  if (item.override !== undefined)
+    return override
+  if (adminOnly && !isAdmin)
+    return false
+  if (devOnly && !isDev)
+    return false
+  return true
+}
+
+const cmsCollectionData = async (edgeFirebase: any, value: any, meta: any, currentSite: any = '') => {
+  for (const key in meta) {
+    if (meta[key]?.collection) {
+      const staticSearch = new edgeFirebase.SearchStaticData()
+
+      const currentQuery = meta[key].collection.query || []
+      for (const queryKey in meta[key].queryItems || {}) {
+        console.log('key', queryKey)
+        if (meta[key].queryItems[queryKey]) {
+          const findIndex = currentQuery.findIndex((q: any) => q.field === queryKey)
+          const queryOption = meta[key]?.queryOptions?.find((o: any) => o.field === queryKey)
+          const operator = queryOption?.operator || '=='
+          const newQuery = { field: queryKey, operator, value: meta[key].queryItems[queryKey] }
+          if (findIndex > -1) {
+            currentQuery[findIndex] = newQuery
+          }
+          else {
+            currentQuery.push(newQuery)
+          }
+        }
+        else {
+          const findIndex = currentQuery.findIndex((q: any) => q.field === queryKey)
+          if (findIndex > -1) {
+            currentQuery.splice(findIndex, 1)
+          }
+        }
+      }
+      let collectionPath = `${edgeState.organizationDocPath}/${meta[key].collection.path}`
+      if (meta[key].collection.path === 'posts' || meta[key].collection.path === 'post') {
+        collectionPath = `${edgeState.organizationDocPath}/sites/${currentSite}/published_posts`
+      }
+      await staticSearch.getData(collectionPath, currentQuery, meta[key].collection.order, meta[key].limit)
+
+      value[key] = Object.values(staticSearch.results.data)
+    }
+  }
+  return value
+}
+
+const getImage = (file: any, type: string) => {
+  const variants = Array.isArray(file?.cloudflareImageVariants)
+    ? file.cloudflareImageVariants.filter((variant: any) => typeof variant === 'string' && variant.length)
+    : []
+  if (variants.length) {
+    const normalizedType = (type || '').trim().toLowerCase()
+    if (normalizedType) {
+      const match = variants.find((variant: string) => variant.toLowerCase().endsWith(`/${normalizedType}`))
+      if (match) {
+        return match
+      }
+    }
+    return variants[0]
+  }
+  return file?.r2Url || ''
+}
+
+export const edgeGlobal = {
+  edgeState,
+  setOrganization,
+  showLeftPanel,
+  getSubscribedStatus,
+  isDarkMode,
+  generateShortId,
+  objHas,
+  getOrganizations,
+  dupObject,
+  currentOrganizationObject,
+  edgeRules,
+  edgeLogOut,
+  orgUserRoles,
+  getRoleName,
+  isAdminGlobal,
+  iconFromMenu,
+  cmsCollectionData,
+  allowMenuItem,
+  syncDevOverride,
+  getImage,
+}

package/edge-pull.sh

@@ -0,0 +1,2 @@
+git fetch edge-vue-components
+git subtree pull --prefix=edge edge-vue-components main --squash

package/edge-push.sh

@@ -0,0 +1 @@
+git subtree push --prefix=edge edge-vue-components main

package/edge-status.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+git fetch edge-vue-components >/dev/null 2>&1
+
+UP_TREE="$(git rev-parse edge-vue-components/main^{tree})"
+LOCAL_TREE="$(git rev-parse HEAD:edge)"
+
+if [ "$UP_TREE" = "$LOCAL_TREE" ]
+then
+  echo "edge is in sync with edge-vue-components/main"
+else
+  echo "edge differs from edge-vue-components/main"
+fi

package/firebase.json

@@ -25,7 +25,10 @@
     "rewrites": [
       {
         "source": "/api/stripe",
-        "function": "stripe-webhook"
+        "function": {
+          "functionId": "stripe-webhook",
+          "region": "us-west1"
+        }
       },
       {
         "source": "**",
@@ -60,4 +63,4 @@
     },
     "singleProjectMode": true
   }
-}
+}

package/firebase_init.sh

@@ -1,19 +1,32 @@
 # Prompt for the Firebase configuration values
 echo "Please enter your Firebase project ID:"
 read project_id
+
 echo "Please enter your Firebase API key:"
 read api_key
+
 echo "Please enter your Firebase Auth domain:"
 read auth_domain
+
 echo "Please enter your Firebase storage bucket:"
 read storage_bucket
+
 echo "Please enter your Firebase messaging sender ID:"
 read messaging_sender_id
+
 echo "Please enter your Firebase app ID:"
 read app_id
+
 echo "Please enter your Firebase measurement ID:"
 read measurement_id
 
+echo "Please enter your Firebase Functions region (default: us-west1):"
+read functions_region
+
+if [ -z "$functions_region" ]; then
+  functions_region="us-west1"
+fi
+
 # Check if project_id is empty
 if [ -z "$project_id" ]; then
   echo "Error: Firebase project ID cannot be empty."
@@ -26,26 +39,26 @@ if ! command -v firebase &> /dev/null; then
   exit 1
 fi
 
-# Check if firebase.json exists and make a backup
+# Backup firebase.json if it exists
 if [ -f ./firebase.json ]; then
   cp ./firebase.json ./firebase.json.temp
 fi
 
-# Check if firestore.rules exists and make a backup
+# Backup firestore.rules if it exists
 if [ -f ./firestore.rules ]; then
   cp ./firestore.rules ./firestore.rules.temp
 fi
 
 # Initialize Firebase
-firebase use --add $project_id --alias default
+firebase use --add "$project_id" --alias default
 firebase init firestore functions hosting storage emulators --project default
 
-# Restore firebase.json from backup
+# Restore firebase.json
 if [ -f ./firebase.json.temp ]; then
   mv ./firebase.json.temp ./firebase.json
 fi
 
-# Restore firestore.rules from backup
+# Restore firestore.rules
 if [ -f ./firestore.rules.temp ]; then
   mv ./firestore.rules.temp ./firestore.rules
 fi
@@ -58,6 +71,7 @@ echo "VITE_FIREBASE_STORAGE_BUCKET=$storage_bucket" >> .env
 echo "VITE_FIREBASE_MESSAGING_SENDER_ID=$messaging_sender_id" >> .env
 echo "VITE_FIREBASE_APP_ID=$app_id" >> .env
 echo "VITE_FIREBASE_MEASUREMENT_ID=$measurement_id" >> .env
+echo "VITE_FIREBASE_FUNCTIONS_REGION=$functions_region" >> .env
 echo "VITE_FIREBASE_EMULATOR_AUTH=" >> .env
 echo "VITE_FIREBASE_EMULATOR_FIRESTORE=" >> .env
 echo "VITE_FIREBASE_EMULATOR_FUNCTIONS=" >> .env
@@ -73,9 +87,10 @@ echo "VITE_FIREBASE_STORAGE_BUCKET=$storage_bucket" >> .env.dev
 echo "VITE_FIREBASE_MESSAGING_SENDER_ID=$messaging_sender_id" >> .env.dev
 echo "VITE_FIREBASE_APP_ID=$app_id" >> .env.dev
 echo "VITE_FIREBASE_MEASUREMENT_ID=$measurement_id" >> .env.dev
+echo "VITE_FIREBASE_FUNCTIONS_REGION=$functions_region" >> .env.dev
 echo "VITE_FIREBASE_EMULATOR_AUTH=9099" >> .env.dev
 echo "VITE_FIREBASE_EMULATOR_FIRESTORE=8080" >> .env.dev
 echo "VITE_FIREBASE_EMULATOR_FUNCTIONS=5001" >> .env.dev
 echo "VITE_FIREBASE_EMULATOR_STORAGE=9199" >> .env.dev
 echo "REGISTRATION_CODE=organization-registration-template" >> .env.dev
-echo "DEVELOPMENT_MODE=true" >> .env.dev
+echo "DEVELOPMENT_MODE=true" >> .env.dev

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edgedev/create-edge-app",
-  "version": "1.1.23",
+  "version": "1.1.26",
   "description": "Create Edge Starter App",
   "bin": {
     "create-edge-app": "./bin/cli.js"

package/plugins/firebase.client.ts

@@ -13,5 +13,6 @@ export default defineNuxtPlugin((nuxtApp) => {
     emulatorFirestore: import.meta.env.VITE_FIREBASE_EMULATOR_FIRESTORE,
     emulatorFunctions: import.meta.env.VITE_FIREBASE_EMULATOR_FUNCTIONS,
     emulatorStorage: import.meta.env.VITE_FIREBASE_EMULATOR_STORAGE,
+    functionsRegion: import.meta.env.VITE_FIREBASE_FUNCTIONS_REGION,
   }, true, true)
 })

package/edge-components-install.sh

@@ -1 +0,0 @@
-git clone https://github.com/Edge-Marketing-and-Design/edge-vue-components.git edge