mango-cms 0.1.21 → 0.1.23

package/cli.js

@@ -168,9 +168,17 @@ program
                 console.log('Error reading settings file:', error.message);
             }
 
+            // Convert project name to lowercase and remove spaces for domain/DB names
+            const projectSlug = answers.projectName.toLowerCase().replace(/[^a-z0-9]/g, '');
+
             settings = {
                 ...settings,
-                license: answers.license
+                license: answers.license,
+                siteName: answers.projectName,
+                siteDomain: `${projectSlug}.com`,
+                domain: `api.${projectSlug}.com`,
+                database: `${projectSlug}`,
+                s3Bucket: `${projectSlug}`
             };
             fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
             fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2));

package/default/package.json

@@ -2,40 +2,41 @@
     "name": "mango-front",
     "version": "0.0.0",
     "scripts": {
-      "dev": "vite",
-      "build": "vite build",
-      "preview": "vite preview",
-      "mango": "mango"
+        "dev": "vite",
+        "build": "vite build",
+        "preview": "vite preview",
+        "mango": "mango"
     },
     "dependencies": {
-      "mango-cms": "^0.1.20",
-      "@headlessui/vue": "^1.6.7",
-      "@mapbox/mapbox-gl-geocoder": "^5.0.0",
-      "@sweetalert2/theme-dark": "^5.0.10",
-      "@tinymce/tinymce-vue": "^4",
-      "@vueup/vue-quill": "^1.0.0-beta.7",
-      "@vueuse/motion": "^2.0.0-beta.12",
-      "algoliasearch": "^4.12.0",
-      "axios": "^0.24.0",
-      "canvas-confetti": "^1.5.1",
-      "datebook": "^7.0.8",
-      "dayjs": "^1.10.7",
-      "express": "^4.18.1",
-      "google-maps": "^4.3.3",
-      "mapbox-gl": "^2.7.0",
-      "sweetalert2": "^11.4.0",
-      "vue": "^3.2.37",
-      "vue-router": "4",
-      "vue-slider-component": "^4.0.0-beta.4",
-      "vue-upload-component": "^3.1.2",
-      "vue3-clipboard": "^1.0.0",
-      "vue3-touch-events": "^4.1.0",
-      "vuedraggable": "^4.1.0"
+        "@headlessui/vue": "^1.6.7",
+        "@mapbox/mapbox-gl-geocoder": "^5.0.0",
+        "@sweetalert2/theme-dark": "^5.0.10",
+        "@tinymce/tinymce-vue": "^4",
+        "@vitejs/plugin-vue": "^5.2.3",
+        "@vueup/vue-quill": "^1.0.0-beta.7",
+        "@vueuse/motion": "^2.0.0-beta.12",
+        "algoliasearch": "^4.12.0",
+        "axios": "^0.24.0",
+        "canvas-confetti": "^1.5.1",
+        "datebook": "^7.0.8",
+        "dayjs": "^1.10.7",
+        "express": "^4.18.1",
+        "google-maps": "^4.3.3",
+        "mango-cms": "^0.1.20",
+        "mapbox-gl": "^2.7.0",
+        "sweetalert2": "^11.4.0",
+        "vite": "^6.2.2",
+        "vue": "^3.2.37",
+        "vue-router": "4",
+        "vue-slider-component": "^4.0.0-beta.4",
+        "vue-upload-component": "^3.1.2",
+        "vue3-clipboard": "^1.0.0",
+        "vue3-touch-events": "^4.1.0",
+        "vuedraggable": "^4.1.0"
     },
     "devDependencies": {
-      "autoprefixer": "^10.4.0",
-      "postcss": "^8.4.5",
-      "tailwindcss": "^3.0.2",
-      "vite": "^4.5.9"
+        "autoprefixer": "^10.4.0",
+        "postcss": "^8.4.5",
+        "tailwindcss": "^3.0.2"
     }
-  }
+}

package/default/src/helpers/Mango.vue

@@ -7,7 +7,6 @@
 <script setup>
 import Mango from './mango'
 import { siteName } from '@config/config/settings.json'
-import rws from './reconnecting-websocket'
 import { ref, watch, computed, nextTick, onUnmounted } from 'vue'
 import { useRoute } from 'vue-router'
 
@@ -245,105 +244,6 @@ async function init() {
 
 }
 
-const GQL = {
-    CONNECTION_INIT: 'connection_init',
-    CONNECTION_ACK: 'connection_ack',
-    CONNECTION_ERROR: 'connection_error',
-    CONNECTION_KEEP_ALIVE: 'ka',
-    START: 'start',
-    STOP: 'stop',
-    CONNECTION_TERMINATE: 'connection_terminate',
-    DATA: 'data',
-    ERROR: 'error',
-    COMPLETE: 'complete'
-}
-function subscribe(collection, id) {
-
-    webSocket = new rws(Mango.ws, 'graphql-ws')
-
-    webSocket.onopen = event => {
-
-        webSocket.send(JSON.stringify({
-            type: GQL.CONNECTION_INIT,
-            payload: {}
-        }))
-
-        webSocket.send(JSON.stringify({
-            type: GQL.START,
-            id: Date.now(),
-            payload: {
-                query: `
-                subscription {
-                    ${collection}(id: "${id}") {
-                        id
-                        settings {
-                            clueTimeLimit
-                            guessTimeLimit
-                        }
-                        guesses {
-                            word
-                            playerId
-                            time
-                        }
-                        clue {
-                            text
-                            number
-                            time
-                            team
-                            words
-                            guesses
-                        }
-                        words {
-                            value
-                            color
-                            guessed
-                        }
-                    }
-                }`,
-                variables: {},
-                operationName: null
-            }
-        }))
-    }
-
-    webSocket.onmessage = event => {
-        const response = JSON.parse(event.data)
-        switch (response.type) {
-            case GQL.CONNECTION_ACK: {
-                console.log('success')
-                break
-            }
-            case GQL.CONNECTION_ERROR: {
-                console.error(response.payload)
-                break
-            }
-            case GQL.CONNECTION_KEEP_ALIVE: {
-                break
-            }
-            case GQL.DATA: {
-                console.log(response.id, response.payload.errors, response.payload.data)
-                if (response.payload.data) {
-                    data.value = response.payload.data[collection]
-                    emit('update:data', data.value)
-                }
-                break
-            }
-            case GQL.COMPLETE: {
-                console.log('completed', response.id)
-                break
-            }
-        }
-    }
-}
-
-onUnmounted(() => {
-    if (webSocket?.send) {
-        webSocket.send(JSON.stringify({
-            type: GQL.CONNECTION_TERMINATE
-        }))
-    }
-})
-
 // init()
 // await init()
 

package/default/src/helpers/email.js

@@ -0,0 +1,36 @@
+import Swal from "sweetalert2"
+import axios from "axios"
+
+function validateEmail(email) {
+    var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return re.test(String(email.trim()).toLowerCase());
+}
+
+async function subscribeToMailChimp({ email, list, source, alert }) {
+
+    let lists = {
+        master: '816047355d',
+        devotional: '5fbac827f8'
+    }
+
+    let listId = lists[list]
+
+    if (!listId) return console.error(`"${list}" is not a valid email list`)
+    if (!source) return console.error(`You must provide a subscription source`)
+
+    if (!validateEmail(email)) {
+        new Swal('Invalid Email', `"${email}" is not a valid email address`, 'warning')
+        return console.error(`"${email}" is not a valid email address`)
+    }
+
+    try {
+        await axios.post(`https://churchandfamilylife.us2.list-manage.com/subscribe/post?u=12eae89c5f8969e490844c75a&id=${listId}`, { EMAIL: email, MMERGE3: source })
+            .then(response => { if (alert) new Swal('Subscribed!', 'Thank you for subscribing.', 'success') })
+            // MC apparently doesn't give a proper error message we can read at the time of writing this...
+            .catch(response => { if (alert) new Swal('Subscribed!', 'Thank you for subscribing.', 'success') })
+    } catch (e) {
+        console.log(e)
+    }
+}
+
+export { subscribeToMailChimp, validateEmail }

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 '@config/config/.collections.json'
-import { algoliaAppId, algoliaSearchKey, algoliaIndex, port, domain } from '@config/config/settings'
+import collections from '@collections'
+import { algoliaAppId, algoliaSearchKey, algoliaIndex, port, domain } from '@settings'
 import axios from "axios";
 import { ref } from 'vue'
 import algoliasearch from 'algoliasearch/lite'

package/default/src/main.js

@@ -2,8 +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 '../../mango/config/settings'
-import { port, domain } from '../../config/config/settings'
+import { port, domain } from '@settings'
 import VueClipboard from 'vue3-clipboard'
 import Vue3TouchEvents from "vue3-touch-events";
 import App from './App.vue'
@@ -62,12 +61,9 @@ Global Properties
 
 */
 
-import breakpoints from './helpers/breakpoints'
 import darkMode from './helpers/darkMode'
-import formatPhone from './helpers/formatPhone'
 import { initUser } from './helpers/user';
 
-app.provide('breakpoints', breakpoints().breakpoints)
 app.provide('darkMode', darkMode().darkMode)
 
 const user = initUser()
@@ -90,7 +86,6 @@ app.provide('store', store)
 app.provide('axios', axios)
 
 app.provide('mode', import.meta.env.MODE)
-app.provide('formatPhone', formatPhone)
 
 
 /*
@@ -102,12 +97,10 @@ Global Components
 import Mango from './helpers/Mango.vue'
 import Spinner from './components/layout/spinner.vue'
 import Modal from './components/layout/modal.vue'
-import Button from './components/partials/button.vue'
 
 app.component('Mango', Mango)
 app.component('Spinner', Spinner)
 app.component('Modal', Modal)
-app.component('btn', Button)
 // app.component('resource', defineAsyncComponent(Layouter.vue')))
 
 /*

package/default/vite.config.js

@@ -27,6 +27,8 @@ export default defineConfig({
     resolve: {
         alias: {
             '@config': configPath,
+            '@settings': path.resolve(configPath, 'config/settings.json'),
+            '@collections': path.resolve(configPath, 'config/.collections.json'),
             '@plugins': path.resolve(configPath, 'plugins'),
             'vue': path.resolve(__dirname, 'node_modules/vue'),
         }

package/package.json

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