ishapi 0.1.8.188 → 0.1.8.190

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71793ea6c179dcdd89798221461806ee5bcd00ba94e9e5f92ed378b33e473622
-  data.tar.gz: fc078c97af8060dba19c745b19a329d05be1e56bd4c831e907aba983316a9442
+  metadata.gz: f891100a3a85dcf7b3b9dfaae2582cbd897c62707c8a461cb7db2028180a3746
+  data.tar.gz: 2a8abf11cff24eb963e1a58c09e97521c5bfbdc0b5e2b2f71a7f1ae9f4a9a18a
 SHA512:
-  metadata.gz: 65a6de0c6777c0bda32fa51ff9e2f222dc06535a5fda670dc428fab3cf8b4d097b963cc11f10c1921203cf8653241d09a145880d94c29b8cd9ce98862e1122ad
-  data.tar.gz: b63c594ff9530cce12c6338c1458fb274554f3f0115e3a008c6f6674346bb77847e31593c4d8ff3a623c55ad7289fea2b4e1662774efa175f755cdebe3b456e7
+  metadata.gz: 4b450ae541f0ccb3a85865af3c3fd41133cc280b20985c002a87756b7ea4dad7063546237a2c3dd6c4f4f15be05003e361141768b9b7f6ed56736d02dbc73c81
+  data.tar.gz: bee01f4ad4dc3715fffebe4f18894333df46141c923347ef1fcff0eb6cbd5eeef5115fe105313ddd738fcb17f5deef12d5203d82c879f4142d731560f53e28a4

data/app/controllers/ishapi/maps_controller.rb

@@ -10,9 +10,11 @@ class Ishapi::MapsController < Ishapi::ApplicationController
     @map = @location.map || @location
 
     authorize! :show, @map
-    @newsitems = @location.newsitems
 
-    @markers = @map.markers.permitted_to(@current_user.profile)
+    @newsitems = @location.newsitems.page( params[:newsitems_page]
+      ).per( @location.newsitems_page_size )
+
+    @markers = @map.markers.permitted_to(@current_user.profile).order_by(ordering: :asc)
 
     @tags = @map.tags
 
@@ -23,14 +25,6 @@ class Ishapi::MapsController < Ishapi::ApplicationController
     #   @markers = @markers.order_by( ordering: :asc )
     # end
 
-    # ## @TODO: figure this out eventually
-    # if city = City.where( cityname: @map.slug ).first
-    #   # @newsitems = city.newsitems
-    #   @galleries = city.galleries
-    #   @reports = city.reports
-    #   @videos = city.videos
-    # end
-
   end
 
   def show_marker

data/app/controllers/ishapi/users/sessions_controller.rb

@@ -10,6 +10,7 @@ class Ishapi::Users::SessionsController < Devise::SessionsController
     # respond_with resource, location: after_sign_in_path_for(resource)
 
     ## Send the jwt to client
+    @current_user = resource
     @jwt_token = encode(user_id: @current_user.id.to_s)
     @profile = @current_user.profile
     render 'ishapi/users/login', format: :json, layout: false

data/app/views/ishapi/application/_pagination.jbuilder

@@ -0,0 +1,11 @@
+
+## From: https://gist.github.com/be9/6446051
+
+current, total, per_page = collection.current_page, collection.total_pages, collection.limit_value
+
+json.current  current
+json.previous (current > 1 ? (current - 1) : nil)
+json.next     (current == total ? nil : (current + 1))
+json.per_page per_page
+json.pages    total
+json.count    collection.total_count

data/app/views/ishapi/maps/_show.jbuilder

@@ -14,7 +14,7 @@ json.cache! this_key do
     json.h            map.h
     json.x            map.x
     json.y            map.y
-    json.map_type     map.map_type
+    # json.map_type     map.map_type
     json.img_path     map.image.image.url(:original)
     json.updated_at   map.updated_at
     json.rated        map.rated

data/app/views/ishapi/markers/_index.jbuilder

@@ -19,13 +19,15 @@ json.markers do
     json.asset3d_path   marker.asset3d ? marker.asset3d.object.url : ''
 
     ## @TODO: this is copy-pasted and should be abstracted.
-    destination = marker.destination
-    json.premium_tier destination.premium_tier
-    json.is_premium   destination.is_premium
-    json.id           destination.id.to_s
-    if destination.is_premium
-      if current_user && current_user.profile
-        json.is_purchased current_user.profile.has_premium_purchase( destination )
+    if destination = marker.destination
+      json.destination_slug destination.slug
+      json.premium_tier destination.premium_tier
+      json.is_premium   destination.is_premium
+      json.id           destination.id.to_s
+      if destination.is_premium
+        if current_user && current_user.profile
+          json.is_purchased current_user.profile.has_premium_purchase( destination )
+        end
       end
     end
 

data/app/views/ishapi/newsitems/_index.jbuilder

@@ -2,8 +2,11 @@
 # ishapi / newsitems / _index
 #
 
-json.n_newsitems newsitems.count
+json.newsitems_pagination do
+  json.partial! "ishapi/application/pagination", collection: newsitems
+end
 json.newsitems do
+
   json.array! newsitems do |item|
     json.newsitem_id item.id.to_s
     json.name        item.name
@@ -46,7 +49,6 @@ json.newsitems do
         json.id         item.report_id.to_s
         json.item_type  item.report.class.name
         json.name       item.report.name
-        json.reportname item.report.slug # @TODO: @deprecated, remove
         json.slug       item.report.slug
         json.subhead    item.report.subhead
         json.username   item.report.user_profile.name if item.report.user_profile

data/app/views/ishapi/reports/show.jbuilder

@@ -23,7 +23,13 @@ json.cache! key do
     json.username    @report.user_profile.name if @report.user_profile
     json.cityname    @report.city.cityname if @report.city
     json.subhead     @report.subhead
-    json.description @report.descr
+
+    case @report.item_type
+    when 'wordpress'
+      json.raw_json    JSON.parse(@report.raw_json)
+    else
+      json.description @report.descr
+    end
 
     if @report.photo
       json.photo do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.188
+  version: 0.1.8.190
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-15 00:00:00.000000000 Z
+date: 2022-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -299,6 +299,7 @@ files:
 - app/models/ishapi/ability.rb
 - app/views/ishapi/addresses/_show.jbuilder
 - app/views/ishapi/application/_meta.jbuilder
+- app/views/ishapi/application/_pagination.jbuilder
 - app/views/ishapi/articles/_form.html.erb
 - app/views/ishapi/articles/edit.html.erb
 - app/views/ishapi/articles/index.html.erb