ishapi 0.1.8.153 → 0.1.8.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 754fefba120e1ee7f87e94a2b3da3a450e07c86e7bd135055cb2240d7ccb5ef7
-  data.tar.gz: ff7748716f5c58c458f6635386a77164c943d30b792f1c854a4d8b6977744e9d
+  metadata.gz: 2ef82397f73230341a9eb9b0b5775568c25c102e9a1f86863022bb9b08bb2006
+  data.tar.gz: 3b341765539250121ca07733bb337f3b74e2fa7dbda45e22268136e1e942664f
 SHA512:
-  metadata.gz: b44159ee3983c79213b8e2ab0d98c1aaec009268b1d701d276e99475bde50235c233d03a249c03f80158d0507565f06c50aeb9cd4dcb4ac431274d07d0772abe
-  data.tar.gz: 92ff67762868d928066fc0fb4d15602f0166da0f7ba74b552c46fd5261bc0a9d26f134768067f1c42ec87872418ff5c983561dc90e975c1e15d5c9db9f3c3f71
+  metadata.gz: a16446d1cdb7e5782319f3f3a0e657538fcb7984c017cb0f6b6f1d59ea1d72617b611ae37adaba4c446eefec2890becd12092c979ea334f7f6589c9825d3cf8c
+  data.tar.gz: 6887ee7845f45f8d379389fa8ce018b60759b6bbfbad5c2483200cefebb0fb8ff88d484c21d06abed4cfca3daa091b92853ba992394bdc75ebc8eafa1ed9e3df

data/app/controllers/ishapi/application_controller.rb

@@ -9,7 +9,7 @@ module Ishapi
       params['domain'] = 'tgm.piousbox.com'
 
       response = ::HTTParty.get "https://graph.facebook.com/v5.0/oauth/access_token?grant_type=fb_exchange_token&" +
-        "client_id=#{FB[params['domain']][:app]}&client_secret=#{FB[params['domain']][:secret]}&" +
+        "client_id=#{::FB[params['domain']][:app]}&client_secret=#{::FB[params['domain']][:secret]}&" +
         "fb_exchange_token=#{accessToken}"
       j = JSON.parse response.body
       @long_term_token  = j['access_token']
@@ -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/galleries_controller.rb

@@ -21,7 +21,7 @@ module Ishapi
     end
 
     def show
-      @gallery = ::Gallery.unscoped.find_by :galleryname => params[:galleryname]
+      @gallery = ::Gallery.unscoped.find_by :slug => params[:slug]
       authorize! :show, @gallery
       if @gallery.premium?
         if current_user&.profile&.has_premium_purchase( @gallery )

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

@@ -17,4 +17,4 @@ if item.city
   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
@@ -31,7 +31,7 @@ json.features do
       r = feature.gallery
       json.name        r.name
       json.subhead     r.subhead
-      json.galleryname r.galleryname
+      json.slug r.slug
       if r.photos[0]
         json.photo_url r.photos[0].photo.url( :thumb )
       end

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

@@ -7,11 +7,11 @@
 json.id           gallery.id.to_s
 json.item_type    gallery.class.name
 json.name         gallery.name
-json.galleryname  gallery.galleryname
+json.slug  gallery.slug
 json.description  gallery.description
 json.username     gallery.username || 'piousbox'
 json.n_photos     gallery.photos.length
-json.slug         gallery.galleryname
+json.slug         gallery.slug
 json.subhead      gallery.subhead
 json.partial!    'ishapi/application/meta', :item => gallery
 if gallery.is_premium
@@ -21,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

@@ -6,12 +6,12 @@
 json.array! @galleries do |gallery|
   json.id          gallery.id.to_s
   json.name        gallery.name
-  json.galleryname gallery.galleryname
-  json.slug        gallery.galleryname
+  json.slug gallery.slug
+  json.slug        gallery.slug
   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/maps/_show.jbuilder

@@ -2,6 +2,8 @@
 # ishapi / maps / _show
 #
 
+## @TODO: make sure that _show.jbuilder and show.jbuilder are reasonably deduped
+
 this_key = [ map, params.permit! ]
 json.cache! this_key do
   json.map do
@@ -16,6 +18,16 @@ json.cache! this_key do
 
     json.partial! 'ishapi/markers/index', map: map
 
+    ## I removed json parsing from here! _vp_ 2021-10-14
+    ## I added json parsing here! _vo_ 2021-10-19
+    if map.parent_slug.present?
+      json.config JSON.parse @map.parent.config
+      json.labels JSON.parse @map.parent.labels
+    else
+      json.config JSON.parse @map.config
+      json.labels JSON.parse @map.labels
+    end
+
   end
 end
 

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

@@ -26,6 +26,16 @@ json.cache! this_key do
       end
     end
 
+    ## I removed json parsing from here! _vp_ 2021-10-14
+    ## I added json parsing here! _vo_ 2021-10-19
+    if @map.parent_slug.present?
+      json.config JSON.parse @map.parent.config
+      json.labels JSON.parse @map.parent.labels
+    else
+      json.config JSON.parse @map.config
+      json.labels JSON.parse @map.labels
+    end
+
     json.partial! 'ishapi/markers/index', map: @map
 
     if @newsitems

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

@@ -2,6 +2,8 @@
 # ishapi / newsitems / _index
 #
 
+puts! newsitems, 'newsitems idx'
+
 json.n_newsitems newsitems.count
 json.newsitems do
   json.array! newsitems do |item|
@@ -9,14 +11,16 @@ json.newsitems do
     json.created_at  item.created_at
     json.updated_at  item.updated_at
 
+    json.description item.description
+
     if item.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.slug  item.gallery.slug
       json.username     item.username || item.gallery.username || 'donor-default'
       json.n_photos     item.gallery.photos.length
-      json.slug         item.gallery.galleryname
+      json.slug         item.gallery.slug
       json.subhead      item.gallery.subhead
       json.partial!    'ishapi/application/meta', :item => item.gallery
       if item.gallery.is_premium
@@ -30,24 +34,29 @@ json.newsitems do
     end
 
     if item.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.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
 

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/_widget.jbuilder

@@ -6,6 +6,6 @@
 
 json.id      tag.id.to_s
 json.name    tag.name
-json.tagname tag.tagname
+json.slug    tag.slug
 
 json.partial! 'ishapi/newsitems/index', :newsitems => tag.newsitems.limit(1)

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/users/_account.jbuilder

@@ -1,15 +1,15 @@
 
 
-json.name     @profile.name
-# json.username @profile.username
-json.email    @profile.email
+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
 
 json.n_reports   @profile.reports.count
 json.n_galleries @profile.galleries.count
 json.n_videos    @profile.videos.count
-json.n_stars     @profile.n_stars
-
-json.n_unlocks @profile.n_unlocks
+json.n_stars     @profile.n_stars # @TODO: which one is deprecated?
+json.n_unlocks   @profile.n_unlocks # @TODO: which one is deprecated?
 
 if @profile.current_city
   json.current_city @profile.current_city

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/config/routes.rb

@@ -19,8 +19,8 @@ Ishapi::Engine.routes.draw do
 
   get  'galleries',                   :to => 'galleries#index'
   post 'galleries',                   :to => 'galleries#index'
-  get  'galleries/view/:galleryname', :to => 'galleries#show'
-  post 'galleries/view/:galleryname', :to => 'galleries#show'
+  get  'galleries/view/:slug', :to => 'galleries#show'
+  post 'galleries/view/:slug', :to => 'galleries#show'
 
   post 'invoices/search', :to => 'invoices#search'
 
@@ -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.153
+  version: 0.1.8.157
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails