ishapi 0.1.8.65 → 0.1.8.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4739332da55fad4246588eae7394e8688023c991
-  data.tar.gz: 907379ad9fa9cda721c9330b8790375ed035aac4
+  metadata.gz: be555f90ac80728f8ef5ce37a597145ec3c0bbe5
+  data.tar.gz: 98fe89b718db9061fe41e6b657a045fb8da47649
 SHA512:
-  metadata.gz: d504edbadad3432502c4126f275b3d909f6f205b050a8579f9d8a96856ea8d5caf3ffaffcf7779c387d405231132e1b72e6b5c7572d7936291d4cf78310c28e5
-  data.tar.gz: a7c07b476ec84f76b2f11c5f90b9f8821c6324c9e615d39a81c34616dd1a92dc567911e0c92d93fa75c43736730e915c6690476e57f676dd0559daf9423691b4
+  metadata.gz: 29d4fafb170e511a84ab549f8d4d82cc8b829a7a15b834efc923946417a192597f1c5f74308902b42ee2eada071a49f48e1f987f56fe7ee02aaf165feea84335
+  data.tar.gz: 4c8bf70aac639feaad2b6ee0430b49a102530b920eae548346ea33e801ac3c83fa28795d11f2dd620c75c250dca1354038c6012b35cd3e801bcd706eb6055e7c

data/app/controllers/ishapi/cities_controller.rb

@@ -8,6 +8,12 @@ module Ishapi
       @cities = City.all
     end
 
+    def features
+      authorize! :index, City
+      @cities = City.where( :is_feature => true )
+      render 'index'
+    end
+
     def show
       @city = City.find_by :cityname => params[:cityname]
       authorize! :show, @city

data/app/controllers/ishapi/user_profiles_controller.rb

@@ -0,0 +1,11 @@
+require_dependency "ishapi/application_controller"
+module Ishapi
+  class UserProfilesController < ApplicationController
+
+    def show
+      @profile = IshModels::UserProfile.find_by :username => params[:username]
+      authorize! :show, @profile
+    end
+
+  end
+end

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

@@ -22,5 +22,6 @@ json.cache! key do
     json.partial! 'ishapi/users/index',     :users     => @city.current_users
     json.partial! 'ishapi/venues/index',    :venues    => @city.venues
     json.partial! 'ishapi/videos/index',    :videos    => @city.videos
+    json.partial! 'ishapi/tags/index',      :tags      => @city.tags
   end
 end

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

@@ -1,7 +1,13 @@
 
 json.events events do |event|
+  json.id          event.id.to_s
   json.name        event.name
   json.eventname   event.eventname
   json.date        event.date
   json.description event.description
+  json.x           event.x
+  json.y           event.y
+  if event.profile_photo
+    json.photo       event.profile_photo.photo.url(:thumb) 
+  end
 end

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

@@ -0,0 +1,14 @@
+
+#
+# ishapi / tags / _index
+#
+
+json.tags do
+  json.array! tags do |tag|
+    json.id          tag.id.to_s
+    json.name        tag.name
+    json.name_seo    tag.name_seo
+  end
+end
+
+

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

@@ -0,0 +1,12 @@
+
+json.name     @profile.name
+json.username @profile.username
+
+json.n_reports   @profile.reports.count
+json.n_galleries @profile.galleries.count
+json.n_videos    @profile.videos.count
+
+if @profile.current_city
+  json.current_city @profile.current_city
+end
+

data/config/routes.rb

@@ -6,6 +6,7 @@ Ishapi::Engine.routes.draw do
 
   get 'cities',                :to => 'cities#index'
   get 'cities/view/:cityname', :to => 'cities#show'
+  get 'cities/features',       :to => 'cities#features'
 
   post 'co_tailors/orders',      :to => 'orders#create'
   post 'co_tailors/order_items', :to => 'order_items#create'
@@ -30,6 +31,8 @@ Ishapi::Engine.routes.draw do
 
   post 'payments', :to => 'payments#create'
 
+  get 'profiles/view/:username', :to => 'user_profiles#show'
+
   get 'reports', :to => 'reports#index'
   get 'reports/view/:name_seo', :to => 'reports#show'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.65
+  version: 0.1.8.66
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-04 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -205,6 +205,7 @@ files:
 - app/controllers/ishapi/sites_controller.rb
 - app/controllers/ishapi/sites_controller.rb~
 - app/controllers/ishapi/tags_controller.rb
+- app/controllers/ishapi/user_profiles_controller.rb
 - app/controllers/ishapi/users_controller.rb
 - app/controllers/ishapi/users_controller.rb~
 - app/controllers/ishapi/venues_controller.rb
@@ -260,9 +261,11 @@ files:
 - app/views/ishapi/reports/show.jbuilder~
 - app/views/ishapi/sites/show.jbuilder
 - app/views/ishapi/sites/show.jbuilder~
+- app/views/ishapi/tags/_index.jbuilder
 - app/views/ishapi/tags/_widget.jbuilder
 - app/views/ishapi/tags/index.jbuilder
 - app/views/ishapi/tags/show.jbuilder
+- app/views/ishapi/user_profiles/show.jbuilder
 - app/views/ishapi/users/_index.jbuilder
 - app/views/ishapi/users/_index.jbuilder~
 - app/views/ishapi/users/show.jbuilder