ishapi 0.1.8.148 → 0.1.8.153

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b93828545b3f0c63df48d764a930c0ce189a7b6c56d80ad8d71d22c12ff6af
-  data.tar.gz: 16ada34a0d549ced6d4bd3cb7103ddd074dac990bcc382f37ab48fa9753d4502
+  metadata.gz: 754fefba120e1ee7f87e94a2b3da3a450e07c86e7bd135055cb2240d7ccb5ef7
+  data.tar.gz: ff7748716f5c58c458f6635386a77164c943d30b792f1c854a4d8b6977744e9d
 SHA512:
-  metadata.gz: 8d950587452e9e0521ea2d5631aa26d7e46929ffe3ba24e31cf1b47c15f4811b089b3e5c67a0c7040ba507f5cc6e47dec914de37b3c90241601f8c5f301857c1
-  data.tar.gz: 0a1776f2adfaad26e1122efe3a38f19d5685ed8daa454512206f67dd9835fefe8b3ddfea921ad75f221647259a086285daabb08b863819b1d0cc93932aca3f66
+  metadata.gz: b44159ee3983c79213b8e2ab0d98c1aaec009268b1d701d276e99475bde50235c233d03a249c03f80158d0507565f06c50aeb9cd4dcb4ac431274d07d0772abe
+  data.tar.gz: 92ff67762868d928066fc0fb4d15602f0166da0f7ba74b552c46fd5261bc0a9d26f134768067f1c42ec87872418ff5c983561dc90e975c1e15d5c9db9f3c3f71

data/app/controllers/ishapi/maps_controller.rb

@@ -4,10 +4,12 @@ module Ishapi
 
     before_action :check_profile, only: [ :show ]
 
+=begin
     def index
       authorize! :index, ::Gameui::Map
       @maps = ::Gameui::Map.all
     end
+=end
 
     def show
       @map = ::Gameui::Map.find_by slug: params[:slug]
@@ -21,12 +23,16 @@ module Ishapi
         @markers = @markers.order_by( ordering: :asc )
       end
 
+      # @TODO: move to models
       if city = City.where( cityname: @map.slug ).first
         @newsitems = city.newsitems
         @galleries = city.galleries
         @reports = city.reports
         @videos = city.videos
       end
+
+      puts! @map, 'prod map'
+
       authorize! :show, @map
     end
 

data/app/controllers/ishapi/my/galleries_controller.rb

@@ -1,7 +1,6 @@
 
-class Ishapi::My::GalleriesController < Ishapi::My::MyController
+class Ishapi::My::GalleriesController < Ishapi::ApplicationController
 
-  ## expects params[:jwt_token]
   def index
     authorize! :my_index, Gallery
     @galleries = @current_user.profile.galleries.unscoped.where( is_trash: false ).order_by( created_at: :desc ).limit(20)

data/app/controllers/ishapi/my/{my_controller.rb → my_controller.rb-trash}

@@ -3,19 +3,20 @@ module Ishapi
   module My
     class MyController < Ishapi::ApplicationController
 
-      # before_action :set_profile # this is DoS on FB - disabled
-      # before_action :do_login
       before_action :check_profile
 
+      # @TODO: move to users_controller
       def account
         @profile = current_user&.profile
         authorize! :show, @profile
+        render 'ishapi/users/account'
       rescue CanCan::AccessDenied
         render json: {
           status: :not_ok,
         }, status: 401
       end
 
+=begin
       private
 
       def do_login
@@ -33,6 +34,7 @@ module Ishapi
           return
         end
       end
+=end
 
     end
   end

data/app/controllers/ishapi/my/reports_controller.rb

@@ -1,14 +1,11 @@
 
-module Ishapi
-  module My
-    class ReportsController < Ishapi::My::MyController
 
-      def index
-        authorize! :my_index, Report
-        @reports = @profile.reports
-      end
+class Ishapi::My::ReportsController < Ishapi::ApplicationController
 
-    end
+  def index
+    authorize! :my_index, Report
+    @reports = @profile.reports
   end
+
 end
 

data/app/controllers/ishapi/my/videos_controller.rb

@@ -1,14 +1,10 @@
 
-module Ishapi
-  module My
-    class VideosController < Ishapi::My::MyController
+class Ishapi::My::VideosController < Ishapi::ApplicationController
 
-      def index
-        authorize! :my_index, Video
-        @videos = @current_user.profile.videos.unscoped.where( is_trash: false ).order_by( created_at: :desc ).limit(20)
-      end
-
-    end
+  def index
+    authorize! :my_index, Video
+    @videos = @current_user.profile.videos.unscoped.where( is_trash: false ).order_by( created_at: :desc ).limit(20)
   end
+
 end
 

data/app/controllers/ishapi/users_controller.rb

@@ -2,9 +2,20 @@ require_dependency "ishapi/application_controller"
 
 module Ishapi
   class UsersController < ApplicationController
-    before_action :set_profile, :only => [ :fb_sign_in, :show ]
 
-    skip_authorization_check only: %i| login |
+    skip_authorization_check only: %i| fb_sign_in login |
+
+    before_action :check_profile, only: %i| account |
+
+    def account
+      @profile = current_user&.profile
+      authorize! :show, @profile
+      render 'ishapi/users/account'
+    rescue CanCan::AccessDenied
+      render json: {
+        status: :not_ok,
+      }, status: 401
+    end
 
     def fb_sign_in
       authorize! :fb_sign_in, Ishapi
@@ -12,10 +23,6 @@ module Ishapi
       render :action => 'show'
     end
 
-    def show
-      authorize! :fb_sign_in, Ishapi
-    end
-
     def login
       @current_user = User.where( email: params[:email] ).first
       if !@current_user
@@ -27,12 +34,16 @@ module Ishapi
 
         # send the jwt to client
         @jwt_token = encode(user_id: @current_user.id.to_s)
+        @profile = @current_user.profile
+
+=begin
         render json: {
           email: @current_user.email,
           jwt_token: @jwt_token,
-          long_term_token: @long_term_token,
           n_unlocks: @current_user.profile.n_unlocks,
         }
+=end
+
       end
     end
 

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

@@ -14,7 +14,7 @@ if item.city
     json.name item.city.name
     json.slug item.city.cityname
   end
-  json.cityname    item.city.cityname 
+  json.cityname    item.city.cityname
 end
 json.subhead     item.subhead
 json.description item.descr

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

@@ -1,8 +1,11 @@
 #
 # ishapi / galleries / _show
 #
+
+# @TODO: remove this file, this looks like a newsitem
+
 json.id           gallery.id.to_s
-json.item_type    'gallery'
+json.item_type    gallery.class.name
 json.name         gallery.name
 json.galleryname  gallery.galleryname
 json.description  gallery.description

data/app/views/ishapi/galleries/show_premium_locked.jbuilder

@@ -5,7 +5,10 @@
 this_key = [ @gallery, params.permit! ]
 json.cache! this_key do
   json.gallery do
-    json.message      "This is premium content - please purchase it to view!"
+
+    json.id           @gallery.id.to_s
+    json.item_type    @gallery.class.name
+
     json.premium_tier @gallery.premium_tier
     json.is_premium   @gallery.is_premium
     json.is_purchased false
@@ -13,5 +16,6 @@ json.cache! this_key do
     # json.partial! 'ishapi/galleries/show', gallery: @gallery
     # json.partial! 'ishapi/photos/index', :photos => [ @gallery.photos[0] ]
   end
+  json.message      "This is premium content - please purchase it to view!"
 end
 

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

@@ -0,0 +1,22 @@
+#
+# ishapi / maps / _show
+#
+
+this_key = [ map, params.permit! ]
+json.cache! this_key do
+  json.map do
+    json.id          map.id.to_s
+    json.slug        map.slug
+    json.parent_slug map.parent_slug
+    json.description map.description
+    json.w           map.w
+    json.h           map.h
+    json.img_path    map.image.image.url(:original)
+    json.updated_at  map.updated_at
+
+    json.partial! 'ishapi/markers/index', map: map
+
+  end
+end
+
+

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

@@ -11,9 +11,13 @@ json.cache! this_key do
     json.description @map.description
     json.w           @map.w
     json.h           @map.h
-    json.img_path    @map.img_path
+    json.img_path    @map.image.image.url(:original)
     json.updated_at  @map.updated_at
 
+    if @map.map
+      json.partial! 'ishapi/maps/show', map: @map.map
+    end
+
     json.breadcrumbs do
       json.array! @map.breadcrumbs do |b|
         json.name b[:name]
@@ -22,19 +26,7 @@ json.cache! this_key do
       end
     end
 
-    json.markers do
-      json.array! @markers do |marker|
-        json.name marker.name
-        json.slug marker.slug
-        json.x    marker.x
-        json.y    marker.y
-        json.w    marker.w
-        json.h    marker.h
-        json.img_path marker.img_path
-        json.title_img_path marker.title_img_path
-        json.item_type marker.item_type
-      end
-    end
+    json.partial! 'ishapi/markers/index', map: @map
 
     if @newsitems
       json.partial! 'ishapi/newsitems/index', :newsitems => @newsitems

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

@@ -0,0 +1,20 @@
+#
+# ishapi / markers / _index
+#
+
+json.markers do
+  json.array! map.markers do |marker|
+    json.name marker.name
+    json.slug marker.slug
+    json.x    marker.x
+    json.y    marker.y
+    json.w    marker.w
+    json.h    marker.h
+    json.centerOffsetX  marker.centerOffsetX
+    json.centerOffsetY  marker.centerOffsetY
+    json.img_path       marker.image.image.url(:original)
+    json.title_img_path marker.title_image.image.url(:thumb)
+    json.item_type      marker.item_type
+    json.url            marker.url
+  end
+end

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

@@ -5,17 +5,16 @@
 json.n_newsitems newsitems.count
 json.newsitems do
   json.array! newsitems do |item|
-
-    json.id          item.id.to_s
     json.name        item.name
     json.created_at  item.created_at
     json.updated_at  item.updated_at
 
     if item.gallery
-      json.item_type    'gallery'
+      json.id           item.gallery_id.to_s
+      json.item_type    item.gallery.class.name
       json.name         item.gallery.name
       json.galleryname  item.gallery.galleryname
-      json.username     item.username || item.gallery.username || 'piousbox'
+      json.username     item.username || item.gallery.username || 'donor-default'
       json.n_photos     item.gallery.photos.length
       json.slug         item.gallery.galleryname
       json.subhead      item.gallery.subhead
@@ -26,16 +25,16 @@ json.newsitems do
         json.is_purchased current_user&.profile&.has_premium_purchase( item.gallery )
         json.partial!    'ishapi/photos/index',     :photos => [ item.gallery.photos[0] ]
       else
-        json.partial!    'ishapi/photos/index',     :photos => item.gallery.photos
+        json.partial!    'ishapi/photos/index',     :photos => item.gallery.photos[0...3]
       end
     end
 
     if item.report
-      json.item_type  'report'
+      json.id         item.report_id.to_s
+      json.item_type  item.report.class.name
       json.name       item.report.name
       json.reportname item.report.name_seo
       json.subhead    item.report.subhead
-      json.report_id  item.report_id.to_s
       json.username   item.report.user_profile.name if item.report.user_profile
 
       if item.report.photo
@@ -53,11 +52,16 @@ json.newsitems do
     end
 
     if item.video_id
-      json.partial! 'ishapi/videos/show', :video => Video.unscoped.find( item.video_id )
+      json.id item.video_id.to_s
+      # @TODO: why this relation is so weird here?!
+      video = Video.unscoped.find( item.video_id )
+      json.item_type video.class.name
+      json.partial! 'ishapi/videos/show', :video => video
     end
 
     if item.photo
-      json.item_type 'photo'
+      json.id item.photo.id.to_s
+      json.item_type item.photo.class.name
       json.partial! 'ishapi/photos/index', :photos => [ item.photo ]
     end
 

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

@@ -8,4 +8,4 @@ json.photos do
   json.array! photos do |photo|
     json.partial! 'ishapi/photos/show', :photo => photo
   end
-end          
+end

data/app/views/ishapi/{my/my/account.jbuilder → users/_account.jbuilder}

@@ -1,6 +1,7 @@
 
+
 json.name     @profile.name
-json.username @profile.username
+# json.username @profile.username
 json.email    @profile.email
 
 json.n_reports   @profile.reports.count
@@ -14,3 +15,8 @@ if @profile.current_city
   json.current_city @profile.current_city
 end
 
+json.bookmarks @profile.bookmarks do |b|
+  json.name b.name
+  json.slug b.slug
+end
+

data/app/views/ishapi/users/account.jbuilder

@@ -0,0 +1,2 @@
+
+json.partial! 'account'

data/app/views/ishapi/users/login.jbuilder

@@ -0,0 +1,5 @@
+
+json.email    @profile.email
+json.n_unlocks @profile.n_unlocks
+json.jwt_token @jwt_token
+json.partial! 'account'

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

@@ -11,8 +11,7 @@ json.description video.descr
 json.subhead     video.subhead
 json.x           video.x
 json.y           video.y
-json.url         video.video.url 
-json.item_type   'video'
+json.url         video.video.url
 
 if video.city
   json.cityname video.city.cityname
@@ -40,6 +39,6 @@ if video.is_premium
 end
 
 if video.thumb
-  json.photo_s169_url   video.thumb.url( :s169 ) 
+  json.photo_s169_url   video.thumb.url( :s169 )
   json.photo_thumb2_url video.thumb.url( :thumb2 )
 end

data/config/routes.rb

@@ -27,8 +27,8 @@ Ishapi::Engine.routes.draw do
   get 'maps', to: 'maps#index'
   get 'maps/view/:slug', to: 'maps#show'
   get 'markers/view/:slug', to: 'maps#show_marker'
-  get  "/my/account", to: "my/my#account"
-  post "/my/account", to: "my/my#account"
+  get  "/my/account", to: "users#account"
+  post "/my/account", to: "users#account"
   namespace :my do
     get 'galleries', to: 'galleries#index'
     get 'newsitems', to: 'newsitems#index'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.148
+  version: 0.1.8.153
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,7 +206,7 @@ files:
 - app/controllers/ishapi/maps_controller.rb
 - app/controllers/ishapi/measurements_controller.rb
 - app/controllers/ishapi/my/galleries_controller.rb
-- app/controllers/ishapi/my/my_controller.rb
+- app/controllers/ishapi/my/my_controller.rb-trash
 - app/controllers/ishapi/my/reports_controller.rb
 - app/controllers/ishapi/my/videos_controller.rb
 - app/controllers/ishapi/newsitems_controller.rb
@@ -247,10 +247,10 @@ files:
 - app/views/ishapi/galleries/show.jbuilder
 - app/views/ishapi/galleries/show_premium_locked.jbuilder
 - app/views/ishapi/galleries/show_premium_unlocked.jbuilder
+- app/views/ishapi/maps/_show.jbuilder
 - app/views/ishapi/maps/index.jbuilder
 - app/views/ishapi/maps/show.jbuilder
-- app/views/ishapi/measurements/_show.jbuilder
-- app/views/ishapi/my/my/account.jbuilder
+- app/views/ishapi/markers/_index.jbuilder
 - app/views/ishapi/my/videos/index.jbuilder
 - app/views/ishapi/newsitems/_index.jbuilder
 - app/views/ishapi/newsitems/index.jbuilder
@@ -268,7 +268,10 @@ files:
 - app/views/ishapi/tags/index.jbuilder
 - app/views/ishapi/tags/show.jbuilder
 - app/views/ishapi/user_profiles/show.jbuilder
+- app/views/ishapi/users/_account.jbuilder
 - app/views/ishapi/users/_index.jbuilder
+- app/views/ishapi/users/account.jbuilder
+- app/views/ishapi/users/login.jbuilder
 - app/views/ishapi/users/show.jbuilder
 - app/views/ishapi/venues/_index.jbuilder
 - app/views/ishapi/venues/index.jbuilder

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

@@ -1,14 +0,0 @@
-
-# _vp_ 20180309
-# MEASUREMENT_PARAMS = [ :neck_around, :chest_around, :waist_around, :sleeve_length, :shoulder_width, :shirt_length, :bicep_around ]
-#
-
-json.measurement do
-  json.neck_around     measurement.neck_around
-  json.chest_around    measurement.chest_around
-  json.waist_around    measurement.waist_around
-  json.sleeve_length   measurement.sleeve_length
-  json.shoulder_width  measurement.shoulder_width
-  json.shirt_length    measurement.shirt_length
-  json.bicep_around    measurement.bicep_around
-end