ishapi 0.1.8.147 → 0.1.8.151

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a74ed060c1c14807a40188d3cb99e1a7b67910a88dfc8ab4a97ad01f4eb11c
-  data.tar.gz: 5c3529a4f9b79117cb4d5c45e92a0d24f4194717f64fe8c2c2f71e3e13543ebb
+  metadata.gz: 48a60ea3b0572e7a03c6367c503ade90a23d0c9c668f7126328cf69fb6edd6f0
+  data.tar.gz: '059b472d0856d0984b540d92207035c0c7e5593a050ae0693d4e309351427f02'
 SHA512:
-  metadata.gz: 19ecdf1027c55c91fdc1526fcc7f0fb1d80e47c60d802b01733ab6ba9cd7de0a9eb8f4a31b5dc857758a0f7abf531cebc190c6c8556ae31d20c91e9ad65b5c17
-  data.tar.gz: 040f38f5013b4ee85b9385b746a4ce01464613e1c1c2ea315099fc69b7b2fb4d6380dc343e5cf0ad14dc07ca854a000a792182280c3bcaea30fc1c5cf4091bbb
+  metadata.gz: 9730c397b9c7468348771f3f25d26a20d3544ab22930ad58363f7b0b79ee1bc9a61b625e7d6c7f1a92c76e12eee9dc875f7b857fe597c9f839e179a29e982978
+  data.tar.gz: 53770e986e3fb7f2f84ff09ac672444961d8eeb79dbafc285fc1961017866a4ca6ef85732b805064b5fc70df61a93f5977a30eec1ab51f8e9135503a89190701

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/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

@@ -23,7 +23,7 @@ json.newsitems do
       if item.gallery.is_premium
         json.premium_tier item.gallery.premium_tier
         json.is_premium   item.gallery.premium_tier > 0
-        json.is_purchased current_user.profile.has_premium_purchase( item.gallery )
+        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
@@ -48,7 +48,7 @@ json.newsitems do
       if item.report.is_premium
         json.premium_tier item.report.premium_tier
         json.is_premium   item.report.premium_tier > 0
-        json.is_purchased current_user.profile.has_premium_purchase( item.report )
+        json.is_purchased current_user&.profile&.has_premium_purchase( item.report )
       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/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.147
+  version: 0.1.8.151
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-09-24 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,11 @@ 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/markers/_index.jbuilder
 - app/views/ishapi/measurements/_show.jbuilder
-- app/views/ishapi/my/my/account.jbuilder
 - app/views/ishapi/my/videos/index.jbuilder
 - app/views/ishapi/newsitems/_index.jbuilder
 - app/views/ishapi/newsitems/index.jbuilder
@@ -268,7 +269,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