ishapi 0.1.8.150 → 0.1.8.155

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cac4c0f45c0f2c4a9b38b41270275390f3edda7d70678b73d4f09f33451f00a
-  data.tar.gz: 0c6aefe857915d2cb0732c180163d4b7191baba4258e84090ca4464634e23acd
+  metadata.gz: 2b273dbf478b4af579ef9471c57c58394351daf23243a8ccc5ae51105962cbe2
+  data.tar.gz: 8f909caebcdbdd20602e2245ee9306897e6dd467be8b68cb9de4a7472bdf964d
 SHA512:
-  metadata.gz: d23fede7459e5014c43b957f4bf8af5370d9d3eee4c208c19339fc9a66f597b96f6102f421af0f759da6cf131301820d2ad5f6576b0b8196af446cc15a9b223d
-  data.tar.gz: 5747e61ae8fcbdd13e37435d074dd9b3362050e275727bc6f18d7a417a6e1dc452f2b2f970432a96441b35fbb12e1e3954469e4140c461a20ef34d3dfc956d08
+  metadata.gz: f9eb5d1a81fd3488f2fcf0ecd3fe746ff0857cab76fa71da05bc8c3d6401f6fcce9c7f46f872d1d0aaf575517aeaf1c049c2ffc8f318aa74cb8094d972a4f87f
+  data.tar.gz: 1aa269a44ee60f9bde3b145c0d85291d7f0a341eff7351db79c2675b355849fd3964d491a3b2bb8455aef21904545e73d31b973eff370b50b0d4f892fee29865

data/app/controllers/ishapi/application_controller.rb

@@ -35,7 +35,6 @@ module Ishapi
         decoded = decode(params[:jwt_token])
         @current_user = User.find decoded['user_id']
       rescue JWT::ExpiredSignature, JWT::DecodeError => e
-        puts! e, 'ee1'
         flash[:notice] = 'You arent logged in, or you have been logged out.'
         # @current_user = User.new
       end
@@ -61,7 +60,7 @@ module Ishapi
     end
 
     # jwt
-    def encode(payload, exp = 2.hours.from_now)
+    def encode(payload, exp = 48.hours.from_now) # @TODO: definitely change, right now I expire once in 2 days.
       payload[:exp] = exp.to_i
       JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
     end

data/app/controllers/ishapi/maps_controller.rb

@@ -1,16 +1,8 @@
 require_dependency "ishapi/application_controller"
 module Ishapi
   class MapsController < ApplicationController
-
     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]
       @markers = @map.markers.where( is_active: true )
@@ -23,16 +15,14 @@ module Ishapi
         @markers = @markers.order_by( ordering: :asc )
       end
 
-      # @TODO: move to models
+      ## @TODO: figure this out eventually
       if city = City.where( cityname: @map.slug ).first
-        @newsitems = city.newsitems
+        # @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/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/reports_controller.rb

@@ -3,7 +3,7 @@ module Ishapi
   class ReportsController < ApplicationController
 
     def show
-      @report = Report.unscoped.find_by :name_seo => params[:name_seo]
+      @report = Report.unscoped.find_by :slug => params[:slug]
       authorize! :show, @report
     end
 

data/app/controllers/ishapi/tags_controller.rb

@@ -13,9 +13,9 @@ module Ishapi
 
     def show
       begin
-        @tag = Tag.find_by( :name_seo => params[:tagname] )
+        @tag = Tag.find_by( slug: params[:slug] )
       rescue Mongoid::Errors::DocumentNotFound
-        @tag = Tag.find params[:tagname]
+        @tag = Tag.find params[:slug]
       end
       authorize! :show, @tag
     end

data/app/controllers/ishapi/venues_controller.rb

@@ -12,7 +12,7 @@ module Ishapi
     end
 
     def show
-      @venue = Venue.find_by :name_seo => params[:venuename]
+      @venue = Venue.find_by :slug => params[:venuename]
       authorize! :show, @venue
     end
 

data/app/controllers/ishapi/videos_controller.rb

@@ -3,7 +3,7 @@ module Ishapi
   class VideosController < ApplicationController
 
     def show
-      @video = Video.unscoped.find_by :name_seo => params[:name_seo]
+      @video = Video.unscoped.find_by :slug => params[:slug]
       authorize! :show, @video
     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
+json.description item.descr

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

@@ -21,7 +21,7 @@ json.features do
       r = feature.report
       json.name       r.name
       json.subhead    r.subhead
-      json.reportname r.name_seo
+      json.reportname r.slug
       if r.photo
         json.photo_url  r.photo.photo.url( :thumb )
       end

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
@@ -18,4 +21,4 @@ if gallery.is_premium
   json.partial!    'ishapi/photos/index',     :photos => [ gallery.photos[0] ]
 else
   json.partial!    'ishapi/photos/index',     :photos => gallery.photos
-end
+end

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

@@ -11,7 +11,7 @@ json.array! @galleries do |gallery|
   json.subhead     gallery.subhead
   json.username    gallery.user_profile.name
   json.cityname    gallery.city.name    if gallery.city
-  json.tag_names   gallery.tags.map &:name_seo
+  json.tag_names   gallery.tags.map &:slug
   json.venuename   gallery.venue.name   if gallery.venue
   json.partial! 'ishapi/photos/index', :photos => gallery.photos
 end

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

@@ -26,8 +26,18 @@ json.cache! this_key do
       end
     end
 
+    ## I removed json parsing from here! _vp_ 2021-10-14
+    if @map.parent_slug.present?
+      json.config @map.parent.config
+      json.labels @map.parent.labels
+    else
+      json.config @map.config
+      json.labels @map.labels
+    end
+
     json.partial! 'ishapi/markers/index', map: @map
 
+    puts! @newsitems, 'these first'
     if @newsitems
       json.partial! 'ishapi/newsitems/index', :newsitems => @newsitems
     end

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

@@ -2,20 +2,23 @@
 # ishapi / newsitems / _index
 #
 
+puts! newsitems, 'newsitems idx'
+
 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
 
+    json.description item.description
+
     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,38 +29,48 @@ 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.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.item_type == 'longscroll' # this allows you to have a wall of scrollable text instead of clickable items
+        json.description item.report.descr
 
-      if item.report.photo
-        json.photo_s169_url item.report.photo.photo.url( :s169 )
-        json.photo_thumb2_url item.report.photo.photo.url( :thumb2 )
-      end
+      else
+        json.id         item.report_id.to_s
+        json.item_type  item.report.class.name
+        json.name       item.report.name
+        json.reportname item.report.slug
+        json.subhead    item.report.subhead
+        json.username   item.report.user_profile.name if item.report.user_profile
+
+        if item.report.photo
+          json.photo_s169_url item.report.photo.photo.url( :s169 )
+          json.photo_thumb2_url item.report.photo.photo.url( :thumb2 )
+        end
 
-      json.partial! 'ishapi/application/meta', :item => item.report
+        json.partial! 'ishapi/application/meta', :item => item.report
 
-      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 )
+        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 )
+        end
       end
     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/reports/_index.jbuilder

@@ -9,7 +9,7 @@ json.reports do
     # json.id          report.id.to_s
     json.created_at  report.created_at
     json.name        report.name
-    json.slug        report.name_seo
+    json.slug        report.slug
     json.description report.descr
 
     if report.photo

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

@@ -9,7 +9,7 @@ json.cache! key do
   json.report do
     json.id          @report.id.to_s
     json.name        @report.name
-    json.reportname  @report.name_seo
+    json.reportname  @report.slug
     if @report.photo
       json.photo_url   @report.photo.photo.url( :small ) 
       json.thumb_url   @report.photo.photo.url( :thumb )

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

@@ -6,7 +6,7 @@
 json.tags do
   json.array! tags do |tag|
     json.name tag.name
-    json.slug tag.name_seo
+    json.slug tag.slug
   end
 end
 

data/app/views/ishapi/tags/index.jbuilder

@@ -5,6 +5,6 @@
 
 json.array! @tags do |tag|
   json.name tag.name
-  json.slug tag.name_seo
+  json.slug tag.slug
 end
 

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

@@ -5,8 +5,9 @@
 #
 
 json.name @tag.name
-json.slug @tag.tagname
+json.slug @tag.slug
 
+json.partial! 'ishapi/features/index',  :features  => @tag.features, :resource => @tag
 json.partial! 'ishapi/newsitems/index', :newsitems => @tag.newsitems.page( params[:newsitems_page] ).per( params[:newsitems_per] || 25 )
 json.partial! 'ishapi/reports/index',   :reports   => @tag.reports.page( params[:reports_page]     ).per( params[:reports_per] || 25 )
 json.partial! 'ishapi/galleries/index', :galleries => @tag.galleries.page( params[:galleries_page] ).per( params[:galleries_per] || 25 )

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

@@ -7,13 +7,15 @@ json.n_venues venues.count
 json.venues do
   json.array! venues do |venue|
     json.id          venue.id.to_s
+
+    json.address     venue.address if venue.address.present?
     json.name        venue.name
-    json.name_seo    venue.name_seo
+    json.slug    venue.slug
     json.subhead     venue.subhead
     json.description venue.descr
     json.x           venue.x
     json.y           venue.y
-    json.photo       venue.profile_photo.photo.url( :thumb ) if venue.profile_photo
+    json.photo       venue.profile_photo ? venue.profile_photo.photo.url( :thumb ) : image_url('missing.png')
     json.partial! 'ishapi/tags/index', :tags => venue.tags
   end
 end

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

@@ -7,7 +7,7 @@ key = [ @venue, params.permit! ]
 json.cache! key do
   json.venue do
     json.name        @venue.name
-    json.venuename   @venue.name_seo
+    json.venuename   @venue.slug
     json.description @venue.descr
   end
 end

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

@@ -47,7 +47,7 @@ Ishapi::Engine.routes.draw do
   get 'profiles/view/:username', :to => 'user_profiles#show'
 
   get 'reports', :to => 'reports#index'
-  get 'reports/view/:name_seo', :to => 'reports#show'
+  get 'reports/view/:slug', :to => 'reports#show'
 
   get 'sites/view/:domain',                            :to => 'sites#show',      :constraints => { :domain => /[^\/]+/ }
   post 'sites/view/:domain',                           :to => 'sites#show',      :constraints => { :domain => /[^\/]+/ }
@@ -58,7 +58,7 @@ Ishapi::Engine.routes.draw do
 
   post 'stars/buy', to: 'gameui#buy_stars'
 
-  get 'tags/view/:tagname', :to => 'tags#show'
+  get 'tags/view/:slug', :to => 'tags#show'
   get 'test', to: 'application#test'
 
   post  'users/fb_sign_in',     :to => 'users#fb_sign_in'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.150
+  version: 0.1.8.155
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -251,7 +251,6 @@ files:
 - 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/videos/index.jbuilder
 - app/views/ishapi/newsitems/_index.jbuilder
 - app/views/ishapi/newsitems/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