mango-cms 0.2.16 → 0.2.18

package/cli.js

@@ -365,6 +365,7 @@ async function detectWebServer() {
 function generateNginxConfig(settings, buildPath) {
     const domain = settings.mangoDomain;
     const port = settings.port || 3002;
+    const frontPort = settings.frontPort || 3001;
 
     return `server {
     root ${buildPath};
@@ -392,7 +393,43 @@ function generateNginxConfig(settings, buildPath) {
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_pass http://localhost:${port};
     }
-}`;
+}
+
+server {
+    server_name ${settings.siteDomain};
+    root ${buildPath};
+    index index.html;
+
+    # Serve static files directly
+    location ~* \.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|otf|json)$ {
+        expires 1y;
+        access_log off;
+        add_header Cache-Control "public";
+        try_files $uri =404;
+    }
+
+    ${settings.s3Bucket ? `location /s3/ {
+        proxy_pass https://${settings.s3Bucket}.s3.amazonaws.com/;
+    }
+` : ''}
+
+    location / {
+        try_files $uri $uri/ @fallback;
+    }
+
+    location @fallback {
+        proxy_http_version 1.1;
+        proxy_cache_bypass $http_upgrade;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection 'upgrade';
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass http://localhost:${frontPort};
+    }
+}
+`;
 }
 
 // Helper function to generate apache config
@@ -425,7 +462,32 @@ function generateApacheConfig(settings, buildPath) {
 
     ErrorLog \${APACHE_LOG_DIR}/${domain}-error.log
     CustomLog \${APACHE_LOG_DIR}/${domain}-access.log combined
-</VirtualHost>`;
+</VirtualHost>
+
+<VirtualHost *:80>
+    ServerName ${settings.siteDomain}
+    DocumentRoot ${buildPath}
+    IndexIndex index.html
+
+    # Serve static files directly
+    <FilesMatch \.\.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot|otf|json)$>
+        Header set Cache-Control "max-age=31536000"
+    </FilesMatch>
+
+    ${settings.s3Bucket ? `ProxyPass /s3/ https://${settings.s3Bucket}.s3.amazonaws.com/
+    ProxyPassReverse /s3/ https://${settings.s3Bucket}.s3.amazonaws.com/
+` : ''}
+
+    ProxyPass / http://localhost:${frontPort}/
+    ProxyPassReverse / http://localhost:${frontPort}/
+
+    RequestHeader set X-Forwarded-Proto "https"
+    RequestHeader set X-Forwarded-Port "443"
+
+    ErrorLog \${APACHE_LOG_DIR}/${settings.siteDomain}-error.log
+    CustomLog \${APACHE_LOG_DIR}/${settings.siteDomain}-access.log combined
+</VirtualHost>
+`;
 }
 
 // Helper function to configure web server
@@ -508,7 +570,7 @@ async function managePM2Process(settings) {
             execSync(`pm2 reload ${processName}`);
         } else {
             console.log(`Starting new PM2 process: ${processName}`);
-            execSync(`pm2 start build/index.js --name ${processName}`);
+            execSync(`pm2 start index.js --name ${processName}`, { cwd: './build' });
         }
     } catch (error) {
         console.error('Error managing PM2 process:', error.message);

package/default/mango/automation/index.js

@@ -11,8 +11,8 @@ let startAutomations = function () {
 
     setInterval(() => {
 
-        // Five hour timezone offset for DigitalOcean server
-        let now = new Date(Date.now() - 1000 * 60 * 60 * 5)
+        // Optional timezone offset for server
+        // let now = new Date(Date.now() - 1000 * 60 * 60 * 5)
 
         let day = now.getDay()
         let weekday = days[day]

package/default/mango/config/settings.json

@@ -1,5 +1,6 @@
 {
     "port": 6646,
+    "frontPort": 6645,
     "siteName": "Example",
     "siteDomain": "example.com",
     "mangoDomain": "api.example.com",

package/default/public/index.js

@@ -1,15 +1,17 @@
 const express = require('express');
 const fs = require('fs')
 const axios = require('axios')
-const settings = require('../../config/config/settings.json')
-const collections = require('../../config/config/.collections.json')
+const settings = require('../mango/config/settings.json')
+const collections = require('../mango/config/.collections.json')
 
-let port = 1337
+let port = settings.frontPort
 let metaComment = '<!-- Inject Meta -->'
 let appPlaceholder = '<!--SSR-->'
 
 let serve = async function (req, res) {
 
+    let index = fs.readFileSync('./index.html', 'utf8')
+
     // Cookies
     let cookies
     const { headers: { cookie } } = req;
@@ -22,28 +24,27 @@ let serve = async function (req, res) {
     }
 
     // User Data Injection
-    let index = fs.readFileSync('./index.html', 'utf8')
-    let authorization = cookies?.Authorization
+    let authorization = req?.query?.token || cookies?.Authorization
     if (authorization) {
-
-        let hash = authorization.split(':')[0]
         let userId = authorization.split(':')[1]
-        let user = (await axios.get(`http://localhost:${settings.port}/members?search={"password.hash": "${hash}", "id": "${userId}"}`, { headers: { 'Authorization': authorization } }))
-        user = user?.data?.response?.[0]
+        console.log('authorization', authorization)
+        console.log('userId', userId)
+        let user = await axios.get(`http://localhost:${settings.port}/members/${userId}`, { headers: { authorization } })
+        user = user?.data?.response
+        console.log('user', user)
         if (user) index = index.replace('window.user = null;', `window.user = ${JSON.stringify(user)};`)
-
     }
 
     // Define the collection and ID
     let collection = req.path.split('/')[1]
     let id = req.path.split('/')[2] ? req.path.split('/')[2] : null
 
-    console.log('collection', collection)
-    console.log('id', id)
+    // console.log('collection', collection)
+    // console.log('id', id)
 
     let entry = (await axios.get(`http://localhost:${settings.port}/${collection}/${id}`))?.data?.response
 
-    console.log('entry', entry)
+    // console.log('entry', entry)
 
     if (!entry) return res.send(index)
 

package/default/src/helpers/Mango.vue

@@ -60,14 +60,15 @@ let oldQuery = JSON.stringify(props.query || {})
 let inferedId = computed(() => props.id !== undefined ? props.id : props.query?.id || route?.params?.id || null )
 let searchingAlgolia = computed(() => !!props.algoliaSearch || !!props.algoliaFilters )
 
-let timer;
-let debounceInit = (...args) => {
-    console.log('debouncing')
-    if (active.value === false || props.disabled) return
-    loading.value = true
-    clearTimeout(timer);
-    timer = setTimeout(() => { init.apply(this, args); }, props.debounce);
-};
+let debounceInit = computed(() => {
+    let timer;
+    return (...args) => {
+        if (active.value === false || props.disabled) return
+        loading.value = true
+        clearTimeout(timer);
+        timer = setTimeout(() => { init.apply(this, args); }, props.debounce);
+    };
+})
 
 watch(() => props.query, (n, o) => {
     let newQuery = JSON.stringify(n)
@@ -76,8 +77,8 @@ watch(() => props.query, (n, o) => {
 
 watch(inferedId, (n, o) => defer(null, null, 'id'))
 watch(() => props.collection, (n, o) => defer(null, null, 'collection'))
-watch(() => props.algoliaSearch, (n, o) => searchingAlgolia.value ? debounceInit() : init())
-watch(() => props.algoliaFilters, (n, o) => searchingAlgolia.value ? debounceInit() : init())
+watch(() => props.algoliaSearch, (n, o) => searchingAlgolia.value ? debounceInit.value() : init())
+watch(() => props.algoliaFilters, (n, o) => searchingAlgolia.value ? debounceInit.value() : init())
 watch(loading, (n, o) => emit('update:loading', loading.value))
 watch(data, () => {
     if (data?.value?.length && props.query?.limit && data?.value?.length < props.query?.limit) noneRemain.value = true
@@ -89,7 +90,7 @@ function defer(n,o,origin) {
     console.log('n,o,origin', n,o,origin)
     if (n == o && origin == 'query') return console.log(`they're the same...`)
     if (origin == 'query') oldQuery = n
-    nextTick(() => debounceInit())
+    nextTick(() => debounceInit.value())
 }
 
 async function loadMore() {
@@ -110,6 +111,7 @@ async function loadMore() {
     } else {
         var nextPage = await Mango[inferedCollection.value](query)
     }
+    nextPage = nextPage?.response || nextPage
     if (nextPage.length) data.value = data.value.concat(nextPage)
     if (!nextPage.length || (query.limit && nextPage.length < query.limit)) noneRemain.value = true
     loadingPage.value = false
@@ -189,6 +191,10 @@ async function init() {
         if (id) data.value = await Mango[collection](id, query)
         else data.value = await Mango[collection](query)
 
+        if (data.value?.count) emit('totalResults', data.value.count)
+
+        data.value = data.value?.response || data.value
+
         emit('update:data', data.value)
         loading.value = false
 

package/default/src/helpers/mango.js

@@ -24,34 +24,63 @@ if (process.env.NODE_ENV != 'production' && useDevAPI) {
     ws = `ws://localhost:${port}/graphql`
 }
 
+function getQuery(params) {
+
+    if (params.search != undefined)
+        params.search = JSON.stringify(params.search);
+    if (params.fields != undefined)
+        params.fields = JSON.stringify(params.fields);
+    if (params.sort != undefined) params.sort = JSON.stringify(params.sort);
+
+    const query =
+        Object.keys(params)
+            .filter((key) => params[key] != undefined)
+            ?.map(
+                (key) =>
+                    `${encodeURIComponent(key)}=${encodeURIComponent(
+                        params[key]
+                    )}`
+            )
+            ?.join("&") || "";
+
+    return query
+}
+
 const Mango = collections.reduce((a, c) => {
 
-    let runQuery = ({ limit, page, search, fields, id, sort, depthLimit } = {}) => {
+    let runQuery = ({ limit, page, search, fields, id, sort, depthLimit, verbose } = {}) => {
 
         let fullQuery
 
-
-        const params = { limit, page, search, fields, sort, depthLimit }
-
-        if (params.search != undefined) params.search = JSON.stringify(params.search)
-        if (params.fields != undefined) params.fields = JSON.stringify(params.fields)
-        if (params.sort != undefined) params.sort = JSON.stringify(params.sort)
-
-        const query = Object.keys(params)
-            .filter(key => params[key] != undefined)
-            ?.map(key => `${encodeURIComponent(key)}=${encodeURIComponent(params[key])}`)
-            ?.join('&') || ''
-        // console.log(query)
+        const query = getQuery({ limit, page, search, fields, sort, depthLimit, verbose })
 
         fullQuery = `${api}/${c.name}/${id || ''}?${query}`
 
         let Authorization = window.localStorage.getItem('token')
 
         return new Promise((resolve, reject) => {
-            axios.get(fullQuery, { headers: { Authorization } })
-                .then(response => resolve(response?.data?.response))
-                .catch(e => reject(e))
-        })
+            // If it's a local entry
+            if (id && !isNaN(id)) {
+                id = Number(id);
+                let request = window.indexedDB.open(c.name, 1);
+                request.onsuccess = (e) => {
+                    let db = e.target.result;
+                    let transaction = db.transaction([c.name], "readwrite");
+                    let store = transaction.objectStore(c.name);
+                    let entryRequest = store.get(id);
+                    entryRequest.onsuccess = (e) => {
+                        let result = entryRequest.result;
+                        if (result) resolve(result);
+                        else reject("No entry found");
+                    };
+                };
+            } else {
+                axios
+                    .get(fullQuery, { headers: { Authorization } })
+                    .then((response) => resolve(verbose ? response?.data : response?.data?.response))
+                    .catch((e) => reject(e));
+            }
+        });
 
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mango-cms",
-    "version": "0.2.16",
+    "version": "0.2.18",
     "main": "./index.js",
     "exports": {
         ".": "./index.js",
@@ -25,10 +25,10 @@
         "dev": "NODE_OPTIONS='--trace-warnings' npx webpack --watch --mode development"
     },
     "peerDependencies": {
-        "vue": "^3.0.0",
-        "vue-router": "^4.0.0",
+        "algoliasearch": "^4.10.3",
         "axios": "^0.21.4",
-        "algoliasearch": "^4.10.3"
+        "vue": "^3.0.0",
+        "vue-router": "^4.0.0"
     },
     "devDependencies": {
         "@vitejs/plugin-vue": "^4.0.0",
@@ -92,16 +92,16 @@
         "stream": "^0.0.2",
         "subscriptions-transport-ws": "^0.9.18",
         "util": "^0.12.3",
-        "uuid": "^8.3.2",
+        "uuid": "3.4.0",
         "web": "^0.0.2",
         "webpack": "^5.10.0",
         "webpack-cli": "^5.1.4",
         "webpack-node-externals": "^2.5.2"
     },
     "optionalDependencies": {
+        "bufferutil": "^4.0.8",
         "kerberos": "^2.0.0",
         "snappy": "^7.2.2",
-        "bufferutil": "^4.0.8",
         "utf-8-validate": "^6.0.4"
     }
 }