Merge pull request #134 from basemate/refactor_core_components_v2

Refactor core components v2

Author: jonasjabari

app/concepts/matestack/ui/core/app/app.rb

@@ -53,7 +53,6 @@ def self.views_dir
       return ""
     end
 
-
     def initialize(model=nil, options={})
       super
       @nodes = {}

app/concepts/matestack/ui/core/app/store.js

@@ -1,7 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
 import Vuex from 'vuex'
 import axios from 'axios'
-
 import matestackEventHub from 'js/event-hub'
 
 Vue.use(Vuex)

app/concepts/matestack/ui/core/async/async.js

@@ -1,7 +1,5 @@
 import Vue from 'vue/dist/vue.esm'
-
 import matestackEventHub from 'js/event-hub'
-
 import componentMixin from 'component/component'
 
 const componentDef = {

app/concepts/matestack/ui/core/async/async.rb

@@ -1,10 +1,9 @@
 module Matestack::Ui::Core::Async
-    class Async < Matestack::Ui::Core::Component::Dynamic
-
-      def setup
-        @rerender = true
-      end
-
+  class Async < Matestack::Ui::Core::Component::Dynamic
 
+    def setup
+      @rerender = true
     end
+
   end
+end

app/concepts/matestack/ui/core/blockquote/blockquote.rb

@@ -1,9 +1,11 @@
 module Matestack::Ui::Core::Blockquote
   class Blockquote < Matestack::Ui::Core::Component::Static
+
     def setup
       @tag_attributes.merge!({
         "cite": options[:cite]
-      })
+        })
     end
+
   end
 end

app/concepts/matestack/ui/core/button/button.haml

@@ -1,7 +1,5 @@
-- if options[:text].nil?
-  %button{@tag_attributes}
-    - if block_given?
-      = yield
-- else
-  %button{@tag_attributes}
+%button{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/caption/caption.haml

@@ -1,6 +1,5 @@
 %caption{@tag_attributes}
-  - if options[:text].nil?
-    - if block_given?
-      = yield
+  - if options[:text].nil? && block_given?
+    = yield
   - else
     = options[:text]

app/concepts/matestack/ui/core/collection/content/content.js

@@ -1,8 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
-
 import matestackEventHub from 'js/event-hub'
 import queryParamsHelper from 'js/helpers/query-params-helper'
-
 import componentMixin from 'component/component'
 import asyncMixin from 'async/async'
 

app/concepts/matestack/ui/core/collection/filter/filter.js

@@ -1,8 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
-
 import matestackEventHub from 'js/event-hub'
 import queryParamsHelper from 'js/helpers/query-params-helper'
-
 import componentMixin from 'component/component'
 
 const componentDef = {

app/concepts/matestack/ui/core/collection/helper.rb

@@ -59,7 +59,6 @@ def config
 
   end
 
-
   module Helper
 
     def get_collection_filter collection_id, key=nil

app/concepts/matestack/ui/core/collection/order/order.js

@@ -1,8 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
-
 import matestackEventHub from 'js/event-hub'
 import queryParamsHelper from 'js/helpers/query-params-helper'
-
 import componentMixin from 'component/component'
 
 const componentDef = {

app/concepts/matestack/ui/core/collection/order/toggle/toggle.rb

@@ -1,6 +1,5 @@
 module Matestack::Ui::Core::Collection::Order::Toggle
   class Toggle < Matestack::Ui::Core::Component::Static
 
-
   end
 end

app/concepts/matestack/ui/core/component/component.js

@@ -1,7 +1,6 @@
 import Vue from 'vue/dist/vue.esm'
 import axios from 'axios'
 import VRuntimeTemplate from "v-runtime-template"
-
 import matestackEventHub from 'js/event-hub'
 
 const componentMixin = {

app/concepts/matestack/ui/core/component/dynamic.rb

@@ -1,7 +1,6 @@
 module Matestack::Ui::Core::Component
   class Dynamic < Trailblazer::Cell
 
-
     include ActionView::Helpers::ActiveModelHelper
     include ActionView::Helpers::ActiveModelInstanceTag
     include ActionView::Helpers::AssetTagHelper
@@ -26,8 +25,6 @@ class Dynamic < Trailblazer::Cell
     include ActionView::Helpers::TextHelper
     include ActionView::Helpers::TranslationHelper
     include ActionView::Helpers::UrlHelper
-    # include ActionView::Helpers::UrlHelper
-    # include ActionView::Helpers::TranslationHelper
     include ::Cell::Haml
     include Matestack::Ui::Core::ApplicationHelper
     include Matestack::Ui::Core::ToCell
@@ -193,7 +190,6 @@ def modifiers
       result.join(" ")
     end
 
-
     private
 
       def generate_children_cells

app/concepts/matestack/ui/core/details/details.rb

@@ -1,4 +1,5 @@
 module Matestack::Ui::Core::Details
   class Details < Matestack::Ui::Core::Component::Static
+
   end
 end

app/concepts/matestack/ui/core/div/div.rb

@@ -1,6 +1,5 @@
 module Matestack::Ui::Core::Div
   class Div < Matestack::Ui::Core::Component::Static
 
-
   end
 end

app/concepts/matestack/ui/core/icon/icon.haml

@@ -1,6 +1,5 @@
 %i{@tag_attributes}
-  - if options[:text].blank?
-    - if block_given?
-      = yield
+  - if options[:text].nil? && block_given?
+    = yield
   - else
     = options[:text]

app/concepts/matestack/ui/core/label/label.haml

@@ -1,7 +1,5 @@
-- if options[:text].blank?
-  %label{@tag_attributes}
-    - if block_given?
-      = yield
-- else
-  %label{@tag_attributes}
+%label{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/li/li.haml

@@ -1,6 +1,5 @@
 %li{@tag_attributes}
-  - if options[:text].blank?
-    - if block_given?
-      = yield
+  - if options[:text].nil? && block_given?
+    = yield
   - else
     = options[:text]

app/concepts/matestack/ui/core/onclick/onclick.rb

@@ -1,6 +1,5 @@
 module Matestack::Ui::Core::Onclick
     class Onclick < Matestack::Ui::Core::Component::Dynamic
 
-
-    end
   end
+end

app/concepts/matestack/ui/core/page/page.rb

@@ -65,7 +65,6 @@ def slot(&block)
       Matestack::Ui::Core::PageNode.build(self, nil, context[:params], &block)
     end
 
-
     def show(component_key=nil, only_page=false)
       prepare
       response
@@ -106,7 +105,6 @@ def show(component_key=nil, only_page=false)
       end
     end
 
-
     def page_id
       @custom_page_id ||= @page_id
     end
@@ -145,7 +143,5 @@ def set_app_class
         end
       end
 
-
   end
-
 end

app/concepts/matestack/ui/core/paragraph/paragraph.haml

@@ -1,8 +1,5 @@
-- if options[:text].nil?
-  %p{@tag_attributes}
-    - if block_given?
-      = yield
-
-- else
-  %p{@tag_attributes}
+%p{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/pg/pg.haml

@@ -1,8 +1,5 @@
-- if options[:text].nil?
-  %p{@tag_attributes}
-    - if block_given?
-      = yield
-
-- else
-  %p{@tag_attributes}
+%p{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/plain/plain.rb

@@ -6,5 +6,4 @@ def show
     end
 
   end
-
 end

app/concepts/matestack/ui/core/summary/summary.haml

@@ -1,6 +1,5 @@
 %summary{@tag_attributes}
-  - if options[:text].blank?
-    - if block_given?
-      = yield
+  - if options[:text].nil? && block_given?
+    = yield
   - else
     = options[:text]

app/concepts/matestack/ui/core/summary/summary.rb

@@ -1,4 +1,5 @@
 module Matestack::Ui::Core::Summary
   class Summary < Matestack::Ui::Core::Component::Static
+
   end
 end

app/concepts/matestack/ui/core/td/td.haml

@@ -1,8 +1,5 @@
-- if options[:text].nil?
-  %td{@tag_attributes}
-    - if block_given?
-      = yield
-
-- else
-  %td{@tag_attributes}
+%td{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/th/th.haml

@@ -1,8 +1,5 @@
-- if options[:text].nil?
-  %th{@tag_attributes}
-    - if block_given?
-      = yield
-
-- else
-  %th{@tag_attributes}
+%th{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/transition/transition.haml

@@ -1,7 +1,5 @@
-- if options[:text].nil?
-  %a{@tag_attributes}
-    - if block_given?
-      = yield
-- else
-  %a{@tag_attributes}
+%a{@tag_attributes}
+  - if options[:text].nil? && block_given?
+    = yield
+  - else
     = options[:text]

app/concepts/matestack/ui/core/view/view.rb

@@ -1,7 +1,5 @@
 module Matestack::Ui::Core::View::Cell
     class View < Matestack::Ui::Core::Component::Dynamic
 
-  
-    end
   end
-  
+end