renusify 2.1.1 → 2.1.4

package/components/calendar/index.js

@@ -4,7 +4,7 @@ export * as rCalendarYearTab from './year.vue'
 export * as l_container from '../container/index.js'
 export * as l_row from '../container/row.js'
 export * as l_col from '../container/col.js'
-export * as l_btn from './index.js'
+export * as l_btn from '../button/index.js'
 export * as l_icon from '../icon/index.js'
 export * as l_card from '../card/index.js'
 export * as l_modal from '../modal/index.js'

package/components/chart/worldMap.js

@@ -1,2 +1,2 @@
-export * as rWorldMap from './worldMap.vue'
+export * as rChartMap from './worldMap.vue'
 export * as l_float from '../float/index.js'

package/components/form/addressInput/index.js

@@ -1,4 +1,4 @@
-export * as rFloat from './index.vue'
+export * as rAddressInput from './index.vue'
 export * as l_TextInput from '../textInput/index.js'
 export * as l_TextArea from '../textArea/index.js'
 export * as l_select from '../selectInput/index.js'

package/components/index.js

@@ -103,7 +103,7 @@ export const _register = (app, components) => {
                 }
 
             } catch (e) {
-                console.error('component not found', c, e)
+                console.error('component not found', name, e)
             }
         }
     }

package/components/meta/index.js

@@ -1,155 +1 @@
-//https://github.com/troxler/headful/blob/master/src/headful.js
-export const rMeta= {
-    name: "r-meta",
-    created(){
-        this.build()
-    },
-    watch: {
-        '$attrs': {
-            handler() {
-                this.build()
-            },
-            deep: true
-        },
-    },
-    activated() {
-        this.build()
-    },
-    deactivated() {
-        this.removeAll()
-    },
-    methods: {
-        build() {
-            for (let i in this.$attrs) {
-                if (this.$helper.hasKey(this.$attrs, i)) {
-                    this[i](this.$attrs[i]);
-                }
-            }
-        },
-        html(obj) {
-            /*
-            :html="{
-                body: {id: 'aPageId'},
-                h1: {'data-foo': 'bar'},
-                }"
-            */
-            Object.keys(obj).forEach(selector =>
-                this.setRootElementAttributes(selector, obj[selector])
-            );
-        },
-        head(obj) {
-            /*
-            :head="{
-                'meta[charset]': {charset: 'utf-8'},
-                }"
-             */
-            Object.keys(obj).forEach(selector =>
-                this.setHeadElementAttributes(selector, obj[selector])
-            );
-        },
-        title(val) {
-            document.title = this.isRemoveValue(val) ? "" : val;
-            this.setMetaContent('itemprop="name"', val);
-            this.setMetaContent('property="og:title"', val);
-            this.setMetaContent('name="twitter:title"', val);
-        },
-        description(val) {
-            this.setMetaContent('name="description"', val);
-            this.setMetaContent('itemprop="description"', val);
-            this.setMetaContent('property="og:description"', val);
-            this.setMetaContent('name="twitter:description"', val);
-        },
-        keywords(val) {
-            this.setMetaContent('name="keywords"',val);
-        },
-        image(val) {
-            this.setMetaContent('itemprop="image"', val);
-            this.setMetaContent('property="og:image"', val);
-            this.setMetaContent('name="twitter:image"', val);
-        },
-        lang(val) {
-            this.setRootElementAttributes("html", {lang: val});
-            this.ogLocaleTag && this.setOgLocaleIfValid(val);
-        },
-        ogLocale(val) {
-            this.setMetaContent('property="og:locale"', val);
-        },
-        url(val) {
-            this.setHeadElementAttributes('link[rel="canonical"]', {href: val});
-            this.setMetaContent('property="og:url"', val);
-            this.setMetaContent('name="twitter:url"', val);
-        },
-        createChild(parent, selector) {
-            if (!this.getElement(parent, selector)) {
-                let property = selector;
-                property = property.split("[");
-                const name = property[0];
-                property = this.$helper.replacer(property[1], "]", "");
-                property = this.$helper.replacer(property, '"', "");
-                property = this.$helper.replacer(property, "'", "");
-                property = property.trim(" ");
-                property = property.split("=");
-                let meta = document.createElement(name);
-                meta.setAttribute("c", "renusify");
-                meta.setAttribute(property[0], property[1]);
-                parent.appendChild(meta);
-            }
-        },
-        setMetaContent(attr, val) {
-            this.createChild(document.head, `meta[${attr}]`);
-            this.setHeadElementAttributes(`meta[${attr}]`, {content: val});
-        },
-        setRootElementAttributes(selector, attributes) {
-            this.createChild(document, selector);
-            this.setElementAttributes(
-                this.getElement(document, selector),
-                attributes
-            );
-        },
-        setHeadElementAttributes(selector, attributes) {
-            this.createChild(document.head, selector);
-            this.setElementAttributes(
-                this.getElement(document.head, selector),
-                attributes
-            );
-        },
-        setElementAttributes(element, attributes) {
-            if (element) {
-                Object.keys(attributes).forEach(attrName => {
-                    if (this.isRemoveValue(attributes[attrName])) {
-                        element.removeAttribute(attrName);
-                    } else {
-                        element.setAttribute(attrName, attributes[attrName]);
-                    }
-                });
-            }
-        },
-        getElement(parent, selector) {
-            return parent.querySelector(selector);
-        },
-        setOgLocaleIfValid(locale) {
-            if (this.isRemoveValue(locale)) {
-                this.ogLocale(locale);
-            } else if (locale.match(/^[a-z]{2}-[a-z]{2}$/i)) {
-                const [language, region] = locale.split("-");
-                const ogLocale = `${language}_${region.toUpperCase()}`;
-                this.ogLocale(ogLocale);
-            }
-        },
-        isRemoveValue(val) {
-            return val === undefined || val === null;
-        },
-        removeAll() {
-            let children = document.querySelectorAll("[c='renusify']");
-            if (children) {
-                let childArray = Array.prototype.slice.call(children);
-
-                childArray.forEach(function (child) {
-                    child.parentNode.removeChild(child);
-                });
-            }
-        }
-    },
-    render() {
-    }
-};
+export * as rMeta from './meta.js'

package/components/meta/meta.js

@@ -0,0 +1,155 @@
+//https://github.com/troxler/headful/blob/master/src/headful.js
+export default {
+    name: "r-meta",
+    created(){
+        this.build()
+    },
+    watch: {
+        '$attrs': {
+            handler() {
+                this.build()
+            },
+            deep: true
+        },
+    },
+    activated() {
+        this.build()
+    },
+    deactivated() {
+        this.removeAll()
+    },
+    methods: {
+        build() {
+            for (let i in this.$attrs) {
+                if (this.$helper.hasKey(this.$attrs, i)) {
+                    this[i](this.$attrs[i]);
+                }
+            }
+        },
+        html(obj) {
+            /*
+            :html="{
+                body: {id: 'aPageId'},
+                h1: {'data-foo': 'bar'},
+                }"
+            */
+            Object.keys(obj).forEach(selector =>
+                this.setRootElementAttributes(selector, obj[selector])
+            );
+        },
+        head(obj) {
+            /*
+            :head="{
+                'meta[charset]': {charset: 'utf-8'},
+                }"
+             */
+            Object.keys(obj).forEach(selector =>
+                this.setHeadElementAttributes(selector, obj[selector])
+            );
+        },
+        title(val) {
+            document.title = this.isRemoveValue(val) ? "" : val;
+            this.setMetaContent('itemprop="name"', val);
+            this.setMetaContent('property="og:title"', val);
+            this.setMetaContent('name="twitter:title"', val);
+        },
+        description(val) {
+            this.setMetaContent('name="description"', val);
+            this.setMetaContent('itemprop="description"', val);
+            this.setMetaContent('property="og:description"', val);
+            this.setMetaContent('name="twitter:description"', val);
+        },
+        keywords(val) {
+            this.setMetaContent('name="keywords"',val);
+        },
+        image(val) {
+            this.setMetaContent('itemprop="image"', val);
+            this.setMetaContent('property="og:image"', val);
+            this.setMetaContent('name="twitter:image"', val);
+        },
+        lang(val) {
+            this.setRootElementAttributes("html", {lang: val});
+            this.ogLocaleTag && this.setOgLocaleIfValid(val);
+        },
+        ogLocale(val) {
+            this.setMetaContent('property="og:locale"', val);
+        },
+        url(val) {
+            this.setHeadElementAttributes('link[rel="canonical"]', {href: val});
+            this.setMetaContent('property="og:url"', val);
+            this.setMetaContent('name="twitter:url"', val);
+        },
+        createChild(parent, selector) {
+            if (!this.getElement(parent, selector)) {
+                let property = selector;
+                property = property.split("[");
+                const name = property[0];
+                property = this.$helper.replacer(property[1], "]", "");
+                property = this.$helper.replacer(property, '"', "");
+                property = this.$helper.replacer(property, "'", "");
+                property = property.trim(" ");
+                property = property.split("=");
+                let meta = document.createElement(name);
+                meta.setAttribute("c", "renusify");
+                meta.setAttribute(property[0], property[1]);
+                parent.appendChild(meta);
+            }
+        },
+        setMetaContent(attr, val) {
+            this.createChild(document.head, `meta[${attr}]`);
+            this.setHeadElementAttributes(`meta[${attr}]`, {content: val});
+        },
+        setRootElementAttributes(selector, attributes) {
+            this.createChild(document, selector);
+            this.setElementAttributes(
+                this.getElement(document, selector),
+                attributes
+            );
+        },
+        setHeadElementAttributes(selector, attributes) {
+            this.createChild(document.head, selector);
+            this.setElementAttributes(
+                this.getElement(document.head, selector),
+                attributes
+            );
+        },
+        setElementAttributes(element, attributes) {
+            if (element) {
+                Object.keys(attributes).forEach(attrName => {
+                    if (this.isRemoveValue(attributes[attrName])) {
+                        element.removeAttribute(attrName);
+                    } else {
+                        element.setAttribute(attrName, attributes[attrName]);
+                    }
+                });
+            }
+        },
+        getElement(parent, selector) {
+            return parent.querySelector(selector);
+        },
+        setOgLocaleIfValid(locale) {
+            if (this.isRemoveValue(locale)) {
+                this.ogLocale(locale);
+            } else if (locale.match(/^[a-z]{2}-[a-z]{2}$/i)) {
+                const [language, region] = locale.split("-");
+                const ogLocale = `${language}_${region.toUpperCase()}`;
+                this.ogLocale(ogLocale);
+            }
+        },
+        isRemoveValue(val) {
+            return val === undefined || val === null;
+        },
+        removeAll() {
+            let children = document.querySelectorAll("[c='renusify']");
+            if (children) {
+                let childArray = Array.prototype.slice.call(children);
+
+                childArray.forEach(function (child) {
+                    child.parentNode.removeChild(child);
+                });
+            }
+        }
+    },
+    render() {
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "renusify",
-  "version": "2.1.1",
+  "version": "2.1.4",
   "description": "Vue3 Framework",
   "keywords": [
     "vuejs",

package/plugins/trans/Translate.js

@@ -1,161 +1,165 @@
-import Axios from 'axios';
-
 export default class Translate {
-  constructor($r, $storage) {
-    this.$r = $r
-    this.$storage = $storage
-    this._count = 0;
-    this._failed_messages = {};
-    this._messages = {};
-    this._local = 'en';
-    this._package = null;
-    this._store = []
-  }
-
-  get messages() {
-    return this._messages;
-  }
-
-  get failed_messages() {
-    return Object.keys(this._failed_messages);
-  }
-
-  get local() {
-    return this._local;
-  }
-
-  set local(value) {
-    this._local = value;
-  }
-
-  set package(value) {
-    this._package = value;
-  }
-
-  setMessages(obj, local) {
-    this._messages[local || this._local] = Object.assign({}, this._messages[local || this._local], obj);
-  }
+    constructor($r, $storage) {
+        this.$r = $r
+        this.$storage = $storage
+        this._count = 0;
+        this._failed_messages = {};
+        this._messages = {};
+        this._local = 'en';
+        this._package = $r.package;
+        this._store = []
+    }
 
-  add(key, value) {
-    if (!this._messages[this._local]) {
-      this._messages[this._local] = {}
+    get messages() {
+        return this._messages;
     }
-    this._messages[this._local][key] = value;
-  }
 
-  replaceAll(string, search, replace) {
-    return string.split(search).join(replace);
-  }
+    get failed_messages() {
+        return Object.keys(this._failed_messages);
+    }
 
-  get(key, package_name = null, lang = null) {
-    if (key === undefined || key === null) {
-      return ''
+    get local() {
+        return this._local;
     }
-    let variable = []
-    if (typeof key === 'object') {
-      variable = key[1]
-      key = key[0]
-      if (!variable) {
-        console.error(
-            'object key must have variables. key:' + key + ' variable:' + variable
-        )
-        this._failed_messages[key] = true
-        return key
-      }
+
+    set local(value) {
+        this._local = value;
     }
 
-    if (package_name && typeof package_name !== 'string') {
-      console.error(
-          'package name must be string. key:' + key + ' package_name:' + package_name
-      )
-      this._failed_messages[key] = true
-      return key
+    set package(value) {
+        this._package = value;
     }
-    if (typeof key !== 'string') {
-      this._failed_messages[key] = true
-      return key
+
+    setMessages(obj, local) {
+        this._messages[local || this._local] = Object.assign({}, this._messages[local || this._local], obj);
     }
-    key = key.toLowerCase()
 
-    const local = lang !== null ? lang : this._local
-    const pack = package_name !== null ? package_name : this._package
-    if (!local) {
-      this._failed_messages[key] = true
-      return key;
+    add(key, value) {
+        if (!this._messages[this._local]) {
+            this._messages[this._local] = {}
+        }
+        this._messages[this._local][key] = value;
     }
-    if (!this._messages[local]) {
-      this._failed_messages[key] = true
-      return key;
+
+    replaceAll(string, search, replace) {
+        return string.split(search).join(replace);
     }
-    if (this._messages[local][key]) {
-      let val = this._messages[local][key];
-      const lng = variable.length
-      for (let i = 0; i < lng; i++) {
-        val = this.replaceAll(val, '{' + i + '}', variable[i]);
-      }
 
-      if (val === null || val === '') {
-        this._failed_messages[key] = true
-        return key;
-      }
-      return val;
-    } else if (this.$r && this.$r.autoAddTranslate && pack && this._count < 100 && /^([a-z_.])*$/.test(key)) {
-      if (!this._store.includes(key)) {
-        let url = '/translate/' + pack + '/' + key + '?v=';
-        const lng = variable.length
-        for (let i = 0; i < lng; i++) {
-          url += '{' + i + '}';
+    get(key, package_name = null, lang = null) {
+        if (key === undefined || key === null) {
+            return ''
+        }
+        let variable = []
+        if (typeof key === 'object') {
+            variable = key[1]
+            key = key[0]
+            if (!variable) {
+                console.error(
+                    'object key must have variables. key:' + key + ' variable:' + variable
+                )
+                this._failed_messages[key] = true
+                return key
+            }
         }
-        Axios.post(url);
-        this._count++;
-        this._store.push(key)
-      }
-      this._failed_messages[key] = true
-      return key;
-    } else {
-      this._failed_messages[key] = true
-      return key;
-    }
-  }
 
-  loads(packages = []) {
-    packages.forEach((p) => {
-      this.load(p)
-    })
-  }
+        if (package_name && typeof package_name !== 'string') {
+            console.error(
+                'package name must be string. key:' + key + ' package_name:' + package_name
+            )
+            this._failed_messages[key] = true
+            return key
+        }
+        if (typeof key !== 'string') {
+            this._failed_messages[key] = true
+            return key
+        }
+        key = key.toLowerCase()
 
-  load(p) {
-    const pack = p || this.$r.package;
-    if (!p) {
-      this.package = pack;
-    }
-    if (!this.$r.store['langs_loaded']) {
-      this.$r.store['langs_loaded'] = {}
-    }
-    this.$r.store['langs_loaded'][pack] = false;
-    let locale = this.$r.lang;
-    if (this.$storage.get("lang")) {
-      locale = this.$storage.get("lang");
-    }
-    Axios.get(`/translate/${pack}/${locale}`).then(
-        res => {
-          if (res.data.length !== 0) {
-            const lang = {};
-            const lng = res.data.length
+        const local = lang !== null ? lang : this._local
+        const pack = package_name !== null ? package_name : this._package
+        if (!local) {
+            this._failed_messages[key] = true
+            return key;
+        }
+        if (!this._messages[local]) {
+            this._failed_messages[key] = true
+            return key;
+        }
+        if (this._messages[local][key]) {
+            let val = this._messages[local][key];
+            const lng = variable.length
             for (let i = 0; i < lng; i++) {
-              lang[res.data[i].key] = res.data[i][locale];
+                val = this.replaceAll(val, '{' + i + '}', variable[i]);
             }
-            this.local = locale;
-            this.setMessages(lang);
-          } else {
-            this.local = locale;
-            this.setMessages({});
-          }
-          this.$r.store['langs_loaded'][pack] = true;
-        },
-        () => {
-          this.$r.store['langs_loaded'][pack] = true;
+
+            if (val === null || val === '') {
+                this._failed_messages[key] = true
+                return key;
+            }
+            return val;
+        } else if (this.$r && this.$r.autoAddTranslate && pack && this._count < 100 && /^([0-9a-z_.])*$/.test(key)) {
+            if (!this._store.includes(key)) {
+                let url = '/translate/' + pack + '/' + key + '?v=';
+                const lng = variable.length
+                for (let i = 0; i < lng; i++) {
+                    url += '{' + i + '}';
+                }
+                fetch(url, {
+                    method: 'POST'
+                });
+                this._count++;
+                this._store.push(key)
+            }
+            this._failed_messages[key] = true
+            return key;
+        } else {
+            this._failed_messages[key] = true
+            return key;
         }
-    );
-  }
+    }
+
+    loads(packages = []) {
+        packages.forEach((p) => {
+            this.load(p)
+        })
+    }
+
+    load(p) {
+        const pack = p || this.$r.package;
+        if (!p) {
+            this.package = pack;
+        }
+        if (!this.$r.store['langs_loaded']) {
+            this.$r.store['langs_loaded'] = {}
+        }
+        this.$r.store['langs_loaded'][pack] = false;
+        let locale = this.$r.lang;
+        if (this.$storage.get("lang")) {
+            locale = this.$storage.get("lang");
+        }
+        fetch(`/api/translate/${pack}/${locale}`, {
+            method: 'GET',
+        }).then(
+            res => {
+                if (res.ok) {
+                    let data = res.json()
+                    if (data.length !== 0) {
+                        const lang = {};
+                        const lng = data.length
+                        for (let i = 0; i < lng; i++) {
+                            lang[data[i].key] = data[i][locale];
+                        }
+                        this.local = locale;
+                        this.setMessages(lang);
+                    } else {
+                        this.local = locale;
+                        this.setMessages({});
+                    }
+                    this.$r.store['langs_loaded'][pack] = true;
+                } else {
+                    this.$r.store['langs_loaded'][pack] = true;
+                }
+            }
+        );
+    }
 }

package/plugins/validation/Validate.js

@@ -72,17 +72,17 @@ export default class Validate {
 
   checkType(names) {
     let filters = [];
-    if (typeof names === 'object') {
-      names.forEach((name) => {
-        let res = name.split(':');
-        let par1 = res[1] ? res[1] : null;
-        let par2 = res[2] ? res[2] : null;
-        let par3 = res[3] ? res[3] : null;
-        if (this[res[0]]) {
-          if (par3 === null && par2 === null) {
-            filters.push(this[res[0]](par1))
-          } else if (par3 === null) {
-            filters.push(this[res[0]](par1, par2))
+    if (Array.isArray(names)) {
+        names.forEach((name) => {
+            let res = name.split(':');
+            let par1 = res[1] ? res[1] : null;
+            let par2 = res[2] ? res[2] : null;
+            let par3 = res[3] ? res[3] : null;
+            if (this[res[0]]) {
+                if (par3 === null && par2 === null) {
+                    filters.push(this[res[0]](par1))
+                } else if (par3 === null) {
+                    filters.push(this[res[0]](par1, par2))
           } else {
             filters.push(this[res[0]](par1, par2, par3))
           }