feature/vue

Gruntfile.js

@@ -53,7 +53,15 @@ module.exports = function(grunt) {
                     'frontend/express/public/javascripts/utils/dropzone.js',
                     'frontend/express/public/javascripts/utils/webfont.js',
                     'frontend/express/public/javascripts/utils/selectize.min.js',
-                    'frontend/express/public/javascripts/utils/vue.min.js',
+                    'frontend/express/public/javascripts/utils/polyfill/es6-promise.auto.min.js',
+                    'frontend/express/public/javascripts/utils/vue/vue.min.js',
+                    'frontend/express/public/javascripts/utils/vue/vuex.min.js',
+                    'frontend/express/public/javascripts/utils/vue/vue-color.min.js',
+                    'frontend/express/public/javascripts/utils/vue/vuelidate.min.js',
+                    'frontend/express/public/javascripts/utils/vue/v-tooltip.min.js',
+                    'frontend/express/public/javascripts/utils/vue/vue-good-table.min.js',
+                    'frontend/express/public/javascripts/utils/vue/validators.min.js',
+                    'frontend/express/public/javascripts/utils/vue/vue2Dropzone.min.js',
                     'frontend/express/public/javascripts/utils/jquery.xss.js',
                     'frontend/express/public/javascripts/countly/countly.common.js',
                     'frontend/express/public/javascripts/utils/simpleUpload.min.js',
@@ -64,7 +72,7 @@ module.exports = function(grunt) {
                     'frontend/express/public/javascripts/utils/jsoneditor/minify.json.js',
                     'frontend/express/public/javascripts/utils/jsoneditor/jsoneditor.js',
                     'frontend/express/public/javascripts/utils/Sortable.min.js',
-                    'frontend/express/public/javascripts/utils/vuedraggable.umd.min.js'
+                    'frontend/express/public/javascripts/utils/vue/vuedraggable.umd.min.js'
                 ],
                 dest: 'frontend/express/public/javascripts/min/countly.utils.concat.js'
             },
@@ -136,6 +144,7 @@ module.exports = function(grunt) {
                 files: {
                     'frontend/express/public/stylesheets/main.min.css': [
                         'frontend/express/public/stylesheets/main.css',
+                        'frontend/express/public/stylesheets/vue/clyvue.css',
                         'frontend/express/public/stylesheets/amaranjs/amaran.min.css',
                         'frontend/express/public/stylesheets/selectize/selectize.css',
                         'frontend/express/public/stylesheets/jsoneditor/codemirror.css',
@@ -265,7 +274,7 @@ module.exports = function(grunt) {
                 files = fs.readdirSync(stylesheets);
                 files.forEach(function(name) {
                     var file = path.join(stylesheets, name);
-                    if (fs.statSync(file).isFile() && name !== 'pre-login.css' && name.indexOf('.') !== 0) {
+                    if (fs.statSync(file).isFile() && name !== 'pre-login.css' && name.indexOf('.') !== 0 && name.indexOf('.scss') === -1) {
                         css.push('plugins/' + plugin + '/frontend/public/stylesheets/' + name);
                     }
                 });

frontend/express/public/javascripts/countly/countly.common.js

@@ -144,6 +144,7 @@
             else {
                 countlyCommon.periodObj = calculatePeriodObj(period);
             }
+
             if (window.app && window.app.recordEvent) {
                 window.app.recordEvent({
                     "key": "period-change",
@@ -152,6 +153,13 @@
                 });
             }
 
+            if (window.countlyVue && window.countlyVue.vuex) {
+                var currentStore = window.countlyVue.vuex.getGlobalStore();
+                if (currentStore) {
+                    currentStore.dispatch("countlyCommon/updatePeriod", {period: period, label: countlyCommon.getDateRangeForCalendar()});
+                }
+            }
+
             if (noSet) {
                 return;
             }