@edgedev/create-edge-app 1.1.11 → 1.1.13

package/package.json

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

package/pages/app/account/[page].vue

@@ -55,15 +55,31 @@ const page = computed(() => {
 
 <template>
   <div
-    v-if="edgeFirebase?.user?.loggedIn"
+    v-if="edgeGlobal.edgeState.organizationDocPath"
   >
-    <Card class="w-full flex-1 bg-muted/50 m-auto">
-      <edge-organization-settings v-if="page === 'organization-settings'" :subscribe-options="subscribeOptions" :form-schema="orgSchema" :org-fields="orgFields" />
-      <edge-my-account v-if="page === 'my-account'" />
-      <edge-my-profile v-if="page === 'my-profile'" :form-schema="metaSchema" :meta-fields="metaFields" />
-      <edge-organization-members v-if="page === 'organization-members'" />
-      <edge-my-organizations v-if="page === 'my-organizations'" :registration-code="config.public.registrationCode" />
-      <edge-billing v-if="page === 'subscription'" />
-    </Card>
+    <edge-organization-settings
+      v-if="page === 'organization-settings'"
+      :subscribe-options="subscribeOptions"
+      :form-schema="orgSchema"
+      :org-fields="orgFields"
+    />
+    <edge-my-account
+      v-if="page === 'my-account'"
+    />
+    <edge-my-profile
+      v-if="page === 'my-profile'"
+      :form-schema="metaSchema"
+      :meta-fields="metaFields"
+    />
+    <edge-organization-members
+      v-if="page === 'organization-members'"
+    />
+    <edge-my-organizations
+      v-if="page === 'my-organizations'"
+      :registration-code="config.public.registrationCode"
+    />
+    <edge-billing
+      v-if="page === 'subscription'"
+    />
   </div>
 </template>

package/pages/app/dashboard/[[collection]]/[[docId]].vue

@@ -62,10 +62,40 @@ definePageMeta({
   middleware: 'auth',
 })
 
+const isAdmin = computed(() => {
+  return edgeGlobal.isAdminGlobal(edgeFirebase).value
+})
+
+const toBool = v => v === true || v === 'true' || v === 1 || v === '1'
+
+const allowMenuItem = (item) => {
+  const isDev = config.public.developmentMode
+  const adminOnly = toBool(item.adminOnly)
+  const devOnly = toBool(item.devOnly)
+  const override = toBool(item.override)
+  if (item.override !== undefined)
+    return override
+  if (adminOnly && !isAdmin.value)
+    return false
+  if (devOnly && !isDev)
+    return false
+  return true
+}
+
 onMounted(() => {
   if (!route.params.collection) {
-    // If making a static collection route, this onMounted should be removed
-    router.push('/app/dashboard/things')
+    const menuItems = edgeGlobal.edgeState.menuItems
+      .filter(allowMenuItem)
+      .map(item => ({
+        ...item,
+        submenu: Array.isArray(item.submenu)
+          ? item.submenu.filter(allowMenuItem)
+          : item.submenu,
+      }))
+    const firstTop = (menuItems && menuItems.length) ? menuItems[0] : null
+    if (firstTop && typeof firstTop.to === 'string' && firstTop.to.length) {
+      router.replace(firstTop.to)
+    }
   }
 })
 </script>