mango-cms 0.2.2 → 0.2.4

package/cli.js

@@ -169,7 +169,7 @@ program
             fs.copySync(templateDir, projectDir);
 
             // Create config directory if it doesn't exist
-            const configDir = path.join(projectDir, 'config');
+            const configDir = path.join(projectDir, 'mango');
 
             // Create or update settings.json
             const settingsPath = path.join(configDir, 'config/settings.json');
@@ -191,7 +191,7 @@ program
                 license: answers.license,
                 siteName: answers.projectName,
                 siteDomain: `${projectSlug}.com`,
-                domain: `api.${projectSlug}.com`,
+                mangoDomain: `api.${projectSlug}.com`,
                 database: `${projectSlug}`,
                 s3Bucket: `${projectSlug}`
             };
@@ -224,8 +224,8 @@ program
     .action(async () => {
         try {
             const currentDir = process.cwd();
-            const templateConfigDir = path.join(__dirname, 'default/config');
-            const targetConfigDir = path.join(currentDir, 'config');
+            const templateConfigDir = path.join(__dirname, 'default/mango');
+            const targetConfigDir = path.join(currentDir, 'mango');
 
             // Check if config directory already exists
             if (fs.existsSync(targetConfigDir)) {
@@ -256,7 +256,7 @@ program
             await checkSystemDependencies();
 
             // Check for license in settings.json
-            const settingsPath = path.join(process.cwd(), 'config/config/settings.json');
+            const settingsPath = path.join(process.cwd(), 'mango/config/settings.json');
             await ensureLicenseExists(settingsPath);
 
             // Ensure src exists
@@ -297,7 +297,7 @@ program
     .action(async () => {
         try {
             // Check for license in settings.json
-            const settingsPath = path.join(process.cwd(), 'config/config/settings.json');
+            const settingsPath = path.join(process.cwd(), 'mango/config/settings.json');
             await ensureLicenseExists(settingsPath);
 
             // Ensure src exists

package/default/{config → mango}/config/settings.json

@@ -2,8 +2,9 @@
     "port": 6646,
     "siteName": "Example",
     "siteDomain": "example.com",
+    "mangoDomain": "api.example.com",
 
-    "domain": "api.example.com",
+    "useDevAPI": false,
 
     "mongoURI":"mongodb://127.0.0.1:27017",
     "database":"exampleMongoDB",

package/default/src/helpers/Mango.vue

@@ -6,7 +6,7 @@
 
 <script setup>
 import Mango from './mango'
-import { siteName } from '@config/config/settings.json'
+import { siteName } from '@mango/config/settings.json'
 import { ref, watch, computed, nextTick, onUnmounted } from 'vue'
 import { useRoute } from 'vue-router'
 

package/default/src/helpers/mango.js

@@ -1,7 +1,7 @@
 // import collections from '../../../mango/config/.collections.json'
 // import { algoliaAppId, algoliaSearchKey, algoliaIndex, port, domain } from '../../../mango/config/settings'
 import collections from '@collections'
-import { algoliaAppId, algoliaSearchKey, algoliaIndex, port, domain } from '@settings'
+import { algoliaAppId, algoliaSearchKey, algoliaIndex, port, mangoDomain, useDevAPI } from '@settings'
 import axios from "axios";
 import { ref } from 'vue'
 import algoliasearch from 'algoliasearch/dist/algoliasearch-lite.esm.browser'
@@ -16,10 +16,10 @@ let endpoints = {
 const client = algoliasearch(algoliaAppId, algoliaSearchKey);
 const algolia = client.initIndex(algoliaIndex);
 
-let api = `https://${domain}`
-let ws = `wss://${domain}/graphql`
+let api = `https://${mangoDomain}`
+let ws = `wss://${mangoDomain}/graphql`
 
-if (process.env.NODE_ENV != 'production') {
+if (process.env.NODE_ENV != 'production' && useDevAPI) {
     api = `http://localhost:${port}`
     ws = `ws://localhost:${port}/graphql`
 }

package/default/src/main.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 import { computed, createApp, defineAsyncComponent, reactive, ref } from 'vue'
 import { createRouter, createWebHistory } from 'vue-router'
 import { MotionPlugin } from '@vueuse/motion'
-import { port, domain } from '@settings'
+import { port, mangoDomain, useDevAPI } from '@settings'
 import VueClipboard from 'vue3-clipboard'
 import Vue3TouchEvents from "vue3-touch-events";
 import App from './App.vue'
@@ -68,9 +68,8 @@ app.provide('darkMode', darkMode().darkMode)
 
 const user = initUser()
 
-let api = `http://localhost:${port}`
-// let api = `https://${domain}`
-if (!isDev) api = `https://${domain}`
+let api = useDevAPI ? `http://localhost:${port}` : `https://${mangoDomain}`
+if (!isDev) api = `https://${mangoDomain}`
 
 const store = reactive({
 

package/default/vite.config.js

@@ -5,16 +5,16 @@ import fs from 'fs'
 
 // Determine project root based on config directory location
 let projectRoot = process.cwd()
-let configPath = path.resolve(projectRoot, 'config')
+let configPath = path.resolve(projectRoot, 'mango')
 
 // If config doesn't exist in current directory, check parent
 if (!fs.existsSync(configPath)) {
     projectRoot = path.resolve(projectRoot, '..')
-    configPath = path.resolve(projectRoot, 'config')
+    configPath = path.resolve(projectRoot, 'mango')
 
     // If config still doesn't exist, throw error
     if (!fs.existsSync(configPath)) {
-        throw new Error('Config folder not found. Please ensure your config folder exists either in the current directory or parent directory.')
+        throw new Error('Mango folder not found. Please ensure your mango folder exists either in the current directory or parent directory.')
     }
 }
 
@@ -27,6 +27,7 @@ export default defineConfig({
     resolve: {
         alias: {
             '@config': configPath,
+            '@mango': configPath,
             '@settings': path.resolve(configPath, 'config/settings.json'),
             '@collections': path.resolve(configPath, 'config/.collections.json'),
             '@plugins': path.resolve(configPath, 'plugins'),

package/package.json

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

package/webpack.config.js

@@ -26,9 +26,9 @@ module.exports = {
     mode: 'production',
     resolve: {
         alias: {
-            '@mango': path.resolve(mangoRoot),
             '@cms': path.resolve(mangoRoot, 'src/cms'),
-            '@config': path.resolve(userProjectRoot, 'config'),
+            '@config': path.resolve(userProjectRoot, legacyMode ? 'config' : 'mango'),
+            '@mango': path.resolve(userProjectRoot, legacyMode ? 'config' : 'mango'),
             '@fields': path.resolve(mangoRoot, 'src/cms/1. build/fields'),
             '@mongo': path.resolve(mangoRoot, 'src/cms/1. build/libraries/mongo'),
             '@helpers': path.resolve(mangoRoot, 'src/cms/1. build/helpers'),