mango-cms 0.2.22 → 0.2.24

package/cli.js

@@ -400,8 +400,8 @@ server {
     root ${buildPath.replace('/build', '/dist')};
     index index.html;
 
-    # Serve static files directly
-    location ~* \.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|otf|json)$ {
+    # Serve static files directly if they exist
+    location ~* \.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|otf|json|html)$ {
         expires 1y;
         access_log off;
         add_header Cache-Control "public";
@@ -413,8 +413,9 @@ server {
     }
 ` : ''}
 
+    # All other routes go to the fallback unless the file exists
     location / {
-        try_files $uri $uri/ @fallback;
+        try_files $uri @fallback;
     }
 
     location @fallback {

package/default/package.json

@@ -25,7 +25,7 @@
         "dayjs": "^1.10.7",
         "express": "^4.18.1",
         "google-maps": "^4.3.3",
-        "mango-cms": "^0.2.22",
+        "mango-cms": "^0.2.24",
         "mapbox-gl": "^2.7.0",
         "sweetalert2": "^11.4.0",
         "vite": "^6.2.2",

package/default/src/components/layout/login.vue

@@ -32,7 +32,8 @@
                 </template>
 
                 <template v-else>
-                    <div class="text-2xl">Mango Login</div>
+                    <div class="-mb-4 uppercase opacity-50 tracking-widest text-sm">Login</div>
+                    <div class="text-2xl">{{ siteName }}</div>
                     <input type="email" v-model.trim="user.email" placeholder="Email" />
                     <input type="password" v-model.trim="user.password" placeholder="Password" autocomplete="current-password" />
                 </template>
@@ -59,6 +60,7 @@
 import Swal from 'sweetalert2'
 import { validateEmail } from '../../helpers/email'
 import { getUser } from '../../helpers/user'
+import { siteName } from '@settings'
 
 // Function for setting cookies
 let setCookie = function (cname, cvalue) {
@@ -72,6 +74,7 @@ export default {
     inject: ['store','axios'],
     data() {
         return {
+            siteName,
             user: {
                 email: null,
                 password: null,

package/default/src/helpers/localDB.js

@@ -1,5 +1,5 @@
 import axios from "axios"
-import Mango from "./mango"
+// import Mango from "./mango"
 import Swal from "sweetalert2"
 
 // Function for setting cookies
@@ -73,7 +73,7 @@ export default class LocalDB {
 
     }
 
-    async save(entry, syncing) {
+    async save(mangoSave, entry, options = {}) {
 
         if (!this.ready) return
 
@@ -102,18 +102,23 @@ export default class LocalDB {
 
             if (existingEntry) entry = { ...existingEntry, ...entry }
 
+            // Handle if the field is an image or array of images
+            let imageFields = {}
+            for (let key in entry) {
+                if (entry[key]?.type?.includes?.('image') || entry[key]?.type?.includes?.('array') && entry[key]?.[0]?.type?.includes?.('image')) {
+                    imageFields[key] = entry[key]
+                    delete entry[key]
+                }
+            }
+
             // Remove Vue Proxy stuff so indexedDB is happy
-            let savedImage = entry.image
-            delete entry.image
             entry = JSON.parse(JSON.stringify(entry))
-            if (!syncing) entry.updatedLocally = new Date()
-
-            // Format Address for offline
-            // if (!entry.address?.id && entry.address?.formatted) entry.address = entry.address.formatted
+            if (!options.syncing) entry.updatedLocally = new Date()
 
-            // Handle images
-            if (savedImage?.type?.includes?.('image')) entry.image = savedImage
-            if (savedImage?.includes?.('http')) entry.image = savedImage
+            // Add images back in after json formatting
+            for (let key in imageFields) {
+                entry[key] = imageFields[key]
+            }
 
 
             let method = entryExists ? 'put' : 'add'
@@ -152,15 +157,26 @@ export default class LocalDB {
 
                     delete entry.updatedLocally
 
+                    // // Save to Mango (timeout if already created, else no timeout)
+                    // let response
+                    // if (onlyLocal) {
+                    //     response = await Mango[this.collection].save(entry, { bypassLocal: true })
+                    //     // if (warnings?.length) Swal.fire('WARNING:', warnings?.join(', '), 'warning')
+                    //     // console.log('mangoResponse', mangoResponse)
+                    //     // response = mangoResponse
+                    // }
+                    // else response = await runWithTimeout(async () => await Mango[this.collection].save(entry, { bypassLocal: true }), 5000)
+
+
                     // Save to Mango (timeout if already created, else no timeout)
                     let response
                     if (onlyLocal) {
-                        let { response: mangoResponse, warnings } = await Mango[this.collection].save(entry, null, true)
-                        if (warnings?.length) Swal.fire('WARNING:', warnings?.join(', '), 'warning')
-                        console.log('mangoResponse', mangoResponse)
-                        response = mangoResponse
+                        response = await mangoSave(entry, { bypassLocal: true })
+                        // if (warnings?.length) Swal.fire('WARNING:', warnings?.join(', '), 'warning')
+                        // console.log('mangoResponse', mangoResponse)
+                        // response = mangoResponse
                     }
-                    else response = await runWithTimeout(async () => await Mango[this.collection].save(entry), 5000)
+                    else response = await runWithTimeout(async () => await mangoSave(entry, { bypassLocal: true }), 5000)
 
                     // If successfull, delete from local queue
                     if (response?.id) {

package/default/src/helpers/mango.js

@@ -5,6 +5,10 @@ import { algoliaAppId, algoliaSearchKey, algoliaIndex, port, mangoDomain, useDev
 import axios from "axios";
 import { ref } from 'vue'
 import algoliasearch from 'algoliasearch/dist/algoliasearch-lite.esm.browser'
+import LocalDB from './localDB'
+
+import { useRoute } from 'vue-router'
+let route = useRoute()
 
 let endpoints = {
     authors: ['get'],
@@ -48,6 +52,8 @@ function getQuery(params) {
 
 const Mango = collections.reduce((a, c) => {
 
+    let localDB = new LocalDB(c.name, api)
+
     let runQuery = ({ limit, page, search, fields, id, sort, depthLimit, verbose } = {}) => {
 
         let fullQuery
@@ -121,7 +127,8 @@ const Mango = collections.reduce((a, c) => {
 
     }
 
-    let save = (data, options = {}) => {
+    let mangoSave = (data, options = {}) => {
+
         let { id } = data
         let method = id ? 'put' : 'post'
 
@@ -152,6 +159,12 @@ const Mango = collections.reduce((a, c) => {
         })
     }
 
+    let save = (data, options = {}) => {
+        console.log('FROM SAVE:', data)
+        if (!options.bypassLocal) return localDB.save(save, data, options)
+        else return mangoSave(data, options)
+    }
+
     let deleteEntry = (data) => {
         let id = data.id || data
 
@@ -164,11 +177,65 @@ const Mango = collections.reduce((a, c) => {
         })
     }
 
+
+    let sync = () => {
+
+        let remainingEntries = ref([])
+        let syncedEntries = ref([])
+        let online = ref(navigator.onLine)
+        let syncing = ref(false)
+
+        setInterval(async () => {
+
+            console.log('syncing', syncing.value, route?.params?.id)
+            online.value = navigator.onLine
+
+            if (syncing.value) return
+
+            syncing.value = true
+
+            let entries = await localDB.getEntries()
+            remainingEntries.value = entries?.filter(e => (new Date() - new Date(e.updatedLocally)) > 30*1000)
+
+            for (let [index, entry] of remainingEntries.value.entries()) {
+
+                // Don't sync what we're actively working on
+                if (route?.params?.id == entry.id || (!isNaN(entry.id) && window.location.pathname.includes(`/${entry.id}`))) {
+                    console.log('skipping', entry.id)
+                    continue
+                }
+
+                try {
+                    let response = await save(entry, {syncing: true})
+                    if (response?.id) remainingEntries.value.splice(index, 1)
+                } catch(e) {
+                    console.log('Error saving entry', e, entry)
+                }
+
+                await new Promise(resolve => setTimeout(resolve, 10*1000))
+
+            }
+
+            syncing.value = false
+            syncedEntries.value = []
+
+        }, 500)
+
+
+        return { remainingEntries, syncedEntries, online, syncing }
+
+    }
+
     a[c.name] = runQuery
     a[c.name]['save'] = save
     a[c.name]['delete'] = deleteEntry
     a[c.singular] = (id, query) => runQuery({ id, ...query })
 
+    a[c.name]['local'] = localDB.getEntries
+    a[c.singular]['local'] = localDB.get
+    a[c.singular]['local']['delete'] = localDB.delete
+    a[c.name]['sync'] = sync
+
     a[c.name]['search'] = runAlgolia
     a[c.name]['search']['init'] = (search, query, algoliaFilters) => {
         let loading = ref(true)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mango-cms",
-    "version": "0.2.22",
+    "version": "0.2.24",
     "main": "./index.js",
     "exports": {
         ".": "./index.js",

package/webpack.config.js

@@ -27,12 +27,18 @@ module.exports = {
     mode: 'production',
     resolve: {
         alias: {
+
+            '@mango$': path.resolve(mangoRoot, 'src/cms/exports'),
+            '@mango': path.resolve(userProjectRoot, legacyMode ? 'config' : 'mango'),
+
             '@cms': path.resolve(mangoRoot, 'src/cms'),
             '@config': path.resolve(userProjectRoot, legacyMode ? 'config' : 'mango'),
-            '@mango': path.resolve(userProjectRoot, legacyMode ? 'config' : 'mango'),
+            '@settings': path.resolve(userProjectRoot, legacyMode ? 'config/config/settings.json' : 'mango/config/settings.json'),
             '@fields': path.resolve(mangoRoot, 'src/cms/1. build/fields'),
             '@mongo': path.resolve(mangoRoot, 'src/cms/1. build/libraries/mongo'),
+            '@query': path.resolve(mangoRoot, 'src/cms/1. build/libraries/mongo'),
             '@helpers': path.resolve(mangoRoot, 'src/cms/1. build/helpers'),
+            '@main': path.resolve(mangoRoot, 'src/cms/2. process/0. main'),
         },
     },
     devtool: 'inline-source-map',