mango-cms 0.2.46 → 0.2.48

package/cli.js

@@ -168,6 +168,13 @@ program
             fs.mkdirSync(projectDir);
             fs.copySync(templateDir, projectDir, { filter: (src, dest) => true });
 
+            // Copy gitignore file (npm excludes .gitignore, so we store it as gitignore)
+            const gitignoreSource = path.join(templateDir, 'gitignore');
+            const gitignoreDest = path.join(projectDir, '.gitignore');
+            if (fs.existsSync(gitignoreSource)) {
+                fs.copySync(gitignoreSource, gitignoreDest);
+            }
+
             // Create config directory if it doesn't exist
             const configDir = path.join(projectDir, 'mango');
 
@@ -668,6 +675,60 @@ program
         }
     });
 
+program
+    .command('pull')
+    .description('Pull the remote database to your local machine')
+    .action(async () => {
+        try {
+            const configPath = path.join(process.cwd(), 'mango/config/settings.json');
+
+            if (!fs.existsSync(configPath)) {
+                console.error('Error: settings.json not found at', configPath);
+                process.exit(1);
+            }
+
+            const settings = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+            const serverIp = settings.serverIp;
+            const database = settings.database;
+
+            if (!serverIp) {
+                console.error('Error: serverIp is not configured in settings.json');
+                process.exit(1);
+            }
+
+            if (!database) {
+                console.error('Error: database is not configured in settings.json');
+                process.exit(1);
+            }
+
+            console.log(`Using server IP: ${serverIp}`);
+            console.log(`Using database: ${database}`);
+
+            const downloadsDir = path.join(require('os').homedir(), 'Downloads');
+            const dumpZip = path.join(downloadsDir, 'dump.zip');
+            const dumpDir = path.join(downloadsDir, 'dump');
+
+            console.log('Dumping remote database...');
+            execSync(`ssh root@${serverIp} "rm -rf dump dump.zip; mongodump --db ${database}; zip -r dump.zip dump/${database}"`, { stdio: 'inherit' });
+
+            console.log('Downloading dump...');
+            execSync(`rsync root@${serverIp}:~/dump.zip ${dumpZip}`, { stdio: 'inherit' });
+
+            console.log('Restoring locally...');
+            execSync(`unzip -o ${dumpZip}`, { cwd: downloadsDir, stdio: 'inherit' });
+            execSync(`mongorestore --drop --db ${database} ${path.join(dumpDir, database)}`, { stdio: 'inherit' });
+
+            // Clean up
+            fs.removeSync(dumpDir);
+            fs.removeSync(dumpZip);
+
+            console.log(`\n✨ Database "${database}" pulled and restored successfully!`);
+        } catch (error) {
+            console.error('Error pulling database:', error.message);
+            process.exit(1);
+        }
+    });
+
 program
     .command('update')
     .description('Update Mango CMS source files to the latest version')

package/default/gitignore

@@ -0,0 +1,5 @@
+node_modules
+.DS_store
+yarn.lock
+build
+dist

package/default/mango/config/globalFields.js

@@ -4,7 +4,7 @@ let { PlainText, Select, Timestamp, Relationship } = fields
 export default {
 
     // title: PlainText({ required: true }),
-    author: Relationship({ collection: 'member', single: true, computed: (doc, req) => [req?.member?.id] || [] }),
+    author: Relationship({ collection: 'member', single: true, default: (doc, req) => req?.member?.id || null }),
     editId: { computed: (doc, req) => req?.member?.id || null },
     created: { computed: doc => doc.created || new Date, type: 'Float' },
     updated: { computed: doc => doc.updated ? new Date : doc.created, type: 'Float' },

package/default/mango/config/settings.json

@@ -23,6 +23,7 @@
 	"s3Bucket": "exampleBucket",
 
 	"emailProvider": "resend",
+    "emailFrom": "Example <info@example.com>",
 	"resendKey": null,
 	"mailgunKey": null,
 	"emailDomain": null,

package/default/mango/helpers/syncDbWithLocal.sh

@@ -33,9 +33,9 @@ echo "Using server IP: $SERVER_IP"
 echo "Using database: $DATABASE"
 
 cd ~/Downloads;
-ssh root@$SERVER_IP "rm -rf dump.zip; mongodump --db $DATABASE; zip -r dump.zip dump"
+ssh root@$SERVER_IP "rm -rf dump dump.zip; mongodump --db $DATABASE; zip -r dump.zip dump/$DATABASE"
 rsync root@$SERVER_IP:~/dump.zip ~/Downloads/dump.zip;
 unzip -o dump.zip;
-mongorestore --drop dump;
+mongorestore --drop --db $DATABASE dump/$DATABASE;
 rm -rf dump;
 rm -rf dump.zip;

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.46",
+        "mango-cms": "^0.2.48",
         "mapbox-gl": "^2.7.0",
         "sweetalert2": "^11.4.0",
         "vite": "^6.2.2",

package/default/src/helpers/mango.js

@@ -87,6 +87,14 @@ const processFields = (fields, collectionName) => {
     return result
 }
 
+// Function for setting cookies
+let setCookie = function (cname, cvalue) {
+    var d = new Date();
+    d.setTime(d.getTime() + (365 * 24 * 60 * 60 * 1000));
+    var expires = "expires=" + d.toUTCString();
+    document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/";
+}
+
 const Mango = collections.reduce((a, c) => {
 	let localDB = new LocalDB(c.name, api)
 
@@ -348,6 +356,11 @@ const Mango = collections.reduce((a, c) => {
 	a[c.singular]['local']['delete'] = localDB.delete
 	a[c.name]['sync'] = sync
 
+    a[c.name]['count'] = ({ search } = {}) => {
+        return runQuery({ search, fields: ['id'], verbose: true })
+            .then(data => data?.count || 0)
+    }
+
 	a[c.name]['search'] = search
 	a[c.name]['search']['init'] = (search, query, algoliaFilters) => {
 		let loading = ref(true)
@@ -487,12 +500,22 @@ Mango.login = ({ email, password }) => {
 				window.localStorage.setItem('token', response.data.token)
 				window.localStorage.setItem('user', response.data.memberId)
 				window.localStorage.setItem('email', email)
+                setCookie(`Authorization`, `${response.data.token}`)
 				resolve(response.data)
 			})
 			.catch((e) => reject(e))
 	})
 }
 
+Mango.logout = (axios) => {
+    window.localStorage.removeItem('token')
+    window.localStorage.removeItem('user')
+    window.localStorage.removeItem('email')
+    setCookie(`Authorization`, ``)
+    if (axios) delete axios.defaults.headers.common['Authorization']
+    return true
+}
+
 // Build endpoints from the generated .endpoints.json
 Mango.endpoints = Object.keys(endpointsData).reduce((acc, path) => {
 	const methods = endpointsData[path]

package/default/vite.config.js

@@ -71,5 +71,6 @@ export default defineConfig({
 	},
 	optimizeDeps: {
 		exclude: ['vue', '@collections', '@settings', '@endpoints'], // Prevent Vite from optimizing Vue separately
+        include: ['socket.io-client'],
 	},
 })

package/package.json

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