mango-cms 0.1.1 → 0.1.3

package/cli.js

@@ -10,6 +10,64 @@ const AdmZip = require('adm-zip');
 
 const program = new Command();
 
+// Helper function to download and extract src.zip
+async function ensureSrcExists(mangoCmsRoot) {
+    const srcDir = path.join(mangoCmsRoot, 'src');
+    if (!fs.existsSync(srcDir)) {
+        console.log('Downloading Mango CMS source files...');
+        const response = await axios({
+            method: 'get',
+            url: 'https://mango-cms.s3.amazonaws.com/src.zip',
+            responseType: 'arraybuffer'
+        });
+
+        const tempZipPath = path.join(mangoCmsRoot, 'src.zip');
+        fs.writeFileSync(tempZipPath, response.data);
+
+        console.log('Extracting source files...');
+        const zip = new AdmZip(tempZipPath);
+        zip.extractAllTo(mangoCmsRoot, true);
+
+        // Clean up the zip file
+        fs.unlinkSync(tempZipPath);
+        console.log('Source files installed successfully.');
+    }
+}
+
+// Helper function to validate and prompt for license if needed
+async function ensureLicenseExists(configPath) {
+    let settings = { license: null };
+
+    try {
+        if (fs.existsSync(configPath)) {
+            settings = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        }
+    } catch (error) {
+        console.log('Error reading settings file:', error.message);
+    }
+
+    if (!settings.license) {
+        const answer = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'license',
+                message: 'Enter your license key:',
+                validate: input => {
+                    if (!input) return 'License key is required';
+                    if (input !== 'admin') return 'Invalid license key';
+                    return true;
+                }
+            }
+        ]);
+
+        settings.license = answer.license;
+        fs.mkdirSync(path.dirname(configPath), { recursive: true });
+        fs.writeFileSync(configPath, JSON.stringify(settings, null, 2));
+    }
+
+    return settings.license;
+}
+
 program
     .name('mango')
     .description('Mango CMS CLI');
@@ -44,28 +102,7 @@ program
             ]);
 
             // First, handle the src.zip download if needed
-            const mangoCmsRoot = __dirname;
-            const srcDir = path.join(mangoCmsRoot, 'src');
-
-            if (!fs.existsSync(srcDir)) {
-                console.log('Downloading Mango CMS source files...');
-                const response = await axios({
-                    method: 'get',
-                    url: 'https://mango-cms.s3.amazonaws.com/src.zip',
-                    responseType: 'arraybuffer'
-                });
-
-                const tempZipPath = path.join(mangoCmsRoot, 'src.zip');
-                fs.writeFileSync(tempZipPath, response.data);
-
-                console.log('Extracting source files...');
-                const zip = new AdmZip(tempZipPath);
-                zip.extractAllTo(mangoCmsRoot, true);
-
-                // Clean up the zip file
-                fs.unlinkSync(tempZipPath);
-                console.log('Source files installed successfully.');
-            }
+            await ensureSrcExists(__dirname);
 
             // Now handle the project creation
             const projectDir = path.join(process.cwd(), answers.projectName);
@@ -80,7 +117,7 @@ program
             const configDir = path.join(projectDir, 'config');
 
             // Create or update settings.json
-            const settingsPath = path.join(configDir, 'settings.json');
+            const settingsPath = path.join(configDir, 'config/settings.json');
             const settings = {
                 license: answers.license
             };
@@ -90,7 +127,8 @@ program
 ✨ Project ${answers.projectName} created successfully!
 To get started:
   cd ${answers.projectName}
-  mango start
+  npm install
+  npm mango start
 `);
         } catch (error) {
             console.error('Error creating project:', error.message);
@@ -101,13 +139,20 @@ To get started:
 program
     .command('start')
     .description('Start the Mango CMS in watch mode')
-    .action(() => {
+    .action(async () => {
         try {
+
+            // Check for license in settings.json
+            const settingsPath = path.join(process.cwd(), 'config/config/settings.json');
+            await ensureLicenseExists(settingsPath);
+
+            // Ensure src exists
+            await ensureSrcExists(__dirname);
+
             // Path to @mango-cms/core inside node_modules
             const cmsPackagePath = path.resolve(__dirname);
             // User's project root (where they run "mango start")
-            // const userProjectRoot = '../../'
-            const userProjectRoot = '/Users/coltonneifert/Sites/test-2'
+            const userProjectRoot = process.cwd();
 
             console.log(`Starting Mango CMS...`);
             console.log(`CMS package located at: ${cmsPackagePath}`);
@@ -122,8 +167,6 @@ program
                     stdio: 'inherit',
                     env: {
                         ...process.env,
-                        // NODE_OPTIONS: '--trace-warnings',
-                        // PROJECT_CONFIG: configDir,
                         NODE_PATH: path.resolve(cmsPackagePath, 'node_modules'),
                         MANGO_ROOT: cmsPackagePath,
                         PROJECT_ROOT: userProjectRoot

package/default/config/config/users.js

@@ -1,4 +1,4 @@
-import { readEntries, updateEntry } from "../../mango/src/cms/1. build/libraries/mongo"
+import { readEntries, updateEntry } from "@cms/1. build/libraries/mongo"
 
 export default {
     fields: {

package/default/package.json

@@ -0,0 +1,8 @@
+{
+    "scripts": {
+        "mango": "mango"
+    },
+    "dependencies": {
+        "mango-cms": "^0.1.1"
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mango-cms",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "main": "index.js",
   "author": "Colton Neifert",
   "license": "ISC",

package/default/config/plugins/mango-stand/index.js

@@ -1,206 +0,0 @@
-// import CMS from '../../../mango/src/cms' (for use like {address: CMS.fields.Address()})
-import fields from '@cms/1. build/fields'
-import { readEntries, readEntry } from '../../../mango/src/cms/1. build/libraries/mongo'
-
-const billing = {
-    fields: {
-        paymentId: String,
-        firstName: { type: String, search: { enabled: true, weight: 5 } },
-        lastName: { type: String, search: { enabled: true, weight: 5 } },
-        phoneNumber: String,
-        address: fields.Address(),
-        payment: {
-            fields: {
-                creditCard: {
-                    fields: {
-                        cardNumber: String,
-                        cardType: String,
-                        expirationDate: String,
-                    }
-                },
-                bankAccount: {
-                    fields: {
-                        accountNumber: String,
-                        accountType: String,
-                        echeckType: String,
-                        nameOnAccount: String,
-                        routingNumber: String
-                    }
-                }
-            }
-        }
-    }
-}
-
-const Items = {
-    name: 'items',
-    singular: 'item',
-    fields: {
-        price: { type: 'Int' },
-        stock: { type: 'Int' },
-        description: fields.PlainText(),
-    },
-    hooks: {
-        sold({ item }) {
-            console.log('sold', item.title)
-        },
-        addedToCart({ item }) {
-            console.log('addedToCart', item.title)
-        },
-        removedFromCart({ item }) {
-            console.log('removedFromCart', item.title)
-        }
-    }
-}
-
-const Discounts = {
-    name: 'discounts',
-    singular: 'discount',
-    permissions: {
-        public: ['create', 'read']
-    },
-    fields: {
-        type: fields.Select({ options: ['coupon', 'sale'], required: true }),
-        code: { required: true, translateInput: i => i.toLowerCase() },
-        limitations: {
-            fields: {
-                items: fields.Relationship({ collection: 'item' }),
-                perCustomer: 'Int',
-                totalUses: 'Int',
-                perOrder: 'Int',
-                quantity: 'Int',
-                // remainingUses: {
-                //     computed: doc => doc.limitations.totalUses ? /* Get times used and subtract from total uses */ : null
-                // }
-            }
-        },
-        freeShipping: Boolean,
-        discount: {
-            inputExample: '$12.50 or 50% etc.',
-            inputType: String,
-            validate: input => ({ valid: (!!input.match(/\$[0-9]+/) || input.match(/[0-9]\%+/)) ? true : false, response: 'Should be formatted like `100%` or `$12.50`' }),
-            translateInput: input => ({
-                type: !!input.match(/\$[0-9]+/) ? 'fixed' : 'percentage',
-                value: !!input.match(/\$[0-9]+/) ? input.match(/\$\d+(?:\.\d+)?/)[0].replace('$', '') : input.match(/(\d+|\d+[.,]\d{1,2})(?=\s*%)/)[0].replace('%', '')
-            }),
-            fields: {
-                type: String,
-                value: 'Float'
-            }
-        }
-    }
-}
-
-
-const Carts = {
-    name: 'carts',
-    singular: 'cart',
-    permissions: {
-        public: ['create', 'read', 'update']
-    },
-    fields: {
-
-        title: { required: false },
-
-        transactionId: String,
-        finalized: Boolean,
-        completed: Boolean,
-        completedDate: fields.Timestamp(),
-        cartItems: [{
-            fields: {
-                quantity: 'Int',
-                discount: 'Float',
-                item: fields.Relationship({ collection: 'item', single: true }),
-            }
-        }],
-        coupons: fields.Relationship({ collection: 'discount' }),
-
-        customerId: String,
-        billing,
-        shipping: {
-            fields: {
-                method: String,
-                price: String,
-                addressId: String,
-                firstName: String,
-                lastName: String,
-                phoneNumber: String,
-                address: fields.Address(),
-                free: { type: Boolean, computed: doc => doc?.coupons?.find(c => c.freeShipping) }
-            }
-        },
-
-        price: {
-            fields: {
-                subtotal: 'Float',
-                discount: 'Float',
-                total: 'Float',
-            },
-            computed: async doc => {
-
-                let subtotal = Number(doc.cartItems?.reduce((a, i) => a + ((i.item?.price || 0) * i.quantity), 0)) || 0
-                let shipping = doc?.shipping?.price || 0
-
-                let discount = 0
-
-                if (doc?.coupons?.length) {
-                    let coupon = doc?.coupons?.[0]
-                    if (coupon?.limitations?.items) {
-                        for (let item of doc.cartItems) {
-                            if (coupon?.limitations?.items?.find(i => i.id == item.item?.id)) {
-                                if (coupon.discount.type == 'fixed') {
-                                    discount += (item.quantity * coupon.discount.value)
-                                } else {
-                                    discount += ((item.quantity * item.item.price) * (Number(coupon.discount.value) / 100))
-                                    console.log('discount', discount)
-                                }
-                            }
-                        }
-                    } else {
-                        if (coupon.discount.type == 'fixed') {
-                            discount = Number(coupon.discount.value > subtotal ? subtotal : coupon.discount.value)
-                        } else {
-                            discount = Number(subtotal * (Number(coupon.discount.value) / 100))
-                        }
-                    }
-                }
-
-                let activeSales = await readEntries({ collection: 'discounts', search: { type: 'sale', startDate: { $lt: new Date() }, endDate: { $gt: new Date() } } })
-
-                if (activeSales?.length) {
-                    for (let item of doc.cartItems) {
-                        for (let sale of activeSales.sort((a, b) => b.discount.value < a.discount.value ? 1 : -1)) {
-                            let saleApplies = sale?.limitations?.items?.some(i => i == item.item?.id) || !sale?.limitations?.items?.length
-                            if (saleApplies) {
-                                if (sale.discount.type == 'fixed') {
-                                    item.discount = (item.quantity * sale.discount.value)
-                                } else {
-                                    item.discount = Number((item.quantity * item.item.price) * (Number(sale.discount.value) / 100))
-                                }
-                            }
-                        }
-                    }
-                    discount = Number(doc.cartItems?.reduce((a, i) => a + i.discount, 0))
-                }
-
-                let total = (subtotal + shipping - discount) || 0
-
-                return {
-                    subtotal,
-                    discount,
-                    total,
-                }
-            }
-        }
-
-    },
-}
-
-export default {
-    name: 'mangoStand',
-    collections: [
-        Items,
-        Carts,
-        Discounts,
-    ],
-}