tomify 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34bf7184118f201d83d1ef89b98057bb1d41f53e
-  data.tar.gz: ac949b2ec8b51179601e9ee09ae94902d41c590d
+  metadata.gz: d85803b12226321bb76440fc8efae058be5d9772
+  data.tar.gz: 3ce0217e98efeced7e3f22ff3abb980f308bfe67
 SHA512:
-  metadata.gz: 3638b5741f85d2218f22ffcf61b52d4a211c2140e9e0623d3c104af6fcb780b4a4b8f0161678d227b3745bffece49b36c4a9eaf47efb0a9cd48f09fffdc212ea
-  data.tar.gz: c2c8fb0eb2a8dfc5046aa1f74fefa24bf3b2ecfc52027fb9083656c4257fb8f709dfdc1367fe2822f5ce964ed268d0701e117d0d857713fce7ef01fdb9ce5d44
+  metadata.gz: 3d9363a21eefec8e5262e5361de0eb8f55fd9f53cb3648c7e1d100d7e10a0a5b08bbe525ad0ec5e59ee8a5ab5cf94878c7b4a66b20fc9495278a2c4946d5a3d9
+  data.tar.gz: 5d0bafb20a6461996c1f05fdd989c8e3e1f0d57192bc75439b1d488f9dfea2e6402e136415e178779d7b31b20a4902fd10b649199a18acd0568fc86f03b45b20

data/app/assets/javascripts/tomify/dynamic/react/components/index.coffee

@@ -1,4 +1,6 @@
 Component.create "Index.Container",
+  getDefaultProps: -> { length: 5 }
+  getInitialState: -> { page: 1, currentRecords: [] }
   componentWillInitialize: ->
     @model = Model.findOrCreate @props.name
     @store = Store.findOrCreate "#{@props.name}.Index"
@@ -20,7 +22,9 @@ Component.create "Index.Container",
   modelDestroy: (response) ->
     @model.all() if response.type == "danger"
   setPage: (page) ->
-    @setState(page: 1, currentRecords: @state.records[(page*10 - 10)..page*10])
+    finish = page * @props.length
+    start = finish - @props.length
+    @setState(page: page, currentRecords: @state.records[start...finish])
   actions: (record) ->
     actions = []
 
@@ -63,7 +67,7 @@ Component.create "Index.Container",
                   <a className="btn btn-primary btn-xs" href="#" onClick={click}>New</a>
                 }
               </h4>
-              <Pagination page="1" total={@state.records.length} setPage={@setPage} />
+              <Pagination page={@state.page} total={@state.records.length} setPage={@setPage} length={@props.length} />
             </div>
             <div className="table-responsive">
               <table className="table table-bordered table-hover">
@@ -76,7 +80,7 @@ Component.create "Index.Container",
                   </tr>
                 </thead>
                 <tbody>
-                  {for record, i in @state.records
+                  {for record, i in @state.currentRecords
                     <tr key={i}>
                       {for field, j in @model.columns
                         <td key={j}>{field.value?(record) ? record[field.name]}</td>
@@ -87,6 +91,10 @@ Component.create "Index.Container",
                 </tbody>
               </table>
             </div>
+            <div className="panel-footer">
+              <Pagination page={@state.page} total={@state.records.length} setPage={@setPage} length={@props.length} />
+              <div className="clearfix" />
+            </div>
           </div>
         </div>
       </div>

data/app/assets/javascripts/tomify/dynamic/react/components/pagination.coffee

@@ -1,29 +1,29 @@
 Component.create "Pagination",
   setPage: (page, e) ->
     e.preventDefault()
-    @props.setPage(page)
+    @props.setPage(page) if page
     false
   render: ->
     first = 1
     prev = @props.page - 1
     next = @props.page + 1
-    last = Math.ceil(@props.total / 10)
+    last = Math.ceil(@props.total / @props.length)
     prevDisabled = first > prev
     nextDisabled = next > last
     <ul className="pagination">
-      <li className="pagination-first#{' disabled' if prevDisabled}">
-        <a href="#" onClick={@setPage.bind(null, first)} className="fa fa-angle-double-left" />
+      <li className="pagination-first#{prevDisabled && ' disabled'}">
+        <a href="#" onClick={@setPage.bind(null, !prevDisabled && first)} className="fa fa-angle-double-left" />
       </li>
-      <li className="pagination-prev#{' disabled' if prevDisabled}">
-        <a href="#" onClick={@setPage.bind(null, prev)} className="fa fa-angle-left" />
+      <li className="pagination-prev#{prevDisabled && ' disabled'}">
+        <a href="#" onClick={@setPage.bind(null, !prevDisabled && prev)} className="fa fa-angle-left" />
       </li>
       <li className="pagination-link active">
         <a href="#" onClick={@setPage.bind(null, @props.page)}>{@props.page}</a>
       </li>
-      <li className="pagination-next#{' disabled' if nextDisabled}">
-        <a href="#" onClick={@setPage.bind(null, next)} className="fa fa-angle-right" />
+      <li className="pagination-next#{nextDisabled && ' disabled'}">
+        <a href="#" onClick={@setPage.bind(null, !nextDisabled && next)} className="fa fa-angle-right" />
       </li>
-      <li className="pagination-last#{' disabled' if nextDisabled}">
-        <a href="#" onClick={@setPage.bind(null, @props.total)} className="fa fa-angle-double-right" />
+      <li className="pagination-last#{nextDisabled && ' disabled'}">
+        <a href="#" onClick={@setPage.bind(null, !nextDisabled && last)} className="fa fa-angle-double-right" />
       </li>
     </ul>

data/app/assets/javascripts/tomify/dynamic/react/components/public/subscription.coffee

@@ -23,7 +23,7 @@ Component.create "Public.Subscription",
         {if @state.subscription.active
           <div>
             <p>
-              <strong>{@state.subscription.email}</strong> will be no longer recieve the majority of emails from {setting "name"}.
+              <strong>{@state.subscription.email}</strong> will no longer recieve the majority of emails from {setting "name"}.
             </p>
             <a href="#" onClick={@destroy} className="btn btn-danger" data-confirm="Are you sure?">Unsubscribe</a>
           </div>

data/app/assets/javascripts/tomify/dynamic/react/mixins/follow.coffee

@@ -32,7 +32,7 @@
       throw "Component: Invalid Store (#{value})" unless store?
   setupModels: ->
     @models = @convertToHash(@followModels?() || @followModels || [])
-    for key, value of @models when not (value instanceof Store)
+    for key, value of @models when not (value instanceof Model)
       delete @models[key]
       store = @stores[key.camelize] = @store.findOrCreate value, []
       model = @models[key.camelize] = Model.findOrCreate(value)

data/app/assets/stylesheets/tomify/_pagination.scss

@@ -1,5 +1,5 @@
 .pagination {
   float: right;
   margin-top: 2px;
-  margin-bottom: 10px;
+  margin-bottom: 2px;
 }

data/lib/tomify/version.rb

@@ -1,3 +1,3 @@
 module Tomify
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails