@edgedev/create-edge-app 1.1.29 → 1.2.30

package/edge/routes/cms/dashboard/blocks/index.vue

@@ -0,0 +1,21 @@
+<script setup>
+const state = reactive({
+  mounted: false,
+})
+
+definePageMeta({
+  middleware: 'auth',
+})
+
+onMounted(() => {
+  state.mounted = true
+})
+</script>
+
+<template>
+  <div
+    v-if="edgeGlobal.edgeState.organizationDocPath && state.mounted"
+  >
+    <edge-cms-blocks-manager />
+  </div>
+</template>

package/edge/routes/cms/dashboard/sites/index.vue

@@ -0,0 +1,13 @@
+<script setup>
+definePageMeta({
+  middleware: 'auth',
+})
+</script>
+
+<template>
+  <div
+    v-if="edgeGlobal.edgeState.organizationDocPath"
+  >
+    <edge-cms-sites-manager />
+  </div>
+</template>

package/edge/routes/cms/nuxtHooks.js

@@ -0,0 +1,52 @@
+import { resolve as resolvePath } from 'node:path'
+import { cmsRoutes } from './routes'
+
+const resolveRouteFileFromCwd = (file) => {
+  const normalizedPath = String(file || '').replace(/^\.\//, '')
+  return resolvePath(process.cwd(), normalizedPath)
+}
+
+export const createCmsNuxtHooks = (resolveFile) => {
+  const resolveRouteFile = typeof resolveFile === 'function'
+    ? resolveFile
+    : resolveRouteFileFromCwd
+
+  const routeExists = (routeList, name) => {
+    for (const route of routeList) {
+      if (route.name === name)
+        return true
+      if (route.children?.length && routeExists(route.children, name))
+        return true
+    }
+    return false
+  }
+
+  const resolveCmsRoute = (route, appRootRoute, isChild = false) => {
+    const shouldStripAppPrefix = Boolean(appRootRoute) && !isChild
+    const nextRoute = {
+      ...route,
+      path: shouldStripAppPrefix
+        ? route.path.replace(/^\/app\/?/, '')
+        : route.path,
+      file: resolveRouteFile(route.file),
+    }
+
+    if (route.children?.length)
+      nextRoute.children = route.children.map(child => resolveCmsRoute(child, appRootRoute, true))
+
+    return nextRoute
+  }
+
+  return {
+    'pages:extend': (pages) => {
+      const appRootRoute = pages.find(page => page.path === '/app')
+      const targetRoutes = appRootRoute?.children || pages
+
+      cmsRoutes.forEach((route) => {
+        const routeToAdd = resolveCmsRoute(route, appRootRoute)
+        if (!routeExists(targetRoutes, routeToAdd.name))
+          targetRoutes.push(routeToAdd)
+      })
+    },
+  }
+}

package/edge/routes/cms/routes.js

@@ -0,0 +1,56 @@
+export const cmsRoutes = [
+  {
+    name: 'cms-dashboard-sites-index',
+    path: '/app/dashboard/sites',
+    file: './edge/routes/cms/dashboard/sites/index.vue',
+  },
+  {
+    name: 'cms-dashboard-blocks-index',
+    path: '/app/dashboard/blocks',
+    file: './edge/routes/cms/dashboard/blocks/index.vue',
+  },
+  {
+    name: 'cms-dashboard-blocks-block',
+    path: '/app/dashboard/blocks/:block',
+    file: './edge/routes/cms/dashboard/blocks/[block].vue',
+  },
+  {
+    name: 'cms-dashboard-media-index',
+    path: '/app/dashboard/media',
+    file: './edge/routes/cms/dashboard/media/index.vue',
+  },
+  {
+    name: 'cms-dashboard-sites-site',
+    path: '/app/dashboard/sites/:site',
+    file: './edge/routes/cms/dashboard/sites/[site].vue',
+    children: [
+      {
+        name: 'cms-dashboard-sites-site-page',
+        path: ':page',
+        file: './edge/routes/cms/dashboard/sites/[site]/[[page]].vue',
+      },
+    ],
+  },
+  {
+    name: 'cms-dashboard-templates-index',
+    path: '/app/dashboard/templates',
+    file: './edge/routes/cms/dashboard/templates/index.vue',
+    children: [
+      {
+        name: 'cms-dashboard-templates-page',
+        path: ':page',
+        file: './edge/routes/cms/dashboard/templates/[page].vue',
+      },
+    ],
+  },
+  {
+    name: 'cms-dashboard-themes-index',
+    path: '/app/dashboard/themes',
+    file: './edge/routes/cms/dashboard/themes/index.vue',
+  },
+  {
+    name: 'cms-dashboard-themes-theme',
+    path: '/app/dashboard/themes/:theme',
+    file: './edge/routes/cms/dashboard/themes/[theme].vue',
+  },
+]

package/firebase_init.sh

@@ -1,3 +1,46 @@
+# Install gcloud if missing (best-effort by platform)
+ensure_gcloud() {
+  if command -v gcloud >/dev/null 2>&1; then
+    return 0
+  fi
+
+  echo "gcloud CLI not found. Attempting to install Google Cloud SDK..."
+
+  if command -v brew >/dev/null 2>&1; then
+    if ! brew list --cask google-cloud-sdk >/dev/null 2>&1; then
+      brew install --cask google-cloud-sdk || {
+        echo "Failed to install Google Cloud SDK with Homebrew."
+        exit 1
+      }
+    fi
+  elif command -v snap >/dev/null 2>&1; then
+    if [ "$(id -u)" -eq 0 ]; then
+      snap install google-cloud-cli --classic || {
+        echo "Failed to install Google Cloud SDK with Snap."
+        exit 1
+      }
+    elif command -v sudo >/dev/null 2>&1; then
+      sudo snap install google-cloud-cli --classic || {
+        echo "Failed to install Google Cloud SDK with Snap."
+        exit 1
+      }
+    else
+      echo "Snap install requires elevated privileges, but 'sudo' is unavailable."
+      exit 1
+    fi
+  else
+    echo "Unable to auto-install Google Cloud SDK on this system."
+    echo "Please install it manually: https://cloud.google.com/sdk/docs/install"
+    exit 1
+  fi
+
+  if ! command -v gcloud >/dev/null 2>&1; then
+    echo "gcloud is still not available in PATH after install."
+    echo "Open a new terminal and run this script again."
+    exit 1
+  fi
+}
+
 # Prompt for the Firebase configuration values
 echo "Please enter your Firebase project ID:"
 read project_id
@@ -34,11 +77,29 @@ if [ -z "$project_id" ]; then
 fi
 
 # Check if firebase is installed
-if ! command -v firebase &> /dev/null; then
+if ! command -v firebase >/dev/null 2>&1; then
   echo "Firebase CLI could not be found. Please install it and try again."
   exit 1
 fi
 
+ensure_gcloud
+
+# Initialize gcloud account/config if needed, then set active project
+active_account="$(gcloud auth list --filter=status:ACTIVE --format='value(account)' 2>/dev/null)"
+if [ -z "$active_account" ]; then
+  echo "No active gcloud account found. Running gcloud init..."
+  if ! gcloud init; then
+    echo "gcloud init failed."
+    exit 1
+  fi
+fi
+
+echo "Setting gcloud project to '$project_id'..."
+if ! gcloud config set project "$project_id"; then
+  echo "Failed to set gcloud project to '$project_id'."
+  exit 1
+fi
+
 # Backup firebase.json if it exists
 if [ -f ./firebase.json ]; then
   cp ./firebase.json ./firebase.json.temp
@@ -93,4 +154,4 @@ 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/nuxt.config.ts

@@ -1,3 +1,8 @@
+import { createCmsNuxtHooks } from './edge/routes/cms/nuxtHooks'
+
+const cmsRouteHooks = {}
+Object.assign(cmsRouteHooks, createCmsNuxtHooks()) // Comment out this line to disable CMS routes.
+
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
   ssr: false,
@@ -16,6 +21,12 @@ export default defineNuxtConfig({
         { rel: 'apple-touch-icon', sizes: '180x180', href: '/favicon/apple-touch-icon.png' },
         { rel: 'manifest', href: '/favicon/site.webmanifest' },
       ],
+      meta: [
+        {
+          'http-equiv': 'Content-Security-Policy',
+          'content': 'font-src \'self\' https://files.edgemarketingdesign.com https://use.typekit.net https://p.typekit.net data:;',
+        },
+      ],
     },
   },
   modules: ['@vant/nuxt', '@nuxtjs/tailwindcss', '@nuxtjs/color-mode', 'shadcn-nuxt'],
@@ -40,9 +51,11 @@ export default defineNuxtConfig({
   },
   components: {
     dirs: [
-      { path: '~/components/formSubtypes', global: true, prefix: 'edge-form-subtypes' },
+      { path: '~/components' },
+
+      // Namespaced wrappers — keep them, but lower priority is fine
       { path: '~/edge/components', global: true, prefix: 'edge' },
-      '~/components',
+      { path: '~/components/formSubtypes', global: true, prefix: 'edge-form-subtypes' },
     ],
   },
   vite: {
@@ -50,11 +63,15 @@ export default defineNuxtConfig({
       'process.env.DEBUG': false,
     },
     server: {
+      watch: {
+        ignored: ['**/.nuxt/**', '**/.output/**', '**/dist/**', '**/node_modules/**'],
+      },
       hmr: {
         port: 3000, // Make sure this port matches your Nuxt server port
         clientPort: 3000, // Ensure this matches your Nuxt server port as well
       },
     },
   },
+  hooks: cmsRouteHooks,
   devtools: { enabled: false },
 })

package/package.json

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

package/services/.deploy.shared.env.example

@@ -0,0 +1,12 @@
+# Optional shared deploy settings for all services.
+# Copy to services/.deploy.shared.env and customize as needed.
+
+# Defaults to .firebaserc project if omitted.
+# PROJECT_ID=clearwater-hub
+
+# Falls back to VITE_FIREBASE_FUNCTIONS_REGION from root .env if omitted.
+# REGION=us-central1
+
+# Comma-separated IAM members to grant Cloud Run Invoker when ALLOW_UNAUTHENTICATED=false.
+# If member type is omitted, serviceAccount: is assumed by deploy-services.sh.
+# INVOKER_MEMBERS=serviceAccount:201505998870-compute@developer.gserviceaccount.com

package/pages/app/dashboard/sites/index.vue

@@ -1,114 +0,0 @@
-<script setup>
-import { toTypedSchema } from '@vee-validate/zod'
-import * as z from 'zod'
-import { Loader2 } from 'lucide-vue-next'
-const route = useRoute()
-// const edgeGlobal = inject('edgeGlobal')
-
-const edgeFirebase = inject('edgeFirebase')
-const isAiBusy = status => status === 'queued' || status === 'running'
-
-const state = reactive({
-  filter: '',
-  newDocs: {
-    sites: {
-      name: { bindings: { 'field-type': 'text', 'label': 'Name', 'helper': 'Name' }, cols: '12', value: '' },
-    },
-  },
-})
-
-const schemas = {
-  sites: toTypedSchema(z.object({
-    name: z.string({
-      required_error: 'Name is required',
-    }).min(1, { message: 'Name is required' }),
-  })),
-}
-
-const collection = computed(() => {
-  if (route.params.collection) {
-    return route.params.collection
-  }
-  return ''
-})
-const docId = computed(() => {
-  if (route.params.docId) {
-    return route.params.docId
-  }
-  return ''
-})
-definePageMeta({
-  middleware: 'auth',
-})
-
-onBeforeMount(() => {
-  // edgeGlobal.showLeftPanel(true)
-})
-const isAdmin = computed(() => {
-  return edgeGlobal.isAdminGlobal(edgeFirebase).value
-})
-const queryField = computed(() => {
-  if (!isAdmin.value) {
-    return 'users'
-  }
-  return ''
-})
-
-const queryValue = computed(() => {
-  if (!isAdmin.value) {
-    return [edgeFirebase?.user?.uid]
-  }
-  return ''
-})
-
-const queryOperator = computed(() => {
-  if (!isAdmin.value) {
-    return 'array-contains-any'
-  }
-  return ''
-})
-</script>
-
-<template>
-  <div
-    v-if="edgeGlobal.edgeState.organizationDocPath"
-  >
-    <edge-dashboard :load-first-if-one="!isAdmin" :filter="state.filter" :query-field="queryField" :query-value="queryValue" :query-operator="queryOperator" collection="sites" class="flex-1 pt-0">
-      <template #list="slotProps">
-        <template v-for="item in slotProps.filtered" :key="item.docId">
-          <edge-shad-button
-            variant="text"
-            class="cursor-pointer w-full flex justify-between items-center py-2 gap-3"
-            :to="isAiBusy(item.aiBootstrapStatus) ? undefined : `/app/dashboard/sites/${item.docId}`"
-            :disabled="isAiBusy(item.aiBootstrapStatus)"
-          >
-            <div>
-              <Avatar class="cursor-pointer p-0 h-8 w-8 mr-2">
-                <FilePenLine class="h-5 w-5" />
-              </Avatar>
-            </div>
-            <div class="grow text-left">
-              <div class="text-lg">
-                {{ item.name }}
-              </div>
-              <div v-if="isAiBusy(item.aiBootstrapStatus)" class="flex items-center gap-2 text-xs text-muted-foreground">
-                <Loader2 class="h-3 w-3 animate-spin" />
-                <span>AI is preparing this site</span>
-              </div>
-            </div>
-            <div>
-              <edge-shad-button
-                size="icon"
-                class="bg-slate-600 h-7 w-7"
-                @click.stop="slotProps.deleteItem(item.docId)"
-              >
-                <Trash class="h-5 w-5" />
-              </edge-shad-button>
-            </div>
-          </edge-shad-button>
-          <Separator class="dark:bg-slate-600" />
-        </template>
-      </template>
-    </edge-dashboard>
-  </div>
-</template>