ishapi 0.1.8.169 → 0.1.8.171

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08c592821bf116f81b983afba7ed5986838709ff2328c22a32219efdc01c8c83'
-  data.tar.gz: 65b5532741934fa9abeddb5e7f226e7d38bcb2c66255812177574334275598cb
+  metadata.gz: 1061557c4a428d72d380f5eaa54ece94dfb5c6c5493707d23297007af653b929
+  data.tar.gz: 310cf825c56d201501a57e592ef31a0ae8b282811c1d43d6cb91399f80d4deb2
 SHA512:
-  metadata.gz: b0fe164c5c7c3662bd4f7df897e8b5b10b69441b727392543bc41b3d2d9ab2f6da444a538787d8726160bfe3e4014229cf3d1691b8b9136928dde4a0b2d94135
-  data.tar.gz: c965e844069b23c23eb4837175f6bdc9dbcac69d11e0a5b3f0c6cf3be98cc6158d45aed5342a085cdb2ec70ea7c7f36fc744daa79484025642c992b8b6616e33
+  metadata.gz: 238eaa5df713a592f8f88456771188a357b0ae4d1d5c463ad390e339573b3ce04749ac3c16779588b5be4374ff7798ee5a44155d932d1281f954ca6ab70f0f1f
+  data.tar.gz: d9208f4b3fb2075bcb418badad07d7466818eed030381b13aba91474dc24db48d87fc8819ecf934b9ae9e7c296a289cec02b57b133753c51589548f076a3938e

data/app/controllers/ishapi/application_controller.rb

@@ -42,7 +42,7 @@ class Ishapi::ApplicationController < ActionController::Base
     rescue JWT::ExpiredSignature, JWT::DecodeError => e
       # flash[:notice] = 'You are not logged in, or you have been logged out.'
       # puts! 'You are not logged in, or you have been logged out.'
-      @current_user = User.new
+      @current_user = User.new({ profile: Ish::UserProfile.new })
     end
   end
 

data/app/controllers/ishapi/cities_controller.rb

@@ -1,10 +1,10 @@
 require_dependency "ishapi/application_controller"
 
 module Ishapi
-  class CitiesController < UnrestrictedController
+  class CitiesController < Ishapi::ApplicationController
     protect_from_forgery :prepend => true, :with => :exception
     layout :false
-    
+
     check_authorization
     skip_before_action :verify_authenticity_token
     before_action :set_current_ability

data/app/controllers/ishapi/payments_controller.rb

@@ -4,6 +4,8 @@ module Ishapi
 
     before_action :check_profile, only: %i| create2 unlock |
 
+    # alphabetized : )
+
     ##
     ## this is for invoices on wasya.co, isn't it?
     ## 20200712

data/app/controllers/ishapi/users_controller.rb

@@ -25,6 +25,7 @@ module Ishapi
 
     def login
       @current_user = User.where( email: params[:email] ).first
+
       if !@current_user
         render json: { status: :not_ok }, status: 401
         return
@@ -35,15 +36,6 @@ 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,
-          n_unlocks: @current_user.profile.n_unlocks,
-        }
-=end
-
       end
     end
 

data/app/helpers/ishapi/application_helper.rb

@@ -1,4 +1,9 @@
 module Ishapi
   module ApplicationHelper
+
+    def image_missing
+      'https://s3.amazonaws.com/ish-wp/wp-content/uploads/2022/02/25232018/100x100_crossout.png'
+    end
+
   end
 end

data/app/models/ishapi/ability.rb

@@ -24,8 +24,6 @@ class Ishapi::Ability
 
       can [ :create, :unlock ], ::Ish::Payment
 
-      can [ :index ], IronWarbler::StockWatch # @TODO: scope this to profile!
-
       can [ :buy_stars ], ::Ish::UserProfile
 
     end

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

@@ -15,7 +15,7 @@ json.cache! this_key do
     json.description @map.description
     json.w           @map.w
     json.h           @map.h
-    json.img_path    @map.image.image.url(:original)
+    json.img_path    @map.image ? @map.image.image.url(:original) : image_missing
     json.updated_at  @map.updated_at
     json.rated       @map.rated
 
@@ -32,7 +32,7 @@ json.cache! this_key do
       json.partial! 'ishapi/markers/index', markers: @markers
     else
       ## I removed json parsing from here! _vp_ 2021-10-14
-      ## I added json parsing here! _vo_ 2021-10-19
+      ## I added json parsing here, and is seems right. _vp_ 2021-10-19
       json.config JSON.parse @map.config
       json.labels JSON.parse @map.labels
       json.partial! 'ishapi/markers/index', markers: @markers

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

@@ -12,9 +12,11 @@ json.markers do
     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.img_path       marker.image ? marker.image.image.url(:original) : image_missing
+    json.title_img_path marker.title_image ? marker.title_image.image.url(:thumb) : image_missing
     json.item_type      marker.item_type
     json.url            marker.url
+    json.premium_tier   marker.destination.premium_tier
+    json.id             marker.destination.id.to_s
   end
 end

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

@@ -2,8 +2,6 @@
 # ishapi / newsitems / _index
 #
 
-puts! newsitems, 'newsitems idx'
-
 json.n_newsitems newsitems.count
 json.newsitems do
   json.array! newsitems do |item|

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

@@ -1,7 +1,6 @@
 
-
+json.id                @profile.id
 json.name              @profile.name
-json.username          @profile.username
 json.email             @profile.email
 json.profile_photo_url @profile.profile_photo.photo.url( :thumb ) if @profile.profile_photo
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.169
+  version: 0.1.8.171
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -273,13 +273,12 @@ files:
 - app/controllers/ishapi/sites_controller.rb
 - app/controllers/ishapi/stock_watches_controller.rb
 - app/controllers/ishapi/tags_controller.rb
-- app/controllers/ishapi/unrestricted_controller.rb
+- app/controllers/ishapi/unrestricted_controller.rb-trash
 - app/controllers/ishapi/user_profiles_controller.rb
 - app/controllers/ishapi/users_controller.rb
 - app/controllers/ishapi/venues_controller.rb
 - app/controllers/ishapi/videos_controller.rb
 - app/helpers/ishapi/application_helper.rb
-- app/helpers/ishapi/articles_helper.rb
 - app/jobs/ishapi/application_job.rb
 - app/mailers/ishapi/application_mailer.rb
 - app/models/ishapi/ability.rb

data/app/helpers/ishapi/articles_helper.rb

@@ -1,4 +0,0 @@
-module Ishapi
-  module ArticlesHelper
-  end
-end