@edgedev/create-edge-app 1.0.44 → 1.0.46

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/emulator.sh +1 -1
  2. package/firebase.json +3 -0
  3. package/functions/package.json +10 -9
  4. package/middleware/auth.ts +7 -3
  5. package/package.json +1 -1
  6. package/pages/app/dashboard/[[collection]]/[[docId]].vue +2 -2
package/emulator.sh CHANGED
@@ -1,6 +1,6 @@
1
1
  #!/bin/bash
2
2
 
3
- ports=(9099 4000 5001 8080 5025 9199)
3
+ ports=(9099 4000 5001 8080 5025 9199 8085)
4
4
  for port in "${ports[@]}"; do
5
5
  pid=$(lsof -ti :$port)
6
6
  if [ ! -z "$pid" ]; then
package/firebase.json CHANGED
@@ -52,6 +52,9 @@
52
52
  "storage": {
53
53
  "port": 9199
54
54
  },
55
+ "pubsub": {
56
+ "port": 8085
57
+ },
55
58
  "ui": {
56
59
  "enabled": true
57
60
  },
package/functions/package.json CHANGED
@@ -1,6 +1,11 @@
1
1
  {
2
2
  "name": "functions",
3
+ "private": true,
3
4
  "description": "Cloud Functions for Firebase",
5
+ "main": "index.js",
6
+ "engines": {
7
+ "node": "18"
8
+ },
4
9
  "scripts": {
5
10
  "serve": "firebase emulators:start --only functions",
6
11
  "shell": "firebase functions:shell",
@@ -8,16 +13,13 @@
8
13
  "deploy": "firebase deploy --only functions",
9
14
  "logs": "firebase functions:log"
10
15
  },
11
- "engines": {
12
- "node": "16"
13
- },
14
- "main": "index.js",
15
16
  "dependencies": {
16
- "@google-cloud/pubsub": "^4.0.6",
17
+ "@google-cloud/pubsub": "^4.9.0",
17
18
  "crypto": "^1.0.1",
18
19
  "dotenv": "^16.3.1",
19
- "firebase-admin": "^10.0.2",
20
- "firebase-functions": "^4.5.0",
20
+ "exceljs": "^4.4.0",
21
+ "firebase-admin": "^13.0.2",
22
+ "firebase-functions": "^6.2.0",
21
23
  "form-data": "^4.0.0",
22
24
  "formidable-serverless": "^1.1.1",
23
25
  "moment-timezone": "^0.5.43",
@@ -27,6 +29,5 @@
27
29
  },
28
30
  "devDependencies": {
29
31
  "firebase-functions-test": "^0.2.0"
30
- },
31
- "private": true
32
+ }
32
33
  }
package/middleware/auth.ts CHANGED
@@ -1,9 +1,13 @@
1
1
  export default defineNuxtRouteMiddleware(async () => {
2
- // EDGE START
2
+ // EDGE START
3
3
  const preLoginRoute = useState('preLoginRoute')
4
+
4
5
  if (!preLoginRoute.value) {
5
- preLoginRoute.value = window.location.pathname
6
+ // Save both pathname and query string
7
+ const { pathname, search } = window.location
8
+ preLoginRoute.value = `${pathname}${search}`
6
9
  }
10
+
7
11
  const auth: any = useState('auth')
8
12
  if (auth.value) {
9
13
  if (!auth.value.loggedIn) {
@@ -13,5 +17,5 @@ export default defineNuxtRouteMiddleware(async () => {
13
17
  else {
14
18
  return '/app/login'
15
19
  }
16
- // EDGE END
20
+ // EDGE END
17
21
  })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@edgedev/create-edge-app",
3
- "version": "1.0.44",
3
+ "version": "1.0.46",
4
4
  "description": "Create Edge Starter App",
5
5
  "bin": {
6
6
  "create-edge-app": "./bin/cli.js"
package/pages/app/dashboard/[[collection]]/[[docId]].vue CHANGED
@@ -50,7 +50,7 @@ const collection = computed(() => {
50
50
  if (route.params.collection) {
51
51
  return route.params.collection
52
52
  }
53
- return 'things'
53
+ return ''
54
54
  })
55
55
  const docId = computed(() => {
56
56
  if (route.params.docId) {
@@ -75,7 +75,7 @@ onMounted(() => {
75
75
  v-if="edgeFirebase?.user?.loggedIn"
76
76
  class="p-3 w-full h-[calc(100vh-118px)] overflow-y-auto"
77
77
  >
78
- <edge-dashboard v-if="docId === ''" :filter="state.filter" :collection="collection">
78
+ <edge-dashboard v-if="docId === '' && collection !== ''" :filter="state.filter" :collection="collection">
79
79
  <template #header-start>
80
80
  <LayoutDashboard class="mr-2" />
81
81
  <span class="capitalize">{{ collection }}</span>