vue_crud 0.1.10.1 → 0.1.10.2

data/lib/generators/vue_crud/templates/assets/stylesheets/fa/font-awesome.scss

@@ -0,0 +1,18 @@
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+
+@import "variables";
+@import "mixins";
+@import "path";
+@import "core";
+@import "larger";
+@import "fixed-width";
+@import "list";
+@import "bordered-pulled";
+@import "animated";
+@import "rotated-flipped";
+@import "stacked";
+@import "icons";
+@import "screen-reader";

data/lib/generators/vue_crud/templates/vue_crud.html

@@ -16,9 +16,6 @@ $(document).ready(function() {
     models.find('.custom_action').html(
         $('#custom_action').html()
     );
-    // models.find('.vue_form_for_edit').html(
-    //     $('#vue_form').html()
-    // );
     modal.find('.custom_modal_body').html(
         $('#custom_modal_body').html()
     );
@@ -338,15 +335,3 @@ $(document).ready(function() {
         </div>
     </form>
 </script>
-<!-- NOTE: memo-->
-<!-- <div class="row well well-sm">
-    <models v-for="model in models" :model="model"></models>
-</div> -->
-<!--         ┌───────────────────────────────────────┐         -->
-<!--         │                                       ↓         -->
-<!-- v-for model in models 這個 model 會透過 :model="model" 傳值到 template，無法直接使用 v-for 迴圈出來的 model -->
-<!--                                          │
-In models component          props: {      ↓
-                                    model: Object
-                                }
--->

data/lib/generators/vue_crud/vuejs_generator.rb

@@ -3,7 +3,7 @@ module VueCrud
   class VuejsGenerator < Rails::Generators::Base
       source_root File.expand_path("../templates/assets", __FILE__)
 
-      def copy_template_file
+      def copy_vuejs
           copy_file "javascripts/vue.js", "app/assets/javascripts/vue.js"
       end
   end

data/lib/vue_crud/version.rb

@@ -1,3 +1,3 @@
 module VueCrud
-  VERSION = "0.1.10.1"
+  VERSION = "0.1.10.2"
 end

data/vendor/assets/javascripts/vue_crud.js

@@ -1,3 +1,9 @@
+$.FE.prototype.reset = function () {
+    this.$el.html('');
+}
+$.FE.prototype.refresh = function () {
+    this.$el.html(this.$oel.val());
+}
 $(document).ajaxStart(function() { Pace.restart(); });
 Vue.config.devtools = true;
 Pace.on('done', function() {
@@ -5,7 +11,7 @@ Pace.on('done', function() {
 });
 var event_hub = new Vue();
 function sleep(time) {
-  return new Promise((resolve) => setTimeout(resolve, time));
+    return new Promise((resolve) => setTimeout(resolve, time));
 }
 function obj_to_json(obj) {
     return JSON.parse(JSON.stringify(obj));
@@ -66,7 +72,8 @@ function vueCRUD_init(params = {}) {
         suffix: '.json',
         column_type: 'card',
         countOfPage: 9,
-        sortable: false
+        sortable: false,
+        info_url: window.location.pathname + '/info.json'
     }
     var options = $.extend(true, {}, default_options, params)
     Vue.directive('froala', {
@@ -109,6 +116,9 @@ function vueCRUD_init(params = {}) {
             }
         },
         mounted: function() {
+            event_hub.$on('update_error', function(error) {
+                this.error = error;
+            }.bind(this));
             event_hub.$on('update_action_name', function(action_name) {
                 this.action_name = action_name;
             }.bind(this));
@@ -167,13 +177,13 @@ function vueCRUD_init(params = {}) {
                     observeChanges: true,
                     transition: 'fade down',
                     onShow: function() {
-                        $('.needRefresh').froalaEditor('reset');
+                        // $('.needRefresh').froalaEditor('reset');
                         $(this).find('select.ui.dropdown').dropdown();
                         $(this).find('.ui.checkbox').checkbox();
                         if(typeof modalOpen !== "undefined") modalOpen(this);
                     },
                     onVisible: function() {
-                        $('.needRefresh').froalaEditor('refresh');
+                        // $('.needRefresh').froalaEditor('refresh');
                     },
                     onHide: function() {
                         event_hub.$emit('cancel_customMode');
@@ -267,7 +277,7 @@ function vueCRUD_init(params = {}) {
                 if(confirm("Are you sure?") == true) {
                     $.ajax({
                         method: 'DELETE',
-                        url: that.info.url_prefix + '/' + that.model.id + options.suffix + location.search,
+                        url: that.info.url_prefix + '/' + that.model.ID + options.suffix + location.search,
                         success: function(res) {
                             that.is_deleted = true;
                             event_hub.$on('toggleRestoreSuccess', function() {
@@ -297,11 +307,10 @@ function vueCRUD_init(params = {}) {
                 var that = this;
                 $.ajax({
                     method: 'PATCH',
-                    data: {
-                        model: that.model,
-                    },
-                    url: that.info.url_prefix + '/' + that.model.id + options.suffix + location.search,
+                    data: JSON.stringify(that.model),
+                    url: that.info.url_prefix + '/' + that.model.ID + options.suffix + location.search,
                     beforeSend: function() {
+                        console.log(JSON.stringify(that.model));
                         event_hub.$emit('dimmerOn');
                         $('.progress-bar').css('width', '0');
                     },
@@ -316,7 +325,7 @@ function vueCRUD_init(params = {}) {
                         });
                     },
                     error: function(res) {
-                        that.errors = res.responseJSON.errors;
+                        event_hub.$emit('update_error', res.responseJSON.errors);
                         event_hub.$emit('dimmerOff');
                     }
                 });
@@ -336,7 +345,6 @@ function vueCRUD_init(params = {}) {
                 info: {
                     url_prefix: '',
                     titles: {},
-                    structure: {},
                     model_attributes: []
                 },
                 errors: {},
@@ -346,7 +354,6 @@ function vueCRUD_init(params = {}) {
                 searchQuery: getParameterByName("q"),
                 filteredModelCount: null,
                 is_calculating: false,
-                model_prefix: getParameterByName("mp"),
                 selected_attribute: getParameterByName("sa"),
                 selected_text: getParameterByName("st")
             }
@@ -354,10 +361,10 @@ function vueCRUD_init(params = {}) {
         mounted: function() {
             var that = this;
             $.ajax({
-                url: window.location.pathname + '/info' + options.suffix,
+                url: options.info_url,
                 success: function(res) {
                     that.info = res;
-                    that.model = obj_to_json(that.info.structure);
+                    that.model = {};
                     var default_url = that.info.url_prefix + location.search;
                     default_url = removeParam("p", default_url);
                     default_url = removeParam("q", default_url);
@@ -384,13 +391,10 @@ function vueCRUD_init(params = {}) {
                 event_hub.$emit('update_progress', $(this).val());
             });
             $(document).delegate('.attribute_option', 'click', function(event) {
-                var model_prefix = $('.attribute_select').find('.item.selected').attr('model_prefix');
                 var selected_attribute = $('.attribute_select').find('.item.selected').attr('target') || "Attribute";
                 var selected_text = $('.attribute_select').find('.item.selected').attr('target_text') || "欄位";
-                that.model_prefix = model_prefix;
                 that.selected_attribute = selected_attribute;
                 that.selected_text = selected_text;
-                updateQueryStringParam('mp', that.model_prefix);
                 updateQueryStringParam('sa', that.selected_attribute);
                 updateQueryStringParam('st', that.selected_text);
             });
@@ -420,12 +424,7 @@ function vueCRUD_init(params = {}) {
                 var that = this;
                 that.is_calculating = true;
                 var result = that.models.filter(function (model) {
-                    if(that.model_prefix.length > 0) {
-                        return String(model[that.model_prefix][that.selected_attribute]).indexOf(that.searchQuery) !== -1;
-                    }
-                    else {
-                        return String(model[that.selected_attribute]).indexOf(that.searchQuery) !== -1;
-                    }
+                    return String(model[that.selected_attribute]).indexOf(that.searchQuery) !== -1;
                 });
 
                 that.filteredModelCount = result.length
@@ -466,9 +465,7 @@ function vueCRUD_init(params = {}) {
                 var that = this;
                 $.ajax({
                     method: 'POST',
-                    data: {
-                        model: that.model,
-                    },
+                    data: JSON.stringify(that.model),
                     url: that.info.url_prefix + options.suffix + location.search,
                     success: function(res) {
                         event_hub.$emit('toggleRestoreSuccess');
@@ -482,11 +479,10 @@ function vueCRUD_init(params = {}) {
                 var that = this;
                 $.ajax({
                     method: 'POST',
-                    data: {
-                        model: that.model,
-                    },
+                    data: JSON.stringify(that.model),
                     url: that.info.url_prefix + options.suffix + location.search,
                     beforeSend: function() {
+                        console.log(JSON.stringify(that.model));
                         event_hub.$emit('dimmerOn');
                         $('.progress-bar').css('width', '0');
                     },
@@ -494,11 +490,11 @@ function vueCRUD_init(params = {}) {
                         event_hub.$emit('closeModal');
                         event_hub.$emit('dimmerOff');
                         that.errors = {};
-                        that.model = obj_to_json(that.info.structure);
+                        that.model = {};
                         that.models.push(res);
                     },
                     error: function(res) {
-                        that.errors = res.responseJSON.errors;
+                        event_hub.$emit('update_error', res.responseJSON.errors);
                         event_hub.$emit('dimmerOff');
                     }
                 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vue_crud
 version: !ruby/object:Gem::Version
-  version: 0.1.10.1
+  version: 0.1.10.2
 platform: ruby
 authors:
 - Donald Chiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,14 +69,27 @@ files:
 - bin/setup
 - lib/.DS_Store
 - lib/generators/.DS_Store
+- lib/generators/vue_crud/.DS_Store
+- lib/generators/vue_crud/codemirror_generator.rb
 - lib/generators/vue_crud/example_generator.rb
+- lib/generators/vue_crud/fa_generator.rb
 - lib/generators/vue_crud/froala_generator.rb
 - lib/generators/vue_crud/install_generator.rb
 - lib/generators/vue_crud/pace_generator.rb
 - lib/generators/vue_crud/semantic_generator.rb
 - lib/generators/vue_crud/sortable_generator.rb
+- lib/generators/vue_crud/template_generator.rb
+- lib/generators/vue_crud/templates/.DS_Store
+- lib/generators/vue_crud/templates/assets/.DS_Store
+- lib/generators/vue_crud/templates/assets/fonts/fa/FontAwesome.otf
+- lib/generators/vue_crud/templates/assets/fonts/fa/fontawesome-webfont.eot
+- lib/generators/vue_crud/templates/assets/fonts/fa/fontawesome-webfont.svg
+- lib/generators/vue_crud/templates/assets/fonts/fa/fontawesome-webfont.ttf
+- lib/generators/vue_crud/templates/assets/fonts/fa/fontawesome-webfont.woff
+- lib/generators/vue_crud/templates/assets/fonts/fa/fontawesome-webfont.woff2
 - lib/generators/vue_crud/templates/assets/images/froala_editor/color_picker.png
 - lib/generators/vue_crud/templates/assets/images/semantic-ui/flags.png
+- lib/generators/vue_crud/templates/assets/javascripts/codemirror.js
 - lib/generators/vue_crud/templates/assets/javascripts/froala_editor/froala_editor.js
 - lib/generators/vue_crud/templates/assets/javascripts/froala_editor/languages/en_gb.js
 - lib/generators/vue_crud/templates/assets/javascripts/froala_editor/languages/zh_cn.js
@@ -117,6 +130,22 @@ files:
 - lib/generators/vue_crud/templates/assets/javascripts/semantic-ui/transition.js
 - lib/generators/vue_crud/templates/assets/javascripts/sortable.js
 - lib/generators/vue_crud/templates/assets/javascripts/vue.js
+- lib/generators/vue_crud/templates/assets/stylesheets/.DS_Store
+- lib/generators/vue_crud/templates/assets/stylesheets/codemirror.css
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_animated.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_bordered-pulled.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_core.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_fixed-width.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_icons.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_larger.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_list.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_mixins.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_path.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_rotated-flipped.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_screen-reader.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_stacked.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/_variables.scss
+- lib/generators/vue_crud/templates/assets/stylesheets/fa/font-awesome.scss
 - lib/generators/vue_crud/templates/assets/stylesheets/froala_editor/froala_editor.scss
 - lib/generators/vue_crud/templates/assets/stylesheets/froala_editor/froala_style.scss
 - lib/generators/vue_crud/templates/assets/stylesheets/froala_editor/plugins/char_counter.scss