ishapi 0.1.8.149 → 0.1.8.150

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cd7a53ae8d95d217a973a346a43735501330d08ff96705fe24ebf42014a10ba
-  data.tar.gz: 1d85e34875c2f3c3b026e92eda83e21d4a4409aada61d57cbd9bf3c547c08c02
+  metadata.gz: 1cac4c0f45c0f2c4a9b38b41270275390f3edda7d70678b73d4f09f33451f00a
+  data.tar.gz: 0c6aefe857915d2cb0732c180163d4b7191baba4258e84090ca4464634e23acd
 SHA512:
-  metadata.gz: 629a76c8e71f990c024cc5968ab41572216d852c73ababc8101327e74dceb998a28a3a480c8a9d657aa4c8cbe531400b8859830e0d8a5ca853fa2510cd36ee9b
-  data.tar.gz: 89da2fef64a91d1560b6a76da8403573ad43978fe22da94a4385c014e74ed5aa36da38a58380f0a00397d97ace7062756eee3473611a8eef1e0aa915943510c6
+  metadata.gz: d23fede7459e5014c43b957f4bf8af5370d9d3eee4c208c19339fc9a66f597b96f6102f421af0f759da6cf131301820d2ad5f6576b0b8196af446cc15a9b223d
+  data.tar.gz: 5747e61ae8fcbdd13e37435d074dd9b3362050e275727bc6f18d7a417a6e1dc452f2b2f970432a96441b35fbb12e1e3954469e4140c461a20ef34d3dfc956d08

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

@@ -11,22 +11,10 @@ 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
 
-    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.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
 
   end
 end

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

@@ -11,7 +11,7 @@ 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
@@ -26,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/{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.149
+  version: 0.1.8.150
 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
@@ -250,8 +250,8 @@ files:
 - 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
@@ -269,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