mango-cms 0.2.21 → 0.2.23

package/cli.js

@@ -397,11 +397,11 @@ function generateNginxConfig(settings, buildPath) {
 
 server {
     server_name ${settings.siteDomain};
-    root ${buildPath};
+    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 {
@@ -466,7 +467,7 @@ function generateApacheConfig(settings, buildPath) {
 
 <VirtualHost *:80>
     ServerName ${settings.siteDomain}
-    DocumentRoot ${buildPath}
+    DocumentRoot ${buildPath.replace('/build', '/dist')}
     IndexIndex index.html
 
     # Serve static files directly
@@ -511,8 +512,8 @@ async function configureWebServer(settings, buildPath) {
         generateApacheConfig(settings, buildPath);
 
     const configPath = webServer === 'nginx' ?
-        `/etc/nginx/sites-available/${settings.siteName.toLowerCase()}` :
-        `/etc/apache2/sites-available/${settings.siteName.toLowerCase()}.conf`;
+        `/etc/nginx/sites-available/${settings.database.toLowerCase()}` :
+        `/etc/apache2/sites-available/${settings.database.toLowerCase()}.conf`;
 
     try {
         // Check if config already exists
@@ -525,7 +526,7 @@ async function configureWebServer(settings, buildPath) {
 
             if (webServer === 'nginx') {
                 // Create symlink if it doesn't exist
-                const enabledPath = `/etc/nginx/sites-enabled/${settings.siteName.toLowerCase()}`;
+                const enabledPath = `/etc/nginx/sites-enabled/${settings.database.toLowerCase()}`;
                 if (!fs.existsSync(enabledPath)) {
                     execSync(`sudo ln -s ${configPath} ${enabledPath}`);
                 }
@@ -533,7 +534,7 @@ async function configureWebServer(settings, buildPath) {
                 execSync('sudo systemctl reload nginx');
             } else {
                 // Enable apache site
-                execSync(`sudo a2ensite ${settings.siteName.toLowerCase()}`);
+                execSync(`sudo a2ensite ${settings.database.toLowerCase()}`);
                 execSync('sudo systemctl reload apache2');
             }
             console.log(`${webServer} configuration has been updated and service reloaded`);

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.21",
+        "mango-cms": "^0.2.23",
         "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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mango-cms",
-    "version": "0.2.21",
+    "version": "0.2.23",
     "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',